From 53366c7e599ad88da40bfe8408f805ccf66f3c24 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 23:15:46 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 58327: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 58317: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) 58291: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8) 58227: 58123: MNT-9992 : Using CMIS authentication using "ROLE_TICKET" or user "null" of "" does not work any more. - Removed check to see if already authenticated - Andy suggested git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webdav/auth/AuthenticationFilter.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java index 7f4fcf9105..f4624c708a 100644 --- a/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java @@ -163,19 +163,16 @@ public class AuthenticationFilter extends BaseAuthenticationFilter implements De password = ""; } - // First check if we already are authenticated - if (AuthenticationUtil.getFullyAuthenticatedUser() == null) + // Go to the repo and authenticate + Authorization auth = new Authorization(username, password); + if (auth.isTicket()) { - // We have to go to the repo and authenticate - Authorization auth = new Authorization(username, password); - if (auth.isTicket()) - { - authenticationService.validate(auth.getTicket()); - } - else - { - authenticationService.authenticate(username, password.toCharArray()); - authenticationListener.userAuthenticated(new BasicAuthCredentials(username, password)); + authenticationService.validate(auth.getTicket()); + } + else + { + authenticationService.authenticate(username, password.toCharArray()); + authenticationListener.userAuthenticated(new BasicAuthCredentials(username, password)); } user = createUserEnvironment(httpReq.getSession(), authenticationService.getCurrentUserName(), authenticationService.getCurrentTicket(), false);