Commit Graph
8771 Commits
Author SHA1 Message Date
Oliver Gondža 8b71d13233 Merge pull request #1447 from mattmoor/labels
Adjust my prior change to better utilize structured form submission...
2014-11-02 23:42:53 +01:00
Matt Moore c426fd2300 mark the legacy jelly endpoints as DoNotUse 2014-11-01 13:10:37 -07:00
Matt Moore 492b4902d8 Adjust my prior change to better utilize structured form submission to accomodate a plugins that are not using p:config-assignedLabel 2014-10-30 13:57:26 -07:00
Jesse Glick e22cb19feb Merge branch 'JENKINS-25358' of github.com:rodrigc/jenkins 2014-10-29 22:34:25 -04:00
Kohsuke Kawaguchi 47b8d961ae merged back the RC branch 2014-10-29 18:46:04 -07:00
Jesse Glick a6204318f8 Merge branch 'master' of github.com:n-nachiappan/jenkins 2014-10-29 18:35:45 -04:00
Jesse Glick 5976b3840a Merge branch 'custom-workspace' of github.com:mattmoor/jenkins 2014-10-29 18:07:48 -04:00
Matt Moore 207bf23884 Adjust my prior change to better utilize structured form submission to accomodate a few plugins that are improperly submitting data through this processing logic 2014-10-29 14:15:02 -07:00
Craig Rodrigues c577fffe43 Use a jna Union type for the DUMMYUNIONNAME union structure
JNAerator ( https://code.google.com/p/jnaerator/ ) was helpful
for generating the Java code from the C struct.
2014-10-29 12:34:47 -07:00
Stephen Connolly 86ea65ab6f Make it possible for sub-classes to have a sub-class specific trust anchor chain 2014-10-29 16:55:41 +00:00
Craig Rodrigues f3e9d5d681 [FIXED JENKINS-25358] Remove extra fields from getFieldOrder()
Remove fields which are not part of struct _SHELLEXECUTEINFO.
2014-10-29 09:52:59 -07:00
Jesse Glick 4cb7414e90 fromExternalizableId should just return null, not throw IAE, if the job has since been renamed/move/deleted.
(It could already return null if the run has since been deleted; #1264 failed to mark this properly.)
Reserving IAE for inputs that getExternalizableId could not actually have produced,
and making sure to also throw this in case of non-numeric text after the hash.
Adding Javadoc for both methods.
2014-10-28 11:23:03 -07:00
Jesse Glick c589392dca Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-28 11:20:29 -04:00
Jesse Glick 8c10c75d85 Merge branch 'security-rc' into SECURITY-144-rc 2014-10-28 11:20:25 -04:00
Stephen Connolly 07fb00e05a If you are synchronizing on something to access a volatile, then you are doing something wrong
- Yet more interrupting bad patterns, especially where we expect the node monitor to take up to 30 seconds to complete if an async variety
2014-10-28 13:48:00 +00:00
Stephen Connolly 68f6222633 Prevent a storm of node monitor updates when there is a storm of nodes coming on line within 1 second
- The old code would result in multiple triggered updates, with corresponding interrupts of in-progress updates
  when faced with lots of slaves coming on line within 1 second of each other.

- New code will ensure that one and only one of the scheduled tasks (i.e. the last one) will trigger the updates.
2014-10-28 13:27:24 +00:00
Stephen Connolly 1587511c55 fix @since tags 2014-10-28 13:27:03 +00:00
Stephen Connolly bf2206d783 Merge pull request #1433 from stephenc/master
Refactor NodeProvisioner to allow for extension of strategies
2014-10-28 13:21:56 +00:00
Kohsuke Kawaguchi 9a108de405 These permissions should be RUN_SCRIPTS
... as it grants access to the JVM internals of the master in the same
Groovy scripts do.
2014-10-27 15:39:46 -07:00
Jesse Glick 0434a2ac4a readFromOffset needed to be adjusted too. 2014-10-26 15:47:47 -07:00
CloudBees DEV@Cloud 1671c9e63a Merge commit '9b36e2ae8dbbd2a7ab0d9d4bc9e24e305e33ecbc' 2014-10-26 22:22:28 +00:00
Kohsuke Kawaguchi 9b36e2ae8d [FIXED JENKINS-25314]
The original fix was made in 0c3d67097a.
In this fix, I'm also moving the code that creates LeftItem.

It makes no sense that there's Item.cancel(Queue) and Queue.cancel(Item)
and they do different things!
2014-10-26 15:20:38 -07:00
Jesse Glick 300b6fa519 Forgotten @since. 2014-10-26 13:58:40 -07:00
Jesse Glick f0658e233d Merge branch 'security-rc' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
2014-10-26 13:55:39 -07:00
Jesse Glick 2f8e2684af Merge pull request #1441 from mattmoor/upstream-javadoc
Change the javadoc of UpstreamCause to be more accurate...
2014-10-25 12:19:59 -04:00
Matt Moore 6ceb24cbd9 Change the javadoc of UpstreamCause to be more accurate (the upstream build need not be complete) 2014-10-25 08:54:11 -07:00
N Nachiappan dc547cf297 move config file check as part of loading job to do it in multithread fashion than in a single thread 2014-10-24 14:06:42 -07:00
Jesse Glick 90292ed28a Null safety.
Observed in a test against 1.480:
… hudson.model.Executor run
SEVERE: Unexpected executor death
java.lang.NullPointerException
	at hudson.model.Computer.getNode(Computer.java:473)
	at hudson.slaves.SlaveComputer.getNode(SlaveComputer.java:177)
	at hudson.slaves.SlaveComputer.getRetentionStrategy(SlaveComputer.java:609)
	at hudson.slaves.SlaveComputer.taskCompleted(SlaveComputer.java:285)
	at hudson.model.queue.WorkUnitContext.synchronizeEnd(WorkUnitContext.java:140)
	at hudson.model.Executor.run(Executor.java:253)
2014-10-21 11:42:11 -04:00
Jesse Glick 97b2f931ae Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-20 08:57:11 -04:00
Oleg Nenashev 6819a620c0 Noting #1411
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-10-19 23:47:35 +04:00
Oleg Nenashev e80fa118aa Merge pull request #1411 from synopsys-arc-oss/JENKINS-19017
[FIXED JENKINS-19017] - FileParameter - Handle non-null file parameters as different values
2014-10-19 23:28:14 +04:00
Kohsuke Kawaguchi 8632efc35f Allowing (and encouraging) rules in config file to use '/' as separator.
Based on comments from Daniel Beck and Jesse Glick in 37a3dda
2014-10-18 20:03:38 -07:00
Kohsuke Kawaguchi ef2dd2473b $JENKINS_HOME might contain symbols that are interpreted as regular expression 2014-10-18 19:55:28 -07:00
Kohsuke Kawaguchi b4ffb2d01b More follow-up renames 2014-10-18 19:47:19 -07:00
Kohsuke Kawaguchi 7376aa0e29 Renamed package. 2014-10-18 19:39:21 -07:00
Kohsuke Kawaguchi 062f9d4845 Show the warning & config only when it's relevant 2014-10-18 19:34:57 -07:00
Kohsuke Kawaguchi 5db8cecae3 Added a AdminMonitor to to warn when this subsystem is disabled
... unless a few conditions indicate that it is likely irrelevant.
2014-10-18 18:51:25 -07:00
Kohsuke Kawaguchi e24ceef22a Disabling this subsystem by default.
As much as we'd like to enable this by default, what we've learned over
the past few days indicate that this is just too disruptive a change. In a nutshell,

 - The change is just too big. It touches more than 4000 lines just in the core and remoting,
   which makes this by far the biggest change we've done in secret. The chance of something
   going wrong is just too high. As recently as yesterday we are still finding significant
   problems with this subsystem.

 - We've learnt that Subversion 1.x contains Callables that we cannot just whitelist, but
   that version is used by roughly a third of users. If we put this on by default, they will
   see their builds break.

 - Every time we come up with a new way to scan plugins to find impacted code, we always
   find several plugins that are affected, indicating that we probably have missed more
   plugins that will be impacted.

 - We haven't really analyzed past versions of any plugins at all, but as the Subversion
   version distribution indicates, considerable portion of people run old plugins.

As we see in the Wiki page (http://jenkins-ci.org/security-144), vast majority of Jenkins
installations will fit in the category of "I have set up Jenkins master and all slaves by
myself", for whom this subsystem is entirely redundant.

Based on the knowledge we now have about the impact of this addition, and considering people
who benefit from this vs people who don't benefit from this, I'm not enabling this feature
out of the box, just yet.

Our plan is to advertise this feature, then get necesary plugin updates in place over time.
At some later point, we can make this feature on by default, which will only impact new
installations. Further down the road, we can inch up the warning given to people who run
without this feature, or remove the GUI configuration and force this feature on, to get
close to the ideal state of having everyone run with this feature on.

Jesse doesn't like this, but I think he understands where I'm coming from. Sorry Jesse,
this time I'm having this my way.
2014-10-18 18:20:09 -07:00
Kohsuke Kawaguchi 8a105ce57c Adding separate check for symlink to prevent jailbreak
Otherwise a symlink can be created to point to a file outside $JENKINS_HOME and be read
2014-10-17 19:03:55 -07:00
Kohsuke Kawaguchi ec1e47c053 Change the name because this directory is shared by all secrets 2014-10-17 18:55:05 -07:00
Kohsuke Kawaguchi 9342558ab1 Based on a discussion with Daniel Beck, implemented a master kill switch as an admin configurable feature.
The wiki page already talks about how an admin can do this: https://wiki.jenkins-ci.org/display/JENKINS/Slave+To+Master+Access+Control#SlaveToMasterAccessControl-Disabletheaccesscontrolmechanismaltogether

There's a risk in making this too easy, but we keep finding more plugins that need SECURITY-144 adjustments, and I'm really worried
about SECURITY-144 fix blowing up in the face of too many people.
2014-10-17 18:51:57 -07:00
Kohsuke Kawaguchi 7c9c5c73e8 Path related changes & Windows fix
- Added <JOBDIR> based on Daniel's comment
- Path macros need to be translated if on Windows
- Windows treat '/' as a valid path separator, so it needs to be normalized to '\\'.
2014-10-17 18:08:35 -07:00
Kohsuke Kawaguchi 37a3ddaaed Path has to be in Windows format on Windows 2014-10-17 16:07:41 -07:00
Kohsuke Kawaguchi ee16f8b63b Fixing another inconsistency.
Most other files are local, so 'gui.conf' better explains what they are.
2014-10-17 15:37:08 -07:00
Kohsuke Kawaguchi aec88b73b5 Fixing inconsistency.
Daniel Beck pointed out that if we ask people to create files not writable from Jenkins as a means to suppress edit to gui.conf,
then we should just stick to the same approach all the way.
2014-10-17 15:37:08 -07:00
Kohsuke Kawaguchi 050b0e7588 set a shorter ID to make URL bit nicer 2014-10-17 15:37:08 -07:00
Kohsuke Kawaguchi bc4d0e1824 Adding new line like elsewhere 2014-10-17 15:37:08 -07:00
Kohsuke Kawaguchi 6ff47b37f6 Need to guide the users to SECURITY-144 landing page 2014-10-17 15:37:08 -07:00
Jesse Glick c94c1716f3 Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	core/src/main/java/hudson/FilePath.java
	core/src/main/java/hudson/PluginManager.java
	core/src/main/java/hudson/PluginWrapper.java
2014-10-17 10:59:32 -04:00
Jesse Glick e89da8d52d Also removing BYPASS_CALLABLES, which should have been superseded by richer admin UI. 2014-10-17 10:21:00 -04:00