From: Olivier Lamy <olamy@apache.org>
Date: Tue, 15 Jan 2013 14:06:00 +0000 (+0000)
Subject: remove dynamic authorizer
X-Git-Tag: archiva-1.4-M4~297
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cec280820b45be7f084c2e0c20daa0a3af436fcc;p=archiva.git

remove dynamic authorizer

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1433424 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
deleted file mode 100644
index 9b0535572..000000000
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.apache.archiva.web.security;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
-import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
-import org.apache.archiva.redback.authorization.AuthorizationDataSource;
-import org.apache.archiva.redback.authorization.AuthorizationException;
-import org.apache.archiva.redback.authorization.AuthorizationResult;
-import org.apache.archiva.redback.authorization.Authorizer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * @author Olivier Lamy
- * @since 1.4-M4
- */
-@Service( "authorizer#archiva" )
-public class ArchivaAuthorizer
-    implements Authorizer
-{
-    private Logger log = LoggerFactory.getLogger( getClass() );
-
-    @Inject
-    private ApplicationContext applicationContext;
-
-    @Inject
-    private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
-
-    public String getId()
-    {
-        return "archiva";
-    }
-
-    public AuthorizationResult isAuthorized( AuthorizationDataSource source )
-        throws AuthorizationException
-    {
-        log.debug( "isAuthorized source: {}", source );
-
-        try
-        {
-            RedbackRuntimeConfiguration redbackRuntimeConfiguration =
-                redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration();
-
-            AuthorizationException authorizationException = null;
-
-            AuthorizationResult lastResult = null;
-
-            for ( String id : redbackRuntimeConfiguration.getAuthorizerImpls() )
-            {
-                Authorizer authorizer = getAuthorizer( id );
-
-                AuthorizationResult result = null;
-                try
-                {
-                    result = authorizer.isAuthorized( source );
-                    log.debug( "AuthorizationResult {} with id '{}", result, id );
-                }
-                catch ( AuthorizationException e )
-                {
-                    log.debug( "AuthorizationException {} with id '{}", e.getMessage(), id );
-                    authorizationException = e;
-                }
-
-                if ( result != null && result.isAuthorized() )
-                {
-                    return result;
-                }
-
-                lastResult = result;
-            }
-            if ( authorizationException != null )
-            {
-                throw authorizationException;
-            }
-            return lastResult;
-        }
-        catch ( RepositoryAdminException e )
-        {
-            throw new AuthorizationException( e.getMessage(), e );
-        }
-
-    }
-
-    private Authorizer getAuthorizer( String id )
-    {
-        return applicationContext.getBean( "authorizer#" + id, Authorizer.class );
-    }
-
-    public boolean isFinalImplementation()
-    {
-        return false;
-    }
-
-    public String getDescriptionKey()
-    {
-        return "archiva.redback.authorizer.archiva";
-    }
-}
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 23d2b58ac..c130c6021 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -32,7 +32,6 @@
 
   <alias name="userConfiguration#archiva" alias="userConfiguration#default" />
 
-  <alias name="authorizer#archiva" alias="authorizer#default"/>
 
   <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
         init-method="initialize"/>