diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2008-05-16 10:43:16 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2008-05-16 10:43:16 +0000 |
| commit | 8adede7e948351856f56d007aeedde3f6b5e5c2d (patch) | |
| tree | 19ee1af5cd4ec883b730b2a6fb02c2648390dff8 /archiva-modules/archiva-web/archiva-security | |
| parent | 9bf8c6b96b360de1fdb70b3c5ae733eccdceb566 (diff) | |
| download | archiva-8adede7e948351856f56d007aeedde3f6b5e5c2d.tar.gz archiva-8adede7e948351856f56d007aeedde3f6b5e5c2d.zip | |
[MRM-694]
-perform authentication only in ArchivaDavSessionProvider.attachSession()
-perform authn and authz for each repo in ArchivaDavResourceFactory.createResource()
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@657012 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-security')
2 files changed, 4 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java index 8af0c0cf3..861e087e4 100644 --- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java @@ -48,7 +48,7 @@ public class ArchivaServletAuthenticator */ private SecuritySystem securitySystem; - public boolean isAuthenticated( HttpServletRequest request, AuthenticationResult result, String repositoryId ) + public boolean isAuthenticated( HttpServletRequest request, AuthenticationResult result ) throws AuthenticationException, AccountLockedException, MustChangePasswordException { if ( result != null && !result.isAuthenticated() ) @@ -63,6 +63,8 @@ public class ArchivaServletAuthenticator boolean isWriteRequest ) throws AuthorizationException, UnauthorizedException { + // also check for permission to proxy the resource when MRM-579 is implemented + String permission = ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS; if ( isWriteRequest ) diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ServletAuthenticator.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ServletAuthenticator.java index e13c2d3e4..a96928887 100644 --- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ServletAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ServletAuthenticator.java @@ -35,7 +35,7 @@ import org.codehaus.plexus.redback.system.SecuritySession; */ public interface ServletAuthenticator { - public boolean isAuthenticated( HttpServletRequest request, AuthenticationResult result, String repositoryId ) + public boolean isAuthenticated( HttpServletRequest request, AuthenticationResult result ) throws AuthenticationException, AccountLockedException, MustChangePasswordException; public boolean isAuthorized( HttpServletRequest request, SecuritySession securitySession, String repositoryId, |