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

58499: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58472: Fix build error as a result of the merge of
         58405 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
           58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
             58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
             Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:44:18 +00:00
parent b56dd58198
commit c05b991ec0

View File

@@ -39,6 +39,7 @@ import org.alfresco.repo.security.authentication.TicketComponent;
import org.alfresco.repo.security.authentication.AuthenticationServiceImpl;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.jaas.JAASAuthenticationComponent;
import org.alfresco.repo.web.auth.NoopAuthenticationListener;
import org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService;
@@ -82,6 +83,7 @@ public class KerberosRemoteUserMapperTest
webDavAuthFilter.setActive(true);
webDavAuthFilter.setTicketLogons(true);
webDavAuthFilter.setServerConfiguration((ExtendedServerConfigurationAccessor) ctx.getBean("fileServerConfiguration"));
webDavAuthFilter.setAuthenticationListener(new NoopAuthenticationListener());
// kerberos authenticationComponent
JAASAuthenticationComponent krbAuthComponent = new JAASAuthenticationComponent();