Migrate from Acegi to Spring Security (#158)

basil · web-flow · commit 96f4fe7e64e7 · 2025-02-24T07:28:33.000-08:00
diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java b/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpoint.java
@@ -395,11 +395,11 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item item) {
             return new StandardListBoxModel()
                     .withEmptySelection()
                     .withMatching(AuthenticationTokens.matcher(DockerRegistryToken.class),
-                            CredentialsProvider.lookupCredentials(
+                            CredentialsProvider.lookupCredentialsInItem(
                                     StandardCredentials.class,
                                     item,
                                     null,
-                                    Collections.<DomainRequirement>emptyList()
+                                    Collections.emptyList()
                             )
                     );
         }
diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerServerEndpoint.java b/src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerServerEndpoint.java
@@ -220,7 +220,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item item, @QueryPa
                     .withMatching(
                             AuthenticationTokens.matcher(KeyMaterialFactory.class),
                             CredentialsProvider
-                                    .lookupCredentials(BASE_CREDENTIAL_TYPE, item, null, domainRequirements)
+                                    .lookupCredentialsInItem(BASE_CREDENTIAL_TYPE, item, null, domainRequirements)
                     );
         }
 
diff --git a/src/test/java/org/jenkinsci/plugins/docker/commons/CasCTest.java b/src/test/java/org/jenkinsci/plugins/docker/commons/CasCTest.java
@@ -18,6 +18,8 @@
 import org.junit.runners.Parameterized;
 import org.jvnet.hudson.test.RestartableJenkinsRule;
 
+import java.util.Collections;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
 import static org.hamcrest.collection.ArrayMatching.arrayContaining;
@@ -48,8 +50,8 @@ public static Object[][] params() {
     protected void assertConfiguredAsExpected(final RestartableJenkinsRule j, final String s) {
 
         //The credentials
-        final IdCredentials cred = CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(IdCredentials.class, j.j.jenkins,
-                ACL.SYSTEM, new DockerServerDomainRequirement()), CredentialsMatchers.withId("dockerx509"));
+        final IdCredentials cred = CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.j.jenkins,
+                ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())), CredentialsMatchers.withId("dockerx509"));
         assertNotNull(cred);
         assertThat(cred, instanceOf(DockerServerCredentials.class));
         DockerServerCredentials dCreds = (DockerServerCredentials) cred;
diff --git a/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java b/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryEndpointTest.java
@@ -41,11 +41,8 @@
 import hudson.model.User;
 import hudson.security.ACL;
 import hudson.security.ACLContext;
-import java.util.HashMap;
-import java.util.Map;
 import jenkins.model.Jenkins;
 import jenkins.security.QueueItemAuthenticatorConfiguration;
-import org.acegisecurity.Authentication;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -138,10 +135,13 @@ public void testGetTokenForRun() throws Exception {
         FreeStyleProject p1 = j.createFreeStyleProject();
         FreeStyleProject p2 = j.createFreeStyleProject();
 
-        Map<String, Authentication> jobsToAuths = new HashMap<>();
-        jobsToAuths.put(p1.getFullName(), User.getById("alice", true).impersonate());
-        jobsToAuths.put(p2.getFullName(), User.getById("bob", true).impersonate());
-        QueueItemAuthenticatorConfiguration.get().getAuthenticators().replace(new MockQueueItemAuthenticator(jobsToAuths));
+        QueueItemAuthenticatorConfiguration.get()
+                .getAuthenticators()
+                .replace(new MockQueueItemAuthenticator()
+                        .authenticate(
+                                p1.getFullName(), User.getById("alice", true).impersonate2())
+                        .authenticate(
+                                p2.getFullName(), User.getById("bob", true).impersonate2()));
 
         FreeStyleBuild r1 = j.buildAndAssertSuccess(p1);
         try (ACLContext as = ACL.as(User.getById("alice", false))) {
diff --git a/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerServerCredentialsTest.java b/src/test/java/org/jenkinsci/plugins/docker/commons/credentials/DockerServerCredentialsTest.java
@@ -65,8 +65,8 @@ public void configRoundTripEmpty() throws Exception {
         j.submit(j.createWebClient().goTo("credentials/store/system/domain/" + domain.getName() + "/credential/"+credentials.getId()+"/update")
                 .getFormByName("update"));
         
-        j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(IdCredentials.class, j.getInstance(),
-                ACL.SYSTEM, new DockerServerDomainRequirement()), CredentialsMatchers.withId(credentials.getId())));
+        j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.getInstance(),
+                ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())), CredentialsMatchers.withId(credentials.getId())));
     }
     
     @Test
