cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Do not enforce email 3PID type

Browse Source
This commit is contained in:
Maxime Dor
2017-03-30 18:23:01 +02:00
parent 843b792904
commit d53c9e4263
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/groovy/io/kamax/mxisd/lookup/strategy/RecursivePriorityLookupStrategy.groovy
View File

@@ -21,7 +21,6 @@
package io.kamax.mxisd.lookup.strategy package io.kamax.mxisd.lookup.strategy
import edazdarevic.commons.net.CIDRUtils import edazdarevic.commons.net.CIDRUtils
import io.kamax.mxisd.api.ThreePidType
import io.kamax.mxisd.config.RecursiveLookupConfig import io.kamax.mxisd.config.RecursiveLookupConfig
import io.kamax.mxisd.lookup.LookupRequest import io.kamax.mxisd.lookup.LookupRequest
import io.kamax.mxisd.lookup.provider.ThreePidProvider import io.kamax.mxisd.lookup.provider.ThreePidProvider
@@ -66,10 +65,6 @@ class RecursivePriorityLookupStrategy implements LookupStrategy, InitializingBea
@Override @Override
Optional<?> find(LookupRequest request) { Optional<?> find(LookupRequest request) {
if (ThreePidType.email != request.getType()) {
throw new IllegalArgumentException("${request.getType()} is currently not supported")
}
boolean canRecurse = false boolean canRecurse = false
if (recursiveCfg.isEnabled()) { if (recursiveCfg.isEnabled()) {
log.debug("Checking {} CIDRs for recursion", allowedCidr.size()) log.debug("Checking {} CIDRs for recursion", allowedCidr.size())
@@ -83,6 +78,7 @@ class RecursivePriorityLookupStrategy implements LookupStrategy, InitializingBea
} }
} }
} }
log.info("Host {} allowed for recursion: {}", request.getRequester(), canRecurse) log.info("Host {} allowed for recursion: {}", request.getRequester(), canRecurse)
for (ThreePidProvider provider : providers) { for (ThreePidProvider provider : providers) {