OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2835 from olivergondza/fixup-provision-perm

Browse Source 
[FIXED JENKINS-37616] Make sure Cloud.PROVISION is properly initialized
This commit is contained in:
Oleg Nenashev authored and GitHub committed 2017-04-15 14:27:34 +02:00
2 parents d7d36b30bd d35dfcb24f
commit bd2ccfb00e
2 files changed
+20 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/model/Computer.java
+6
View File
@@ -29,6 +29,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.EnvVars;
import hudson.Extension;
import hudson.Launcher.ProcStarter;
import hudson.slaves.Cloud;
import jenkins.util.SystemProperties;
import hudson.Util;
import hudson.cli.declarative.CLIMethod;
@@ -1747,5 +1748,10 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
public static final Permission CONNECT = new Permission(PERMISSIONS,"Connect", Messages._Computer_ConnectPermission_Description(), DISCONNECT, PermissionScope.COMPUTER);
public static final Permission BUILD = new Permission(PERMISSIONS, "Build", Messages._Computer_BuildPermission_Description(), Permission.WRITE, PermissionScope.COMPUTER);
// This permission was historically scoped to this class albeit declared in Cloud. While deserializing, Jenkins loads
// the scope class to make sure the permission is initialized and registered. since Cloud class is used rather seldom,
// it might appear the permission does not exist. Referencing the permission from here to make sure it gets loaded.
private static final @Deprecated Permission CLOUD_PROVISION = Cloud.PROVISION;
private static final Logger LOGGER = Logger.getLogger(Computer.class.getName());
}
core/src/test/java/hudson/slaves/CloudTest.java → test/src/test/java/hudson/slaves/CloudTest.java
+14 -1
View File
@@ -7,11 +7,17 @@ import hudson.security.Permission;
import hudson.security.SidACL;
import jenkins.model.Jenkins;
import org.acegisecurity.acls.sid.Sid;
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.WithoutJenkins;
public class CloudTest {
@Test
@Rule public JenkinsRule j = new JenkinsRule();
@Test @WithoutJenkins @Issue("JENKINS-37616")
public void provisionPermissionShouldBeIndependentFromAdminister() throws Exception {
SidACL acl = new SidACL() {
@Override protected Boolean hasPermission(Sid p, Permission permission) {
@@ -23,4 +29,11 @@ public class CloudTest {
assertFalse(acl.hasPermission(Jenkins.ANONYMOUS, Jenkins.ADMINISTER));
assertEquals(Cloud.PROVISION, Computer.PERMISSIONS.find("Provision"));
}
@Test @Issue("JENKINS-37616")
public void ensureProvisionPermissionIsLoadable() throws Exception {
// Name introduced by JENKINS-37616
Permission p = Permission.fromId("hudson.model.Computer.Provision");
assertEquals("Provision", p.name);
}
}