Allow to enable/disable LDAP provider in config
This commit is contained in:
@@ -32,6 +32,7 @@ class LdapConfig implements InitializingBean {
|
||||
|
||||
private Logger log = LoggerFactory.getLogger(LdapConfig.class)
|
||||
|
||||
private boolean enabled;
|
||||
private String host
|
||||
private int port
|
||||
private String baseDn
|
||||
@@ -41,6 +42,14 @@ class LdapConfig implements InitializingBean {
|
||||
private String bindPassword
|
||||
private Map<String, String> mappings
|
||||
|
||||
boolean getEnabled() {
|
||||
return enabled
|
||||
}
|
||||
|
||||
void setEnabled(boolean enabled) {
|
||||
this.enabled = enabled
|
||||
}
|
||||
|
||||
String getHost() {
|
||||
return host
|
||||
}
|
||||
|
||||
@@ -48,6 +48,11 @@ class DnsLookupProvider implements IThreePidProvider {
|
||||
@Autowired
|
||||
private IRemoteIdentityServerFetcher fetcher
|
||||
|
||||
@Override
|
||||
boolean isEnabled() {
|
||||
return true
|
||||
}
|
||||
|
||||
@Override
|
||||
boolean isLocal() {
|
||||
return false
|
||||
|
||||
@@ -40,6 +40,11 @@ class ForwarderProvider implements IThreePidProvider {
|
||||
@Autowired
|
||||
private IRemoteIdentityServerFetcher fetcher
|
||||
|
||||
@Override
|
||||
boolean isEnabled() {
|
||||
return true
|
||||
}
|
||||
|
||||
@Override
|
||||
boolean isLocal() {
|
||||
return false
|
||||
|
||||
@@ -25,6 +25,8 @@ import io.kamax.mxisd.lookup.ThreePidMapping
|
||||
|
||||
interface IThreePidProvider {
|
||||
|
||||
boolean isEnabled()
|
||||
|
||||
boolean isLocal()
|
||||
|
||||
/**
|
||||
|
||||
@@ -50,6 +50,11 @@ class LdapProvider implements IThreePidProvider {
|
||||
@Autowired
|
||||
private LdapConfig ldapCfg
|
||||
|
||||
@Override
|
||||
boolean isEnabled() {
|
||||
return ldapCfg.getEnabled()
|
||||
}
|
||||
|
||||
@Override
|
||||
boolean isLocal() {
|
||||
return true
|
||||
|
||||
@@ -96,7 +96,7 @@ class RecursivePriorityLookupStrategy implements LookupStrategy, InitializingBea
|
||||
|
||||
log.info("Host {} allowed for recursion: {}", request.getRequester(), canRecurse)
|
||||
for (IThreePidProvider provider : providers) {
|
||||
if (provider.isLocal() || canRecurse) {
|
||||
if (provider.isEnabled() && (provider.isLocal() || canRecurse)) {
|
||||
usableProviders.add(provider)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user