Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from daniel-beck/JENKINS-34616
[JENKINS-34616] Add symbols, getter, and constructor for pipeline
- Loading branch information
Showing
9 changed files
with
206 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
src/test/java/hudson/security/AuthorizationMatrixPropertyTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| package hudson.security; | ||
|
|
||
| import hudson.model.Item; | ||
| import hudson.scm.SCM; | ||
| import jenkins.model.Jenkins; | ||
| import org.jenkinsci.plugins.matrixauth.AuthorizationContainer; | ||
| import org.jenkinsci.plugins.matrixauth.inheritance.NonInheritingStrategy; | ||
| import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; | ||
| import org.jenkinsci.plugins.workflow.cps.SnippetizerTester; | ||
| import org.jenkinsci.plugins.workflow.job.WorkflowJob; | ||
| import org.jenkinsci.plugins.workflow.multibranch.JobPropertyStep; | ||
| import org.junit.Assert; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.jvnet.hudson.test.Issue; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
| import org.jvnet.hudson.test.LoggerRule; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.logging.Level; | ||
|
|
||
| public class AuthorizationMatrixPropertyTest { | ||
|
|
||
| @Rule | ||
| public JenkinsRule j = new JenkinsRule(); | ||
|
|
||
| @Rule | ||
| public LoggerRule l = new LoggerRule(); | ||
|
|
||
| @Test | ||
| public void testSnippetizer() throws Exception { | ||
| AuthorizationMatrixProperty property = new AuthorizationMatrixProperty(Collections.emptyMap()); | ||
| property.add(Item.CONFIGURE, "alice"); | ||
| property.add(Item.READ, "bob"); | ||
| property.add(Item.READ, "alice"); | ||
| property.add(SCM.TAG, "bob"); // use this to test for JENKINS-17200 robustness | ||
| property.setInheritanceStrategy(new NonInheritingStrategy()); | ||
| SnippetizerTester tester = new SnippetizerTester(j); | ||
| tester.assertRoundTrip(new JobPropertyStep(Collections.singletonList(property)), | ||
| "properties([authorizationMatrix(inheritanceStrategy: nonInheriting(), " + | ||
| "permissions: ['hudson.model.Item.Configure:alice', 'hudson.model.Item.Read:alice', 'hudson.model.Item.Read:bob', 'hudson.scm.SCM.Tag:bob'])])"); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| @Issue("JENKINS-46944") | ||
| public void testSnippetizerInapplicablePermission() throws Exception { | ||
| AuthorizationMatrixProperty property = new AuthorizationMatrixProperty(Collections.emptyMap()); | ||
| l.record(AuthorizationContainer.class, Level.WARNING).capture(1); | ||
| property.add("hudson.model.Item.Configure:alice"); | ||
| property.add("hudson.model.Item.Read:bob"); | ||
| property.add("hudson.model.Item.Read:alice"); | ||
| property.add("hudson.scm.SCM.Tag:bob"); // use this to test for JENKINS-17200 robustness | ||
| property.add("hudson.model.Hudson.Read:carol"); // the important line for this test, inapplicable permission | ||
|
|
||
| property.setInheritanceStrategy(new NonInheritingStrategy()); | ||
|
|
||
| SnippetizerTester tester = new SnippetizerTester(j); | ||
| tester.assertRoundTrip(new JobPropertyStep(Collections.singletonList(property)), | ||
| "properties([authorizationMatrix(inheritanceStrategy: nonInheriting(), " + | ||
| "permissions: ['hudson.model.Item.Configure:alice', 'hudson.model.Item.Read:alice', 'hudson.model.Item.Read:bob', 'hudson.scm.SCM.Tag:bob'])])"); | ||
|
|
||
| Assert.assertTrue(l.getMessages().get(0).contains("Tried to add inapplicable permission")); | ||
| Assert.assertTrue(l.getMessages().get(0).contains("Hudson,Read")); | ||
| Assert.assertTrue(l.getMessages().get(0).contains("carol")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPipelineReconfiguration() throws Exception { | ||
|
|
||
| HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(true, false, null); | ||
| realm.createAccount("alice", "alice"); | ||
| realm.createAccount("bob", "bob"); | ||
| realm.createAccount("carol", "carol"); | ||
| j.jenkins.setSecurityRealm(realm); | ||
|
|
||
| ProjectMatrixAuthorizationStrategy strategy = new ProjectMatrixAuthorizationStrategy(); | ||
| strategy.add(Jenkins.ADMINISTER, "alice"); | ||
| strategy.add(Jenkins.READ, "bob"); | ||
| strategy.add(Jenkins.READ, "carol"); | ||
| strategy.add(Item.READ, "carol"); | ||
|
|
||
| j.jenkins.setAuthorizationStrategy(strategy); | ||
|
|
||
| WorkflowJob project = j.createProject(WorkflowJob.class); | ||
|
|
||
| // bob cannot see the project due to lack of Item.Read | ||
| j.createWebClient().login("bob").assertFails(project.getUrl(), 404); | ||
|
|
||
| // but bob can discover the project and get a 403 | ||
| strategy.add(Item.DISCOVER, "bob"); | ||
| j.createWebClient().login("bob").assertFails(project.getUrl(), 403); | ||
|
|
||
| // alice OTOH is admin and can see it | ||
| j.createWebClient().login("alice").goTo(project.getUrl()); // succeeds | ||
|
|
||
| // carol can also see the project, she has global Item.Read | ||
| j.createWebClient().login("carol").goTo(project.getUrl()); | ||
|
|
||
| project.setDefinition(new CpsFlowDefinition("properties([authorizationMatrix(inheritanceStrategy: nonInheriting(), " + | ||
| "permissions: ['hudson.model.Item.Read:bob', 'hudson.model.Item.Configure:bob', 'hudson.scm.SCM.Tag:bob'])])", true)); | ||
| j.buildAndAssertSuccess(project); | ||
|
|
||
| // let's look ast the property | ||
| AuthorizationMatrixProperty property = project.getProperty(AuthorizationMatrixProperty.class); | ||
| Assert.assertTrue(property.getInheritanceStrategy() instanceof NonInheritingStrategy); | ||
| Assert.assertEquals(3, property.getGrantedPermissions().size()); | ||
| Assert.assertEquals("bob", property.getGroups().toArray()[0]); | ||
|
|
||
| // now bob has access, including configure | ||
| j.createWebClient().login("bob").goTo(project.getUrl()); | ||
| j.createWebClient().login("bob").goTo(project.getUrl() + "configure"); | ||
|
|
||
| // and carol no longer has access due to non-inheriting strategy | ||
| j.createWebClient().login("carol").assertFails(project.getUrl(), 404); | ||
| } | ||
| } |