Disconnect both sockets on user report

Author: lovasoa

server/sockets.js

@@ -42,6 +42,8 @@ var destructiveRateLimits = new Map();
 var constructiveRateLimits = new Map();
 /** @type {Map<string, Map<string, BoardUser>>} */
 var boardUsers = new Map();
+/** @type {Map<string, AppSocket>} */
+var activeSockets = new Map();
 var connectedUsersTotal = 0;
 /** @type {{
  *   board: string,
@@ -492,6 +494,14 @@ function closeSocket(socket, eventName, infos) {
   socket.disconnect(true);
 }
 
+/**
+ * @param {string} socketId
+ * @returns {AppSocket | undefined}
+ */
+function getActiveSocket(socketId) {
+  return activeSockets.get(socketId);
+}
+
 /**
  * @param {AppSocket} socket
  * @param {string} eventName
@@ -1071,6 +1081,8 @@ function getBoard(name) {
  * @param {AppSocket} socket
  */
 function handleSocketConnection(socket) {
+  activeSockets.set(socket.id, socket);
+
   /**
    * Function to call when an user joins a board
    * @param {string} name
@@ -1480,6 +1492,23 @@ function handleSocketConnection(socket) {
             reporter_name: lastUserReportLog.reporter_name,
             reported_name: lastUserReportLog.reported_name,
           });
+
+          var socketsToDisconnect = [socket];
+          var reportedSocket = getActiveSocket(reported.socketId);
+          if (reportedSocket && reportedSocket !== socket) {
+            socketsToDisconnect.push(reportedSocket);
+          }
+
+          socketsToDisconnect.forEach(
+            function disconnectReportedUser(
+              /** @type {AppSocket} */ targetSocket,
+            ) {
+              closeSocket(targetSocket, "report_user", {
+                board: boardName,
+                socket: targetSocket.id,
+              });
+            },
+          );
         },
       );
     }, "report_user"),
@@ -1488,6 +1517,7 @@ function handleSocketConnection(socket) {
   socket.on(
     "disconnecting",
     function onDisconnecting(/** @type {string} */ reason) {
+      activeSockets.delete(socket.id);
       socket.rooms.forEach(
         async function disconnectFrom(/** @type {string} */ room) {
           if (boards.hasOwnProperty(room)) {
@@ -1605,6 +1635,7 @@ if (exports) {
       destructiveRateLimits.clear();
       constructiveRateLimits.clear();
       boardUsers.clear();
+      activeSockets.clear();
       lastUserReportLog = null;
     },
   };

test-node/socket_users.test.js

@@ -412,6 +412,7 @@ test("report_user logs reporter and reported user details for active board membe
       });
       sockets.__test.handleSocketConnection(reporter.socket);
       await getRequiredHandler(reporter.handlers, "getboard")("board-report");
+      const reporterEmitCountBeforeReport = reporter.emitted.length;
 
       const reported = createSocket({
         id: "socket-reported",
@@ -429,6 +430,7 @@ test("report_user logs reporter and reported user details for active board membe
       });
       sockets.__test.handleSocketConnection(reported.socket);
       await getRequiredHandler(reported.handlers, "getboard")("board-report");
+      const reportedEmitCountBeforeReport = reported.emitted.length;
 
       getRequiredHandler(
         reporter.handlers,
@@ -448,6 +450,10 @@ test("report_user logs reporter and reported user details for active board membe
       assert.equal(reportedLog.reported_user_agent, "ReportedAgent/2.0");
       assert.equal(reportedLog.reporter_language, "fr-FR,fr;q=0.9");
       assert.equal(reportedLog.reported_language, "en-US,en;q=0.8");
+      assert.deepEqual(reporter.socket.disconnectCalls, [true]);
+      assert.deepEqual(reported.socket.disconnectCalls, [true]);
+      assert.equal(reporter.emitted.length, reporterEmitCountBeforeReport);
+      assert.equal(reported.emitted.length, reportedEmitCountBeforeReport);
     },
   );
 });