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:47:13 UTC
svn commit: r1430606 - in /archiva/trunk: ./
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/
ar...
Author: olamy
Date: Tue Jan 8 22:47:13 2013
New Revision: 1430606
URL: http://svn.apache.org/viewvc?rev=1430606&view=rev
Log:
[MRM-1736] map roles to ldap groups
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1430606&r1=1430605&r2=1430606&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java Tue Jan 8 22:47:13 2013
@@ -30,6 +30,8 @@ import org.apache.archiva.maven2.model.A
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
+import org.apache.archiva.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.apache.archiva.redback.rest.services.RedbackRequestInformation;
import org.apache.archiva.redback.users.User;
@@ -95,6 +97,11 @@ public abstract class AbstractRestServic
@Named(value = "archivaTaskScheduler#repository")
protected DefaultRepositoryArchivaTaskScheduler repositoryTaskScheduler;
+
+ @Inject
+ @Named( value = "userConfiguration#default" )
+ protected UserConfiguration config;
+
@Context
protected HttpServletRequest httpServletRequest;
@@ -143,9 +150,9 @@ public abstract class AbstractRestServic
RedbackRequestInformation redbackRequestInformation = RedbackAuthenticationThreadLocal.get();
return redbackRequestInformation == null
- ? UserManager.GUEST_USERNAME
+ ? config.getString( UserConfigurationKeys.DEFAULT_GUEST )
: ( redbackRequestInformation.getUser() == null
- ? UserManager.GUEST_USERNAME
+ ? config.getString( UserConfigurationKeys.DEFAULT_GUEST )
: redbackRequestInformation.getUser().getUsername() );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java?rev=1430606&r1=1430605&r2=1430606&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java Tue Jan 8 22:47:13 2013
@@ -43,6 +43,11 @@ public class ArchivaAuthorizer
@Named( value = "authorizer#rbac" )
private Authorizer rbacAuthorizer;
+
+ @Inject
+ @Named( value = "authorizer#ldap" )
+ private Authorizer ldapAuthorizer;
+
public String getId()
{
return "archiva";
@@ -52,6 +57,11 @@ public class ArchivaAuthorizer
throws AuthorizationException
{
log.debug( "isAuthorized source: {}", source );
+
+ AuthorizationResult result = ldapAuthorizer.isAuthorized( source );
+
+
+
return rbacAuthorizer.isAuthorized( source );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1430606&r1=1430605&r2=1430606&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Jan 8 22:47:13 2013
@@ -463,6 +463,33 @@
</dependency>
<dependency>
+ <groupId>org.apache.archiva.redback.components.registry</groupId>
+ <artifactId>spring-registry-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback.components.registry</groupId>
+ <artifactId>spring-registry-commons</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-rest-api</artifactId>
<exclusions>
@@ -644,6 +671,16 @@
<artifactId>redback-integrations-security</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-authorization-ldap</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>provided</scope>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1430606&r1=1430605&r2=1430606&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Tue Jan 8 22:47:13 2013
@@ -56,7 +56,8 @@
</bean>
<!-- START SNIPPET: configuration-files-list -->
- <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ init-method="initialize">
<property name="properties">
<value>
<![CDATA[
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml?rev=1430606&r1=1430605&r2=1430606&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml Tue Jan 8 22:47:13 2013
@@ -85,6 +85,8 @@
<logger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/>
+ <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
+
<root level="info">
<appender-ref ref="console"/>
</root>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1430606&r1=1430605&r2=1430606&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jan 8 22:47:13 2013
@@ -929,6 +929,17 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-authorization-ldap</artifactId>
+ <version>${redback.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-memory</artifactId>
<version>${redback.version}</version>
<scope>test</scope>