Check for meetingId conflicts

jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt

@@ -243,7 +243,7 @@ class ChatRoomImpl(
         }
         synchronized(this) {
             lastPresenceSent = null
-            logger.addContext("meeting_id", "")
+            logger.removeContext("meeting_id")
             avModerationByMediaType.values.forEach { it.reset() }
         }
     }

jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java

@@ -49,7 +49,6 @@
 import org.jxmpp.jid.*;
 
 import java.time.*;
-import java.net.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -257,7 +256,7 @@ public class JitsiMeetConferenceImpl
      * Whether broadcasting to visitors is currently enabled.
      * TODO: support changing it.
      */
-    private boolean visitorsBroadcastEnabled = VisitorsConfig.config.getAutoEnableBroadcast();
+    private final boolean visitorsBroadcastEnabled = VisitorsConfig.config.getAutoEnableBroadcast();
 
     @NotNull private final Instant createdInstant = Instant.now();
 
@@ -506,6 +505,39 @@ public boolean isStarted()
         return started.get();
     }
 
+    /**
+     * Initialize {@link #meetingId}, given an optional value coming from the chat room configuration. If no valid
+     * meeting ID is provided, a random UUID will be generated.
+     * @param chatRoomMeetingId the meeting ID that was set in the chat room configuration.
+     */
+    private void setMeetingId(String chatRoomMeetingId)
+    {
+        if (meetingId != null)
+        {
+            logger.error("Meeting ID is already set: " + meetingId + ", will not replace.");
+            return;
+        }
+
+        String meetingId;
+        if (org.apache.commons.lang3.StringUtils.isBlank(chatRoomMeetingId))
+        {
+            meetingId = UUID.randomUUID().toString();
+            logger.warn("No meetingId set for the MUC. Generating one locally.");
+        }
+        else
+        {
+            meetingId = chatRoomMeetingId;
+        }
+
+        if (!listener.meetingIdSet(this, meetingId))
+        {
+            logger.error("Failed to set a unique meeting ID after 100 attempts, giving up.");
+            throw new RuntimeException("Failed to set a unique meeting ID.");
+        }
+
+        this.meetingId = meetingId;
+        logger.addContext("meeting_id", meetingId);
+    }
     /**
      * Joins the conference room.
      *
@@ -521,16 +553,7 @@ private void joinTheRoom()
         chatRoom.addListener(chatRoomListener);
 
         ChatRoomInfo chatRoomInfo = chatRoom.join();
-        if (chatRoomInfo.getMeetingId() == null)
-        {
-            meetingId = UUID.randomUUID().toString();
-            logger.warn("No meetingId set for the MUC. Generating one locally.");
-        }
-        else
-        {
-            this.meetingId = chatRoomInfo.getMeetingId();
-        }
-        logger.addContext("meeting_id", meetingId);
+        setMeetingId(chatRoomInfo.getMeetingId());
 
         mainRoomJid = chatRoomInfo.getMainRoomJid();
 
@@ -998,7 +1021,7 @@ private void onMemberLeft(ChatRoomMember chatRoomMember)
             {
                 rescheduleSingleParticipantTimeout();
             }
-            else if (participants.size() == 0)
+            else if (participants.isEmpty())
             {
                 expireBridgeSessions();
             }
@@ -1098,7 +1121,7 @@ else if (removed.getChatMember().getRole() == MemberRole.VISITOR)
     }
 
     @Override
-    public void componentsChanged(Set<XmppProvider.Component> components)
+    public void componentsChanged(@NotNull Set<XmppProvider.Component> components)
     {
     }
 
@@ -1903,7 +1926,7 @@ private long getUserParticipantCount()
 
     /**
      * Selects a visitor node for a new participant, and joins the associated chat room if not already joined
-     * @return
+     * @return the ID of the selected node, or null if the endpoint is to be sent to the main room.
      * @throws Exception if joining the chat room failed.
      */
     private String selectVisitorNode()
