From bd7b19bb615d79b0d8453cc609f4e1bcffdcc15f Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 11 Mar 2016 17:26:29 +0000 Subject: [PATCH] Merged 5.1.N (5.1.1) to HEAD (5.1) 114992 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 114940 cturlica: Merged DEV to 5.0.N (5.0.3) 114938 cturlica: MNT-14367: Unable to connect to CMIS 1.0 and CMIS 1.1 API URL in 5.0.1 only with Kerberos SSO enabled - added default fallback for new CMIS URLs and the possibility to disable this fallback if needed (new properties) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../auth/BaseSSOAuthenticationFilter.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java index 51935cc52c..7ccec11ff5 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java @@ -74,6 +74,7 @@ public abstract class BaseSSOAuthenticationFilter extends BaseAuthenticationFilt private boolean m_isActive = true; private AuthenticationDriver fallbackDelegate; + private boolean m_isFallbackEnabled = true; protected static final String MIME_HTML_TEXT = "text/html"; @@ -106,7 +107,7 @@ public abstract class BaseSSOAuthenticationFilter extends BaseAuthenticationFilt } /** - * Activates or deactivates the fallback authentication support for this filter + * Sets the fallback authentication support for this filter * * @param delegate AuthenticationDriver */ @@ -114,13 +115,23 @@ public abstract class BaseSSOAuthenticationFilter extends BaseAuthenticationFilt { this.fallbackDelegate = delegate; } - + + /** + * Activates or deactivates the fallback authentication support for this filter + * + * @param fallbackEnabled + */ + public final void setFallbackEnabled(boolean fallbackEnabled) + { + this.m_isFallbackEnabled = fallbackEnabled; + } + /** * @return true if fallback authentication enabled */ public final boolean isFallbackEnabled() { - return fallbackDelegate != null; + return m_isFallbackEnabled && fallbackDelegate != null; } /*