From 833aff69dcc4bbb8ee936f9c486f7851a10bd498 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 5 Nov 2013 12:31:19 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) - Correct merge error 57582: Merged DEV to V4.1-BUG-FIX (4.1.8) with corrections 56334: MNT-9712: VTI doesn't allow external authentication. - Modify org.alfresco.web.sharepoint.auth.BasicAuthenticationHandler to check Remote User - Add unit test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/sharepoint/auth/BasicAuthenticationHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java b/source/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java index f31947a9ae..a1408adb7b 100644 --- a/source/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java +++ b/source/java/org/alfresco/web/sharepoint/auth/BasicAuthenticationHandler.java @@ -30,7 +30,9 @@ import org.alfresco.repo.SessionUser; import org.alfresco.repo.management.subsystems.ActivateableBean; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationException; +import org.alfresco.repo.webdav.auth.RemoteUserMapper; import org.alfresco.repo.web.auth.AuthenticationListener; +import org.alfresco.repo.web.auth.TicketCredentials; import org.alfresco.repo.web.auth.BasicAuthCredentials; import org.alfresco.repo.webdav.auth.SharepointConstants; import org.alfresco.web.bean.repository.User;