Commit Graph
13197 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi bf736a7407 [maven-release-plugin] prepare for next development iteration 2014-10-29 18:10:06 -07:00
Kohsuke Kawaguchi b3660bf84e [maven-release-plugin] prepare release jenkins-1.587 2014-10-29 18:10:06 -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
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
Jesse Glick 48beb9135f Merge branch 'SECURITY-144' into SECURITY-144-rc
Conflicts:
	pom.xml
2014-10-26 15:27:59 -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
CloudBees DEV@Cloud 6f9fc7d9b5 Merge REMERGE_HEAD into HEAD 2014-10-26 21:40:21 +00: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
Kohsuke Kawaguchi b4a9671c27 Integrated the newest Stapler version
In particular, this includes pull request #39 from Matt that handles
'$class'
2014-10-26 13:35:49 -07:00
Craig Rodrigues 6d3d43275f [FIXED JENKINS-24527] Update jna-posix to 1.0.3-jenkins-1 which uses JNA 4.1 2014-10-25 17:19:42 -07:00
Jesse Glick 12f5dec0ed junit 1.2-beta-3 2014-10-25 15:39:08 -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
James Nord e135651539 [FIXED JENKINS-25280] Failed tests do not get displayed properly in the overview
there is no such mothod getFullDisplayName in a TestObject - only getDisplayName

Change-Id: Idd454be00a22ee3c93f661a3ee3ae322a25c271d
2014-10-23 17:03:26 +01: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 8c06d5fb07 If not enabled by default, need to change wording. 2014-10-20 10:05:49 -04:00
Jesse Glick 97b2f931ae Merge branch 'SECURITY-144' into SECURITY-144-rc 2014-10-20 08:57:11 -04:00
Kohsuke Kawaguchi 0fa32eac4e the trunk is toward 1.587-SNAPSHOT 2014-10-19 21:51:18 -07: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
Oleg Nenashev cc06ae78e3 [JENKINS-19017] - Unit tests
Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2014-10-18 22:03:28 +04: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 e8adb10bcb tightening up the treatment of access to directory itself 2014-10-17 16:10:01 -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 14f05e9141 One more entry. 2014-10-17 17:20:47 -04:00
Jesse Glick da0f7e84e9 Adding a couple of whitelist entries. 2014-10-17 16:44:40 -04:00
Kohsuke Kawaguchi cfb59257bf Using the wording changes suggested by Daniel 2014-10-17 10:38:37 -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 38cb00b325 Refining comments in *.conf. 2014-10-17 10:34:19 -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
Jesse Glick f327fc284a Removing BYPASS_LOG here as well. 2014-10-17 10:18:46 -04:00