@@ -2334,7 +2357,17 @@ public interface ConferenceListener
          * Event fired when conference has ended.
          * @param conference the conference instance that has ended.
          */
-        void conferenceEnded(JitsiMeetConferenceImpl conference);
+        void conferenceEnded(@NotNull JitsiMeetConferenceImpl conference);
+
+        /**
+         * Fire an event attempting to set the meeting ID for the conference. The implementation should return `false`
+         * in case another meeting with the same ID already exists, which will result in a new randomly generated
+         * meeting ID to be attempted.
+         * @param conference the conference.
+         * @param meetingId the meetindId to attempt.
+         * @return true if the given meetingId was free and was associated with the conference, false otherwise.
+         */
+        boolean meetingIdSet(@NotNull JitsiMeetConferenceImpl conference, @NotNull String meetingId);
     }
 
     /**

jicofo/src/main/kotlin/org/jitsi/jicofo/FocusManager.kt

@@ -63,6 +63,7 @@ class FocusManager(
      */
     private val conferences: MutableMap<EntityBareJid, JitsiMeetConferenceImpl> = ConcurrentHashMap()
     private val conferencesCache: MutableList<JitsiMeetConference> = CopyOnWriteArrayList()
+    private val conferencesByMeetingId: MutableMap<String, JitsiMeetConferenceImpl> = ConcurrentHashMap()
 
     /** The object used to synchronize access to [.conferences]. */
     private val conferencesSyncRoot = Any()
@@ -149,6 +150,7 @@ class FocusManager(
         synchronized(conferencesSyncRoot) {
             conferences.remove(roomName)
             conferencesCache.remove(conference)
+            conferencesByMeetingId.remove(conference.meetingId)
             if (conference.includeInStatistics()) {
                 ConferenceMetrics.conferenceCount.dec()
             }
@@ -171,6 +173,19 @@ class FocusManager(
         }
     }
 
+    override fun meetingIdSet(conference: JitsiMeetConferenceImpl, meetingId: String): Boolean =
+        synchronized(conferencesSyncRoot) {
+            conferencesByMeetingId[meetingId]?.let {
+                // If there is already a conference with this meeting ID, we don't allow setting it.
+                logger.warn("Meeting ID $meetingId already exists for ${it.roomName}.")
+                false
+            } ?: run {
+                // Otherwise, we set the meeting ID and register the conference.
+                conferencesByMeetingId[meetingId] = conference
+                true
+            }
+        }
+
     /** {@inheritDoc} */
     override fun getConference(jid: EntityBareJid): JitsiMeetConferenceImpl? = synchronized(conferencesSyncRoot) {
         return conferences[jid]

jicofo/src/test/kotlin/org/jitsi/jicofo/conference/ConferenceTest.kt

@@ -71,6 +71,7 @@ class ConferenceTest : ShouldSpec() {
         roomName,
         mockk {
             every { conferenceEnded(any()) } answers { ended = true }
+            every { meetingIdSet(any(), any()) } returns true
         },
         HashMap(),
         Level.INFO,

pom.xml

@@ -43,7 +43,7 @@
     <kotest.version>5.7.2</kotest.version>
     <slf4j.version>1.7.32</slf4j.version>
     <jackson.version>2.19.0</jackson.version>
-    <jitsi.utils.version>1.0-140-g16ddce7</jitsi.utils.version>
+    <jitsi.utils.version>1.0-141-g3b92141</jitsi.utils.version>
     <jicoco.version>1.1-160-g4ad2288</jicoco.version>
     <ktlint-maven-plugin.version>3.0.0</ktlint-maven-plugin.version>
     <spotbugs.version>4.8.6</spotbugs.version>
@@ -176,7 +176,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>jitsi-xmpp-extensions</artifactId>
-        <version>1.0-96-gb0509fc</version>
+        <version>1.0-97-g6f2f8f9</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>