@@ -81,8 +81,8 @@ public void configRoundTripData() throws Exception {
         j.submit(j.createWebClient().goTo("credentials/store/system/domain/" + domain.getName() + "/credential/"+credentials.getId()+"/update")
                 .getFormByName("update"));
         
-        j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(IdCredentials.class, j.getInstance(),
-                ACL.SYSTEM, new DockerServerDomainRequirement()), CredentialsMatchers.withId(credentials.getId())));
+        j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.getInstance(),
+                ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())), CredentialsMatchers.withId(credentials.getId())));
     }
 
     @Test
@@ -114,7 +114,7 @@ private HtmlForm getUpdateForm(Domain domain, DockerServerCredentials credential
 
     private IdCredentials findFirstWithId(String credentialsId) {
         return CredentialsMatchers.firstOrNull(
-                CredentialsProvider.lookupCredentials(IdCredentials.class, j.getInstance(), ACL.SYSTEM, new DockerServerDomainRequirement()),
+                CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.getInstance(), ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())),
                 CredentialsMatchers.withId(credentialsId));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -395,11 +395,11 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item item) {`
`395`	`395`	`return new StandardListBoxModel()`
`396`	`396`	`.withEmptySelection()`
`397`	`397`	`.withMatching(AuthenticationTokens.matcher(DockerRegistryToken.class),`
`398`		`- CredentialsProvider.lookupCredentials(`
	`398`	`+ CredentialsProvider.lookupCredentialsInItem(`
`399`	`399`	`StandardCredentials.class,`
`400`	`400`	`item,`
`401`	`401`	`null,`
`402`		`- Collections.<DomainRequirement>emptyList()`
	`402`	`+ Collections.emptyList()`
`403`	`403`	`)`
`404`	`404`	`);`
`405`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item item, @QueryPa`
`220`	`220`	`.withMatching(`
`221`	`221`	`AuthenticationTokens.matcher(KeyMaterialFactory.class),`
`222`	`222`	`CredentialsProvider`
`223`		`- .lookupCredentials(BASE_CREDENTIAL_TYPE, item, null, domainRequirements)`
	`223`	`+ .lookupCredentialsInItem(BASE_CREDENTIAL_TYPE, item, null, domainRequirements)`
`224`	`224`	`);`
`225`	`225`	`}`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ public void configRoundTripEmpty() throws Exception {`
`65`	`65`	`j.submit(j.createWebClient().goTo("credentials/store/system/domain/" + domain.getName() + "/credential/"+credentials.getId()+"/update")`
`66`	`66`	`.getFormByName("update"));`
`67`	`67`
`68`		`- j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(IdCredentials.class, j.getInstance(),`
`69`		`- ACL.SYSTEM, new DockerServerDomainRequirement()), CredentialsMatchers.withId(credentials.getId())));`
	`68`	`+ j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.getInstance(),`
	`69`	`+ ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())), CredentialsMatchers.withId(credentials.getId())));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Test`
`@@ -81,8 +81,8 @@ public void configRoundTripData() throws Exception {`
`81`	`81`	`j.submit(j.createWebClient().goTo("credentials/store/system/domain/" + domain.getName() + "/credential/"+credentials.getId()+"/update")`
`82`	`82`	`.getFormByName("update"));`
`83`	`83`
`84`		`- j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(IdCredentials.class, j.getInstance(),`
`85`		`- ACL.SYSTEM, new DockerServerDomainRequirement()), CredentialsMatchers.withId(credentials.getId())));`
	`84`	`+ j.assertEqualDataBoundBeans(credentials, CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.getInstance(),`
	`85`	`+ ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())), CredentialsMatchers.withId(credentials.getId())));`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Test`
`@@ -114,7 +114,7 @@ private HtmlForm getUpdateForm(Domain domain, DockerServerCredentials credential`
`114`	`114`
`115`	`115`	`private IdCredentials findFirstWithId(String credentialsId) {`
`116`	`116`	`return CredentialsMatchers.firstOrNull(`
`117`		`- CredentialsProvider.lookupCredentials(IdCredentials.class, j.getInstance(), ACL.SYSTEM, new DockerServerDomainRequirement()),`
	`117`	`+ CredentialsProvider.lookupCredentialsInItemGroup(IdCredentials.class, j.getInstance(), ACL.SYSTEM2, Collections.singletonList(new DockerServerDomainRequirement())),`
`118`	`118`	`CredentialsMatchers.withId(credentialsId));`
`119`	`119`	`}`
`120`	`120`	`}`