From d05e34fe369e348cbe254ba2400758076cdc77be Mon Sep 17 00:00:00 2001 From: Ramon Leon Date: Tue, 22 Jun 2021 13:13:24 +0200 Subject: [PATCH 1/3] More AccessDeniedException and core bump needed --- pom.xml | 8 +++++--- .../jenkinsci/plugins/configfiles/ConfigFilesTest.java | 2 +- .../jenkinsci/plugins/configfiles/Security2203Test.java | 2 +- .../plugins/configfiles/sec/PermissionChecker.java | 3 +-- .../plugins/configfiles/sec/ProtectedCodeRunnerTests.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 1883bbea..2c06d665 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ true - 2.235.5 + 2.277 8 2.15 @@ -54,8 +54,8 @@ io.jenkins.tools.bom - bom-2.235.x - 19 + bom-2.277.x + 29 import pom @@ -71,6 +71,8 @@ org.jenkins-ci.plugins token-macro + + 2.15 org.jenkins-ci.plugins diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesTest.java index a689ba74..f04155a1 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesTest.java @@ -3,7 +3,6 @@ import hudson.model.Item; import hudson.model.ItemGroup; import jenkins.model.Jenkins; -import org.acegisecurity.AccessDeniedException; import org.jenkinsci.lib.configprovider.model.Config; import org.jenkinsci.plugins.configfiles.custom.CustomConfig; import org.junit.Assert; @@ -11,6 +10,7 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; +import org.springframework.security.access.AccessDeniedException; import javax.annotation.CheckForNull; import java.io.File; diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/Security2203Test.java b/src/test/java/org/jenkinsci/plugins/configfiles/Security2203Test.java index c9149e6c..8c841e72 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/Security2203Test.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/Security2203Test.java @@ -9,7 +9,7 @@ import hudson.security.Permission; import hudson.util.ListBoxModel; import jenkins.model.Jenkins; -import org.acegisecurity.AccessDeniedException; +import org.springframework.security.access.AccessDeniedException; import org.jenkinsci.lib.configprovider.ConfigProvider; import org.jenkinsci.lib.configprovider.model.Config; import org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile; diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/sec/PermissionChecker.java b/src/test/java/org/jenkinsci/plugins/configfiles/sec/PermissionChecker.java index 51382683..f3db0955 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/sec/PermissionChecker.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/sec/PermissionChecker.java @@ -2,8 +2,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; import hudson.security.Permission; -import org.acegisecurity.AccessDeniedException; - +import org.springframework.security.access.AccessDeniedException; import java.util.function.Supplier; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/sec/ProtectedCodeRunnerTests.java b/src/test/java/org/jenkinsci/plugins/configfiles/sec/ProtectedCodeRunnerTests.java index dadbd0ed..b76188e2 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/sec/ProtectedCodeRunnerTests.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/sec/ProtectedCodeRunnerTests.java @@ -1,12 +1,12 @@ package org.jenkinsci.plugins.configfiles.sec; import jenkins.model.Jenkins; -import org.acegisecurity.AccessDeniedException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; +import org.springframework.security.access.AccessDeniedException; import java.util.function.Supplier; From a37b35837b6226c3a8a14091b5d6a7f6f91bbdc2 Mon Sep 17 00:00:00 2001 From: Ramon Leon Date: Tue, 22 Jun 2021 13:46:45 +0200 Subject: [PATCH 2/3] Get token-macro from bom --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2c06d665..ea44027c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,8 +71,6 @@ org.jenkins-ci.plugins token-macro - - 2.15 org.jenkins-ci.plugins From 966f1926698d113494c77e3a482da013cf4f7a34 Mon Sep 17 00:00:00 2001 From: Ramon Leon Date: Tue, 6 Jul 2021 12:06:29 +0200 Subject: [PATCH 3/3] Make spotbugs happy --- .../org/jenkinsci/lib/configprovider/ConfigProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java b/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java index a0779d26..1d97b4e5 100644 --- a/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java +++ b/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java @@ -134,8 +134,10 @@ public Config newConfig(@NonNull String id, String name, String comment, String private void setField(String fieldName, String value, Config config) { Field field = ReflectionUtils.findField(config.getClass(), fieldName); - field.setAccessible(true); - ReflectionUtils.setField(field, config, value); + if (field != null) { + field.setAccessible(true); + ReflectionUtils.setField(field, config, value); + } } public abstract void clearOldDataStorage();