diff options
| -rw-r--r-- | redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java index f37221354..566f597a7 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java @@ -26,6 +26,7 @@ import org.apache.archiva.redback.common.ldap.connection.LdapConnection; import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory; import org.apache.archiva.redback.common.ldap.connection.LdapException; import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper; +import org.apache.archiva.redback.common.ldap.role.LdapRoleMapperConfiguration; import org.apache.archiva.redback.components.cache.Cache; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; @@ -103,6 +104,10 @@ public class LdapRbacManager private LdapController ldapController; @Inject + @Named( value = "ldapRoleMapperConfiguration#default" ) + private LdapRoleMapperConfiguration ldapRoleMapperConfiguration; + + @Inject @Named( value = "cache#ldapRoles" ) private Cache<String, Role> rolesCache; @@ -206,7 +211,7 @@ public class LdapRbacManager { try { - Collection<Collection<String>> roleNames = ldapRoleMapper.getLdapGroupMappings().values(); + Collection<Collection<String>> roleNames = ldapRoleMapperConfiguration.getLdapGroupMappings().values(); Set<Role> roles = new HashSet<Role>(); @@ -356,7 +361,7 @@ public class LdapRbacManager } List<Role> roles = new ArrayList<Role>( groups.size() ); - Map<String, Collection<String>> mappedGroups = ldapRoleMapper.getLdapGroupMappings(); + Map<String, Collection<String>> mappedGroups = ldapRoleMapperConfiguration.getLdapGroupMappings(); for ( String group : groups ) { Collection<String> roleNames = mappedGroups.get( group ); |