Merge PR #6594: FIX(client): Don't assume SSL error == SSL version mi…

…smatch
mumble-voip · Oct 4, 2024 · 7ef9b74 · 7ef9b74
2 parents 4148f9b + 1329381
commit 7ef9b74
Show file tree

Hide file tree

Showing 46 changed files with 565 additions and 364 deletions.
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
@@ -3618,10 +3618,31 @@ void MainWindow::serverDisconnected(QAbstractSocket::SocketError err, QString re
 			}
 		}
 	} else if (err == QAbstractSocket::SslHandshakeFailedError) {
-		QMessageBox::warning(this, tr("SSL Version mismatch"),
-							 tr("This server is using an older encryption standard, and is no longer supported by "
-								"modern versions of Mumble."),
-							 QMessageBox::Ok);
+		QMessageBox msgBox;
+		msgBox.addButton(QMessageBox::Ok);
+		msgBox.setIcon(QMessageBox::Warning);
+		msgBox.setTextFormat(Qt::RichText);
+		msgBox.setWindowTitle(tr("SSL error"));
+		msgBox.setText(tr("Mumble is unable to establish a secure connection to the server. (\"%1\")").arg(reason));
+		// clang-format off
+		msgBox.setInformativeText(
+			tr("This could be caused by one of the following scenarios:"
+			   "<ul>"
+			       "<li>Your client and the server use different encryption standards. This could be because you are using "
+			       "a very old client or the server you are connecting to is very old. In the first case, you should update "
+			       "your client and in the second case you should contact the server administrator so that they can update "
+				   "their server.</li>"
+				   "<li>Either your client or the server is using an old operating system that doesn't provide up-to-date "
+				   "encryption methods. In this case you should consider updating your OS or contacting the server admin "
+				   "so that they can update theirs.</li>"
+				   "<li>The server you are connecting to isn't actually a Mumble server. Please ensure that the used server "
+				   "address really belongs to a Mumble server and not e.g. to a game server.</li>"
+				   "<li>The port you are connecting to does not belong to a Mumble server but instead is bound to a "
+				   "completely unrelated process on the server-side. Please double-check you have used the correct port.</li>"
+				"</ul>"));
+		// clang-format on
+
+		msgBox.exec();
 	} else {
 		bool ok = false;
 

diff --git a/src/mumble/mumble_ar.ts b/src/mumble/mumble_ar.ts
@@ -5159,10 +5159,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSL Version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Server connection failed.</source>
         <translation type="unfinished"></translation>
@@ -5384,10 +5380,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;b&gt;WARNING:&lt;/b&gt; The server presented a certificate that was different from the stored one.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>This server is using an older encryption standard, and is no longer supported by modern versions of Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Server connection failed: %1.</source>
         <translation type="unfinished"></translation>
@@ -7011,6 +7003,18 @@ Valid options are:
         <source>This will toggle positional audio on/off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSL error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mumble is unable to establish a secure connection to the server. (&quot;%1&quot;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This could be caused by one of the following scenarios:&lt;ul&gt;&lt;li&gt;Your client and the server use different encryption standards. This could be because you are using a very old client or the server you are connecting to is very old. In the first case, you should update your client and in the second case you should contact the server administrator so that they can update their server.&lt;/li&gt;&lt;li&gt;Either your client or the server is using an old operating system that doesn&apos;t provide up-to-date encryption methods. In this case you should consider updating your OS or contacting the server admin so that they can update theirs.&lt;/li&gt;&lt;li&gt;The server you are connecting to isn&apos;t actually a Mumble server. Please ensure that the used server address really belongs to a Mumble server and not e.g. to a game server.&lt;/li&gt;&lt;li&gt;The port you are connecting to does not belong to a Mumble server but instead is bound to a completely unrelated process on the server-side. Please double-check you have used the correct port.&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

diff --git a/src/mumble/mumble_bg.ts b/src/mumble/mumble_bg.ts
@@ -5156,10 +5156,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSL Version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Server connection failed.</source>
         <translation type="unfinished"></translation>
@@ -5381,10 +5377,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;b&gt;WARNING:&lt;/b&gt; The server presented a certificate that was different from the stored one.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>This server is using an older encryption standard, and is no longer supported by modern versions of Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Server connection failed: %1.</source>
         <translation type="unfinished"></translation>
@@ -7008,6 +7000,18 @@ Valid options are:
         <source>This will toggle positional audio on/off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSL error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mumble is unable to establish a secure connection to the server. (&quot;%1&quot;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This could be caused by one of the following scenarios:&lt;ul&gt;&lt;li&gt;Your client and the server use different encryption standards. This could be because you are using a very old client or the server you are connecting to is very old. In the first case, you should update your client and in the second case you should contact the server administrator so that they can update their server.&lt;/li&gt;&lt;li&gt;Either your client or the server is using an old operating system that doesn&apos;t provide up-to-date encryption methods. In this case you should consider updating your OS or contacting the server admin so that they can update theirs.&lt;/li&gt;&lt;li&gt;The server you are connecting to isn&apos;t actually a Mumble server. Please ensure that the used server address really belongs to a Mumble server and not e.g. to a game server.&lt;/li&gt;&lt;li&gt;The port you are connecting to does not belong to a Mumble server but instead is bound to a completely unrelated process on the server-side. Please double-check you have used the correct port.&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

diff --git a/src/mumble/mumble_br.ts b/src/mumble/mumble_br.ts
@@ -5155,10 +5155,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSL Version mismatch</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Server connection failed.</source>
         <translation type="unfinished"></translation>
@@ -5380,10 +5376,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;b&gt;WARNING:&lt;/b&gt; The server presented a certificate that was different from the stored one.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>This server is using an older encryption standard, and is no longer supported by modern versions of Mumble.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Server connection failed: %1.</source>
         <translation type="unfinished"></translation>
@@ -7007,6 +6999,18 @@ Valid options are:
         <source>This will toggle positional audio on/off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSL error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mumble is unable to establish a secure connection to the server. (&quot;%1&quot;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This could be caused by one of the following scenarios:&lt;ul&gt;&lt;li&gt;Your client and the server use different encryption standards. This could be because you are using a very old client or the server you are connecting to is very old. In the first case, you should update your client and in the second case you should contact the server administrator so that they can update their server.&lt;/li&gt;&lt;li&gt;Either your client or the server is using an old operating system that doesn&apos;t provide up-to-date encryption methods. In this case you should consider updating your OS or contacting the server admin so that they can update theirs.&lt;/li&gt;&lt;li&gt;The server you are connecting to isn&apos;t actually a Mumble server. Please ensure that the used server address really belongs to a Mumble server and not e.g. to a game server.&lt;/li&gt;&lt;li&gt;The port you are connecting to does not belong to a Mumble server but instead is bound to a completely unrelated process on the server-side. Please double-check you have used the correct port.&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

diff --git a/src/mumble/mumble_ca.ts b/src/mumble/mumble_ca.ts
@@ -5217,10 +5217,6 @@ El paràmetre només serà per als missatges nous, els que ja s&apos;han mostrat
         <source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;Concretament els errors d&apos;aquest certificat són:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Voleu acceptar aquest certificat de totes maneres?&lt;br /&gt;(També s&apos;emmagatzemarà per tal que no se li tornarà a demanar això.)&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>SSL Version mismatch</source>
-        <translation>La versió SSL no coincideix</translation>
-    </message>
     <message>
         <source>Server connection failed.</source>
         <translation>Ha fallat la connexió al servidor.</translation>
@@ -5442,10 +5438,6 @@ El paràmetre només serà per als missatges nous, els que ja s&apos;han mostrat
         <source>&lt;b&gt;WARNING:&lt;/b&gt; The server presented a certificate that was different from the stored one.</source>
         <translation>&lt;b&gt;AVÍS:&lt;/b&gt; El servidor ha presentar un certificat diferent de l&apos;emmagatzemat.</translation>
     </message>
-    <message>
-        <source>This server is using an older encryption standard, and is no longer supported by modern versions of Mumble.</source>
-        <translation>Aquest servidor està utilitzant una encriptació estàndard més antiga, i ja no està recolzat per les versions actuals del Mumble.</translation>
-    </message>
     <message>
         <source>Server connection failed: %1.</source>
         <translation>Ha fallat la connexió del servidor: %1.</translation>
@@ -7161,6 +7153,18 @@ Les opcions vàlides són:
         <source>This will toggle positional audio on/off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSL error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mumble is unable to establish a secure connection to the server. (&quot;%1&quot;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This could be caused by one of the following scenarios:&lt;ul&gt;&lt;li&gt;Your client and the server use different encryption standards. This could be because you are using a very old client or the server you are connecting to is very old. In the first case, you should update your client and in the second case you should contact the server administrator so that they can update their server.&lt;/li&gt;&lt;li&gt;Either your client or the server is using an old operating system that doesn&apos;t provide up-to-date encryption methods. In this case you should consider updating your OS or contacting the server admin so that they can update theirs.&lt;/li&gt;&lt;li&gt;The server you are connecting to isn&apos;t actually a Mumble server. Please ensure that the used server address really belongs to a Mumble server and not e.g. to a game server.&lt;/li&gt;&lt;li&gt;The port you are connecting to does not belong to a Mumble server but instead is bound to a completely unrelated process on the server-side. Please double-check you have used the correct port.&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>

diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts
@@ -5210,10 +5210,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;p&gt;%1&lt;/p&gt;&lt;ul&gt;%2&lt;/ul&gt;&lt;p&gt;The specific errors with this certificate are:&lt;/p&gt;&lt;ol&gt;%3&lt;/ol&gt;&lt;p&gt;Do you wish to accept this certificate anyway?&lt;br /&gt;(It will also be stored so you won&apos;t be asked this again.)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSL Version mismatch</source>
-        <translation>Neshoda verze SSL</translation>
-    </message>
     <message>
         <source>Server connection failed.</source>
         <translation type="unfinished"></translation>
@@ -5435,10 +5431,6 @@ The setting only applies for new messages, the already shown ones will retain th
         <source>&lt;b&gt;WARNING:&lt;/b&gt; The server presented a certificate that was different from the stored one.</source>
         <translation>&lt;b&gt;VAROVÁNÍ:&lt;/b&gt; Server předložil certifikát, který se liší od uloženého.</translation>
     </message>
-    <message>
-        <source>This server is using an older encryption standard, and is no longer supported by modern versions of Mumble.</source>
-        <translation>Tento server používá starý šifrovací standard, a nebude nadále podporován novými verzemi Mumble.</translation>
-    </message>
     <message>
         <source>Server connection failed: %1.</source>
         <translation>Připojování k serveru selhalo: %1.</translation>
@@ -7067,6 +7059,18 @@ Valid options are:
         <source>This will toggle positional audio on/off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSL error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mumble is unable to establish a secure connection to the server. (&quot;%1&quot;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This could be caused by one of the following scenarios:&lt;ul&gt;&lt;li&gt;Your client and the server use different encryption standards. This could be because you are using a very old client or the server you are connecting to is very old. In the first case, you should update your client and in the second case you should contact the server administrator so that they can update their server.&lt;/li&gt;&lt;li&gt;Either your client or the server is using an old operating system that doesn&apos;t provide up-to-date encryption methods. In this case you should consider updating your OS or contacting the server admin so that they can update theirs.&lt;/li&gt;&lt;li&gt;The server you are connecting to isn&apos;t actually a Mumble server. Please ensure that the used server address really belongs to a Mumble server and not e.g. to a game server.&lt;/li&gt;&lt;li&gt;The port you are connecting to does not belong to a Mumble server but instead is bound to a completely unrelated process on the server-side. Please double-check you have used the correct port.&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manual</name>