OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,492 Commits 55 Branches 1,942 Tags
7bb61a248e59c3baa8e06ccb85db9a31fd45272b
Commit Graph
577 Commits
Author SHA1 Message Date
Richard Mortimer 7bb61a248e Merge fix for 'JENKINS-26777' 2015-03-30 13:17:38 +01:00
Stephen Connolly d9e4e36fde fix build 2015-03-28 00:05:22 +00:00
Stephen Connolly 86954de76e Merge branch 'wip-loadstats-refactor' 2015-03-27 10:14:25 +00:00
Richard Mortimer c2c9a3ef37 [FIXED JENKINS-26777] Build reports to be running for 45 yr and counting 2015-03-25 16:51:13 +00:00
Stephen Connolly b8a4a53245 Arg! cannot use Util.isOverridden as these are protected methods 2015-03-25 13:05:46 +00:00
Stephen Connolly 6b8af39b03 [FIXED JENKINS-21618] Ensure that the LoadStatistics return a self-consistent result. 
The original method of computing load statistics would compute the total and idle counts independently
which could lead to counting errors while jobs started in between the different state counting operations.
This change switches to returning a `LoadStatisticsSnapshot` so that callers will get a single consistent
view of the counts which was valid for at least one point in time during the collection of the snapshot.
 2015-03-25 11:56:11 +00:00
Kohsuke Kawaguchi dda70ee662 Merge remote-tracking branch 'security/security-rc' 2015-03-20 15:31:10 -07:00
Stephen Connolly 1cb69f8cc0 Move isRelativePath to Util and use from hudson.model.Slave's descriptor 2015-03-19 13:56:38 +00:00
Stephen Connolly 5de6f84eb7 Handle mostly-absolute paths on windows that use a drive letter 
- of course drive mappings are user scoped and can change from user session to user session, so calling them absolute is a bit of a joke... none the less, for our purposes they are absolute enough
 2015-03-18 12:01:26 +00:00
Jesse Glick 2c4cc77d33 Merge branch 'security' into security-rc 
Conflicts:
	core/src/test/java/hudson/util/FormValidationTest.java
	test/src/test/java/hudson/model/UserTest.java
 2015-03-16 18:16:09 -04:00
Oliver Gondža f880d8d2cd [SECURITY-171] test 2015-03-07 20:32:17 +01:00
Kohsuke Kawaguchi 03647c7ce4 merged back the RC branch 2015-02-28 12:53:13 -08: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
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
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 1bba1ac3c6 [SECURITY-162] Capture the root directory in VirtualFile.forFile and reject attempts to escape it. 2015-02-06 11:37:24 -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
Jesse Glick 10fbe7f1cb Miscellaneous updates in preparation for merge to trunk. 2015-02-05 10:29:05 -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
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 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
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
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
Jesse Glick 7f82ab94a4 [FIXED JENKINS-26519] Build record migration failed on Windows using Java 6. 
In this environment, Util.createSymlink and .isSymlink are implemented, but resolveSymlink is not.
(cherry picked from commit 388c4b5e6b)

Conflicts:
	changelog.html
 2015-01-30 10:10:11 -05:00
Jesse Glick 4a75e058ba [JENKINS-26519] Attempting to improve diagnostics in case rename fails. 
(cherry picked from commit 0633beef08)
 2015-01-30 10:08:42 -05:00
Jesse Glick 388c4b5e6b [FIXED JENKINS-26519] Build record migration failed on Windows using Java 6. 
In this environment, Util.createSymlink and .isSymlink are implemented, but resolveSymlink is not.
 2015-01-29 14:57:32 -05:00
Jesse Glick 0633beef08 [JENKINS-26519] Attempting to improve diagnostics in case rename fails. 2015-01-27 16:09:48 -05:00
Jesse Glick b2cc36377e Merge branch 'rc' 2015-01-21 13:18:57 -05:00
Jesse Glick 056b446480 [FIXED JENKINS-26519] Accept Windows text file quasi-symlinks for build numbers. 2015-01-21 13:17:31 -05:00
Jesse Glick c997ac0c86 [JENKINS-26519] Confirming that it is safe to rerun migration by just deleting legacyId files. 2015-01-21 13:01:05 -05:00
René Scheibe 665c4985d7 don't extend a test class from org.junit.Assert to use its static methods 
* to simplify the static import and test use Hamcrest to compare arrays
* no need to box boolean[] to Boolean[] when using Hamcrest
 2015-01-09 12:30:00 +01:00
René Scheibe 13ab787d5f don't extend a test class from org.junit.Assert to use its static methods 2015-01-09 12:25:37 +01:00
René Scheibe 2d3dbad35a statically import methods used from org.junit.Assert 
* that's a common practice so do it consistently in all tests
 2015-01-08 20:25:18 +01:00
René Scheibe bd1d6251e0 replace all deprecated @Bug annotations with @Issue 2015-01-07 17:12:21 +01:00
Jesse Glick 42fede3248 Merge pull request #1505 from darxriggs/junit3-to-junit4 
convert tests from JUnit3 to JUnit4
 2015-01-02 12:33:41 -05:00
Jesse Glick 1fcee97d2f [FIXED JENKINS-26196] More robust handling of server errors in FilePath.installIfNecessaryFrom. 2014-12-29 14:49:27 -05:00
Jesse Glick babfb832a3 JUnit 4. 2014-12-29 14:00:48 -05:00
René Scheibe 73efe6825a convert tests from JUnit3 to JUnit4 
* life goes on :-)
* touching all tests that directly inherit from junit.framework.TestCase
 2014-12-27 22:41:09 +01:00
Kohsuke Kawaguchi b47d450ddb Fixed RunIdMigratorTest failures in non-EST time zone 
RunIdMigrator.LEGACY_ID_FORMATTER was static, which gets instantiated before the time zone is overriden during the test. Changing this to an instance field so that it gets created later on.
 2014-12-23 11:33:23 -08:00
CloudBees DEV@Cloud 4c474cea6f Merge commit '711b3325adf629585d60aa5a2bcac1d49b8324ae' 2014-12-23 16:59:01 +00:00
Daniel Beck b090751c16 [JENKINS-25897] Add tests 2014-12-23 11:22:01 +01:00
Kohsuke Kawaguchi 296849edf9 Merge pull request 1379 2014-12-22 14:33:48 -08:00
Jesse Glick b415b467fb Replacing Util.createTempDir with the standard TemporaryFolder rule in some tests. 2014-12-17 15:04:45 -05:00
Jesse Glick 589d74a55e Making reverse migration tool handle more kinds of item groups. 2014-12-15 15:51:45 -05:00
Jesse Glick 0a9b638280 Added a tool to reverse the build directory migration if required. 2014-12-15 14:26:36 -05:00
Jesse Glick 0cd13e9670 Compilability fix. 2014-12-12 14:59:03 -05:00
Jesse Glick 7c988de3cd Merge branch 'master' into build-number-is-id-JENKINS-24380 2014-12-12 13:27:31 -05:00
Stephen Connolly 8e5a92d8e6 remove trailing whitespace and tabs 2014-12-03 17:02:18 +00:00
Jesse Glick 534328b264 [FIXED JENKINS-25759] Avoid consuming too much memory while running validateAntFileMask. 
Not fully solved, since the scannedDirs field can still grow to be large, but at least clearing files/dirsNotIncluded.
Also imposing a 5s timeout on the scan regardless of file count, and defining a user-customizable bound.
 2014-11-24 10:37:58 -05:00