From d53c9e42632a316b43149710e2d63cbc7352adec Mon Sep 17 00:00:00 2001 From: Maxime Dor Date: Thu, 30 Mar 2017 18:23:01 +0200 Subject: [PATCH] Do not enforce email 3PID type --- .../lookup/strategy/RecursivePriorityLookupStrategy.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/groovy/io/kamax/mxisd/lookup/strategy/RecursivePriorityLookupStrategy.groovy b/src/main/groovy/io/kamax/mxisd/lookup/strategy/RecursivePriorityLookupStrategy.groovy index 31f6456..0c8f334 100644 --- a/src/main/groovy/io/kamax/mxisd/lookup/strategy/RecursivePriorityLookupStrategy.groovy +++ b/src/main/groovy/io/kamax/mxisd/lookup/strategy/RecursivePriorityLookupStrategy.groovy @@ -21,7 +21,6 @@ package io.kamax.mxisd.lookup.strategy import edazdarevic.commons.net.CIDRUtils -import io.kamax.mxisd.api.ThreePidType import io.kamax.mxisd.config.RecursiveLookupConfig import io.kamax.mxisd.lookup.LookupRequest import io.kamax.mxisd.lookup.provider.ThreePidProvider @@ -66,10 +65,6 @@ class RecursivePriorityLookupStrategy implements LookupStrategy, InitializingBea @Override Optional find(LookupRequest request) { - if (ThreePidType.email != request.getType()) { - throw new IllegalArgumentException("${request.getType()} is currently not supported") - } - boolean canRecurse = false if (recursiveCfg.isEnabled()) { 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) for (ThreePidProvider provider : providers) {