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
20,309 Commits 58 Branches 1,942 Tags
92147c3597308bc05e6448ccc41409fcc7c05fd7
Commit Graph
9045 Commits
Author SHA1 Message Date
Stephen Connolly 92147c3597 [FIXED JENKINS-27565] Refactor the Queue and Nodes to use a consistent locking strategy 
The test system I set up to verify resolution of customer(s)' issues driving this change, required
additional changes in order to fully resolve the issues at hand. As a result I am bundling these
changes:

- Moves nodes to being store in separate config files outside of the main config file (improves performance) [FIXED JENKINS-27562]
- Makes the Jenkins is loading screen not block on the extensions loading lock [FIXED JENKINS-27563]
- Removes race condition rendering the list of executors [FIXED JENKINS-27564] [FIXED JENKINS-15355]
- Tidy up the locks that were causing deadlocks with the once retention strategy in durable tasks [FIXED JENKINS-27476]
- Remove any requirement from Jenkins Core to lock on the Queue when rendering the Jenkins UI [FIXED-JENKINS-27566]
 2015-03-24 14:48:47 +00:00
Kohsuke Kawaguchi b400d1507a [FIXED JENKINS-27277] 2015-03-07 09:59:19 -08:00
Oliver Gondža 20171e4d86 Merge pull request #1558 from patbos/JENKINS-26723 
[JENKINS-26723] Expose displayName in Remote API
 2015-03-06 23:19:18 +01:00
Jesse Glick cf2b02dc58 [JENKINS-26739] Merging #1592. 2015-03-02 20:16:35 -05:00
Jesse Glick 87ab95e7fc Merge branch 'master' of git://github.com/jenkinsci/jenkins 2015-03-02 18:54:06 -05:00
Jesse Glick 5ada903554 [FIXED JENKINS-26739] Suppress monotonicity assertion for MatrixRun. 2015-03-02 18:11:34 -05:00
Johno Crawford a624f373c5 Return copy of EnvVars to prevent outside modification. 2015-03-02 21:22:32 +00:00
James Nord 16e0eb3494 TransientActionFactory should implement ExtensionPoint 2015-03-02 10:38:27 +00:00
Kohsuke Kawaguchi 03647c7ce4 merged back the RC branch 2015-02-28 12:53:13 -08:00
Kohsuke Kawaguchi 8c5843537e Merge branch 'security-rc' into rc 2015-02-28 08:26:13 -08:00
Kohsuke Kawaguchi fe1a1487d5 Added Jenkins 100K easter egg for 1.600 
My plan is to remove this in a while.
 2015-02-28 08:16:53 -08:00
Jesse Glick 8636a2bc08 Simplify code a bit using Collections.reverseOrder(). 2015-02-27 16:02:55 -05:00
Jesse Glick d2d91748dc Forgotten @since. 2015-02-27 14:47:12 -05:00
Jesse Glick f60bde00ab Merge branch 'security' into security-rc 
Conflicts:
	core/src/main/java/hudson/PluginManager.java
	core/src/test/java/hudson/PluginManagerTest.java
 2015-02-27 13:50:21 -05:00
Jesse Glick 8f84890923 Merge branch 'rc' into security-rc 2015-02-27 13:48:15 -05:00
James Nord b8c9841c30 [SECURITY-167] Plugin manager was also vulnerable. 
Although the plugiun manager was vulnerable getting information
out of Jenkins was harder - however it would still be possible to
do bad things such as reading from /dev/zero on Linux
 2015-02-27 18:18:23 +00:00
Jesse Glick db1f805d68 [FIXED JENKINS-26690] Integer overflow in AbstractLazyLoadRunMap.headMap with negative arguments. 2015-02-26 18:10:50 -05:00
tfennelly d81c300c5a Added @since to some new id related fields/methods in Queue.Item and Run 2015-02-24 08:08:39 +00:00
tfennelly bd31bde3c3 Fix Queue.Item.id and Run.getQueueId javadoc 2015-02-24 08:01:44 +00:00
Jesse Glick f918dd84ac Merge pull request #1579 from jglick/ArtifactArchiver.allowEmptyArchive-NPE-JENKINS-25779 
NPE from ArtifactArchiver.getAllowEmptyArchive
 2015-02-23 07:47:38 -05:00
