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 (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
71857: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71852: MNT-11233: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71850: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Fix remoteUserMapper checking to be the same as in BaseAuthenticationFilter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:35:27 +00:00
parent 9326da6ec3
commit badd76e80d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java
View File

@@ -165,7 +165,8 @@ public class PublicApiAuthenticatorFactory extends BasicHttpAuthenticatorFactory
String userId = null; String userId = null;
// If the remote user mapper is configured, we may be able to map in an externally authenticated user // If the remote user mapper is configured, we may be able to map in an externally authenticated user
if (remoteUserMapper != null && !(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive()) if (remoteUserMapper != null
&& (!(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive()))
{ {
userId = remoteUserMapper.getRemoteUser(this.servletReq.getHttpServletRequest()); userId = remoteUserMapper.getRemoteUser(this.servletReq.getHttpServletRequest());
} }