Commit Graph
5172 Commits
Author SHA1 Message Date
Oleg Nenashev c0bacad9b2 Merge pull request #4621 from jglick/SLAVE_LOG_HANDLER-parameters
An agent log record with numeric params could be unformattable on the master
2020-04-11 13:11:10 +02:00
Jesse Glick bf858b7e55 Fixing console annotation masking in LogTaskListener 2020-04-06 17:44:47 -04:00
Tim Jacomb 7f8cea0f92 Merge branch 'master' into kill-jsr-305 2020-04-04 10:30:21 +01:00
Daniel Beck 99f8b3f866 [JENKINS-61467] Do not show disabled, implied permissions in er… (#4575)
* [JENKINS-61467] Do not show disabled, implied permissions in erors

* Maintain order of permissions, fix test assertion
2020-04-04 10:26:59 +01:00
Markus Winter 10a224278b [JENKINS-5597] add option to follow symlinks during artifact archiving (#3947)
* [JENKINS-5597] don't follow symlinks

add an option that allows to configure the DirectoryScanner used by
ArtifactArchiver to not follow symbolic links. Option is enabled by
default for backwards compatibility.

* missing readresolve

need to resolve in case it is not defined

* add linebreaks at end of file

* add test for not follow symlinks

* fix indentation

* add tests

update ant to 1.10.7 which supports symlinks on windows and is able to
properly ignore them

* change default in jelly to false

* fix test execution

* indentation and help text
2020-04-03 16:03:29 -06:00
Jesse Glick 3262d8b7cf An agent log record with numeric params could be unformattable on the master 2020-04-03 16:11:59 -04:00
James Nord bdcb2fb222 Merge remote-tracking branch 'origin/master' into kill-jsr-305 2020-03-30 12:40:44 +01:00
Kohsuke Kawaguchi 653243a07a [maven-release-plugin] prepare for next development iteration 2020-03-29 22:59:09 -07:00
Kohsuke Kawaguchi 0f56520c5b [maven-release-plugin] prepare release jenkins-2.229 2020-03-29 22:59:03 -07:00
Jesse Glick e76f6a293a Let ConfidentialKey & Secret do something from unit tests (#4603)
* Delete ConfidentialStoreRule

* Also delete MockSecretRule so Secret.fromString works

* Secret.SECRET still referenced by SecretHelper in jenkins-test-harness, used by RekeySecretAdminMonitorTest, also copied in publish-over-*-plugin

* RSAConfidentialKey ought to use the same SecureRandom as the ConfidentialStore; this also lets the mock use a fixed seed

* For now ConfidentialStore.secureRandom can be abstract

* Some core unit tests can be rather verbose; set maven.test.redirectTestOutputToFile

* Looks like we need a ConfidentialStoreRule after all

* Restored another couple of usages
2020-03-28 19:13:00 +00:00
Tim Jacomb 7b4eab92d1 Merge pull request #4507 from res0nance/static-inner
Static nested classes
2020-03-28 09:04:59 +00:00
Tim Jacomb 54f84aa8c5 Merge pull request #4602 from daniel-beck/JENKINS-61688
[JENKINS-61688] Load build discarder configuration after restart
2020-03-28 09:00:43 +00:00
Jesse Glick 03659a1f1b Do not print random binary data during WebSocketAgentsTest 2020-03-26 17:55:22 -04:00
James Nord 6b5c81de55 s/javax.annotation.concurrent.GuardedBy/net.jcip.annotations.GuardedBy/ 2020-03-26 16:19:26 +00:00
James Nord 1f946961b9 s/javax.annotation.CheckForNull/edu.umd.cs.findbugs.annotations.CheckForNull/g 2020-03-26 16:12:35 +00:00
James Nord 819f80b12f s/javax.annotation.Nonnull/edu.umd.cs.findbugs.annotations.NonNull/g 2020-03-26 11:14:41 +00:00
James Nord a7fcc8e447 s/javax.annotation.Nullable/edu.umd.cs.findbugs.annotations.Nullable/g 2020-03-26 11:11:22 +00:00
Daniel Beck 2c37b1d1ba [JENKINS-61688] Load build discarder configuration after restart 2020-03-26 01:36:38 +01:00
Vincent Latombe 41fc5e8622 [JENKINS-61409] Websockets: Use AbstractByteBufferCommandTransport to transport messages (#4596)
* [JENKINS-61409] Websockets: Use AbstractByteBufferCommandTransport to transport messages

* Depend on timestamped snapshot since incrementals is broken

* Fix reviews

* Update snapshot dep

* Print directly
2020-03-25 14:38:41 -06:00
Kohsuke Kawaguchi 634d26520d Merge branch 'master' of github.com:jenkinsci/jenkins 2020-03-25 07:42:57 -07:00
Antonio MunizandTim Jacomb b6678c2241 [JENKINS-61455] "About Jenkins" accessible with Jenkins.MANAGE (#4569)
* [JENKINS-61455] _About Jenkins_ accesible with Jenkins.MANAGE

_About Jenkins_ management link is now accessible to users with
Jenkins.MANAGE or Jenkins.SYSTEM_READ (as well as the usual
Jenkins.ADMINISTRATOR)

* [JENKINS-61455] Test updated to cover this use case

* [JENKINS-61455] Fix test

* [JENKINS-61455] Fix permissions on linked pages

Co-authored-by: Tim Jacomb <timjacomb1+github@gmail.com>
2020-03-25 07:57:56 +00:00
Kohsuke Kawaguchi 96ef7039d5 [maven-release-plugin] prepare for next development iteration 2020-03-23 15:41:58 -07:00
Kohsuke Kawaguchi 2181495af5 [maven-release-plugin] prepare release jenkins-2.228 2020-03-23 15:41:53 -07:00
Daniel Beck 06e6cbd0b8 Fix test failure in security-master 2020-03-23 20:52:48 +01:00
Daniel Beck 73c1ed41bb Merge branch 'master' into security-master 2020-03-23 10:55:26 +01:00
Kohsuke Kawaguchi cb6552c9db [maven-release-plugin] prepare for next development iteration 2020-03-22 21:17:47 -07:00
Kohsuke Kawaguchi 454b01fe72 [maven-release-plugin] prepare release jenkins-2.227 2020-03-22 21:17:42 -07:00
Tim Jacomb 3f899290e6 Merge pull request #4570 from EstherAF/JENKINS-61457
[JENKINS-61457] Allow Jenkins.MANAGE to configure UsageStatistics
2020-03-21 09:32:39 +00:00
Kohsuke Kawaguchi 07c48b03fb [maven-release-plugin] prepare for next development iteration 2020-03-15 17:06:49 -07:00
Kohsuke Kawaguchi 6c0afccc0c [maven-release-plugin] prepare release jenkins-2.226 2020-03-15 17:06:44 -07:00
Tim Jacomb bdff747581 Merge pull request #4573 from daniel-beck/JENKINS-61465
[JENKINS-61465] Make checkAnyPermission work on non-AccessControlled
2020-03-14 15:58:58 +00:00
Tim Jacomb 6de7e5fc7f Merge pull request #4546 from daniel-beck/new-manage-layout
Manage Jenkins with flow layout and categories
2020-03-14 09:48:45 +00:00
Daniel Beck 7259d8698c [JENKINS-61465] Make checkAnyPermission work on non-AccessControlled 2020-03-13 12:31:45 +01:00
Esther Álvarez FeijooandDaniel Beck 8d5fca952e [JENKINS-61457] Fix typo in JenkinsManagePermissionTest
Co-Authored-By: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
2020-03-13 10:56:45 +01:00
Esther Alvarez Feijoo c159a692af [JENKINS-61457] Allow Jenkins.MANAGE to configure UsageStatistics 2020-03-12 18:08:14 +01:00
Daniel Beck 542361f3ab Merge branch 'security-stable-2.222' into security-master 2020-03-11 10:28:41 +01:00
Daniel Beck dabe8139c1 Merge branch 'security-stable-2.204' into security-stable-2.222 2020-03-11 10:27:57 +01:00
Daniel Beck f600f98cb6 Merge branch 'security-stable-2.190' into security-stable-2.204 2020-03-11 10:27:13 +01:00
Daniel Beck f6b7d98139 Merge branch 'security-stable-2.176' into security-stable-2.190 2020-03-11 10:26:29 +01:00
Daniel Beck 4b104354a5 Merge branch 'security-stable-2.164' into security-stable-2.176 2020-03-11 10:23:14 +01:00
Matt Sicker f7cf283559 [SECURITY-1774] 2020-03-11 09:29:41 +01:00
Daniel Beck f479652171 [SECURITY-1774] 2020-03-11 08:12:56 +01:00
Daniel Beck c2d22b241e [SECURITY-1793] 2020-03-11 08:11:03 +01:00
Wadeck Follonier dbff6fdcf8 [SECURITY-1781] 2020-03-11 07:57:14 +01:00
Kohsuke Kawaguchi 5c49b3b2f3 [maven-release-plugin] prepare for next development iteration 2020-03-09 23:10:30 -07:00
Kohsuke Kawaguchi f282bd8627 [maven-release-plugin] prepare release jenkins-2.225 2020-03-09 23:10:24 -07:00
Mark Waite 598568a21f [JENKINS-61398] Don't lose SCM configuration when saving job
Revert "[FIX JENKINS-51495] descriptorRadioList does not honor DescriptorVisibilityFilter (#3969)"

This reverts commit 6c2142ccb7.
2020-03-09 09:51:06 -06:00
Kohsuke Kawaguchi 4767a3bf99 [maven-release-plugin] prepare for next development iteration 2020-03-08 14:11:10 -07:00
Kohsuke Kawaguchi 3935b7c734 [maven-release-plugin] prepare release jenkins-2.224 2020-03-08 14:11:00 -07:00
Sho MatsumotoandOleg Nenashev 6c2142ccb7 [FIX JENKINS-51495] descriptorRadioList does not honor DescriptorVisibilityFilter (#3969)
* [FIX JENKINS-51495] descriptorRadioList does not honor DescriptorVisibilityFilter

quit using index to associate descriptor selected on the front-end with the implementation on the back-end.

* [FIX JENKINS-51495] descriptorRadioList does not honor DescriptorVisibilityFilter

fix additionally because of test failures.

* [FIX JENKINS-51495] descriptorRadioList does not honor
DescriptorVisilityFilter

add a test method for DescriptorList and DescriptorExtensionList.

* [FIX JENKINS-51495] descriptorRadioList does not honor DescriptorVisibilityFilter

fix test failure because of the reuse of Map.

* [FIX JENKINS-51495] descriptorRadioList does not honor DescriptorVisibilityFilter

fix test failure by changing class to find.

* [JENKINS-51495] - Fix formatting of the unit test

Co-authored-by: Oleg Nenashev <o.v.nenashev@gmail.com>
2020-03-08 09:10:50 +01:00