From f57b06cebfdcf03ec89cc491143dc563fd91dfe6 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 28 Jan 2009 17:11:03 +0000 Subject: [PATCH] [FIXED HUDSON-2930] FULL_CONTROL right is no longer FULL_CONTROL at all. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14845 71c3de6d-444a-0410-be80-ed276b4c234a --- .../FullControlOnceLoggedInAuthorizationStrategy.java | 5 +++-- .../java/hudson/security/LegacyAuthorizationStrategy.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java index ec0ac0aa1e..70c45dede5 100644 --- a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java @@ -1,6 +1,7 @@ package hudson.security; import hudson.model.Descriptor; +import hudson.model.Hudson; import java.util.Collections; import java.util.List; @@ -28,8 +29,8 @@ public class FullControlOnceLoggedInAuthorizationStrategy extends AuthorizationS private static final SparseACL THE_ACL = new SparseACL(null); static { - THE_ACL.add(ACL.EVERYONE,Permission.FULL_CONTROL,true); - THE_ACL.add(ACL.ANONYMOUS,Permission.FULL_CONTROL,false); + THE_ACL.add(ACL.EVERYONE,Hudson.ADMINISTER,true); + THE_ACL.add(ACL.ANONYMOUS,Hudson.ADMINISTER,false); THE_ACL.add(ACL.ANONYMOUS,Permission.READ,true); } diff --git a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java index 4ffa3e80b0..fef4b0cf3c 100644 --- a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java @@ -1,6 +1,7 @@ package hudson.security; import hudson.model.Descriptor; +import hudson.model.Hudson; import org.acegisecurity.acls.sid.GrantedAuthoritySid; import org.kohsuke.stapler.StaplerRequest; import net.sf.json.JSONObject; @@ -15,7 +16,7 @@ import java.util.Collections; public final class LegacyAuthorizationStrategy extends AuthorizationStrategy { private static final ACL LEGACY_ACL = new SparseACL(null) {{ add(EVERYONE,Permission.READ,true); - add(new GrantedAuthoritySid("admin"),Permission.FULL_CONTROL,true); + add(new GrantedAuthoritySid("admin"), Hudson.ADMINISTER,true); }}; public ACL getRootACL() {