This is an automated email from the ASF dual-hosted git repository. fmartelli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 2c9e1b54ac232bc9f86bc0742033b22da192b774 Author: fabio <[email protected]> AuthorDate: Thu Apr 18 12:35:57 2024 +0200 [SYNCOPE-1816] removes ntlm parameter because not available anymore on CAS 7 --- .../syncope/common/lib/auth/JcifsSpnegoAuthModuleConf.java | 13 ------------- .../bootstrap/mapping/AuthModulePropertySourceMapper.java | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JcifsSpnegoAuthModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JcifsSpnegoAuthModuleConf.java index 06ef008a91..712ca3e18d 100644 --- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JcifsSpnegoAuthModuleConf.java +++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/JcifsSpnegoAuthModuleConf.java @@ -135,11 +135,6 @@ public class JcifsSpnegoAuthModuleConf implements AuthModuleConf { */ private String spnegoAttributeName = "distinguishedName"; - /** - * Determines the header to set and the message prefix when negotiating spnego. - */ - private boolean ntlm; - /** * If true, does not terminate authentication and allows CAS to resume * and fallback to normal authentication means such as uid/psw via the login page. @@ -292,14 +287,6 @@ public class JcifsSpnegoAuthModuleConf implements AuthModuleConf { this.spnegoAttributeName = spnegoAttributeName; } - public boolean isNtlm() { - return ntlm; - } - - public void setNtlm(final boolean ntlm) { - this.ntlm = ntlm; - } - public boolean isMixedModeAuthentication() { return mixedModeAuthentication; } diff --git a/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/mapping/AuthModulePropertySourceMapper.java b/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/mapping/AuthModulePropertySourceMapper.java index 5b619a5418..e3b66c34e4 100644 --- a/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/mapping/AuthModulePropertySourceMapper.java +++ b/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/mapping/AuthModulePropertySourceMapper.java @@ -460,7 +460,6 @@ public class AuthModulePropertySourceMapper extends PropertySourceMapper impleme props.setDnsTimeout(conf.getDnsTimeout()); props.setHostNameClientActionStrategy(conf.getHostNameClientActionStrategy()); props.setHostNamePatternString(conf.getHostNamePatternString()); - props.setNtlm(conf.isNtlm()); props.setNtlmAllowed(conf.isNtlmAllowed()); props.setPoolSize(conf.getPoolSize()); props.setPoolTimeout(conf.getPoolTimeout()); @@ -481,6 +480,6 @@ public class AuthModulePropertySourceMapper extends PropertySourceMapper impleme props.setLdap(ldapProps); } - return prefix("cas.authn.spnego.", CasCoreConfigurationUtils.asMap(props)); + return prefix("cas.authn.spnego.", WAConfUtils.asMap(props)); } }
