Merge pull request #750 from Syncplay/tls-cnless-certs-fix

TLS: Support certificates without common name (Fixes #749)

Author: Et0h

syncplay/protocols.py

@@ -396,7 +396,18 @@ def customHandshakeCallback(self, conn, where, ret):
 
     def handshakeCompleted(self):
         self._serverCertificateTLS = self.transport.getPeerCertificate()
-        self._subjectTLS = self._serverCertificateTLS.get_subject().CN
+        if not self._serverCertificateTLS:
+            self._client.ui.showErrorMessage(getMessage("startTLS-server-certificate-invalid"))
+            self.sendHello()
+            return
+
+        for x in range(0,self._serverCertificateTLS.get_extension_count()):
+            if (self._serverCertificateTLS.get_extension(x).get_short_name() == b'subjectAltName'):
+                self._subjectTLS = self._serverCertificateTLS.get_extension(x).__str__().replace("DNS:", "")
+
+        if not self._subjectTLS:
+            self._subjectTLS = self._client._config.get("host", "") or ""
+
         self._issuerTLS = self._serverCertificateTLS.get_issuer().CN
         self._expiredTLS =self._serverCertificateTLS.has_expired()
         self._expireDateTLS = datetime.strptime(self._serverCertificateTLS.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ')