Author: olamy
Date: Tue Jan 15 13:19:40 2013
New Revision: 1433394
URL: http://svn.apache.org/viewvc?rev=1433394&view=rev
Log:
use new method
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java?rev=1433394&r1=1433393&r2=1433394&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-ldap/src/main/java/org/apache/archiva/redback/authorization/ldap/LdapAuthorizer.java
Tue Jan 15 13:19:40 2013
@@ -82,9 +82,7 @@ public class LdapAuthorizer
String resource = source.getResource();
try
{
- List<String> ldapGroups = ldapRoleMapper.getGroups( userName );
-
- List<String> roles = mapLdapGroups( ldapGroups );
+ List<String> roles = ldapRoleMapper.getRoles( userName );
Map<String, List<Permission>> permissionMap =
getAssignedPermissionMap( roles );
@@ -122,24 +120,7 @@ public class LdapAuthorizer
}
- protected List<String> mapLdapGroups( List<String> groups )
- throws MappingException
- {
- List<String> roles = new ArrayList<String>();
-
- Map<String, String> mapping = ldapRoleMapper.getLdapGroupMappings();
- for ( String group : groups )
- {
- String role = mapping.get( group );
- if ( role != null )
- {
- roles.add( role );
- }
- }
-
- return roles;
- }
public Map<String, List<Permission>> getAssignedPermissionMap(
List<String> roles )
throws RbacObjectNotFoundException, RbacManagerException
