diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java index ef12625583..ac5e420305 100644 --- a/core/src/main/java/hudson/security/AuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java @@ -44,8 +44,7 @@ public abstract class AuthorizationStrategy implements Describable LIST = new DescriptorList( - ); + public static final DescriptorList LIST = new DescriptorList(); /** * {@link AuthorizationStrategy} that implements the semantics @@ -91,9 +90,11 @@ public abstract class AuthorizationStrategy implements Describable> grantedPermissions = new HashMap>(); + + @Override + public ACL getRootACL() { + return acl; + } + + private Object readResolve() { + acl = new AclImpl(); + return this; + } + + private final class AclImpl extends SidACL { + protected Boolean hasPermission(Sid p, Permission permission) { + Set set = grantedPermissions.get(permission); + if(set==null) return null; + if(set.contains(toString(p))) return true; + return null; + } + + private String toString(Sid p) { + if (p instanceof GrantedAuthoritySid) + return ((GrantedAuthoritySid) p).getGrantedAuthority(); + if (p instanceof PrincipalSid) + return ((PrincipalSid) p).getPrincipal(); + // hmm... + return p.toString(); + } + } + + public Descriptor getDescriptor() { + return DESCRIPTOR; + } + + public static final Descriptor DESCRIPTOR = new DescriptorImpl(); + + /** + * Persist {@link GlobalMatrixAuthorizationStrategy} as a list of IDs that + * represent {@link GlobalMatrixAuthorizationStrategy#grantedPermissions}. + */ + public static final class ConverterImpl implements Converter { + private final Converter collectionConv; // used to convert ArrayList in it + + public ConverterImpl(Converter collectionConv) { + this.collectionConv = collectionConv; + } + + public boolean canConvert(Class type) { + return type== GlobalMatrixAuthorizationStrategy.class; + } + + public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) { + GlobalMatrixAuthorizationStrategy strategy = (GlobalMatrixAuthorizationStrategy)source; + + List permissions = new ArrayList(); + for (Entry> e : strategy.grantedPermissions.entrySet()) { + String p = e.getKey().getId(); + for (String sid : e.getValue()) + permissions.add(p+':'+sid); + } + + collectionConv.marshal( permissions, writer, context ); + } + + public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingContext context) { + GlobalMatrixAuthorizationStrategy as = new GlobalMatrixAuthorizationStrategy(); + + for( String id : (List)(collectionConv.unmarshal(reader,context))) { + int idx = id.indexOf(':'); + Permission p = Permission.fromId(id.substring(0,idx)); + Set set = as.grantedPermissions.get(p); + if(set==null) + as.grantedPermissions.put(p,set = new HashSet()); + set.add(id.substring(idx+1)); + } + + return as; + } + } + + static { + LIST.add(DESCRIPTOR); + Hudson.XSTREAM.registerConverter( + new GlobalMatrixAuthorizationStrategy.ConverterImpl( + new CollectionConverter(Hudson.XSTREAM.getClassMapper()) + ),10); + } + + public static final class DescriptorImpl extends Descriptor { + public DescriptorImpl() { + super(GlobalMatrixAuthorizationStrategy.class); + } + + public String getDisplayName() { + return "Role-based security"; + } + + public AuthorizationStrategy newInstance(StaplerRequest req, JSONObject formData) throws FormException { + // TODO: configure + return new GlobalMatrixAuthorizationStrategy(); + } + + public String getHelpFile() { + return "/help/security/full-control-once-logged-in.html"; + } + + public List getAllGroups() { + return Permission.getAllGroups(); + } + } +} + diff --git a/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly new file mode 100644 index 0000000000..7ad1758123 --- /dev/null +++ b/core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly @@ -0,0 +1,15 @@ + + + + + + + + +
+ + + ${g.owner.name} +
+
+
\ No newline at end of file