From 06945b39331a471b2b6b14e0f38a31c6720e3146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Alberto=20D=C3=ADaz=20Orozco?=
 <jorge.diaz@riskident.com>
Date: Wed, 2 Oct 2024 13:37:10 +0200
Subject: [PATCH] Add a mutex and used ports list to the random port generator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

to avoid port collisions

Signed-off-by: Jorge Alberto Díaz Orozco <diazorozcoj@gmail.com>
---
 util/testutil/port.go | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/util/testutil/port.go b/util/testutil/port.go
index 1e449b123..7cf4cf1cc 100644
--- a/util/testutil/port.go
+++ b/util/testutil/port.go
@@ -15,21 +15,56 @@ package testutil
 
 import (
 	"net"
+	"sync"
 	"testing"
 )
 
+var (
+	mu        sync.Mutex
+	usedPorts []int
+)
+
 // RandomUnprivilegedPort returns valid unprivileged random port number which can be used for testing.
 func RandomUnprivilegedPort(t *testing.T) int {
 	t.Helper()
+	mu.Lock()
+	defer mu.Unlock()
+
+	port, err := getPort()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for portWasUsed(port) {
+		port, err = getPort()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	usedPorts = append(usedPorts, port)
+
+	return port
+}
+
+func portWasUsed(port int) bool {
+	for _, usedPort := range usedPorts {
+		if port == usedPort {
+			return true
+		}
+	}
+	return false
+}
 
+func getPort() (int, error) {
 	listener, err := net.Listen("tcp", ":0")
 	if err != nil {
-		t.Fatalf("Listening on random port: %v", err)
+		return 0, err
 	}
 
 	if err := listener.Close(); err != nil {
-		t.Fatalf("Closing listener: %v", err)
+		return 0, err
 	}
 
-	return listener.Addr().(*net.TCPAddr).Port
+	return listener.Addr().(*net.TCPAddr).Port, nil
 }