Commit Graph
32590 Commits
Author SHA1 Message Date
Jesse Glick 7515734b6d Merge branch 'security' into security-stable-1.596
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/resources/hudson/model/Messages.properties
2015-02-05 08:53:28 -05:00
Jesse Glick 1e884de087 Merge branch 'stable-1.596' into security-stable-1.596 2015-02-05 08:52:56 -05:00
Jesse Glick 228e3d90b6 Merge branch 'security' into security-stable-1.580
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/resources/hudson/model/Messages.properties
2015-02-05 08:52:24 -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
tfennelly c78d1519a1 Noting JENKINS-26406 2015-02-05 09:46:43 +00:00
Tom Fennelly a7a48abea7 Merge pull request #1542 from tfennelly/JENKINS-26406
[FIXED JENKINS-26406] Build history text field wrap fails when containing markup
2015-02-05 09:43:01 +00:00
Nicolas De Loof 8881703f7c [JENKINS-26781] lookup descriptor by ID, then by class if explicitly set
to match some specific use cases.
2015-02-05 00:31:00 +01: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 f987f9ce89 Need to test against the same version of matrix-project we bundle.
Otherwise FingerprinterTest.matrixDependency throws an AbstractMethodError.
2015-02-04 15:52:56 -05:00
Jesse Glick 5b93017568 Integrating snapshot build of matrix-project. 2015-02-04 14:58:22 -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 075bd9b5b3 matrix-project 1.0-beta-1
(cherry picked from commit 9259f8736c)
2015-02-04 14:05:06 -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 9069428f0b Test harness must depend on matrix-project.
(cherry picked from commit b628b47285)
2015-02-04 14:04:52 -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
Jesse Glick 3ca23a1111 Unclear status of MatrixConfiguration when enableFingerprintsInDependencyGraph mode selected.
(cherry picked from commit b9d8f554c6)
2015-02-04 14:04:30 -05:00
Jesse Glick 1b47215e68 Removing MatrixChildAction dependency.
(cherry picked from commit 42195d83c4)
2015-02-04 14:04:21 -05:00
Jesse Glick 5a9b69d2fc XStream initializations moved to MatrixProject.
(cherry picked from commit dbed304407)

Conflicts:
	core/src/main/java/hudson/model/Run.java
2015-02-04 14:04:04 -05:00
Jesse Glick bf2cd1a689 isMatrixProject appears unused, but keep for compatibility.
(cherry picked from commit d72fda46a6)
2015-02-04 14:01:44 -05:00
Jesse Glick 17ba1dad1f Comment, but not critical for separation.
(cherry picked from commit e405078e09)
2015-02-04 14:01:38 -05: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 71f9d5ebf4 [SECURITY-165] Add constants for system-wide usernames 2015-02-04 10:24:17 -06:00
tfennelly b31bb1cc1c [FIXED JENKINS-26406] Build history text field wrap fails when containing markup 2015-02-04 16:07:36 +00:00
Ryan Campbell 09c04e3b66 Resolve feedback on SECURITY-165 2015-02-04 09:36:16 -06:00
Ryan Campbell a944634e4f Merge pull request #1561 from recampbell/JENKINS-26718
[FIXED JENKINS-26718] Update changelog
2015-02-04 08:21:21 -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 b579a53cfd [SECURITY-167] update log message when prevention is disabled.
add stack trace so the offending plugin/code can be identified
2015-02-04 10:35:03 +00:00
Ryan Campbell bb487bc098 [FIXED JENKINS-21750] Update changelog 2015-02-03 12:41:49 -06:00
Nicolas De Loof 70abf12328 [FIXED JENKINS-26755] document fixed issue 2015-02-03 19:35:36 +01:00
James Nord 2a1b8542cb [SECURITY-167] fix failing unit test. 2015-02-03 18:31:52 +00:00
Oliver Gondža 692d545048 Merge pull request #1560 from olivergondza/powermock-java8
Bump powermock to 1.5.6 that support java 8
2015-02-03 19:31:11 +01:00
Nicolas De loof 7f15e67fc7 Merge pull request #1559 from ndeloof/JENKINS-26755
[JENKINS-26755] cache node environment
2015-02-03 19:16:19 +01:00
tfennelly 0817b78df2 force panel resize check before progressiveText bottom scroll
(cherry picked from commit 0b2bf7ad60)
2015-02-03 19:06:55 +01:00
tfennelly 8576c0b6ab prototypejs setStyle different behavior between firefox and chrome
(cherry picked from commit 7a9649ca70)
2015-02-03 19:06:55 +01:00
tfennelly f98947f6e4 [FIX JENKINS-26312] reimpl of layout changes 3e9cdcb
Attempt to do it in pure CSS ala 3e9cdcb failed so using CSS and JS combo.

(cherry picked from commit e2ec9eb3c2)
2015-02-03 19:06:54 +01:00
tfennelly 79379fde47 Revert "Tweak of earlier fix for JENKINS-25971"
This reverts commit 3e9cdcbc85.

(cherry picked from commit 66c02a4cc3)
2015-02-03 19:06:54 +01: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
Nicolas De Loof a186262113 Do not use two volatiles to hold state that needs to be atomically updated 2015-02-03 17:29:10 +01:00
James Nord c58ea9fe79 [SECURITY-167] attempt to set JAXP properties.
Atempt to set SAX specific properties to defend against XXE attacks.
2015-02-03 15:59:01 +00:00
Nicolas De Loof e0a394ab86 [JENKINS-26755] cache node environment
to prevent inefficient channel overuse
2015-02-03 16:26:00 +01:00
Oliver Gondža f582b76801 Bump powermock to 1.5.6 that support java 8 2015-02-03 14:54:13 +01: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 d6d96e14c1 Merge pull request #1557 from recampbell/JENKINS-26718
[JENKINS-26718] OldDataMonitor: Handle poorly written project types
2015-02-02 17:49:24 -06: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
christ66 13774a105d [JENKINS-22811] Remove unnecessary check in test unit. Fix misleading test unit comment.
(cherry picked from commit 3661ed5093)
2015-02-01 16:09:37 +01:00
christ66 937ed1b9ca [JENKINS-22811] Remove redundant catch exception
(cherry picked from commit d58c3cd5d6)
2015-02-01 16:09:35 +01:00