You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/12/07 08:17:24 UTC
svn commit: r354745 - in /portals/jetspeed-2/trunk/components/security/src:
java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java
test/org/apache/jetspeed/security/TestRoleManager.java
Author: ate
Date: Tue Dec 6 23:17:06 2005
New Revision: 354745
URL: http://svn.apache.org/viewcvs?rev=354745&view=rev
Log:
Rolling back initial checkin for JS2-21.
I've spend most of the day and a full night on this one, but I have to give in (for now).
There just isn't enough time anymore to get it completely right before 2.0-FINAL :(
I'll retarget JS2-21 (and JS2-27 which I also have 99% working locally) to 2.0-POST
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java?rev=354745&r1=354744&r2=354745&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultSecurityMappingHandler.java Tue Dec 6 23:17:06 2005
@@ -112,7 +112,6 @@
this.groupHierarchyResolver = groupHierarchyResolver;
}
-
/**
* @see org.apache.jetspeed.security.spi.SecurityMappingHandler#getRolePrincipals(java.lang.String)
*/
@@ -123,43 +122,27 @@
if (null != internalUser)
{
Collection internalRoles = internalUser.getRolePrincipals();
- addRolePrincipals(rolePrincipals, internalRoles);
- // add all the group roles of the group the user belongs to
- Collection internalGroups = internalUser.getGroupPrincipals();
- if ( null != internalGroups )
+ if (null != internalRoles)
{
- Iterator internalGroupsIter = internalGroups.iterator();
- while ( internalGroupsIter.hasNext())
+ Iterator internalRolesIter = internalRoles.iterator();
+ while (internalRolesIter.hasNext())
{
- // add all roles the group belongs to
- addRolePrincipals(rolePrincipals,((InternalGroupPrincipal)internalGroupsIter.next()).getRolePrincipals());
- }
- }
- }
- return rolePrincipals;
- }
-
- private void addRolePrincipals(Set rolePrincipals, Collection internalRoles)
- {
- if (null != internalRoles)
- {
- Iterator internalRolesIter = internalRoles.iterator();
- while (internalRolesIter.hasNext())
- {
- InternalRolePrincipal internalRole = (InternalRolePrincipal) internalRolesIter.next();
- Preferences preferences = Preferences.userRoot().node(internalRole.getFullPath());
- String[] fullPaths = roleHierarchyResolver.resolve(preferences);
- for (int i = 0; i < fullPaths.length; i++)
- {
- Principal rolePrincipal = new RolePrincipalImpl(RolePrincipalImpl
- .getPrincipalNameFromFullPath(fullPaths[i]));
- if (!rolePrincipals.contains(rolePrincipal))
+ InternalRolePrincipal internalRole = (InternalRolePrincipal) internalRolesIter.next();
+ Preferences preferences = Preferences.userRoot().node(internalRole.getFullPath());
+ String[] fullPaths = roleHierarchyResolver.resolve(preferences);
+ for (int i = 0; i < fullPaths.length; i++)
{
- rolePrincipals.add(rolePrincipal);
+ Principal rolePrincipal = new RolePrincipalImpl(RolePrincipalImpl
+ .getPrincipalNameFromFullPath(fullPaths[i]));
+ if (!rolePrincipals.contains(rolePrincipal))
+ {
+ rolePrincipals.add(rolePrincipal);
+ }
}
}
}
}
+ return rolePrincipals;
}
/**
Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java?rev=354745&r1=354744&r2=354745&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java Tue Dec 6 23:17:06 2005
@@ -431,10 +431,7 @@
{
ums.addUser("anonuser4", "password");
rms.addRole("testuserrolemapping");
- rms.addRole("testrole");
- gms.addGroup("testrolegroupmapping");
rms.addRoleToUser("anonuser4", "testuserrolemapping");
- rms.addRoleToGroup("testrole","testrolegroupmapping");
}
catch (SecurityException sex)
{
@@ -445,30 +442,11 @@
{
boolean isUserInRole = rms.isUserInRole("anonuser4", "testuserrolemapping");
assertTrue("anonuser4 should be in role testuserrolemapping", isUserInRole);
- assertFalse("anonuser4 should not be in role testrole", rms.isUserInRole("anonuser4","testrole"));
-
}
catch (SecurityException sex)
{
assertTrue("user and role exist. should not have thrown an exception: " + sex, false);
}
-
- try
- {
- gms.addUserToGroup("anonuser4","testrolegroupmapping");
- }
- catch (SecurityException sex)
- {
- assertTrue("failed to add user anonuser4 to group testrolegroupmapping " + sex, false);
- }
- try
- {
- assertTrue("anonuser4 should be in role testrole because it is assigned the group testrolegroupmapping", rms.isUserInRole("anonuser4","testrole"));
- }
- catch (SecurityException sex)
- {
- assertTrue("user, group and role exist. should not have thrown an exception: " + sex, false);
- }
// Cleanup test.
try
@@ -578,7 +556,7 @@
final String[] users = new String[] { "anonuser1", "anonuser2", "anonuser3", "anonuser4", "anonuser5", };
final String[] roles = new String[] { "testrole", "testrole1", "testrole2", "testrole3", "testgetrole",
"testusertorole1", "testuserrolemapping.role1", "testuserrolemapping2.role2", "testuserrolemapping","testuserrolemapping2" };
- final String[] groups = new String[] { "testrolegroupmapping" };
+ final String[] groups = new String[] { "testusertorole1" };
for (int i = 0; i < users.length; i++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org