Add config toggle to disable Xirsys turn servers

FAForever · Jan 21, 2024 · 17349a9 · 17349a9
1 parent 73d1bc5
commit 17349a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysProperties.kt b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysProperties.kt
@@ -5,6 +5,7 @@ import io.smallrye.config.ConfigMapping
 @ConfigMapping(prefix = "xirsys")
 interface XirsysProperties {
     fun enabled(): Boolean
+    fun turnEnabled(): Boolean
     fun baseUrl(): String
     fun ident(): String
     fun secret(): String

diff --git a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt
@@ -21,6 +21,7 @@ class XirsysSessionHandler(
     }
 
     override val active = xirsysProperties.enabled()
+    private val turnEnabled = xirsysProperties.turnEnabled()
 
     override fun createSession(id: String) {
         LOG.debug("Creating session id $id")
@@ -48,7 +49,7 @@ class XirsysSessionHandler(
                         // The java URI class fails to read host and port due to the missing // after the :
                         // Thus we "normalize" the uri, even though it is technically valid
                         url.replaceFirst(":", "://")
-                    },
+                    }.filter { url -> turnEnabled || !url.startsWith("turn") },
                 ),
             )
         }

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -48,6 +48,7 @@ xirsys:
   ident: ${XIRSYS_IDENT}
   secret: ${XIRSYS_SECRET}
   channel-namespace: "faf"
+  turn-enabled: ${XIRSYS_TURN_ENABLED:true}
 smallrye:
   jwt:
     sign: