Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi a0fe61a098 Merge remote-tracking branch 'security/security' into rc
Conflicts:
	.idea/encodings.xml
	core/pom.xml
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
2014-10-01 10:09:42 -07:00
Kohsuke Kawaguchi 481f28b73f Merge remote-tracking branch 'security/security-rc' into rc 2014-10-01 10:06:37 -07:00
Kohsuke Kawaguchi be195b0e19 [FIXED SECURITY-150]
Integrated the change
2014-10-01 08:21:06 -07:00
Matt Moore eec43983a3 This change converts several optionalBlock's wrapping a single field to inline="true".
By converting several optionalBlock entries to use inline="true", we convert the submitted JSON from:
   "hasPropertyFoo": {
     "propertyFoo": "value"
   },

which is a somewhat unnatural naming scheme, to:
   "hasPropertyFoo": true,
   "propertyFoo": "value",

This enables us to use the pattern:
   if(json.optBoolean("hasPropertyFoo", json.has("propertyFoo"))) {
     ...
   }

To permit either of the following as JSON blobs, for specifying a value for "propertyFoo":
1) "hasPropertyFoo": true,            # What comes through from jelly
   "propertyFoo": "value",

2) "propertyFoo": "value",

It also allows any of the following as JSON blobs, for NOT specifying a value for "propertyFoo":
3) "hasPropertyFoo": false,           # What comes through from jelly
   "propertyFoo": "value",

4) "hasPropertyFoo": false,

5) (nothing specified)

NOTE: The main interest in flexibility in what JSON comes through is in support of: https://wiki.jenkins-ci.org/display/JENKINS/YAML+Project+Plugin, this is also the purpose of the couple renames that are mixed in with this.
2014-09-29 09:36:19 -07:00
Kohsuke Kawaguchi 09c59c0171 merged back the RC branch 2014-09-28 22:33:54 -07:00
Kohsuke Kawaguchi 45ff0bcb83 updated changelog as a part of the release 2014-09-28 22:33:50 -07:00
Kohsuke Kawaguchi e53fde1060 Merge pull request #1410 from rodrigc/JENKINS-24521
Add getFieldOrder() methods.
2014-09-28 21:34:38 -07:00
Matt Moore 86c911e8b9 Switch to using inline optionalBlock for several AbstractProject checkboxes so that we are passed a boolean, instead of either null or {}.
NOTE: The discrepancy between inline-optionalBlock and f:entry/f:checkbox is the text alignment, which optionalBlock keeps consistent with other elements (and what is done for these today).
2014-09-28 21:10:40 -07:00
Matt Moore 873de8cd22 Switch the source of a number of AbstractProject config options from StaplerRequest to JSONObject.
This change shifts the way a number of form elements are accessed when handling AbstractProject's doConfigSubmit from using "req.getParameter(...)" style access to using JSON-style (structured form submission) access through "reg.getSubmittedForm()".
2014-09-28 19:33:47 -07:00
Kohsuke Kawaguchi e026d522d3 updated changelog for release 2014-09-28 14:07:38 -07:00
Kohsuke Kawaguchi 4a8f12b3f2 [maven-release-plugin] prepare for next development iteration 2014-09-28 14:01:28 -07:00
Kohsuke Kawaguchi 3c99828edf [maven-release-plugin] prepare release jenkins-1.582 jenkins-1.582 2014-09-28 14:01:28 -07:00
Harald Albers 1759ffb3e1 localization cleanup 2014-09-28 18:01:55 +02:00
Oleg Nenashev 7c4f6b7ef4 [FIXED JENKINS-19017] - FileParameter - Handle non-null file parameters as different values
The change prevents the issue when Jenkins merges builds with different files coming from one source (It may happen!).

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-09-28 18:11:57 +04:00
Craig Rodrigues 1c1a4b7544 Add getFieldOrder() methods.
Add getFieldOrder() methods to classes which extend com.sun.jna.Structure,
for compatibility with newer versions of JNA.  [JENKINS-24521]
2014-09-27 17:22:54 -07:00
Kohsuke Kawaguchi 28d997704f [FIXED SECURITY-159]
Bumping up dependencies to 1.3.1, with extra precaution to make
DiskFileItem non-serializable
2014-09-27 15:51:47 -07:00
Kohsuke Kawaguchi 5f1ff56d8c Maven module was removed 2014-09-27 15:46:57 -07:00
Kohsuke Kawaguchi b6a15f502c Winstone now report a proper version during startup and in the 'Server' header 2014-09-27 12:54:28 -07:00
Jesse Glick 85f356bc5f Forgotten compilability fix.
(cherry picked from commit 20e5d06280fcce471abfdcc1921bd607c6a1f4df)
2014-09-26 17:33:36 -04:00
Jesse Glick 89cbfc4639 Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/EnvVars.java
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/cli/ClientAuthenticationCache.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/model/Computer.java
	core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
	core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
	core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
	core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
	core/src/main/java/hudson/slaves/Channels.java
	core/src/main/java/hudson/slaves/SlaveComputer.java
	core/src/main/java/hudson/tasks/Fingerprinter.java
	core/src/main/java/hudson/tasks/Shell.java
	core/src/main/java/hudson/tasks/junit/JUnitParser.java
	core/src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java
	core/src/main/java/hudson/util/ProcessTree.java
	core/src/main/java/hudson/util/RemotingDiagnostics.java
	core/src/main/java/jenkins/model/Jenkins.java
	core/src/test/java/hudson/LauncherTest.java
	pom.xml
	test/src/test/java/hudson/tasks/junit/CaseResultTest.java
