Merge pull request #6 from synopsys-arc-oss/jenkins_18978_slave_perm_…

…groups [JENKINS-18978] - Modified filtering of permission groups for the slaves.
jenkinsci · May 28, 2014 · 0fe3af8 · 0fe3af8
2 parents a26e5d2 + 6c2e145
commit 0fe3af8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ work
 .settings
 .classpath
 .project
-/nb-configuration.xml
+/nb-configuration.xml
+/work - Copy
diff --git a/...ain/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java b/...ain/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java
@@ -41,7 +41,10 @@
 import hudson.model.Hudson;
 import hudson.model.Item;
 import hudson.model.Job;
+import hudson.model.Project;
+import hudson.model.Run;
 import hudson.model.View;
+import hudson.scm.SCM;
 import hudson.security.ACL;
 import hudson.security.AccessControlled;
 import hudson.security.AuthorizationStrategy;
@@ -570,8 +573,15 @@ else if(type.equals(PROJECT)) {
             groups.remove(PermissionGroup.get(View.class));
         }
         else if (type.equals(SLAVE)) {
-            groups = new ArrayList<PermissionGroup>();
-            groups.add(PermissionGroup.get(Computer.class));
+            groups = new ArrayList<PermissionGroup>(PermissionGroup.getAll());
+            groups.remove(PermissionGroup.get(Permission.class));
+            groups.remove(PermissionGroup.get(Hudson.class));
+            groups.remove(PermissionGroup.get(View.class));
+
+            // Project, SCM and Run permissions 
+            groups.remove(PermissionGroup.get(Item.class));
+            groups.remove(PermissionGroup.get(SCM.class));
+            groups.remove(PermissionGroup.get(Run.class));
         }
         else {
             groups = null;