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 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
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
This commit is contained in:
Alan Davis
2016-03-11 17:26:29 +00:00
parent 0cc1587581
commit bd7b19bb61
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java
View File

@@ -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
*/
@@ -115,12 +116,22 @@ 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 <code>true</code> if fallback authentication enabled
*/
public final boolean isFallbackEnabled()
{
return fallbackDelegate != null;
return m_isFallbackEnabled && fallbackDelegate != null;
}
/*