Merge pull request #6313 from niklasf/ipintel-config

configurable ipintel check url

conf/base.conf

@@ -226,7 +226,10 @@ security {
   }
   recaptcha = ${recaptcha}
   mailgun = ${mailgun}
-  ipintel.email = ""
+  ipintel {
+    url = "https://check.getipintel.net/check.php"
+    email = ""
+  }
   lame_name_check = true
 }
 oauth {

modules/security/src/main/Env.scala

@@ -54,8 +54,8 @@ final class Env(
   lazy val store = new Store(db(config.collection.security), net.ip)
 
   lazy val ipIntel = {
-    def mk = (email: EmailAddress) => wire[IpIntel]
-    mk(config.ipIntelEmail)
+    def mk = (url: String, email: EmailAddress) => wire[IpIntel]
+    mk(config.ipIntelUrl, config.ipIntelEmail)
   }
 
   lazy val ugcArmedSetting = settingStore[Boolean](

modules/security/src/main/IpIntel.scala

@@ -9,6 +9,7 @@ import lila.common.{ EmailAddress, IpAddress }
 final class IpIntel(
     ws: WSClient,
     cacheApi: lila.memo.CacheApi,
+    checkUrl: String,
     contactEmail: EmailAddress
 )(implicit ec: scala.concurrent.ExecutionContext) {
 
@@ -25,7 +26,7 @@ final class IpIntel(
 
   private def get(reason: IpIntel.Reason)(ip: IpAddress): Fu[Int] = {
     lila.mon.security.proxy.ipintel(reason.toString).increment()
-    val url = s"https://check.getipintel.net/check.php?ip=$ip&contact=${contactEmail.value}"
+    val url = s"$checkUrl?ip=$ip&contact=${contactEmail.value}"
     ws.url(url)
       .get()
       .dmap(_.body)

modules/security/src/main/SecurityConfig.scala

@@ -24,6 +24,7 @@ final private class SecurityConfig(
     @ConfigName("check_mail_api") val checkMail: CheckMail,
     val recaptcha: Recaptcha.Config,
     val mailgun: Mailgun.Config,
+    @ConfigName("ipintel.url") val ipIntelUrl: String,
     @ConfigName("ipintel.email") val ipIntelEmail: EmailAddress,
     @ConfigName("lame_name_check") val lameNameCheck: LameNameCheck
 )