From 56255ec216490e80e7f43effa4e47c71fb823d27 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Sun, 13 Jun 2010 13:25:32 +0000 Subject: [PATCH] ALF-2265: Share 'Uber Filter' part 2 - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter - Now the filter simply chains to the downstream authentication filter rather than call its superclass - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml - Configured webscriptAuthenticationFilter for Kerberos subsystem git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/webdav/auth/BaseAuthenticationFilter.java | 3 +++ .../repo/webdav/auth/BaseSSOAuthenticationFilter.java | 10 +--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java index 5801a5d415..ee917c3c95 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java @@ -50,6 +50,9 @@ import org.json.JSONObject; */ public abstract class BaseAuthenticationFilter { + /** Indication by an up-stream filter that no authentication checks are required. */ + protected static final String NO_AUTH_REQUIRED = "alfNoAuthRequired"; + /** The default session attribute used to cache the user. Subclasses may override this with {@link #setUserAttributeName(String)}. */ public static final String AUTHENTICATION_USER = "_alfDAVAuthTicket"; diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java index 1848de8b58..c115e55cd0 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java @@ -49,15 +49,7 @@ import org.springframework.beans.factory.InitializingBean; * @author kroast */ public abstract class BaseSSOAuthenticationFilter extends BaseAuthenticationFilter implements DependencyInjectedFilter, ActivateableBean, InitializingBean -{ - // Constants - // - // Session value names - // - // Note: These values are copied from the AuthenticationHelper and LoginBean classes to avoid project dependencies - - protected static final String NO_AUTH_REQUIRED = "alfNoAuthRequired"; - +{ // Allow an authentication ticket to be passed as part of a request to bypass authentication private ExtendedServerConfigurationAccessor serverConfiguration;