OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 04:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,351 Commits 58 Branches 1,942 Tags
926e5f10bce6006b70e0eeffb9ca5dc77c6704fe
Commit Graph
8585 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 926e5f10bc merged back the RC branch 2014-10-01 12:54:13 -07:00
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 be195b0e19 [FIXED SECURITY-150] 
Integrated the change
 2014-10-01 08:21:06 -07: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
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.
 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
Nicolas De Loof d54bc061b1 Merge branch 'JENKINS-24825' 2014-09-24 23:21:04 +02: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
 2014-09-24 13:58:12 -04:00
Jesse Glick 511af1cea0 Noting that CloudSlaveRetentionStrategy appears to be a poor reimplementation of CloudRetentionStrategy. 2014-09-24 12:59:45 -04:00
Jesse Glick c04cdcd9f7 [FIXED JENKINS-22769] ItemListener callbacks should run as SYSTEM since they sometimes do ACL-checked calls. 2014-09-24 11:06:00 -04: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.
 2014-09-24 08:49:21 -04:00
Nicolas De Loof 9b3f48853d [FIXED JENKINS-24825] define hudson.model.AbstractItem#movedTo 2014-09-24 14:03:41 +02:00
Stephen Connolly bfa9c503d6 Expose the remote cause details 2014-09-23 10:31:39 +01:00
Jesse Glick be76d09384 If during hudson-dev:run we have updated a bundled plugin, honor that pin at next start. 2014-09-22 13:03:31 -04:00
Jesse Glick 53958b8a33 Merge branch 'rc' into security-rc 2014-09-22 11:56:08 -04:00
Jesse Glick 30f37b2c3a Merge branch 'security' into security-rc 2014-09-19 14:43:05 -04:00
Jesse Glick 38563d3470 @DataBoundConstructor makes no sense on an abstract class. 
(cherry picked from commit 71600d8b37)
 2014-09-19 14:40:52 -04:00
Jesse Glick 8aafca039d Merge branch 'security' into security-rc 
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/security/ACL.java
	test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
 2014-09-18 10:32:00 -04:00
Jesse Glick 747238d898 Merge branch 'rc' into security-rc 2014-09-18 10:29:09 -04:00
Jesse Glick 16cbab5e48 Better toString. 2014-09-17 14:26:38 -04:00
CloudBees DEV@Cloud 8b2d70f60b Merge REMERGE_HEAD into HEAD 2014-09-17 14:42:17 +00:00
Daniel Beck 3d25f57aa1 Merge pull request #1370 from DavidRuhmann/JENKINS-7478 
[FIXED JENKINS-7478] Correct Line Endings for Batch Files
 2014-09-17 16:22:40 +02:00
Daniel Beck 8bb88be27e Merge pull request #1392 from dominiquebrice/javadoc_update 
Updating javadoc of Plugin, LabelAtomProperty, GlobalConfiguration with ...
 2014-09-17 16:20:21 +02:00
Daniel Beck f715fc7598 Merge pull request #620 from laurence-h/master 
[FIXED JENKINS-15576] Label's Load Statistics queue length based on label assigned to job rather than to item in build queue.
 2014-09-17 16:18:14 +02:00
Jesse Glick 71600d8b37 @DataBoundConstructor makes no sense on an abstract class. 2014-09-17 10:01:13 -04:00
Dominique 680c54887b Updating javadoc based on PR feedback 2014-09-16 21:12:59 -04:00
Daniel Beck 8cbd2b57a8 Updated since 2014-09-13 14:29:50 +02:00
Daniel Beck 852ba85c96 Merge pull request #1391 from daniel-beck/JENKINS-21881 
[FIXED JENKINS-21881] System property for disabling X-Frame-Options
 2014-09-13 14:14:37 +02:00
Kohsuke Kawaguchi f5a245e95d Exposing this to use it from other places that use channels 2014-09-11 15:21:05 +02:00
Dominique 259f5e1780 Updating javadoc of Plugin, LabelAtomProperty, GlobalConfiguration with my observations from working on my plugin 2014-09-09 21:25:10 -04:00
Daniel Beck fc78fdee9b [FIXED JENKINS-21881] System property for disabling X-Frame-Options 2014-09-07 18:46:49 +02:00
Daniel Beck 934d000bfd Inserted missing at-since 2014-09-06 00:52:51 +02:00
Daniel Beck 8aac35d4a1 Merge pull request #1380 from daniel-beck/JENKINS-6153 
[FIXED JENKINS-6153] Add description for label atoms
 2014-09-06 00:51:59 +02:00
Daniel Beck 9bc2f1d057 Merge pull request #1377 from daniel-beck/JENKINS-19764 
[FIXED JENKINS-19764] Ensure parent dir of new builds dir exists.
 2014-09-06 00:31:47 +02:00
Kohsuke Kawaguchi 6a2b879262 Revisiting 9b7b1364c0 a bit. 
Since ConsistentHash is written as a mutable class, I think a better way to fit the existing design is to provide a bulk add operation.
It already has several methods to that end, so I just added one more that's needed for our purpose.
 2014-09-05 10:45:42 -07:00
Daniel Beck 990a84f753 [FIXED JENKINS-24407] Restore icon class name during deserialization 2014-09-05 14:26:08 +01:00
Nicolas De Loof 9b7b1364c0 use a Builder to create ConsistentHash<Node> 
invoking add(Node, replica) for all nodes rebuild the internal Table many times. Using a builder, Table is only created (and sorted) once
also avoid creating a fresh new Hash object (java 8 lambdas, I miss you)
 2014-09-05 13:54:49 +02:00
Nicolas De Loof 66766953eb typos 2014-09-05 13:09:22 +02:00
Kohsuke Kawaguchi c93635b9e9 [SECURITY-128] 
Plugins that depend on LTS shouldn't be using this API.
 2014-09-02 16:15:22 -07:00
Kohsuke Kawaguchi 54d44502bd [FIXED SECURITY-127] 
CONFIGURE permission shouldn't allow the type of the job to be changed.
That's more of CREATE+DELETE.

In any case, the code doesn't correctly handling submitting config.xml
for a different type.
 2014-09-02 16:12:47 -07:00
Kohsuke Kawaguchi 31df138d69 [SECURITY-87] 
After talking to Jesse, he's OK with me bringing it back to public so
long as we don't allow other programmatic dependencies to it.

The intention of leaving them mutable is to allow admins to play with
this in the groovy script during the initialization and at runtime.

Groovy currently ignores the private access modifier anyway, but that is
considered as a bug in the upstream
(https://jira.codehaus.org/browse/GROOVY-3010)
 2014-09-02 14:16:53 -07:00
Kohsuke Kawaguchi db757116f1 [FIXED SECURITY-128] 
It may be that the 'newName' exists and just not visible to the user trying to do a rename
 2014-09-02 14:05:42 -07:00
Nicolas De loof 314bd64604 set @since on DecoratedLauncher 2014-09-02 12:04:12 +02:00
Jesse Glick 1a6e943d04 Improved Javadoc for ExecutorListener. 2014-09-01 21:41:33 -04:00
Jesse Glick 67f23793fc [SECURITY-120] Do not print a warning with stack trace just because we are using a 2.x servlet container. 2014-08-31 17:44:29 -04:00
Jesse Glick c7cf218076 Merge branch 'security' into security-rc 2014-08-31 11:45:07 -04:00
Jesse Glick 9dec86501b Merge branch 'rc' into security-rc 2014-08-31 11:45:05 -04:00