portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r692414 - in /portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl: BaseJetspeedPrincipalManager.java RoleManagerImpl.java
Date Fri, 05 Sep 2008 11:47:25 GMT
Author: woonsan
Date: Fri Sep  5 04:47:24 2008
New Revision: 692414

URL: http://svn.apache.org/viewvc?rev=692414&view=rev
Log:
Flattening the Principal API.
Implemented retrieving associations in the role manager.

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java?rev=692414&r1=692413&r2=692414&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/BaseJetspeedPrincipalManager.java
Fri Sep  5 04:47:24 2008
@@ -29,6 +29,7 @@
 import org.apache.jetspeed.security.JetspeedPrincipalAssociationReference;
 import org.apache.jetspeed.security.JetspeedPrincipalType;
 import org.apache.jetspeed.security.PrincipalAlreadyExistsException;
+import org.apache.jetspeed.security.PrincipalAssociationNotAllowedException;
 import org.apache.jetspeed.security.PrincipalAssociationRequiredException;
 import org.apache.jetspeed.security.PrincipalNotFoundException;
 import org.apache.jetspeed.security.PrincipalNotRemovableException;
@@ -255,4 +256,32 @@
         validatePrincipal(principal);
         jppsm.revokePermission(principal, permission);
     }
+    
+    //
+    // JetspeedPrincipalAssociationHandler interface invocations
+    //
+    public void addAssociation(String associationName, JetspeedPrincipal from, JetspeedPrincipal
to) throws PrincipalNotFoundException, PrincipalAssociationNotAllowedException
+    {
+        AssociationHandlerKey key = new AssociationHandlerKey(associationName, from.getType().getName(),
to.getName());
+        
+        if (!assHandlers.containsKey(key))
+        {
+            throw new PrincipalAssociationNotAllowedException();
+        }
+        
+        JetspeedPrincipalAssociationHandler jpah = assHandlers.get(key);
+        jpah.add(from, to);
+    }
+
+    public void removeAssociation(String associationName, JetspeedPrincipal from, JetspeedPrincipal
to) throws PrincipalNotFoundException, PrincipalAssociationRequiredException
+    {
+        AssociationHandlerKey key = new AssociationHandlerKey(associationName, from.getType().getName(),
to.getName());
+        JetspeedPrincipalAssociationHandler jpah = assHandlers.get(key);
+        
+        if (jpah != null)
+        {
+            jpah.remove(from, to);
+        }
+    }
+    
 }

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java?rev=692414&r1=692413&r2=692414&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
Fri Sep  5 04:47:24 2008
@@ -28,6 +28,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.security.AuthenticationProviderProxy;
 import org.apache.jetspeed.security.DependentPrincipalException;
+import org.apache.jetspeed.security.Group;
+import org.apache.jetspeed.security.GroupManager;
 import org.apache.jetspeed.security.JetspeedPermission;
 import org.apache.jetspeed.security.JetspeedPrincipal;
 import org.apache.jetspeed.security.JetspeedPrincipalAssociationHandler;
@@ -36,6 +38,7 @@
 import org.apache.jetspeed.security.JetspeedPrincipalManager;
 import org.apache.jetspeed.security.JetspeedPrincipalType;
 import org.apache.jetspeed.security.PrincipalAlreadyExistsException;
+import org.apache.jetspeed.security.PrincipalAssociationNotAllowedException;
 import org.apache.jetspeed.security.PrincipalAssociationRequiredException;
 import org.apache.jetspeed.security.PrincipalNotFoundException;
 import org.apache.jetspeed.security.PrincipalNotRemovableException;
@@ -46,6 +49,7 @@
 import org.apache.jetspeed.security.RolePrincipal;
 import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.SecurityProvider;
+import org.apache.jetspeed.security.User;
 import org.apache.jetspeed.security.UserManager;
 import org.apache.jetspeed.security.attributes.SecurityAttributes;
 import org.apache.jetspeed.security.attributes.SecurityAttributesProvider;
@@ -81,12 +85,17 @@
     
     private JetspeedPrincipalType userType;
     private JetspeedPrincipalType groupType;
+    private UserManager userManager;
+    private GroupManager groupManager;
     
     public RoleManagerImpl(JetspeedPrincipalType principalType, JetspeedPrincipalType userType,
JetspeedPrincipalType groupType, 
                            JetspeedPrincipalAccessManager jpam, JetspeedPrincipalStorageManager
jpsm,
-                           JetspeedPrincipalPermissionStorageManager jppsm)
+                           JetspeedPrincipalPermissionStorageManager jppsm,
+                           UserManager userManager, GroupManager groupManager)
     {
         super(principalType, jpam, jpsm, jppsm);
+        this.userManager = userManager;
+        this.groupManager = groupManager;
     }
 
     
