From 8b87bbf09a7f59054fa6b488721e64997cb47259 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 23 Jul 2014 16:31:26 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 77207: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 75127: Test a fix for oauth breakage in Cloud build git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/api/PublicApiAuthenticatorFactory.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java b/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java index 160b62a9db..7f60f4ecc7 100644 --- a/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java +++ b/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java @@ -38,7 +38,10 @@ public class PublicApiAuthenticatorFactory extends BasicHttpAuthenticatorFactory private static Log logger = LogFactory.getLog(PublicApiAuthenticatorFactory.class); public static final String DEFAULT_AUTHENTICATOR_KEY_HEADER = "X-Alfresco-Authenticator-Key"; - + + public static final String DEFAULT_REMOTE_USER_HEADER = "X-Alfresco-Remote-User"; + + private String remoteUserHeader = DEFAULT_REMOTE_USER_HEADER; private String authenticatorKeyHeader = DEFAULT_AUTHENTICATOR_KEY_HEADER; private RemoteUserMapper remoteUserMapper; private RetryingTransactionHelper retryingTransactionHelper; @@ -170,6 +173,12 @@ public class PublicApiAuthenticatorFactory extends BasicHttpAuthenticatorFactory { userId = remoteUserMapper.getRemoteUser(this.servletReq.getHttpServletRequest()); } + else + { + // fall back to extracting the header + userId = servletReq.getHeader(remoteUserHeader); + } + if (logger.isDebugEnabled()) { if (userId == null)