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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2014-02-11 23:15:46 +00:00
parent a9b65c3715
commit 53366c7e59
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
View File

@@ -163,19 +163,16 @@ public class AuthenticationFilter extends BaseAuthenticationFilter implements De
password = ""; password = "";
} }
// First check if we already are authenticated // Go to the repo and authenticate
if (AuthenticationUtil.getFullyAuthenticatedUser() == null) Authorization auth = new Authorization(username, password);
if (auth.isTicket())
{ {
// We have to go to the repo and authenticate authenticationService.validate(auth.getTicket());
Authorization auth = new Authorization(username, password); }
if (auth.isTicket()) else
{ {
authenticationService.validate(auth.getTicket()); authenticationService.authenticate(username, password.toCharArray());
} authenticationListener.userAuthenticated(new BasicAuthCredentials(username, password));
else
{
authenticationService.authenticate(username, password.toCharArray());
authenticationListener.userAuthenticated(new BasicAuthCredentials(username, password));
} }
user = createUserEnvironment(httpReq.getSession(), authenticationService.getCurrentUserName(), authenticationService.getCurrentTicket(), false); user = createUserEnvironment(httpReq.getSession(), authenticationService.getCurrentUserName(), authenticationService.getCurrentTicket(), false);