[jboss-cvs] JBossAS SVN: r60373 - in branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3: security and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 7 07:53:29 EST 2007
Author: wolfc
Date: 2007-02-07 07:53:29 -0500 (Wed, 07 Feb 2007)
New Revision: 60373
Modified:
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
Log:
Fixed SecurityRoleMetaData
Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java 2007-02-07 12:00:41 UTC (rev 60372)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/AssemblyDescriptor.java 2007-02-07 12:53:29 UTC (rev 60373)
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
-//import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.security.SecurityRoleMetaData;
import org.jboss.metamodel.descriptor.SecurityRole;
/**
@@ -49,7 +49,7 @@
private List securityRoles = new ArrayList();
-// private Map<String, SecurityRoleMetaData> securityRoleMetaData = new HashMap();
+ private Map<String, SecurityRoleMetaData> securityRoleMetaData = new HashMap();
private List methodPermissions = new ArrayList();
@@ -177,61 +177,59 @@
containerTransactions.add(containerTransaction);
}
- // FIXME: NYI
-// public void addSecurityRoleMetaData(SecurityRoleMetaData srm)
-// {
-// this.securityRoleMetaData.put(srm.getRoleName(), srm);
-// }
-//
-// public Set getSecurityRolesGivenPrincipal(String userName)
-// {
-// HashSet roleNames = new HashSet();
-// Iterator it = securityRoleMetaData.values().iterator();
-// while (it.hasNext())
-// {
-// SecurityRoleMetaData srMetaData = (SecurityRoleMetaData) it.next();
-// if (srMetaData.getPrincipals().contains(userName))
-// roleNames.add(srMetaData.getRoleName());
-// }
-// return roleNames;
-// }
+ public void addSecurityRoleMetaData(SecurityRoleMetaData srm)
+ {
+ this.securityRoleMetaData.put(srm.getRoleName(), srm);
+ }
+ public Set getSecurityRolesGivenPrincipal(String userName)
+ {
+ HashSet roleNames = new HashSet();
+ Iterator it = securityRoleMetaData.values().iterator();
+ while (it.hasNext())
+ {
+ SecurityRoleMetaData srMetaData = (SecurityRoleMetaData) it.next();
+ if (srMetaData.getPrincipals().contains(userName))
+ roleNames.add(srMetaData.getRoleName());
+ }
+ return roleNames;
+ }
+
/**
* Get a map of principals versus set of roles
* that may be configured by the user at the deployment level
* @return
*/
- // FIXME: NYI
-// public Map getPrincipalVersusRolesMap()
-// {
-// Map principalRolesMap = null;
-//
-// Iterator iter = securityRoleMetaData.keySet().iterator();
-// while(iter.hasNext())
-// {
-// if(principalRolesMap == null)
-// principalRolesMap = new HashMap();
-// String rolename = (String)iter.next();
-// SecurityRoleMetaData srm = (SecurityRoleMetaData) securityRoleMetaData.get(rolename);
-// Iterator principalIter = srm.getPrincipals().iterator();
-// while(principalIter.hasNext())
-// {
-// String pr = (String)principalIter.next();
-// Set roleset = (Set)principalRolesMap.get(pr);
-// if(roleset == null)
-// roleset = new HashSet();
-// if(!roleset.contains(rolename))
-// roleset.add(rolename);
-// principalRolesMap.put(pr, roleset);
-// }
-// }
-// return principalRolesMap;
-// }
-//
-// public Map<String,SecurityRoleMetaData> getSecurityRoleMetaData()
-// {
-// return this.securityRoleMetaData;
-// }
+ public Map getPrincipalVersusRolesMap()
+ {
+ Map principalRolesMap = null;
+
+ Iterator iter = securityRoleMetaData.keySet().iterator();
+ while(iter.hasNext())
+ {
+ if(principalRolesMap == null)
+ principalRolesMap = new HashMap();
+ String rolename = (String)iter.next();
+ SecurityRoleMetaData srm = (SecurityRoleMetaData) securityRoleMetaData.get(rolename);
+ Iterator principalIter = srm.getPrincipals().iterator();
+ while(principalIter.hasNext())
+ {
+ String pr = (String)principalIter.next();
+ Set roleset = (Set)principalRolesMap.get(pr);
+ if(roleset == null)
+ roleset = new HashSet();
+ if(!roleset.contains(rolename))
+ roleset.add(rolename);
+ principalRolesMap.put(pr, roleset);
+ }
+ }
+ return principalRolesMap;
+ }
+
+ public Map<String,SecurityRoleMetaData> getSecurityRoleMetaData()
+ {
+ return this.securityRoleMetaData;
+ }
public String toString()
{
Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-02-07 12:00:41 UTC (rev 60372)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-02-07 12:53:29 UTC (rev 60373)
@@ -1298,16 +1298,15 @@
*/
public void setValue(SecurityRoleRefMetaData parent, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- /* FIXME: NYI
- if (localName.equals("role-name"))
- {
- parent.setName(value);
- }
- else if (localName.equals("role-link"))
- {
- parent.setLink(value);
- }
- */
+ // FIXME: NYI
+// if (localName.equals("role-name"))
+// {
+// parent.setName(value);
+// }
+// else if (localName.equals("role-link"))
+// {
+// parent.setLink(value);
+// }
throw new RuntimeException("NYI");
}
Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-02-07 12:00:41 UTC (rev 60372)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-02-07 12:53:29 UTC (rev 60373)
@@ -37,7 +37,7 @@
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
-//import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.security.SecurityRoleMetaData;
import org.jboss.metamodel.descriptor.DDObjectFactory;
import org.jboss.metamodel.descriptor.EjbLocalRef;
import org.jboss.metamodel.descriptor.EjbRef;
@@ -273,9 +273,7 @@
}
if (localName.equals("security-role"))
{
- // FIXME: NYI
-// child = new SecurityRoleMetaData("dummy_to_be_replaced_in_setValue");
- throw new RuntimeException("NYI");
+ child = new SecurityRoleMetaData("dummy_to_be_replaced_in_setValue");
}
return child;
@@ -412,11 +410,10 @@
parent.addMessageDestination(destination);
}
- // FIXME: NYI
-// public void addChild(AssemblyDescriptor parent, SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName)
-// {
-// parent.addSecurityRoleMetaData(srm);
-// }
+ public void addChild(AssemblyDescriptor parent, SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ parent.addSecurityRoleMetaData(srm);
+ }
/**
* Called when parsing character is complete.
@@ -1049,18 +1046,19 @@
/**
* Called when a child element with simple content is read for DD.
*/
- // FIXME: NYI
-// public void setValue(SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
-// {
-// if (localName.equals("role-name"))
-// {
+ public void setValue(SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ {
+ if (localName.equals("role-name"))
+ {
+// FIXME: NYI
// srm.setRoleName(getValue(localName, value));
-// }
-// else if (localName.equals("principal-name"))
-// {
-// srm.addPrincipalName(getValue(localName, value));
-// }
-// }
+ throw new RuntimeException("NYI");
+ }
+ else if (localName.equals("principal-name"))
+ {
+ srm.addPrincipalName(getValue(localName, value));
+ }
+ }
protected String getValue(String name, String value)
{
Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java 2007-02-07 12:00:41 UTC (rev 60372)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java 2007-02-07 12:53:29 UTC (rev 60373)
@@ -100,9 +100,7 @@
//Set a map of principal-roles that may be configured at deployment level
if(container.getAssemblyDescriptor() != null)
{
- // FIXME: NYI
- throw new RuntimeException("NYI");
-// SecurityRolesAssociation.setSecurityRoles(container.getAssemblyDescriptor().getPrincipalVersusRolesMap());
+ SecurityRolesAssociation.setSecurityRoles(container.getAssemblyDescriptor().getPrincipalVersusRolesMap());
}
return super.invoke(invocation);
}
Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java 2007-02-07 12:00:41 UTC (rev 60372)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/security/RunAsSecurityInterceptorFactory.java 2007-02-07 12:53:29 UTC (rev 60373)
@@ -76,9 +76,7 @@
AssemblyDescriptor ad = container.getAssemblyDescriptor();
if(ad != null)
{
- // FIXME: NYI
- throw new RuntimeException("NYI");
-// extraRoles.addAll(ad.getSecurityRolesGivenPrincipal(runAsPrincipal));
+ extraRoles.addAll(ad.getSecurityRolesGivenPrincipal(runAsPrincipal));
}
return new RunAsIdentity(runAs.value(), runAsPrincipal, extraRoles);
More information about the jboss-cvs-commits
mailing list