@@ -205,20 +214,19 @@
      */
     public void addRoleToUser(String username, String roleName) throws SecurityException
     {
-        Principal rolePrincipal = roleSecurityHandler.getRolePrincipal(roleName);
-        if (null == rolePrincipal)
+        try
         {
-            throw new SecurityException(SecurityException.ROLE_DOES_NOT_EXIST.create(roleName));
-        }
-        Principal userPrincipal = atnProviderProxy.getUserPrincipal(username);
-        if (null == userPrincipal)
+            User user = userManager.getUser(username);
+            Role role = getRole(roleName);
+            super.addAssociation(JetspeedPrincipalAssociationType.IS_PART_OF, user, role);
+        } 
+        catch (PrincipalNotFoundException e)
         {
-            throw new SecurityException(SecurityException.USER_DOES_NOT_EXIST.create(username));
-        }
-        Set<RolePrincipal> rolePrincipals = securityMappingHandler.getRolePrincipals(username);
-        if (!rolePrincipals.contains(rolePrincipal))
+            throw new SecurityException(e);
+        } 
+        catch (PrincipalAssociationNotAllowedException e)
         {
-            securityMappingHandler.setUserPrincipalInRole(username, roleName);
+            throw new SecurityException(e);
         }
     }
 
@@ -228,15 +236,19 @@
      */
     public void removeRoleFromUser(String username, String roleName) throws SecurityException
     {
-        Principal userPrincipal = atnProviderProxy.getUserPrincipal(username);
-        if (null == userPrincipal)
+        try
         {
-            throw new SecurityException(SecurityException.USER_DOES_NOT_EXIST.create(username));
-        }
-        Principal rolePrincipal = roleSecurityHandler.getRolePrincipal(roleName);
-        if (null != rolePrincipal)
+            User user = userManager.getUser(username);
+            Role role = getRole(roleName);
+            super.removeAssociation(JetspeedPrincipalAssociationType.IS_PART_OF, user, role);
+        } 
+        catch (PrincipalNotFoundException e)
+        {
+            throw new SecurityException(e);
+        } 
+        catch (PrincipalAssociationRequiredException e)
         {
-            securityMappingHandler.removeUserPrincipalInRole(username, roleName);
+            throw new SecurityException(e);
         }
     }
 
@@ -246,14 +258,7 @@
      */
     public boolean isUserInRole(String username, String roleName) throws SecurityException
     {
-        boolean isUserInRole = false;
-        Set<RolePrincipal> rolePrincipals = securityMappingHandler.getRolePrincipals(username);
-        Principal rolePrincipal = new RolePrincipalImpl(roleName);
-        if (rolePrincipals.contains(rolePrincipal))
-        {
-            isUserInRole = true;
-        }
-        return isUserInRole;
+        return getRolesForUser(username).contains(getRole(roleName));
     }
 
     /**
@@ -262,12 +267,20 @@
      */
     public void addRoleToGroup(String roleName, String groupName) throws SecurityException
     {
-        Principal rolePrincipal = roleSecurityHandler.getRolePrincipal(roleName);
-        if (null == rolePrincipal)
+        try
         {
-            throw new SecurityException(SecurityException.ROLE_DOES_NOT_EXIST.create(roleName));
+            Group group = groupManager.getGroup(groupName);
+            Role role = getRole(roleName);
+            super.addAssociation(JetspeedPrincipalAssociationType.IS_PART_OF, group, role);
+        } 
+        catch (PrincipalNotFoundException e)
+        {
+            throw new SecurityException(e);
+        } 
+        catch (PrincipalAssociationNotAllowedException e)
+        {
+            throw new SecurityException(e);
         }
-        securityMappingHandler.setRolePrincipalInGroup(groupName, roleName);
     }
 
     /**
@@ -276,10 +289,19 @@
      */
     public void removeRoleFromGroup(String roleName, String groupName) throws SecurityException
     {
-        Principal rolePrincipal = roleSecurityHandler.getRolePrincipal(roleName);
-        if (null != rolePrincipal)
+        try
+        {
+            Group group = groupManager.getGroup(groupName);
+            Role role = getRole(roleName);
+            super.removeAssociation(JetspeedPrincipalAssociationType.IS_PART_OF, group, role);
+        } 
+        catch (PrincipalNotFoundException e)
         {
-            securityMappingHandler.removeRolePrincipalInGroup(groupName, roleName);
+            throw new SecurityException(e);
+        } 
+        catch (PrincipalAssociationRequiredException e)
+        {
+            throw new SecurityException(e);
         }
     }
 
@@ -289,14 +311,7 @@
      */
     public boolean isGroupInRole(String groupName, String roleName) throws SecurityException
     {
-        boolean isGroupInRole = false;
-        Set<RolePrincipal> rolePrincipals = securityMappingHandler.getRolePrincipalsInGroup(groupName);
-        Principal rolePrincipal = new RolePrincipalImpl(roleName);
-        if (rolePrincipals.contains(rolePrincipal))
-        {
-            isGroupInRole = true;
-        }
-        return isGroupInRole;
+        return getRolesInGroup(groupName).contains(getRole(roleName));
     }
 
     /**
@@ -344,170 +359,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#addAssociationHandler(org.apache.jetspeed.security.JetspeedPrincipalAssociationHandler)
-     */
-    @Override
-    public void addAssociationHandler(JetspeedPrincipalAssociationHandler jpah)
-    {
-        // TODO Auto-generated method stub
-        super.addAssociationHandler(jpah);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#addPrincipal(org.apache.jetspeed.security.JetspeedPrincipal,
java.util.Set)
-     */
-    @Override
-    public void addPrincipal(JetspeedPrincipal principal, Set<JetspeedPrincipalAssociationReference>
associations)
-                                                                                        
                         throws PrincipalAlreadyExistsException,
