inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
117930 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
         - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 17:27:10 +00:00
parent a9e033f2c5
commit 99bc1f16ac
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/security/authentication/subsystems/SubsystemChainingFtpAuthenticator.java
View File

@@ -68,6 +68,11 @@ public class SubsystemChainingFtpAuthenticator extends AbstractChainingFtpAuthen
{ {
ApplicationContext context = this.applicationContextManager.getApplicationContext(instance); ApplicationContext context = this.applicationContextManager.getApplicationContext(instance);
FTPAuthenticatorBase authenticator = (FTPAuthenticatorBase) context.getBean(sourceBeanName); FTPAuthenticatorBase authenticator = (FTPAuthenticatorBase) context.getBean(sourceBeanName);
if(this.getClass().isInstance(authenticator))
{
continue;
}
// Only add active authenticators. E.g. we might have an passthru FTP authenticator that is disabled. // Only add active authenticators. E.g. we might have an passthru FTP authenticator that is disabled.
if (!(authenticator instanceof ActivateableBean) if (!(authenticator instanceof ActivateableBean)
|| ((ActivateableBean) authenticator).isActive()) || ((ActivateableBean) authenticator).isActive())