Add a config flag to allow disabling JitsiXmppStringprep.

jitsi · Apr 26, 2024 · b1c8713 · b1c8713
1 parent fac75d1
commit b1c8713
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/XmppConfig.kt b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/XmppConfig.kt
@@ -37,6 +37,10 @@ class XmppConfig private constructor() {
             .convertFrom<List<String>> { l -> l.map { JidCreate.domainBareFrom(it) } }
     }
 
+    val useJitsiJidValidation: Boolean by config {
+        "jicofo.xmpp.use-jitsi-jid-validation".from(newConfig)
+    }
+
     companion object {
         @JvmField
         val service = XmppServiceConnectionConfig()

diff --git a/jicofo-selector/src/main/resources/reference.conf b/jicofo-selector/src/main/resources/reference.conf
@@ -389,6 +389,9 @@ jicofo {
   }
 
   xmpp {
+    // Whether to use JitsiXmppStringprep to validate JIDs. If set to false uses the default validation in Smack.
+    use-jitsi-jid-validation = true
+
     // The separate XMPP connection used for communication with clients (endpoints).
     client {
       enabled = true

diff --git a/jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt b/jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt
@@ -54,7 +54,7 @@ import org.jivesoftware.smack.SmackConfiguration
 import org.jivesoftware.smack.provider.ProviderManager
 
 fun initializeSmack() {
-    org.jitsi.xmpp.Smack.initialize()
+    org.jitsi.xmpp.Smack.initialize(XmppConfig.config.useJitsiJidValidation)
 
     SmackConfiguration.setDefaultReplyTimeout(15000)