Jesse Glick 0d8ebb17c2 [JENKINS-25779] Fix an NPE when ArtifactArchiver.setAllowEmptyArchive is not explicitly called. 2015-02-22 16:26:23 -05:00
Jesse Glick 9f6be6306e Merge branch 'master' of git://github.com/jenkinsci/jenkins 2015-02-22 16:18:37 -05:00
tfennelly 89681c2029 Mapping of Queue.Item.id onto Run instance 
Allowing correlation/tracking all the way through the lifecycle
 2015-02-20 10:32:42 +00:00
Jesse Glick 61091c1400 Suggested additions now all filed in JIRA and linked to JENKINS-20999 for tracking. 2015-02-19 09:45:01 -05:00
Oliver Gondža 58a41bcb18 [FIXED JENKINS-26684] Escape special chars in maven build step arguments 2015-02-08 14:26:14 +01:00
Jesse Glick 7f51765a59 Merge branch 'security' into security-rc 
Conflicts:
	test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
 2015-02-07 11:37:16 -05:00
Jesse Glick be06d6c4b8 Merge pull request #11 from jenkinsci-cert/SECURITY-162 
[SECURITY-162] Forbid symlink attacks from artifact archiving
 2015-02-07 11:25:08 -05:00
Jesse Glick 35b97d451c Merge branch 'security' into security-rc 
Conflicts:
	core/src/main/java/hudson/model/Api.java
	test/src/test/java/hudson/model/ApiTest.java
 2015-02-06 17:31:49 -05:00
Robert Sandell 1887656c11 Merge pull request #9 from jenkinsci-cert/SECURITY-165 
[SECURITY-165] blacklist the document xpath function for use in Api
 2015-02-06 18:18:30 +01:00
Jesse Glick 1bba1ac3c6 [SECURITY-162] Capture the root directory in VirtualFile.forFile and reject attempts to escape it. 2015-02-06 11:37:24 -05:00
Robert Sandell c03afbbd4f Moved new class to other package 2015-02-06 14:52:20 +01:00
Robert Sandell 1629a93fbc Tidy up 
Review comments fixed:
 Added license header
 Reformat the issue comment
 Restricted NoExternalUse
 toLowerCase in English locale
 lesser resolution of declared exception from the test
 2015-02-06 10:34:41 +01:00
Jesse Glick 6ad8cbfc3a Merge branch 'security' into security-rc 
Conflicts:
	core/src/main/java/hudson/ClassicPluginStrategy.java
	core/src/main/java/hudson/cli/AddJobToViewCommand.java
	core/src/main/java/hudson/model/Run.java
	core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
	core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
	core/src/main/java/jenkins/model/IdStrategyDescriptor.java
	core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
	core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
	core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
	core/src/main/resources/hudson/model/Job/index.jelly
	core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
	core/src/main/resources/hudson/node_monitors/Messages_cs.properties
	core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
	core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
	core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
	core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
	core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
	core/src/main/resources/jenkins/model/IdStrategy/config.jelly
	core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
	core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
	core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
	core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
	core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
	core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
	core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
	core/src/main/resources/jenkins/triggers/Messages_fr.properties
	core/src/main/resources/lib/form/class-entry.jelly
	core/src/main/resources/lib/form/helpLink_pt_BR.properties
	core/src/main/resources/lib/form/link.jelly
	core/src/main/resources/lib/hudson/project/configurable.properties
	core/src/main/resources/lib/hudson/project/configurable_bg.properties
	core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
	core/src/main/resources/lib/hudson/project/configurable_eu.properties
	core/src/main/resources/lib/hudson/project/configurable_gl.properties
	core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
	core/src/main/resources/lib/hudson/project/configurable_nl.properties
	core/src/main/resources/lib/hudson/project/configurable_tr.properties
	core/src/main/resources/lib/hudson/project/console-link.jelly
	core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
	core/src/main/resources/lib/layout/pane_de.properties
	core/src/main/resources/lib/layout/pane_pt.properties
	core/src/main/resources/lib/layout/pane_pt_BR.properties
	core/src/main/resources/lib/layout/task_pt.properties
	core/src/test/java/hudson/util/XStream2Test.java
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/model/AbstractItemSecurityTest.java
	test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
	war/src/main/webapp/scripts/msie.js
 2015-02-05 16:35:57 -05:00
