inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Web Scripts from BRANCHES/DEV/DAVE

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2007-03-08 14:36:34 +00:00
parent d5b82c15a7
commit 570cbb6606
37 changed files with 1788 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/web/api/BasicAuthenticator.java
View File

@@ -67,6 +67,7 @@ public class BasicAuthenticator implements MethodInterceptor
Object[] args = invocation.getArguments();
APIRequest request = (APIRequest)args[0];
APIService service = (APIService)invocation.getThis();
APIDescription description = service.getDescription();
try
{
@@ -87,14 +88,14 @@ public class BasicAuthenticator implements MethodInterceptor
if (logger.isDebugEnabled())
{
logger.debug("Service authentication required: " + service.getRequiredAuthentication());
logger.debug("Service authentication required: " + description.getRequiredAuthentication());
logger.debug("Guest login: " + isGuest);
logger.debug("Authorization provided (overrides Guest login): " + (authorization != null && authorization.length() > 0));
}
// authenticate as guest, if service allows
if (((authorization == null || authorization.length() == 0) || isGuest)
&& service.getRequiredAuthentication().equals(APIRequest.RequiredAuthentication.Guest))
&& description.getRequiredAuthentication().equals(APIRequest.RequiredAuthentication.guest))
{
if (logger.isDebugEnabled())
logger.debug("Authenticating as Guest");
@@ -133,7 +134,7 @@ public class BasicAuthenticator implements MethodInterceptor
// assume username and password passed
if (parts[0].equals(AuthenticationUtil.getGuestUserName()))
{
if (service.getRequiredAuthentication().equals(APIRequest.RequiredAuthentication.Guest))
if (description.getRequiredAuthentication().equals(APIRequest.RequiredAuthentication.guest))
{
authenticationService.authenticateAsGuest();
authorized = true;