[jboss-cvs] JBossAS SVN: r59237 - projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 26 16:14:35 EST 2006
Author: anil.saldhana at jboss.com
Date: 2006-12-26 16:14:33 -0500 (Tue, 26 Dec 2006)
New Revision: 59237
Modified:
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
Log:
changes made to the perform mapping method
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java 2006-12-26 21:13:36 UTC (rev 59236)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java 2006-12-26 21:14:33 UTC (rev 59237)
@@ -43,7 +43,7 @@
* @since Nov 1, 2006
* @version $Revision$
*/
-public class DeploymentRolesMappingProvider implements MappingProvider
+public class DeploymentRolesMappingProvider implements MappingProvider<Group>
{
private static Logger log = Logger.getLogger(DeploymentRolesMappingProvider.class);
private boolean trace = log.isTraceEnabled();
@@ -56,14 +56,12 @@
* Obtains the deployment roles via the context map and applies it
* on the mappedObject
* @see MappingProvider#performMapping(Map, Object)
- */
- public void performMapping(Map map, Object mappedObject)
+ */
+ public void performMapping(Map map, Group mappedObject)
{
if(map == null || map.isEmpty())
throw new IllegalArgumentException("Context Map is null or empty");
- if(mappedObject instanceof Group == false)
- throw new IllegalArgumentException("mapped Object is not an instance of java.security.acl.Group");
-
+
//Obtain the principal to roles mapping
Principal principal = (Principal) map.get(SecurityConstants.PRINCIPAL_IDENTIFIER);
Map principalRolesMap = (Map)map.get(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP);
@@ -71,7 +69,7 @@
log.trace("Principal="+principal+":principalRolesMap="+principalRolesMap);
if(principal == null || principalRolesMap == null || principalRolesMap.isEmpty())
- return; // No Mapping
+ return ; // No Mapping
Set roleset = (Set)principalRolesMap.get(principal.getName());
if(roleset != null)
@@ -81,30 +79,30 @@
while(iter.hasNext())
{
String rolename = (String)iter.next();
- newRoles.addMember(createNewPrincipal((Group) mappedObject,rolename));
+ newRoles.addMember(createNewPrincipal(mappedObject,rolename));
}
- mappedObject = MappingProviderUtil.replacePrincipals((Group) mappedObject, newRoles);
- }
+ mappedObject = MappingProviderUtil.replacePrincipals(mappedObject, newRoles);
+ }
}
/**
* Need to maintain the Principal type from the original group
- * @param grp
+ * @param mappedObject
* @param name
* @return
*/
- private Principal createNewPrincipal(Group grp, String name)
+ private Principal createNewPrincipal(Group mappedObject, String name)
{
Principal p = new SimplePrincipal(name);
//If the original group had a different principal than simpleprincipal
- if(grp.members().hasMoreElements())
+ if(mappedObject.members().hasMoreElements())
{
- Principal origp = grp.members().nextElement();
+ Principal origp = mappedObject.members().nextElement();
p = MappingProviderUtil.instantiatePrincipal(origp.getClass(), name);
if(p == null)
p = new SimplePrincipal(name);
}
return p;
- }
+ }
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java 2006-12-26 21:13:36 UTC (rev 59236)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java 2006-12-26 21:14:33 UTC (rev 59237)
@@ -25,7 +25,7 @@
* @version $Revision$
* @since Aug 24, 2006
*/
-public class OptionsRoleMappingProvider implements MappingProvider
+public class OptionsRoleMappingProvider implements MappingProvider<Group>
{
private static final Logger log = Logger.getLogger(OptionsRoleMappingProvider.class);
@@ -58,17 +58,13 @@
}
}
- public void performMapping(Map contextMap, Object mappedObject)
+ public void performMapping(Map contextMap, Group mappedObject)
{
ArrayList<Principal> removeMembers = new ArrayList<Principal>();
- ArrayList<Principal> addMembers = new ArrayList<Principal>();
+ ArrayList<Principal> addMembers = new ArrayList<Principal>();
- Group roles = (Group)contextMap.get(SecurityConstants.ROLES_IDENTIFIER);
- if(roles == null)
- throw new IllegalArgumentException("Group called Roles not found");
-
//Enumerate over the members
- Enumeration enumer = roles.members();
+ Enumeration enumer = mappedObject.members();
while(enumer.hasMoreElements())
{
Principal p = (Principal)enumer.nextElement();
@@ -89,14 +85,13 @@
//Go through the remove list
for(Principal p:removeMembers)
{
- roles.removeMember(p);
+ mappedObject.removeMember(p);
}
//Go through the add list
for(Principal p:addMembers)
{
- roles.addMember(p);
+ mappedObject.addMember(p);
}
-
- mappedObject = roles;
+
}
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java 2006-12-26 21:13:36 UTC (rev 59236)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PolicyContextIdRoleMappingProvider.java 2006-12-26 21:14:33 UTC (rev 59237)
@@ -45,7 +45,7 @@
* @since Oct 10, 2006
* @version $Revision$
*/
-public class PolicyContextIdRoleMappingProvider implements MappingProvider
+public class PolicyContextIdRoleMappingProvider implements MappingProvider<Group>
{
private static Logger log = Logger.getLogger(PolicyContextIdRoleMappingProvider.class);
private boolean trace = log.isTraceEnabled();
@@ -85,14 +85,10 @@
}
}
- public void performMapping(Map contextMap, Object mappedObject)
+ public void performMapping(Map contextMap, Group mappedObject)
{
- ArrayList <Principal> tempPrincipalList = new ArrayList<Principal>();
+ ArrayList <Principal> tempPrincipalList = new ArrayList<Principal>();
- Group roles = (Group)contextMap.get(SecurityConstants.ROLES_IDENTIFIER);
- if(roles == null)
- throw new IllegalArgumentException("Group called Roles not found");
-
Principal principal = null;
Set<Principal> principals = (Set)contextMap.get(SecurityConstants.PRINCIPALS_SET_IDENTIFIER);
for(Principal p:principals)
@@ -125,7 +121,7 @@
addRoles = MappingProviderUtil.getRolesFromCommaSeparatedString(rolesToAdd);
//Create a temp list of principals stored in the role group
- Enumeration<? extends Principal> groupMembers = roles.members();
+ Enumeration<? extends Principal> groupMembers = mappedObject.members();
while(groupMembers.hasMoreElements())
{
tempPrincipalList.add(groupMembers.nextElement());
@@ -134,19 +130,18 @@
//Remove all the previous roles from the Group
for(Principal p:tempPrincipalList)
{
- roles.removeMember(p);
+ mappedObject.removeMember(p);
}
//Now add the new roles to the group
- MappingProviderUtil.addRoles(roles, addRoles);
+ MappingProviderUtil.addRoles(mappedObject, addRoles);
}
catch (IOException e)
{
if(trace)
log.trace("Exception:",e);
}
- }
- mappedObject = roles;
+ }
}
private Properties loadProperties(String filename) throws IOException
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java 2006-12-26 21:13:36 UTC (rev 59236)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/PrincipalToRoleMappingProvider.java 2006-12-26 21:14:33 UTC (rev 59237)
@@ -38,7 +38,7 @@
* @version $Revision$
* @since Sep 27, 2006
*/
-public class PrincipalToRoleMappingProvider implements MappingProvider
+public class PrincipalToRoleMappingProvider implements MappingProvider<Group>
{
private static final Logger log = Logger.getLogger(PrincipalToRoleMappingProvider.class);
@@ -63,12 +63,8 @@
}
}
- public void performMapping(Map contextMap, Object mappedObject)
- {
- Group roles = (Group)contextMap.get(SecurityConstants.ROLES_IDENTIFIER);
- if(roles == null)
- throw new IllegalArgumentException("Group called Roles not found");
-
+ public void performMapping(Map contextMap, Group mappedObject)
+ {
Set<Principal> principals = (Set<Principal>) contextMap.get(SecurityConstants.PRINCIPALS_SET_IDENTIFIER);
for(Principal p:principals)
{
@@ -83,9 +79,8 @@
int len = tokens != null ? tokens.length : 0;
for(int i = 0; i < len; i++)
{
- roles.addMember(MappingProviderUtil.instantiatePrincipal(p.getClass(),tokens[i]));
+ mappedObject.addMember(MappingProviderUtil.instantiatePrincipal(p.getClass(),tokens[i]));
}
- }
- mappedObject = roles;
+ }
}
}
More information about the jboss-cvs-commits
mailing list