From 3c68f4dc40820b63fc719a422e5e4d4143d29a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Sat, 19 Sep 2026 07:18:09 +0200
Subject: [PATCH] [Settings] Match a server on the exact host and port when
 adding it

---
 .../settings/servers_settings.cpp             | 64 ++++++++++++++-----
 .../libcockatrice/settings/servers_settings.h |  7 ++
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
index 811b0c842..436e260c5 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
@@ -171,7 +171,12 @@ void ServersSettings::addNewServer(const QString &saveName,
                                    bool savePassword,
                                    const QString &site)
 {
-    if (updateExistingServer(saveName, serv, port, username, password, savePassword, site)) {
+    // Match the exact host-plus-port server the caller is adding, so a link or
+    // public-server list entry cannot clobber the port (and credentials) of an
+    // unrelated entry that happens to share the same hostname.
+    const int existingIndex = findServerIndex(serv, port);
+    if (existingIndex >= 0) {
+        updateServerFields(existingIndex, saveName, username, password, savePassword, site);
         return;
     }
 
@@ -271,22 +276,7 @@ bool ServersSettings::updateExistingServer(QString saveName,
     for (int i = 0; i <= size; ++i) {
         if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
             setValue(port, QString("port%1").arg(i), "server", "server_details");
-            if (!username.isEmpty()) {
-                setValue(username, QString("username%1").arg(i), "server", "server_details");
-            }
-
-            if (savePassword && !password.isEmpty()) {
-                setValue(password, QString("password%1").arg(i), "server", "server_details");
-            } else {
-                setValue(QString(), QString("password%1").arg(i), "server", "server_details");
-            }
-
-            if (!site.isEmpty()) {
-                setValue(site, QString("site%1").arg(i), "server", "server_details");
-            }
-
-            setValue(savePassword, QString("savePassword%1").arg(i), "server", "server_details");
-            setValue(saveName, QString("saveName%1").arg(i), "server", "server_details");
+            updateServerFields(i, saveName, username, password, savePassword, site);
 
             return true;
         }
@@ -294,6 +284,31 @@ bool ServersSettings::updateExistingServer(QString saveName,
     return false;
 }
 
+void ServersSettings::updateServerFields(int index,
+                                         const QString &saveName,
+                                         const QString &username,
+                                         const QString &password,
+                                         bool savePassword,
+                                         const QString &site)
+{
+    if (!username.isEmpty()) {
+        setValue(username, QString("username%1").arg(index), "server", "server_details");
+    }
+
+    if (savePassword && !password.isEmpty()) {
+        setValue(password, QString("password%1").arg(index), "server", "server_details");
+    } else {
+        setValue(QString(), QString("password%1").arg(index), "server", "server_details");
+    }
+
+    if (!site.isEmpty()) {
+        setValue(site, QString("site%1").arg(index), "server", "server_details");
+    }
+
+    setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details");
+    setValue(saveName, QString("saveName%1").arg(index), "server", "server_details");
+}
+
 int ServersSettings::findServerIndex(const QString &host, const QString &port) const
 {
     int size = getValue("totalServers", "server", "server_details").toInt();
@@ -310,6 +325,21 @@ int ServersSettings::findServerIndex(const QString &host, const QString &port) c
     return -1;
 }
 
+int ServersSettings::findHostIndex(const QString &host) const
+{
+    int size = getValue("totalServers", "server", "server_details").toInt();
+
+    for (int i = 0; i <= size; ++i) {
+        QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString();
+
+        if (storedHost.compare(host, Qt::CaseInsensitive) == 0) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
 bool ServersSettings::hasUsername(const QString &host, const QString &port) const
 {
     int index = findServerIndex(host, port);
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
index f9803a158..93651c813 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
@@ -61,7 +61,14 @@ public:
                               QString password,
                               bool savePassword,
                               QString site = QString());
+    void updateServerFields(int index,
+                            const QString &saveName,
+                            const QString &username,
+                            const QString &password,
+                            bool savePassword,
+                            const QString &site);
     int findServerIndex(const QString &host, const QString &port) const;
+    int findHostIndex(const QString &host) const;
     bool hasUsername(const QString &host, const QString &port) const;
     bool hasCredentials(const QString &host, const QString &port) const;
     bool hasLoginData(const QString &host, const QString &port) const;