2014-09-26 15:56:48 -04:00
Kohsuke Kawaguchi ee19d1e34f Merge pull request #1400 from msrb/rpm-init-script
init script: don't try to run on Java 5
2014-09-25 17:38:53 -07:00
Kohsuke Kawaguchi 99020aed61 Merge pull request #1407 from michaelneale/master
Use copytruncate consistent with .deb packaging
2014-09-25 17:37:38 -07:00
Michael Neale f96f49b7e8 Use copytruncate consistent with .deb packaging
also requires no signalling of the process and less risk of (ironically) lost logs which postrotate attempts to address.
2014-09-26 10:10:48 +10:00
CloudBees DEV@Cloud e1c3d13cd8 Merge commit '19da04619d36b80dcdbc9d69d6ca715b996b2ded' builds/260 2014-09-25 19:24:03 +00:00
Kohsuke Kawaguchi 19da04619d Integrating a newer version of Stapler
The primary change is that the thread name update code now lives in a
filter instead of 'Stapler' servlet, so it happens a lot earlier.
changes/260
2014-09-25 12:21:53 -07:00
Jesse Glick c1e8b150b3 Simplifying JSONException handling in doConfigSubmit to use standard (?) error reporting.
Also sending the exception to the log, which is where plugin developers expect to see it.
(This is also necessary for the exception to be visible say from configRoundtrip in a functional test.
Otherwise you just see a FailingHttpStatusCodeException due to the 400 error code, with no details.)
Might actually suffice to just throw a ServletException wrapping the exception up the chain,
letting Stapler or the container handle it, but this change is more conservative.
builds/259 changes/259
2014-09-25 14:10:44 -04:00
Jesse Glick 2751bf4ac5 sendError(Exception…) should set the exception attribute on the response, since error.jelly handles this nicely. 2014-09-25 14:06:51 -04:00
Jesse Glick 4f736a9334 Merge branch 'security' into SECURITY-144 2014-09-25 13:30:42 -04:00
Jesse Glick 3ba17df3b3 Moving one test case to maven-plugin.
(cherry picked from commit 261f40533e)
2014-09-25 13:30:33 -04:00
Jesse Glick 7af7fbb0fc Merge branch 'security' into SECURITY-144 2014-09-25 10:08:34 -04:00
Jesse Glick 5612b235ef Moving hudson.maven tests to maven-plugin.
(cherry picked from commit facfc178df)
2014-09-25 10:08:18 -04:00
Jesse Glick 801b82578e Bundling patched Maven plugin. 2014-09-25 09:52:48 -04:00
Jesse Glick 695a66f196 1af88e8b7f incorrectly disabled all logging.
When we are allowing all callables through, we want to enable remote class loading
(just in case someone is using it legitimately), but continue logging callable issues.
Currently there is no remoting flag to allow remote class loading while logging it.
2014-09-25 09:25:15 -04:00
Kohsuke Kawaguchi 40c4a2f356 Got rid of the unused constants 2014-09-24 19:04:24 -07:00
Kohsuke Kawaguchi 4f733244e6 Moving MasterToSlaveFileCallable/SlaveToMasterFileCallable to the top level classes.
If we ever decide to develop a compatibility thunk library for these changes to help promote deployment in plugins,
then these classes being a nested type is problematic as they'll fail to load under onld Jenkins
2014-09-24 19:04:24 -07:00
Kohsuke Kawaguchi 1af88e8b7f Disable classloading from slaves and other VMs connected to the master 2014-09-24 19:04:24 -07:00
Kohsuke Kawaguchi c3a2069603 Added a 'ChannelConfigurator' extension point
... to intercept new Channel creation, which provides the opportunity to set up the new channel.
2014-09-24 19:04:24 -07:00
Nicolas De Loof d54bc061b1 Merge branch 'JENKINS-24825' 2014-09-24 23:21:04 +02:00
Jesse Glick c5bda70bee Reverting e47dc1d555.
The result of a misunderstanding.
BYPASS_LOG can be deleted by the time we release, and for its temporary purpose, runtime modification is not necessary.
2014-09-24 15:51:49 -04:00
Kohsuke Kawaguchi 1e40aa5805 Expand the test to cover diagnostic stack trace 2014-09-24 11:46:22 -07:00
Jesse Glick b2bb58895f Trying to improve a useless log warning when starting Docker slaves.
… hudson.tasks.Shell$DescriptorImpl getShellOrDefault
WARNING: Remote call on …@docker failed
builds/258 changes/258
2014-09-24 13:58:12 -04:00
Kohsuke Kawaguchi e47dc1d555 I'm begging Jesse to keep those properties modifiable at runtime!
It would just provide so much flexibility that would come in handy for operators.

  - One can control this feature from $JENKINS_HOME/groovy.init.d/*.groovy. When these are managed by Chef/puppet,
    this make it very clean to apply this as a patch.
  - The log file is getting too big and wants to rotate? No problem with quick groovy script from the console
    (or from CLI if you need to do the same with 12 masters)
  - Shipping the log over to network instead of local file? No problem!

I thought your primary concern of field being unreachable from outside is already addressed via @Restricted(NoExternalUse).
2014-09-24 10:51:21 -07:00
Jesse Glick 511af1cea0 Noting that CloudSlaveRetentionStrategy appears to be a poor reimplementation of CloudRetentionStrategy. builds/257 changes/257 2014-09-24 12:59:45 -04:00
Kohsuke Kawaguchi 71fe6e6650 Signature update complete for RoleChecker change 2014-09-24 09:51:31 -07:00
Kohsuke Kawaguchi 201b035cfc Updated to reflect the signature change around role checking in remoting 2014-09-24 09:43:31 -07:00
Jesse Glick c04cdcd9f7 [FIXED JENKINS-22769] ItemListener callbacks should run as SYSTEM since they sometimes do ACL-checked calls. builds/256 changes/256 2014-09-24 11:06:00 -04:00
Nicolas De Loof 8975b0e0b5 test case for JENKINS-24825 2014-09-24 16:59:37 +02:00
Jesse Glick 253943e13e [JENKINS-5756] Removing workarounds for HotSpot bug.
https://bugs.openjdk.java.net/browse/JDK-6933067 claims to be fixed as of Java 6, our baseline.
2014-09-24 09:32:50 -04:00
Nicolas De Loof bd3abf6beb javadoc 2014-09-24 15:30:54 +02:00
Jesse Glick 28dfd90d2d Better to use an IllegalStateException rather than assertion in setResult.
Assertions are only for cases where you believe the failure of the condition is impossible.
For cases where external code might mistakenly make an incorrect call, throw an exception.
builds/255 changes/255
2014-09-24 08:49:21 -04:00