Commit Graph
2960 Commits
Author SHA1 Message Date
Jesse Glick e2c1ae15a3 Merge branch 'master' into whitelist-JENKINS-47736 2017-12-01 16:17:38 -05:00
Baptiste Mathus b32bc8d277 Merge pull request #2548 from christ66/JENKINS-34855
[JENKINS-34855] AtomicFileWriter is not Atomic
2017-11-29 15:45:57 +01:00
Jesse Glick 01c8c55652 Merge branch 'master' into whitelist-JENKINS-47736 2017-11-28 08:36:41 -05:00
Baptiste Mathus 927192fc00 Poor man regression testing 2017-11-28 14:18:22 +01:00
Jesse Glick 5f8f42624e Introducing ItemGroup.allItems and similar default methods (#3148)
* Introducing ItemGroup.allItems and similar default methods.

* Do not get me started.
2017-11-28 12:28:50 +03:00
Jesse Glick ca542c0a41 Merge branch 'master' into whitelist-JENKINS-47736 2017-11-27 13:55:36 -05:00
Oleg Nenashev 211b57e8b0 [JENKINS-48157] - Risk of NPE when migrating MyViewProperty without PrimaryView (#3156)
* [JENKINS-48157] - Reproduce the issue in test

* [JENKINS-48157] - Annotate and document nullness conditions in MyViewsProperty and ViewGroupMixIn

* [FIXED JENKINS-48157] - Prevent NPEs when using public API and when using null primaryViewName

* [JENKINS-48157] - Fix typo in Javadoc
2017-11-26 15:51:46 +03:00
Oleg Nenashev 56f5abdf81 Merge pull request #3158 from oleg-nenashev/tests/SetupWizard_ProtocolMonitor
Disable flaky SetupWizardTest#shouldDisableUnencrypterProtocolsByDefault()
2017-11-26 12:33:57 +03:00
Oleg Nenashev b3cd925a69 Merge pull request #3149 from jglick/AccessControlled
Introducing AccessControlled.hasPermission(Authentication, Permission)
2017-11-26 12:33:27 +03:00
Baptiste Mathus 9b48200921 Try to get the future for 10 seconds before timing out
Should make the test more robust on variously performing setups.
2017-11-23 15:10:36 +01:00
Baptiste Mathus e50d4d71c3 Retry assertion for 10 seconds before failing
Also reduce the time 250 ms (instead of 1 second previously) between
retries to hopefully reduce the test duration on quick enough setups,
and still degrade nicely on less performing ones.
2017-11-23 14:34:03 +01:00
Oleg Nenashev 7db8e7f0ff Disable SetupWizardTest#shouldDisableUnencrypterProtocolsByDefault()
I cannot reproduce the issue locally, but it happens in CI (due to the parallel tests?). I I would prefer to just disable it for now.
2017-11-22 10:42:52 +01:00
Jesse Glick 7dee930f33 Introducing AccessController.hasPermission(Authentication, Permission). 2017-11-16 20:43:07 -05:00
t-hall d688c15490 [JENKINS-34138] Fix maven installs from stepping on each other (#3042)
* [JENKINS-34138] Adding equals/hashCode methods so that installs don't step on each other

* [JENKINS-34138] Added issue reference to unit tests

* [JENKINS-34138] - changed the order of equals / hashcode
2017-11-16 17:18:43 +01:00
Jesse Glick d8a5d61721 Merge branch 'master' into whitelist-JENKINS-47736 2017-11-13 10:03:06 -05:00
Daniel Beck 7c06a9ba94 Merge pull request #3134 from jglick/IdStrategy-NFE-JENKINS-47909
[JENKINS-47909] Handle false hex escapes
2017-11-12 16:02:15 +01:00
Wadeck Follonier 9735043b61 [JENKINS-47768] - Avoid having "authenticated" twice in the group membership of a user (LastGrantedAuthorities) (#3123)
* Avoid having "authenticated" twice in the group membership of a user
- this occur when the SecurityRealm potentially already grants that role (like in github-oauth-plugin)

* - changed as requested by Oleg
- the list has a maximum of roles.length and in reality it's either roles.length or (roles.length-1), so the maximum is ok

* - fix problem of missing the "authenticated" authority

* - convert the Groovy script to a Java version
- the Groovy test was not run by default (IIUC Groovy scripts are not compiled if placed in java src folder)
2017-11-12 15:48:18 +01:00
Wadeck Follonier 80d17f5a68 [JENKINS-43852] add caching options for captcha (#3126)
* JENKINS-42852 add caching options for captcha

* - remove whitespace

* - correct unit tests

* - copy/paste is bad

* - second edit...
2017-11-10 17:42:39 +01:00
Jesse Glick 48fcab9862 [JENKINS-47909] @daniel-beck asks about usernames containing valid $ escapes. Behavior is partly broken. 2017-11-09 13:27:57 -05:00
Jesse Glick e2d36820da [JENKINS-47909] Migration test. 2017-11-09 12:51:03 -05:00
Jesse Glick 08d50a929a Merge commit '048e313aa95844e2366a0611192415abbcf4b5ee' into security-master 2017-11-06 07:13:57 -05:00
Oleg Nenashev 4f6ff15fba Merge pull request #3121 from jglick/missingDescriptor-JENKINS-45977
[JENKINS-45977] Behave robustly when a UserProperty is missing its descriptor
2017-11-04 10:04:23 +01:00
Jesse Glick f8f5ffc7e6 [FIXED JENKINS-45977] Behave robustly when a UserProperty is missing its descriptor. 2017-10-31 14:23:03 -04:00
Oleg Nenashev 27f0abd414 [FIXED JENKINS-47181] - Recover the agent protocol handling tests. (#3118)
* [FIXED JENKINS-47181] - Recover the agent protocol handling tests.

The protocol handling logic does not longer use bogus assumptions anymore.
Instead of that, there are extra `MockAgentProtocol` instances (to be moved to JTH?)

* Extremely important fix to retrigger the PR builder
2017-10-30 20:53:42 +01:00
Jesse Glick 903b4461d3 [JENKINS-47736] Switch Remoting/XStream blacklist to a whitelist. 2017-10-30 14:20:57 -04:00
Jesse Glick 209a5ad1a5 Merge commit 'c2aca606e3dc45384c38785e1ced4780733bd906' into security-master 2017-10-30 10:18:02 -04:00
Oleg Nenashev c7f68438e8 Fix typo in the SetupWizardTest#shouldProhibitAccessToPluginListWithoutAuth() 2017-10-30 11:54:36 +01:00
Wadeck Follonier ac3cd3eb21 [JENKINS-47426] getPropertyKey is not consistent over time (#3080)
* JENKINS-47426: getPropertyKey is not consistent over time
- add passing test for the case the rootUrl is set
- add failing test for the case the rootUrl is not set yet, the propertyKey is not consistent
- add a warning message when the flow passes in the fallback mode

* - fixing the getEncryptedValue using a static memory

* - add issue annotations

* - modifications proposed by Jesse: use legacyId instead of randomId, stable over restart

* - small correction for a test case
2017-10-28 23:01:50 +02:00
Jesse Glick f266a7f6aa Merge commit '790068c8486cdd4741336f9d61de72a9a6537a30' into security-master 2017-10-23 09:09:19 -04:00
Oleg Nenashev b3d20446dc Merge pull request #3098 from jglick/QueueTest.taskEquality
QueueTest.taskEquality was flaky
2017-10-22 11:16:39 +02:00
Oleg Nenashev 136fe8255e Merge pull request #3093 from dwnusbaum/JENKINS-47448
[JENKINS-47448] Fix JDKInstaller for downloads requiring an Oracle login
2017-10-21 09:46:40 +02:00
Jesse Glick 5e6b1050b2 Merge pull request #3099 from jglick/getCauseOfBlockage-JENKINS-47517
[JENKINS-47517] Revert the change to the default behavior of Queue.Task.getCauseOfBlockage
2017-10-20 18:02:40 -04:00
Jesse Glick 19714f2018 Deprecate isBuildBlocked & getWhyBlocked in favor of getCauseOfBlockage, which you needed to implement anyway. 2017-10-19 13:06:35 -04:00
Jesse Glick a9246c2887 Merge branch 'security-stable-2.73' into security-master 2017-10-19 12:28:51 -04:00
Jesse Glick a2491e323b Merge branch 'security-stable-2.60' into security-stable-2.73 2017-10-19 12:28:07 -04:00
Jesse Glick 87b7ba7d31 Merge branch 'security-stable-2.46' into security-stable-2.60 2017-10-19 12:19:45 -04:00
Rebecca Ysteboe 566a8ddb88 [SECURITY-499] Sanitize user id <-> filename conversion 2017-10-19 12:14:51 -04:00
Jesse Glick 0e5274b4b5 [JENKINS-47517] Revert the change to the default behavior of Queue.Task.getCauseOfBlockage. 2017-10-18 22:07:59 -04:00
Jesse Glick 3defe0f8aa QueueTest.taskEquality was flaky: the original task could run before we got a chance to even try scheduling a second. 2017-10-18 15:02:22 -04:00
Jesse Glick 815b97a907 Updating JnlpAccessWithSecuredHudsonTest to JenkinsRule. 2017-10-18 12:21:00 -04:00
Jesse Glick 6d2de7d914 Merge branch 'master' into CommandLauncher-JENKINS-47393 2017-10-17 09:06:29 -04:00
Devin Nusbaum 36ef5d51ca Fix JDKInstaller for downloads requiring an Oracle login 2017-10-16 17:16:24 -04:00
Alex Taylor ead38e0d23 [JENKINS-35459] - Prevent Duplicated elements with incorrect URL when using the search on DashBoard View (#2994)
[JENKINS-35459] - Prevent Duplicated elements with incorrect URL when using the search on DashBoard View
2017-10-16 10:22:31 +02:00
Akbashev Alexander be02386449 [JENKINS-20046] - Do not query queue dispatchers from UI (#3038)
* Do not query queue dispatchers from UI

* Address comments from review

* Restore old constructors and mark them as @deprecated
* Optimise query from UI even more

* Check non-concurrent builds in getCauseOfBlockageForItem
2017-10-15 09:20:52 +02:00
Oleg Nenashev 0fac49e4ac Merge pull request #3063 from oleg-nenashev/protocols-flakytest
Disable the flaky AgentProtocolTest test
2017-10-14 15:40:19 +02:00
Wadeck Follonier 02b8e7f356 [JENKINS-47372] Add a new Administrative monitor for CSRF-protection (#3072)
* [JENKINS-47372] add administrative monitor when there is no CSRF issuer configured

* - add line breaks

* - add license header
- put link in the properties instead of the previous mix
- remove @author
- simplify isActivated body

* - correct line breaks
2017-10-14 11:45:26 +02:00
Jesse Glick e376780c64 [JENKINS-47393] Preparation for split of CommandLauncher to a plugin. 2017-10-11 16:43:06 -04:00
Jesse Glick 860d9c5485 Merge pull request #3070 from jglick/QueueTest.shouldBeAbleToBlockFlyweightTaskAtTheLastMinute
[JENKINS-30084] Suppressing flaky QueueTest.shouldBeAbleToBlockFlyweightTaskAtTheLastMinute
2017-10-11 15:10:55 -04:00
Kohsuke Kawaguchi d50dc367f5 Merge remote-tracking branch 'origin/master' 2017-10-11 09:34:07 -07:00
Jesse Glick eb5b40e25c Suppressing flaky shouldBeAbleToBlockFlyweightTaskAtTheLastMinute. 2017-10-10 03:06:10 -04:00