-                                                                                        
                         PrincipalAssociationRequiredException
-    {
-        // TODO Auto-generated method stub
-        super.addPrincipal(principal, associations);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getAssociatedFrom(java.lang.String,
java.lang.String)
-     */
-    @Override
-    public List<JetspeedPrincipal> getAssociatedFrom(String principalName, String associationName)
-    {
-        // TODO Auto-generated method stub
-        return super.getAssociatedFrom(principalName, associationName);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getAssociatedNamesFrom(java.lang.String,
java.lang.String)
-     */
-    @Override
-    public List<String> getAssociatedNamesFrom(String principalName, String associationName)
-    {
-        // TODO Auto-generated method stub
-        return super.getAssociatedNamesFrom(principalName, associationName);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getAssociatedNamesTo(java.lang.String,
java.lang.String)
-     */
-    @Override
-    public List<String> getAssociatedNamesTo(String principalName, String associationName)
-    {
-        // TODO Auto-generated method stub
-        return super.getAssociatedNamesTo(principalName, associationName);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getAssociatedTo(java.lang.String,
java.lang.String)
-     */
-    @Override
-    public List<JetspeedPrincipal> getAssociatedTo(String principalName, String associationName)
-    {
-        // TODO Auto-generated method stub
-        return super.getAssociatedTo(principalName, associationName);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getPrincipal(java.lang.String)
-     */
-    @Override
-    public JetspeedPrincipal getPrincipal(String name)
-    {
-        // TODO Auto-generated method stub
-        return super.getPrincipal(name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getPrincipalNames(java.lang.String)
-     */
-    @Override
-    public List<String> getPrincipalNames(String nameFilter)
-    {
-        // TODO Auto-generated method stub
-        return super.getPrincipalNames(nameFilter);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#getPrincipals(java.lang.String)
-     */
-    @Override
-    public List<JetspeedPrincipal> getPrincipals(String nameFilter)
-    {
-        // TODO Auto-generated method stub
-        return super.getPrincipals(nameFilter);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#grantPermission(org.apache.jetspeed.security.JetspeedPrincipal,
org.apache.jetspeed.security.JetspeedPermission)
-     */
-    @Override
-    public void grantPermission(JetspeedPrincipal principal, JetspeedPermission permission)
-    {
-        // TODO Auto-generated method stub
-        super.grantPermission(principal, permission);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#principalExists(java.lang.String)
-     */
-    @Override
-    public boolean principalExists(String name)
-    {
-        return super.principalExists(name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#removePrincipal(org.apache.jetspeed.security.JetspeedPrincipal)
-     */
-    @Override
-    public void removePrincipal(JetspeedPrincipal principal) throws PrincipalNotFoundException,
-                                                            PrincipalNotRemovableException,
DependentPrincipalException
-    {
-        // TODO Auto-generated method stub
-        super.removePrincipal(principal);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#removePrincipal(java.lang.String)
-     */
-    @Override
-    public void removePrincipal(String name) throws PrincipalNotFoundException, PrincipalNotRemovableException,
-                                            DependentPrincipalException
-    {
-        // TODO Auto-generated method stub
-        super.removePrincipal(name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#revokeAll(org.apache.jetspeed.security.JetspeedPrincipal)
-     */
-    @Override
-    public void revokeAll(JetspeedPrincipal principal)
-    {
-        // TODO Auto-generated method stub
-        super.revokeAll(principal);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#revokePermission(org.apache.jetspeed.security.JetspeedPrincipal,
org.apache.jetspeed.security.JetspeedPermission)
-     */
-    @Override
-    public void revokePermission(JetspeedPrincipal principal, JetspeedPermission permission)
-    {
-        // TODO Auto-generated method stub
-        super.revokePermission(principal, permission);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.security.impl.BaseJetspeedPrincipalManager#updatePrincipal(org.apache.jetspeed.security.JetspeedPrincipal)
-     */
-    @Override
-    public void updatePrincipal(JetspeedPrincipal principal) throws PrincipalUpdateException,
-                                                            PrincipalNotFoundException
-    {
-        // TODO Auto-generated method stub
-        super.updatePrincipal(principal);
-    }
-
-    /* (non-Javadoc)
      * @see org.apache.jetspeed.security.JetspeedPrincipalManager#newPrincipal(java.lang.String,
boolean)
      */
     public JetspeedPrincipal newPrincipal(String name, boolean mapped)



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message