feat: Adds an option to randomize user-id used when client logins. (#501

) * feat: Adds an option to randomize user-id used when client logins. Updates to latest desktop lib dependency to fix ALWAYS_TRUST_MODE_ENABLED. * squash: Update jid random part.
jitsi · Sep 27, 2023 · 3de47d0 · 3de47d0
1 parent b9e9572
commit 3de47d0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/jigasi-home/sip-communicator.properties b/jigasi-home/sip-communicator.properties
@@ -163,6 +163,10 @@ org.jitsi.jigasi.xmpp.acc.USE_DEFAULT_STUN_SERVER=false
 # To fix SSL/TLS required by client but not supported by server
 #org.jitsi.jigasi.xmpp.acc.ALLOW_NON_SECURE=true
 
+# Can be used in combination with jitsi-meet module mod_auth_jitsi-shared-secret
+# To have jigasi use a random username on every call
+#org.jitsi.jigasi.xmpp.acc.UNIQUE_USER_ID=true
+
 # If you want to disconnect jigasi calls automatically when all web users have
 # left, you can set the following property to false.
 # org.jitsi.jigasi.ALLOW_ONLY_JIGASIS_IN_ROOM=true

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <assembly.skipAssembly>true</assembly.skipAssembly>
-    <jitsi-desktop.version>2.14.113297e05</jitsi-desktop.version>
+    <jitsi-desktop.version>2.14.77b1f5e65</jitsi-desktop.version>
     <jitsi-desktop.groupId>org.jitsi.desktop</jitsi-desktop.groupId>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <slf4j.version>1.7.36</slf4j.version>

diff --git a/src/main/java/org/jitsi/jigasi/JvbConference.java b/src/main/java/org/jitsi/jigasi/JvbConference.java
@@ -180,6 +180,11 @@ public class JvbConference
         Util.createNewThreadPool("xmpp-executor-pool")
     );
 
+    /**
+     * Used for randomizing usernames if needed.
+     */
+    private static final Random RANDOM = new Random();
+
     /**
      * Adds the features supported by jigasi to a specific
      * <tt>OperationSetJitsiMeetTools</tt> instance.
@@ -1649,6 +1654,26 @@ else if ("org.jitsi.jigasi.xmpp.acc.BOSH_URL_PATTERN".equals(overridenProp))
                     ctx.setBoshURL(value);
                 }
             }
+            else if ("org.jitsi.jigasi.xmpp.acc.USER_ID".equals(overridenProp)
+                && JigasiBundleActivator.getConfigurationService().getBoolean(overridePrefix + ".UNIQUE_USER_ID", false))
+            {
+                try
+                {
+                    Jid jid = JidCreate.from(value);
+                    long random = RANDOM.nextInt();
+                    Jid newJid = JidCreate.entityBareFrom(
+                            Localpart.from(jid.getLocalpartOrNull() + "-" + String.format("%x", random)),
+                            jid.getDomain());
+
+                    properties.put(ProtocolProviderFactory.USER_ID, newJid.toString());
+                }
+                catch (XmppStringprepException e)
+                {
+                    logger.error("Error jid in org.jitsi.jigasi.xmpp.acc.USER_ID config", e);
+
+                    properties.put(ProtocolProviderFactory.USER_ID, value);
+                }
+            }
             else
             {
                 properties.put(key, value);