Commit Graph
1783 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi f83e9aef6d Merge branch 'security' into security-rc
Conflicts:
	test/src/test/java/hudson/model/UpdateCenter2Test.java
2015-02-28 08:25:09 -08:00
Kohsuke Kawaguchi 25411a0bed Fixed a test failure
With the server-side download, the test needs to induce the update
center metadata retrieval in a separate manner.
2015-02-27 15:35:13 -08:00
Jesse Glick 8f84890923 Merge branch 'rc' into security-rc 2015-02-27 13:48:15 -05:00
Oliver Gondža fae41b01c9 [JENKINS-26684] Reproduce in unittest. 2015-02-08 14:26:13 +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 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 57d2b5382b Merge pull request #8 from jenkinsci-cert/testConfigureDownstreamProjectSecurity-RandomlyFails
@RandomlyFails
2015-02-05 21:27:55 -05:00
Jesse Glick b237a41af4 Also checking DirectoryBrowserSupport behavior, as in DirectoryBrowserSupportTest. 2015-02-05 18:42:54 -05:00
Jesse Glick b72246edb1 outsideSymlinks 2015-02-05 18:30:16 -05:00
Jesse Glick 0b96005f60 Merge branch 'security' into security-rc 2015-02-05 17:47:47 -05:00
Ryan Campbell 3e40c6fa00 Merge pull request #10 from jenkinsci-cert/SECURITY-166
[SECURITY-166] Make UI tests work across Jenkins versions
2015-02-05 16:39:50 -06: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
Oliver Gondža c0bda98396 Refactor ProjectTest#testGetRelationship 2015-02-05 21:32:44 +01:00
Oliver Gondža cb5845db29 Fix ProjectTest#testGetRelationship for Windows 2015-02-05 21:19:04 +01:00
Oliver Gondža 07ecd9e1bf Broken .bat script in LauncherTest#overwriteSystemEnvVars 2015-02-05 21:19:04 +01:00
Ryan Campbell 29f59e42ae [SECURITY-166] Make UI tests work across Jenkins versions 2015-02-05 13:45:33 -06: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
Jesse Glick dff4beb641 @RandomlyFails 2015-02-05 10:09:08 -05: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 1d9e1d473a Merge branch 'security' into security-rc 2015-02-05 09:07:08 -05:00
Jesse Glick 76ff1034a9 Avoid duplicate class conflict with core/src/test/java/hudson/model/AbstractItemTest.java. 2015-02-05 09:05:06 -05: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
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 7d926f720e Removing hudson.matrix classes and associated resources as a first pass.
(cherry picked from commit 4aad749cbe)

Conflicts:
	core/src/main/java/hudson/matrix/MatrixBuild.java
	core/src/main/java/hudson/matrix/MatrixConfiguration.java
	core/src/main/java/hudson/matrix/MatrixProject.java
	core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
2015-02-04 13:08:01 -05:00
Ryan Campbell 09c04e3b66 Resolve feedback on SECURITY-165 2015-02-04 09:36:16 -06:00
Oliver Gondža fac3c21367 Do not fail HudsonTestCase test when TestEnvironment.dispose fails
JenkinsRule does the same for years.
2015-02-04 13:54:11 +01:00
Ryan Campbell 01a087d127 [SECURITY-166] Prevent the creation of anonymous, system or unknown users.
These users can still be instantiated, as would happen if there is no security and an anonymous user triggers a build -- the anonymous user would correctly be created and added to the User list. This fix merely prevents the saving of that user, and therefore prevents them from logging in.

There may be some plugins which trigger a build as the SYSTEM user, and that is not prohibited here.

Also prevent full names of 'anonymous', 'system' or 'uknown'. As discussed on SECURITY-166 this may encumber auditing since full names are used in most places in the UI
2015-02-04 05:48:05 -06:00
James Nord 2a1b8542cb [SECURITY-167] fix failing unit test. 2015-02-03 18:31:52 +00:00
Jesse Glick 1e7713402b Merge pull request #1553 from jglick/SimplerBuildWrapperTest.envOverrideExpand
Added test for env var expansion in SimpleBuildWrapper
2015-02-03 13:06:37 -05:00
James Nord d6e14b1eca [SECURITY-167] defend against XXE attacks.
Added a new EntityResolver that will throw an exception if any attempts
are made to load external entities.
Made the transforer use SAX so that we can use out EntityResolover.

As we can't defend against calls that have already parsed the xml (e.g.
DOMSource) if we are parsed one of those throw an exception (which can be
disabled with a System property.
2015-02-03 13:52:46 +00:00
Ryan Campbell 327f778013 [JENKINS-26718] Allow runs to be discarded even if their project can't be found by its fullname 2015-02-02 11:37:06 -06:00
Jesse Glick a398cabd32 Make WorkspaceList.Lease implement AutoCloseable for Java 7 callers, to make releasing the lease more convenient. 2015-01-29 18:07:07 -05:00
Jesse Glick 62af87b67a [JENKINS-26698] Make sure BuildExecution.cleanUp always calls super, to release the workspace lease.
Also stop closing the build log in Run.handleFatalBuildProblem; we want to see any subsequent messages too.
2015-01-29 17:57:47 -05:00
Jesse Glick 7f827adac2 Verifying that even recursive expansion works, at least in simple cases. 2015-01-29 11:29:38 -05:00
Jesse Glick 9dcd3c0497 Added envOverrideExpand to confirm that ${OTHERVAR} is expanded when needed. 2015-01-29 11:20:25 -05:00
Jesse Glick eaaf1fcf45 Merge branch 'rc' into security-rc 2015-01-28 09:05:08 -05:00
CloudBees DEV@Cloud b37af29504 Merge commit 'c1e89aa74ee1a3f9061645fdea9aaeaa8efc70e8' 2015-01-23 18:47:56 +00:00
Kohsuke Kawaguchi c1e89aa74e report URL in case of a failure 2015-01-23 10:46:17 -08:00
Jesse Glick 416bdef94d [JENKINS-24673] Noting merge of #1530. 2015-01-23 12:39:34 -05:00
Jesse Glick bb7b1f950d Updating SingleFileSCM to nondeprecated overload of checkout. 2015-01-22 18:51:01 -05:00
Jesse Glick 67f338507d Merge branch 'security' into security-rc
Conflicts:
	core/src/main/java/hudson/model/DownloadService.java
	core/src/main/java/hudson/model/UpdateSite.java
	core/src/main/java/jenkins/model/DownloadSettings.java
	core/src/main/java/jenkins/util/JSONSignatureValidator.java
	core/src/main/resources/hudson/model/UpdateCenter/PageDecoratorImpl/footer.jelly
	core/src/main/resources/jenkins/model/DownloadSettings/config.groovy
	core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
	test/src/test/java/hudson/model/DownloadServiceTest.java
2015-01-22 17:00:39 -05:00
Jesse Glick 94cc487002 Also verifying that initialEnvironment somehow works. 2015-01-22 09:53:07 -05:00