Use JitsiXmppStringprep, update smack (#1151)

* ref: Use org.jitsi.xmpp.Smack.

* ref: Remove JidTest (moved to xmpp-extensions).

* chore: Update smack to 4.4.8

https://github.com/igniterealtime/Smack/blob/4.4.8/CHANGELOG.md

* chore: Update jitsi-xmpp-extensions (JitsiXmppStringprep).

* Add a config flag to allow disabling JitsiXmppStringprep.

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()

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

jicofo/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt

@@ -51,29 +51,12 @@ import org.jitsi.xmpp.extensions.jitsimeet.UserInfoPacketExt
 import org.jitsi.xmpp.extensions.jitsimeet.VideoMutedExtension
 import org.jitsi.xmpp.extensions.rayo.RayoIqProvider
 import org.jivesoftware.smack.SmackConfiguration
-import org.jivesoftware.smack.parsing.ExceptionLoggingCallback
 import org.jivesoftware.smack.provider.ProviderManager
-import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy
-import org.jxmpp.JxmppContext
-import org.jxmpp.stringprep.rocksxmppprecis.RocksXmppPrecisStringprep
 
 fun initializeSmack() {
-    System.setProperty("jdk.xml.entityExpansionLimit", "0")
-    System.setProperty("jdk.xml.maxOccurLimit", "0")
-    System.setProperty("jdk.xml.elementAttributeLimit", "524288")
-    System.setProperty("jdk.xml.totalEntitySizeLimit", "0")
-    System.setProperty("jdk.xml.maxXMLNameLimit", "524288")
-    System.setProperty("jdk.xml.entityReplacementLimit", "0")
-
-    // The default SimpleXmppStringrep is very permissive and allows some invalid JIDs that we don't want to allow.
-    JxmppContext.setDefaultXmppStringprep(RocksXmppPrecisStringprep.INSTANCE)
+    org.jitsi.xmpp.Smack.initialize(XmppConfig.config.useJitsiJidValidation)
 
     SmackConfiguration.setDefaultReplyTimeout(15000)
-    // if there is a parsing error, do not break the connection to the server(the default behaviour) as we need it for
-    // the other conferences.
-    SmackConfiguration.setDefaultParsingExceptionCallback(ExceptionLoggingCallback())
-
-    Socks5Proxy.setLocalSocks5ProxyEnabled(false)
 
     registerXmppExtensions()
 }

pom.xml

@@ -38,7 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- Make sure this matches the version of the jxmpp artifacts inheriteb from smack. -->
     <jxmpp.version>1.0.3</jxmpp.version>
-    <smack.version>4.4.6</smack.version>
+    <smack.version>4.4.8</smack.version>
     <kotlin.version>1.9.10</kotlin.version>
     <kotest.version>5.7.2</kotest.version>
     <slf4j.version>1.7.32</slf4j.version>
@@ -175,7 +175,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>jitsi-xmpp-extensions</artifactId>
-        <version>1.0-79-gdc9285e</version>
+        <version>1.0-80-g0ce9883</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>