You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/04/19 05:15:08 UTC
svn commit: r649748 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
Author: brett
Date: Fri Apr 18 20:15:06 2008
New Revision: 649748
URL: http://svn.apache.org/viewvc?rev=649748&view=rev
Log:
[MRM-781] correct probem with guest account
Submitted by: James William Dumay
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?rev=649748&r1=649747&r2=649748&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java Fri Apr 18 20:15:06 2008
@@ -121,7 +121,9 @@
}
catch (DavException e) {
if (e.getErrorCode() == HttpServletResponse.SC_UNAUTHORIZED) {
- log.error("Should throw UnauthorizedDavException");
+ final String msg = "Should throw " + UnauthorizedDavException.class.getName();
+ log.error(msg);
+ webdavResponse.sendError(e.getErrorCode(), msg);
} else {
webdavResponse.sendError(e);
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java?rev=649748&r1=649747&r2=649748&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java Fri Apr 18 20:15:06 2008
@@ -77,12 +77,11 @@
// Authentication Tests.
try
{
- AuthenticationResult result = httpAuth.getAuthenticationResult(request, null);
+ AuthenticationResult result = httpAuth.getAuthenticationResult( request, null );
- if ( result == null || !result.isAuthenticated() )
+ if ( result != null && !result.isAuthenticated() )
{
- //Unfortunatly, the DavSessionProvider does not pass in the response
- httpAuth.authenticate(request, null);
+ throw new UnauthorizedDavException(repositoryId, "User Credentials Invalid");
}
}
catch ( AuthenticationException e )
@@ -130,7 +129,7 @@
",permission=" + permission + ",repo=" + repositoryId + "] : " +
authzResult.getException().getMessage() );
}
- throw new DavException(HttpServletResponse.SC_UNAUTHORIZED, "Access denied for repository " + repositoryId);
+ throw new UnauthorizedDavException(repositoryId, "Access denied for repository " + repositoryId);
}
}
catch ( AuthorizationException e )