Fix to webscript authenticators to correctly respect guest/user descriptor for webclient and http auth.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-05-22 15:39:00 +00:00
parent 927767365f
commit 582188c7dd
3 changed files with 37 additions and 19 deletions

View File

@@ -76,7 +76,7 @@ public class BasicHttpAuthenticator implements WebScriptServletAuthenticator
}
// authenticate as guest, if service allows
if (isGuest)
if (isGuest && RequiredAuthentication.guest == required)
{
if (logger.isDebugEnabled())
logger.debug("Authenticating as Guest");

View File

@@ -83,24 +83,24 @@ public class WebClientAuthenticator implements WebScriptServletAuthenticator, Se
{
if (logger.isDebugEnabled())
logger.debug("Authenticating ticket " + ticket);
status = AuthenticationHelper.authenticate(context, req, res, ticket);
}
else
{
if (isGuest)
if (isGuest && RequiredAuthentication.guest == required)
{
if (logger.isDebugEnabled())
logger.debug("Authenticating as Guest");
status = AuthenticationHelper.authenticate(context, req, res, true);
}
else
{
if (logger.isDebugEnabled())
logger.debug("Authenticating session");
status = AuthenticationHelper.authenticate(context, req, res, false);
status = AuthenticationHelper.authenticate(context, req, res, false, false);
}
}