[jboss-cvs] JBossAS SVN: r67182 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security: client and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 16 12:20:51 EST 2007
Author: anil.saldhana at jboss.com
Date: 2007-11-16 12:20:51 -0500 (Fri, 16 Nov 2007)
New Revision: 67182
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRolesAssociation.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimplePrincipal.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
Log:
SECURITY-92:typesafe collections
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestableGroup.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -50,7 +50,7 @@
/** The stack of the Groups. Elements are pushed/poped by
inserting/removing element 0.
*/
- private LinkedList rolesStack;
+ private LinkedList<Principal> rolesStack;
/** Creates new NestableGroup with the given name
*/
@@ -64,7 +64,7 @@
/** Returns an enumeration that contains the single active Principal.
@return an Enumeration of the single active Principal.
*/
- public Enumeration members()
+ public Enumeration<Principal> members()
{
return new IndexEnumeration();
}
@@ -131,7 +131,7 @@
{
NestableGroup clone = (NestableGroup) super.clone();
if(clone != null)
- clone.rolesStack = (LinkedList)this.rolesStack.clone();
+ clone.rolesStack = (LinkedList<Principal>)this.rolesStack.clone();
return clone;
}
@@ -162,4 +162,4 @@
return next;
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/NestablePrincipal.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -51,21 +51,21 @@
/** The stack of the Principals. Elements are pushed/poped by
inserting/removing element 0.
*/
- private LinkedList principalStack;
+ private LinkedList<Principal> principalStack;
/** Creates new NestablePrincipal with the given name
*/
public NestablePrincipal(String name)
{
super(name);
- principalStack = new LinkedList();
+ principalStack = new LinkedList<Principal>();
}
// --- Begin Group interface methods
/** Returns an enumeration that contains the single active Principal.
@return an Enumeration of the single active Principal.
*/
- public Enumeration members()
+ public Enumeration<Principal> members()
{
return new IndexEnumeration();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/RunAsIdentity.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -43,8 +43,8 @@
private static final long serialVersionUID = -3236178735180485083L;
/** The run-as role principals */
- private HashSet runAsRoles = new HashSet();
- private HashSet principalsSet;
+ private HashSet<Principal> runAsRoles = new HashSet<Principal>();
+ private HashSet<Principal> principalsSet;
private static final String ANOYMOUS_PRINCIPAL = "anonymous";
@@ -65,7 +65,7 @@
/**
* Construct an inmutable instance of a RunAsIdentity
*/
- public RunAsIdentity(String roleName, String principalName, Set extraRoleNames)
+ public RunAsIdentity(String roleName, String principalName, Set<String> extraRoleNames)
{
this(roleName, principalName);
@@ -85,7 +85,7 @@
Return a set with the configured run-as role
@return Set<Principal> for the run-as roles
*/
- public Set getRunAsRoles()
+ public Set<Principal> getRunAsRoles()
{
return new HashSet(runAsRoles);
}
@@ -96,7 +96,7 @@
@return Set<Principal> for the run-as principal and roles
*/
- public synchronized Set getPrincipalsSet()
+ public synchronized Set<Principal> getPrincipalsSet()
{
if( principalsSet == null )
{
@@ -122,7 +122,7 @@
/**
* True if the run-as principal has any of the method roles
*/
- public boolean doesUserHaveRole(Set methodRoles)
+ public boolean doesUserHaveRole(Set<Principal> methodRoles)
{
Iterator it = methodRoles.iterator();
while (it.hasNext())
@@ -164,4 +164,4 @@
{
return (T) SecurityConstants.JAVAEE;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRolesAssociation.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRolesAssociation.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityRolesAssociation.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -22,40 +22,45 @@
package org.jboss.security;
import java.util.Map;
+import java.util.Set;
import org.jboss.logging.Logger;
/**
- * The SecurityRolesAssociation uses a ThreadLocal to accociatw the SecurityRoleMetaData
+ * The SecurityRolesAssociation uses a ThreadLocal to associate the SecurityRoleMetaData
* from the deployment with the current thread.
*
* @author Thomas.Diesler at jboss.org
+ * @author Anil.Saldhana at jboss.org
* @version $Revision$
*/
public final class SecurityRolesAssociation
{
- /** Thread local that holds the deployment security roles */
- private static ThreadLocal threadSecurityRoleMapping = new ThreadLocal();
+ /** Thread local that holds the deployment security roles - it holds a map
+ * of principal-name versus a set of role strings
+ */
+ private static ThreadLocal<Map<String,Set<String>>> threadSecurityRoleMapping
+ = new ThreadLocal<Map<String,Set<String>>>();
private static Logger log = Logger.getLogger(SecurityRolesAssociation.class);
/**
* Get the current map of SecurityRoleMetaData.
+ * The map is principal name keyed against a set of rolenames
* @return A Map that stores SecurityRoleMetaData by roleName
*/
- public static Map getSecurityRoles()
+ public static Map<String,Set<String>> getSecurityRoles()
{
- return (Map) threadSecurityRoleMapping.get();
+ return (Map<String,Set<String>>) threadSecurityRoleMapping.get();
}
/**
- * Get the current map of SecurityRoleMetaData.
+ * Set the current map of SecurityRoleMetaData.
*/
- public static void setSecurityRoles(Map securityRoles)
+ public static void setSecurityRoles(Map<String,Set<String>> securityRoles)
{
if(log.isTraceEnabled())
log.trace("Setting threadlocal:"+securityRoles);
threadSecurityRoleMapping.set(securityRoles);
}
-
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimpleGroup.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -107,7 +107,7 @@
or Group (which is a subinterface of Principal).
@return an enumeration of the group members.
*/
- public Enumeration members()
+ public Enumeration<Principal> members()
{
return Collections.enumeration(members.values());
}
@@ -144,4 +144,4 @@
clone.members = (HashMap)this.members.clone();
return clone;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimplePrincipal.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimplePrincipal.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SimplePrincipal.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -70,4 +70,4 @@
{
return name;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/client/JBossSecurityClient.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -103,4 +103,4 @@
throw new RuntimeException(e);
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java 2007-11-16 17:18:39 UTC (rev 67181)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java 2007-11-16 17:20:51 UTC (rev 67182)
@@ -72,14 +72,14 @@
//Obtain the principal to roles mapping
Principal principal = (Principal) map.get(SecurityConstants.PRINCIPAL_IDENTIFIER);
- Map principalRolesMap = (Map)map.get(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP);
+ Map<String,Set<String>> principalRolesMap = (Map<String,Set<String>>)map.get(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP);
if(trace)
log.trace("Principal="+principal+":principalRolesMap="+principalRolesMap);
if(principal == null || principalRolesMap == null || principalRolesMap.isEmpty())
return ; // No Mapping
- Set roleset = (Set)principalRolesMap.get(principal.getName());
+ Set<String> roleset = (Set<String>)principalRolesMap.get(principal.getName());
if(roleset != null)
{
Group newRoles = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
@@ -114,4 +114,4 @@
}
return p;
}
-}
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list