From c52b6236795066b5d3eb10416561cf85394f6e52 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Mon, 19 Aug 2024 20:38:20 +0200
Subject: [PATCH] Fixed port not available.

---
 pnpm-lock.yaml              |  2 +-
 src/package.json            |  2 +-
 src/tests/backend/common.ts | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 867e0e0ac..9940d4491 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -144,7 +144,7 @@ importers:
   src:
     dependencies:
       '@etherpad/express-session':
-        specifier: ^1.18.4
+        specifier: 1.18.4
         version: 1.18.4
       async:
         specifier: ^3.2.5
diff --git a/src/package.json b/src/package.json
index 89226afd2..aa90a2709 100644
--- a/src/package.json
+++ b/src/package.json
@@ -30,7 +30,7 @@
     }
   ],
   "dependencies": {
-    "@etherpad/express-session": "^1.18.4",
+    "@etherpad/express-session": "1.18.4",
     "async": "^3.2.5",
     "axios": "^1.7.4",
     "cookie-parser": "^1.4.6",
diff --git a/src/tests/backend/common.ts b/src/tests/backend/common.ts
index 4f3937546..993c863bf 100644
--- a/src/tests/backend/common.ts
+++ b/src/tests/backend/common.ts
@@ -17,6 +17,7 @@ import {Http2Server} from "node:http2";
 import {SignJWT} from "jose";
 import {privateKeyExported} from "../../node/security/OAuth2Provider";
 const webaccess = require('../../node/hooks/express/webaccess');
+import crypto from 'crypto';
 
 const backups:MapArrayType<any> = {};
 let agentPromise:Promise<any>|null = null;
@@ -74,16 +75,22 @@ export const init = async function () {
                 'To enable non-test logging, change the loglevel setting to DEBUG.');
   }
 
+  const generateRandomPort = () => {
+    const minPort = 1024;
+    const maxPort = 65535;
+    return crypto.randomInt(minPort, maxPort + 1);
+  };
+
   // Note: This is only a shallow backup.
   backups.settings = Object.assign({}, settings);
   // Start the Etherpad server on a random unused port.
-  settings.port = 0;
+  settings.port = generateRandomPort();
   settings.ip = 'localhost';
   settings.importExportRateLimiting = {max: 999999};
   settings.commitRateLimiting = {duration: 0.001, points: 1e6};
   httpServer = await server.start();
   // @ts-ignore
-  baseUrl = `http://localhost:${httpServer!.address()!.port}`;
+  baseUrl = `http://localhost:${settings.port}`;
   logger.debug(`HTTP server at ${baseUrl}`);
   // Create a supertest user agent for the HTTP server.
   agent = supertest(baseUrl)