[jboss-cvs] JBossAS SVN: r65938 - in projects/security/security-jboss-sx/trunk/src/main/org/jboss/security: config and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 8 16:02:19 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-10-08 16:02:19 -0400 (Mon, 08 Oct 2007)
New Revision: 65938
Modified:
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/BaseAuthenticationInfo.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicy.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuditInfo.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuthorizationInfo.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/BaseSecurityInfo.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/IdentityTrustInfo.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/MappingInfo.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java
Log:
parameterize generics
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/BaseAuthenticationInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/BaseAuthenticationInfo.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/BaseAuthenticationInfo.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -43,7 +43,7 @@
}
@Override
- protected BaseSecurityInfo create(String name)
+ protected BaseSecurityInfo<Object> create(String name)
{
return new BaseAuthenticationInfo(name);
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicy.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/ApplicationPolicy.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -42,6 +42,7 @@
private AuthorizationInfo authorizationInfo;
private AuditInfo auditInfo;
private MappingInfo roleMappingInfo;
+ private MappingInfo principalMappingInfo;
private IdentityTrustInfo identityTrustInfo;
// Base application policy (if any)
@@ -133,8 +134,29 @@
public void setRoleMappingInfo(MappingInfo roleMappingInfo)
{
this.roleMappingInfo = roleMappingInfo;
- }
+ }
+
+ public MappingInfo getPrincipalMappingInfo()
+ {
+ MappingInfo bai = null;
+ ApplicationPolicy ap = this.getBaseApplicationPolicy();
+ if(ap != null)
+ bai = ap.getPrincipalMappingInfo();
+
+ if(bai != null && principalMappingInfo == null)
+ return bai;
+ else if(bai != null)
+ return (MappingInfo) principalMappingInfo.merge(bai);
+ else
+ return principalMappingInfo;
+ }
+
+ public void setPrincipalMappingInfo(MappingInfo principalMappingInfo)
+ {
+ this.principalMappingInfo = principalMappingInfo;
+ }
+
public AuditInfo getAuditInfo()
{
AuditInfo bai = null;
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuditInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuditInfo.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuditInfo.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -49,7 +49,7 @@
}
@Override
- protected BaseSecurityInfo create(String name)
+ protected BaseSecurityInfo<AuditProviderEntry> create(String name)
{
return new AuditInfo(name);
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuthorizationInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuthorizationInfo.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/AuthorizationInfo.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -49,7 +49,7 @@
}
@Override
- protected BaseSecurityInfo create(String name)
+ protected BaseSecurityInfo<AuthorizationModuleEntry> create(String name)
{
return new AuthorizationInfo(name);
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/BaseSecurityInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/BaseSecurityInfo.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/BaseSecurityInfo.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -64,7 +64,7 @@
this.moduleEntries.addAll(moduleEntries);
}
- public List getModuleEntries()
+ public List<T> getModuleEntries()
{
SecurityManager sm = System.getSecurityManager();
if( sm != null )
@@ -82,17 +82,16 @@
this.name = name;
}
- protected abstract BaseSecurityInfo create(String name);
+ protected abstract BaseSecurityInfo<T> create(String name);
- public BaseSecurityInfo merge(BaseSecurityInfo bi)
+ public BaseSecurityInfo<T> merge(BaseSecurityInfo<T> bi)
{
if(bi == null)
return this;
- List al = bi.getModuleEntries();
+ List<T> al = bi.getModuleEntries();
al.addAll(this.moduleEntries);
- BaseSecurityInfo mergedBAI = create(name);
+ BaseSecurityInfo<T> mergedBAI = create(name);
mergedBAI.add(al);
return mergedBAI;
}
-
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/IdentityTrustInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/IdentityTrustInfo.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/IdentityTrustInfo.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -32,7 +32,7 @@
}
@Override
- protected BaseSecurityInfo create(String name)
+ protected BaseSecurityInfo<IdentityTrustModuleEntry> create(String name)
{
return new IdentityTrustInfo(name);
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/MappingInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/MappingInfo.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/MappingInfo.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -37,7 +37,7 @@
}
@Override
- protected BaseSecurityInfo create(String name)
+ protected BaseSecurityInfo<MappingModuleEntry> create(String name)
{
return new MappingInfo(name);
}
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/config/SecurityActions.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -35,17 +35,16 @@
*/
class SecurityActions
{
- static void addModules(final BaseSecurityInfo binfo, final List authenticationModuleEntries)
+ static <T> void addModules(final BaseSecurityInfo<T> binfo, final List<T> moduleEntries)
{
AccessController.doPrivileged(new PrivilegedAction()
{
public Object run()
{
- binfo.add(authenticationModuleEntries);
+ binfo.add(moduleEntries);
return null;
}
});
}
-
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -353,6 +353,7 @@
{
MappingManager mm = sc.getMappingManager();
MappingContext mc = mm.getMappingContext(Group.class);
+ Group mappedUserRoles = userRoles;
if(mc != null)
{
Map contextMap = new HashMap();
@@ -367,10 +368,11 @@
if(trace)
log.trace("Roles before mapping:"+ userRoles);
mc.performMapping(contextMap, userRoles);
+ mappedUserRoles = (Group) mc.getMappingResult().getMappedObject();
if(trace)
log.trace("Roles after mapping:"+ userRoles);
}
- sc.getData().put(ROLES_IDENTIFIER, userRoles);
+ sc.getData().put(ROLES_IDENTIFIER, mappedUserRoles);
}
//Send the final processed (mapping applied) roles
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java 2007-10-08 20:01:45 UTC (rev 65937)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java 2007-10-08 20:02:19 UTC (rev 65938)
@@ -21,6 +21,7 @@
*/
package org.jboss.security.plugins.mapping;
+import java.security.Principal;
import java.security.acl.Group;
import java.util.ArrayList;
@@ -79,22 +80,28 @@
MappingContext mc = null;
if(mappingType == Group.class)
{
- rmi = aPolicy.getRoleMappingInfo();
- if(rmi != null)
- {
- MappingModuleEntry[] mpe = rmi.getMappingModuleEntry();
- ArrayList<MappingProvider> al = new ArrayList<MappingProvider>();
-
- for(int i = 0 ; i < mpe.length; i++)
- {
- MappingProvider mp = getMappingProvider(mpe[i]);
- if(mp != null)
- al.add(mp);
- }
- mc = new MappingContext(al);
+ rmi = aPolicy.getRoleMappingInfo();
+ }
+ else if(mappingType == Principal.class)
+ {
+ rmi = aPolicy.getPrincipalMappingInfo();
+ }
+
+ if(rmi != null)
+ {
+ MappingModuleEntry[] mpe = rmi.getMappingModuleEntry();
+ ArrayList<MappingProvider> al = new ArrayList<MappingProvider>();
+
+ for(int i = 0 ; i < mpe.length; i++)
+ {
+ MappingProvider mp = getMappingProvider(mpe[i]);
+ if(mp != null)
+ al.add(mp);
}
+ mc = new MappingContext(al);
}
- return mc;
+
+ return mc;
}
public String getSecurityDomain()
More information about the jboss-cvs-commits
mailing list