You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/08 23:46:53 UTC
svn commit: r1430603 - in /archiva/redback/redback-core/trunk:
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/
redback-configuration/src/main/java/org/apache/archiva/redback/configuration/
Author: olamy
Date: Tue Jan 8 22:46:52 2013
New Revision: 1430603
URL: http://svn.apache.org/viewvc?rev=1430603&view=rev
Log:
[MRM-1736] map roles to ldap groups
remove hardcoded tests !
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java?rev=1430603&r1=1430602&r2=1430603&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java Tue Jan 8 22:46:52 2013
@@ -39,6 +39,7 @@ import javax.naming.directory.DirContext
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -347,9 +348,17 @@ public class DefaultLdapRoleMapper
public Map<String, String> getLdapGroupMappings()
{
Map<String, String> map = new HashMap<String, String>();
- map.put( "archiva-admin", "System Administrator" );
- //log.warn( "getLdapGroupMappings not implemented" );
- //return Collections.emptyMap();
+
+ Collection<String> keys = userConf.getKeys();
+
+ for ( String key : keys )
+ {
+ if ( key.startsWith( UserConfigurationKeys.LDAP_GROUPS_ROLE_START_KEY ) )
+ {
+ map.put( key, userConf.getString( key ) );
+ }
+ }
+
return map;
}
Modified: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1430603&r1=1430602&r2=1430603&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java Tue Jan 8 22:46:52 2013
@@ -33,6 +33,7 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
+import java.util.Collection;
import java.util.List;
/**
@@ -222,4 +223,9 @@ public class DefaultUserConfiguration
{
this.registry = registry;
}
+
+ public Collection<String> getKeys()
+ {
+ return this.registry.getKeys();
+ }
}
Modified: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java?rev=1430603&r1=1430602&r2=1430603&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java Tue Jan 8 22:46:52 2013
@@ -21,6 +21,7 @@ package org.apache.archiva.redback.confi
import org.apache.archiva.redback.components.registry.RegistryException;
import javax.annotation.PostConstruct;
+import java.util.Collection;
import java.util.List;
/**
@@ -48,4 +49,6 @@ public interface UserConfiguration
List<String> getList( String key );
String getConcatenatedList( String key, String defaultValue );
+
+ Collection<String> getKeys();
}
Modified: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java?rev=1430603&r1=1430602&r2=1430603&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java Tue Jan 8 22:46:52 2013
@@ -26,6 +26,8 @@ public interface UserConfigurationKeys
{
String USER_MANAGER_IMPL = "user.manager.impl";
+ String AUTHORIZER_IMPL = "authorizer.impl";
+
String DEFAULT_ADMIN = "redback.default.admin";
String DEFAULT_GUEST = "redback.default.guest";