[jboss-cvs] JBossAS SVN: r70600 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 9 18:17:30 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-03-09 18:17:29 -0400 (Sun, 09 Mar 2008)
New Revision: 70600
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/ContextPolicy.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/DelegatingPolicy.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityService.java
Log:
generics
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/ContextPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/ContextPolicy.java 2008-03-09 22:17:12 UTC (rev 70599)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/ContextPolicy.java 2008-03-09 22:17:29 UTC (rev 70600)
@@ -51,7 +51,7 @@
private Permissions excludedPermissions = new Permissions();
private Permissions uncheckedPermissions = new Permissions();
/** HashMap<String, Permissions> role name to permissions mapping */
- private HashMap rolePermissions = new HashMap();
+ private HashMap<String, Permissions> rolePermissions = new HashMap<String, Permissions>();
/** Flag indicating if our category is at trace level for logging */
private boolean trace;
@@ -64,13 +64,13 @@
Permissions getPermissions()
{
Permissions perms = new Permissions();
- Enumeration eter = uncheckedPermissions.elements();
+ Enumeration<Permission> eter = uncheckedPermissions.elements();
while( eter.hasMoreElements() )
{
Permission p = (Permission) eter.nextElement();
perms.add(p);
}
- Iterator iter = rolePermissions.values().iterator();
+ Iterator<Permissions> iter = rolePermissions.values().iterator();
while( iter.hasNext() )
{
Permissions rp = (Permissions) iter.next();
@@ -105,15 +105,16 @@
// Check principal to role permissions
Principal[] principals = domain.getPrincipals();
+ log.trace("ProtectionDomain principals="+principals);
int length = principals != null ? principals.length : 0;
- ArrayList princpalNames = new ArrayList();
+ ArrayList<String> princpalNames = new ArrayList<String>();
for(int n = 0; n < length; n ++)
{
Principal p = principals[n];
if( p instanceof Group )
{
Group g = (Group) p;
- Enumeration iter = g.members();
+ Enumeration<? extends Principal> iter = g.members();
while( iter.hasMoreElements() )
{
p = (Principal) iter.nextElement();
@@ -167,7 +168,7 @@
void addToExcludedPolicy(PermissionCollection permissions)
throws PolicyContextException
{
- Enumeration iter = permissions.elements();
+ Enumeration<Permission> iter = permissions.elements();
while( iter.hasMoreElements() )
{
Permission p = (Permission) iter.nextElement();
@@ -196,7 +197,7 @@
perms = new Permissions();
rolePermissions.put(roleName, perms);
}
- Enumeration iter = permissions.elements();
+ Enumeration<Permission> iter = permissions.elements();
while( iter.hasMoreElements() )
{
Permission p = (Permission) iter.nextElement();
@@ -213,7 +214,7 @@
void addToUncheckedPolicy(PermissionCollection permissions)
throws PolicyContextException
{
- Enumeration iter = permissions.elements();
+ Enumeration<Permission> iter = permissions.elements();
while( iter.hasMoreElements() )
{
Permission p = (Permission) iter.nextElement();
@@ -267,7 +268,7 @@
tmp.append(contextID);
tmp.append("'>\n");
tmp.append("\t<ExcludedPermissions>\n");
- Enumeration iter = excludedPermissions.elements();
+ Enumeration<Permission> iter = excludedPermissions.elements();
while( iter.hasMoreElements() )
{
Permission p = (Permission) iter.nextElement();
@@ -297,7 +298,7 @@
tmp.append("\t</UncheckedPermissions>\n");
tmp.append("\t<RolePermssions>\n");
- Iterator roles = rolePermissions.keySet().iterator();
+ Iterator<String> roles = rolePermissions.keySet().iterator();
while( roles.hasNext() )
{
String role = (String) roles.next();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-03-09 22:17:12 UTC (rev 70599)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-03-09 22:17:29 UTC (rev 70600)
@@ -30,7 +30,6 @@
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
-import javax.security.auth.Subject;
import javax.security.jacc.EJBMethodPermission;
import javax.security.jacc.EJBRoleRefPermission;
import javax.security.jacc.PolicyConfiguration;
@@ -41,7 +40,6 @@
import javax.security.jacc.WebUserDataPermission;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityConstants;
/**
* A JAAC Policy provider implementation that delegates any non-JACC permissions
@@ -63,12 +61,12 @@
* Map<String, ContextPolicy> for the JACC context IDs that have been
* committed.
*/
- private ConcurrentHashMap activePolicies = new ConcurrentHashMap();
+ private ConcurrentHashMap<String,ContextPolicy> activePolicies = new ConcurrentHashMap<String,ContextPolicy>();
/**
* Map<String, ContextPolicy> for the JACC policies that are in the open
* state and should be excluded from the active permission set.
*/
- private ConcurrentHashMap openPolicies = new ConcurrentHashMap();
+ private ConcurrentHashMap<String,ContextPolicy> openPolicies = new ConcurrentHashMap<String,ContextPolicy>();
/**
* Flag indicating if our category is at trace level for logging
*/
@@ -82,7 +80,7 @@
The types of permissions which should be treated as JACC permission types
in terms of whether this policy should validate the permission.
*/
- private Class[] externalPermissionTypes = {};
+ private Class<?>[] externalPermissionTypes = {};
public synchronized static DelegatingPolicy getInstance()
{
@@ -127,14 +125,15 @@
if (trace)
log.trace("Loaded JACC permissions: " + loadedPerms);
// Load PolicyContext as this also can trigger permission checks in implies
- Class c = PolicyContext.class;
+ Class<?> c = PolicyContext.class;
+ log.trace("loaded policy context class"+c);
}
- public Class[] getExternalPermissionTypes()
+ public Class<?>[] getExternalPermissionTypes()
{
return externalPermissionTypes;
}
- public void setExternalPermissionTypes(Class[] externalPermissionTypes)
+ public void setExternalPermissionTypes(Class<?>[] externalPermissionTypes)
{
if( externalPermissionTypes == null )
externalPermissionTypes = new Class[0];
@@ -145,7 +144,7 @@
{
PermissionCollection pc = super.getPermissions(domain);
PermissionCollection delegated = delegate.getPermissions(domain);
- for (Enumeration e = delegated.elements(); e.hasMoreElements();)
+ for (Enumeration<Permission> e = delegated.elements(); e.hasMoreElements();)
{
Permission p = (Permission) e.nextElement();
pc.add(p);
@@ -164,10 +163,10 @@
// If there are external permission types check them
if( isJaccPermission == false && externalPermissionTypes.length > 0 )
{
- Class pc = permission.getClass();
+ Class<?> pc = permission.getClass();
for(int n = 0; n < externalPermissionTypes.length; n ++)
{
- Class epc = externalPermissionTypes[n];
+ Class<?> epc = externalPermissionTypes[n];
if( epc.isAssignableFrom(pc) )
{
isJaccPermission = true;
@@ -182,20 +181,7 @@
implied = delegate.implies(domain, permission);
}
else
- {
- if (trace)
- {
- log.trace("implies, domain=" + domain + ", permission=" + permission);
- try
- {
- Subject caller = (Subject) PolicyContext.getContext(SecurityConstants.SUBJECT_CONTEXT_KEY);
- log.trace("implies javax.security.auth.Subject.container: "+caller);
- }
- catch(Throwable e)
- {
- log.trace("Failed to access Subject context", e);
- }
- }
+ {
String contextID = PolicyContext.getContextID();
ContextPolicy contextPolicy = (ContextPolicy) activePolicies.get(contextID);
if (contextPolicy != null)
@@ -272,7 +258,7 @@
public String listContextPolicies()
{
StringBuffer tmp = new StringBuffer("<ActiveContextPolicies>");
- Iterator iter = activePolicies.keySet().iterator();
+ Iterator<String> iter = activePolicies.keySet().iterator();
while (iter.hasNext())
{
String contextID = (String) iter.next();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-03-09 22:17:12 UTC (rev 70599)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-03-09 22:17:29 UTC (rev 70600)
@@ -41,7 +41,8 @@
extends PolicyConfigurationFactory
{
private StateMachine configStateMachine;
- private ConcurrentHashMap policyConfigMap = new ConcurrentHashMap();
+ private ConcurrentHashMap<String,JBossPolicyConfiguration> policyConfigMap
+ = new ConcurrentHashMap<String,JBossPolicyConfiguration>();
private DelegatingPolicy policy;
/** Build the JACC policy configuration state machine from the
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityActions.java 2008-03-09 22:17:12 UTC (rev 70599)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityActions.java 2008-03-09 22:17:29 UTC (rev 70600)
@@ -43,9 +43,9 @@
{
static ClassLoader getContextClassLoader()
{
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
- public Object run()
+ public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
}
@@ -54,9 +54,9 @@
static URL findResource(final URLClassLoader cl, final String name)
{
- return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<URL>()
{
- public Object run()
+ public URL run()
{
return cl.findResource(name);
}
@@ -65,9 +65,9 @@
static Policy getPolicy()
{
- return (Policy) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<Policy>()
{
- public Object run()
+ public Policy run()
{
return Policy.getPolicy();
}
@@ -76,9 +76,9 @@
static URL getResource(final ClassLoader cl, final String name)
{
- return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<URL>()
{
- public Object run()
+ public URL run()
{
return cl.getResource(name);
}
@@ -87,9 +87,9 @@
static InputStream openStream(final URL url) throws PrivilegedActionException
{
- return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>()
{
- public Object run() throws IOException
+ public InputStream run() throws IOException
{
return url.openStream();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityService.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityService.java 2008-03-09 22:17:12 UTC (rev 70599)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/jacc/SecurityService.java 2008-03-09 22:17:29 UTC (rev 70600)
@@ -128,12 +128,12 @@
String provider = getProperty(JACC_POLICY_PROVIDER,
"org.jboss.security.jacc.DelegatingPolicy");
ClassLoader loader = SecurityActions.getContextClassLoader();
- Class providerClass = loader.loadClass(provider);
+ Class<?> providerClass = loader.loadClass(provider);
try
{
// Look for a ctor(Policy) signature
- Class[] ctorSig = {Policy.class};
- Constructor ctor = providerClass.getConstructor(ctorSig);
+ Class<?>[] ctorSig = {Policy.class};
+ Constructor<?> ctor = providerClass.getConstructor(ctorSig);
Object[] ctorArgs = {oldPolicy};
jaccPolicy = (Policy) ctor.newInstance(ctorArgs);
}
@@ -163,7 +163,7 @@
Policy.setPolicy(oldPolicy);
}
- static class PropertyAccessAction implements PrivilegedAction
+ static class PropertyAccessAction implements PrivilegedAction<String>
{
private String name;
private String defaultValue;
@@ -172,7 +172,7 @@
this.name = name;
this.defaultValue = defaultValue;
}
- public Object run()
+ public String run()
{
return System.getProperty(name, defaultValue);
}
@@ -185,7 +185,7 @@
static String getProperty(String name, String defaultValue)
{
- PrivilegedAction action = new PropertyAccessAction(name, defaultValue);
+ PrivilegedAction<?> action = new PropertyAccessAction(name, defaultValue);
String property = (String) AccessController.doPrivileged(action);
return property;
}
More information about the jboss-cvs-commits
mailing list