Jesse Glick a001f71ded Merge pull request #6 from jenkinsci-cert/SECURITY-125 
[SECURITY-125] Matrix project script security
 2015-02-05 15:44:47 -05:00
Robert Sandell de4414cbf3 [SECURITY-165] blacklist the document xpath function for use in Api 2015-02-05 20:37:57 +01:00
James Nord 5564a62eb6 Merge pull request #7 from jenkinsci-cert/SECURITY-167_2 
[SECURITY-167] Followup tweaks to address review comments.
 2015-02-05 16:19:14 +00:00
Jesse Glick 10fbe7f1cb Miscellaneous updates in preparation for merge to trunk. 2015-02-05 10:29:05 -05:00
James Nord fe5077e534 remove uneeded "@since TODO" 2015-02-05 14:45:35 +00:00
Ryan Campbell 1338e661aa Merge pull request #5 from jenkinsci-cert/SECURITY-166 
Fixes for SECURITY-166
 2015-02-05 08:44:51 -06:00
James Nord 1786daa514 [SECURITY-167] Followup tweaks to address review comments. 
Addresses some comments received after the original fix was merged.
 2015-02-05 14:36:29 +00:00
Jesse Glick 5c2ac6f50e Merge branch 'security' into security-rc 
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/resources/hudson/model/Messages.properties
 2015-02-05 08:54:50 -05:00
Jesse Glick 1de59c936c Merge branch 'rc' into security-rc 2015-02-05 08:54:16 -05:00
James Nord 065c3b40d3 Merge pull request #4 from jenkinsci-cert/security-167 
SECURITY-167

defend against XXE attacks in core https://issues.jenkins-ci.org/browse/SECURITY-167
 2015-02-05 10:21:26 +00:00
Jesse Glick 41786ad019 Preventing cyclic dependencies among bundled plugins. 
Reproducible for example via HelpLinkTest.testMatrixConfig.
Otherwise have: matrix-project → script-security → matrix-auth → windows-slaves → antisamy-markup-formatter → matrix-project
Tried to come up with a generic way of doing this automatically, but failed.
Just because we bundle a particular build of some plugin does not mean it was built against anything recent,
and for use on older cores it may well need some of those implicit dependencies.
 2015-02-04 16:45:53 -05:00
Jesse Glick 5d43fdf1e6 matrix-project 1.0 
(cherry picked from commit 0bd831e2d9)
 2015-02-04 14:05:32 -05:00
Jesse Glick da829b345d isMatrixProject ought to handle nulls, just in case. 
(cherry picked from commit 747d550c3c)
 2015-02-04 14:05:11 -05:00
Jesse Glick 92ca85339f Preparing to include transitional release. 
(cherry picked from commit 071951e658)
 2015-02-04 14:05:00 -05:00
Jesse Glick 04681f6b84 Extracting some miscellaneous usages from core/src. 
(cherry picked from commit 04aace98d1)
 2015-02-04 14:04:46 -05:00
Jesse Glick a236b34364 DetachedPlugin entry. 
(cherry picked from commit e4ba41d539)
 2015-02-04 14:04:40 -05:00
Jesse Glick 5361065437 Extracting MatrixAggregatable dependency. 
(cherry picked from commit 5d9e4d7b07)
 2015-02-04 14:04:36 -05:00