Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Making authenication optional (if provided, then authenticate) 

* Making authorization denial reason be dumped to log file.



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@468507 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2006-10-27 19:21:46 +00:00
parent b0562adf9d
commit 87bdeaecf6
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
View File

@ -27,6 +27,7 @@ import org.apache.maven.archiva.web.servlet.AbstractPlexusServlet;
import org.codehaus.plexus.security.authentication.AuthenticationException;
import org.codehaus.plexus.security.authentication.AuthenticationResult;
import org.codehaus.plexus.security.authorization.AuthorizationException;
import org.codehaus.plexus.security.authorization.AuthorizationResult;
import org.codehaus.plexus.security.policy.AccountLockedException;
import org.codehaus.plexus.security.policy.MustChangePasswordException;
import org.codehaus.plexus.security.system.SecuritySession;
@ -134,19 +135,18 @@ public class RepositoryAccess
}
// Authentication Tests.
AuthenticationResult result;
try
{
result = httpAuth.getAuthenticationResult( request, response );
AuthenticationResult result = httpAuth.getAuthenticationResult( request, response );
if ( !result.isAuthenticated() )
if ( ( result != null ) && !result.isAuthenticated() )
{
// Must Authenticate.
httpAuth.challenge( request, response, "Repository " + repoconfig.getName(),
new AuthenticationException( "User Credentials Invalid" ) );
return;
}
}
catch ( AuthenticationException e )
{
@ -178,10 +178,16 @@ public class RepositoryAccess
permission = ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD;
}
boolean isAuthorized = securitySystem.isAuthorized( securitySession, permission, repoconfig.getId() );
AuthorizationResult authzResult = securitySystem
.authorize( securitySession, permission, repoconfig.getId() );
if ( !isAuthorized )
if ( !authzResult.isAuthorized() )
{
if ( authzResult.getException() != null )
{
getLogger().warn( "Authorization Denied", authzResult.getException() );
}
// Issue HTTP Challenge.
httpAuth.challenge( request, response, "Repository " + repoconfig.getName(),
new AuthenticationException( "Authorization Denied." ) );