PyPtt 2.0.8__tar.gz → 2.0.10__tar.gz

{pyptt-2.0.8 → pyptt-2.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.0.8
+Version: 2.0.10
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.0.8 → pyptt-2.0.10}/PyPtt/PTT.py

@@ -53,6 +53,7 @@ class API:
             logger_callback (Callable): PyPtt 顯示訊息的 callback。預設為 None。
             port (int): PyPtt 連線的 port。預設為 **23**。
             host (:ref:`host`): PyPtt 連線的 PTT 伺服器。預設為 **PTT1**。
+            verify_ssl (bool): 是否驗證 PTT server 端的 TLS 憑證。預設為 **True**。若你的網路環境透過 SSL 攔截 proxy（如企業防火牆），可設為 **False** 以停用驗證。
             check_update (bool): 是否檢查 PyPtt 的更新。預設為 **False**。
 
         Returns:
@@ -145,6 +146,10 @@ class API:
             raise exceptions.ParameterError('[PyPtt] TELNET is not available on PTT1 and PTT2')
         self.config.connect_mode = connect_mode
 
+        verify_ssl = kwargs.get('verify_ssl', True)
+        check_value.check_type(verify_ssl, bool, 'verify_ssl')
+        self.config.verify_ssl = verify_ssl
+
         self.connect_core = connect_core.API(self)
         self._exist_board_list = set()
         self._exist_user_list = set()

{pyptt-2.0.8 → pyptt-2.0.10}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.0.8'
+__version__ = '2.0.10'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.0.8 → pyptt-2.0.10}/PyPtt/config.py

@@ -36,6 +36,9 @@ class Config:
     # 預設使用 23
     port = 23
 
+    # 預設驗證 server 端 TLS 憑證；設為 False 可在 SSL 攔截 proxy 環境下使用
+    verify_ssl = True
+
     logger_callback = None
 
 

{pyptt-2.0.8 → pyptt-2.0.10}/PyPtt/connect_core.py

@@ -32,12 +32,15 @@ except AttributeError:
     websockets.http11.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
     use_http11 = True
 
-ssl_context = None
-
-
-def ssl_init():
-    global ssl_context
-
+def ssl_init(verify_ssl: bool = True) -> ssl.SSLContext:
+    # Verify the PTT server certificate against the system CA bundle.
+    # The client cert loaded below is *not* for identity (PTT does not
+    # validate it); it exists purely to make the TLS handshake succeed in
+    # environments where omitting a Certificate message breaks negotiation.
+    # See PyPtt/ssl_config.py for details.
+    #
+    # Pass verify_ssl=False only when connecting through an SSL-inspecting
+    # proxy whose CA cert is not in the system trust store.
     cert_file = tempfile.NamedTemporaryFile(delete=False, suffix='.pem')
     cert_file.write(ssl_config.cert.encode('utf-8'))
 
@@ -47,17 +50,18 @@ def ssl_init():
     cert_file.close()
     key_file.close()
 
-    ssl_context = ssl.create_default_context()
-    ssl_context.check_hostname = False
-    ssl_context.load_cert_chain(certfile=cert_file.name, keyfile=key_file.name)
-    ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
-    ssl_context.verify_mode = ssl.CERT_NONE
+    ctx = ssl.create_default_context()
+    ctx.load_cert_chain(certfile=cert_file.name, keyfile=key_file.name)
+    ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+
+    if not verify_ssl:
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
 
     os.unlink(cert_file.name)
     os.unlink(key_file.name)
 
-
-ssl_init()
+    return ctx
 
 
 class TargetUnit:
@@ -153,6 +157,7 @@ class API(object):
         self._UseTooManyResources = TargetUnit(screens.Target.use_too_many_resources,
                                                exceptions_=exceptions.UseTooManyResources())
         self._loop = None
+        self._ssl_context = ssl_init(self.config.verify_ssl)
 
     def _get_event_loop(self):
         if self._loop and not self._loop.is_closed():
@@ -208,7 +213,7 @@ class API(object):
                     websockets.connect(
                         websocket_host,
                         origin=websocket_origin,
-                        ssl=ssl_context))
+                        ssl=self._ssl_context))
                 connect_success = True
                 break
             except Exception as e:

pyptt-2.0.10/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMm/frEbk7WCyFvGd+CJveLnElsKhBDuk6ktPOYSI+/OoAoGCCqGSM49
+AwEHoUQDQgAE7KtBn7Lmzl9czBvQE/7jgt0DdQkPLQjUREYpUsGjRB7Xlk+CsL2c
+xr1FQ8AcCxSu9SO0wTqAA4b9gNNeLngcbw==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFGmCwd8Y9oagOeoSh2eZ9db35aYiMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA1MjMwNzUyMDdaFw0zNjA1MjAwNzUy
+MDdaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABOyrQZ+y5s5fXMwb0BP+44LdA3UJDy0I1ERGKVLBo0Qe15ZPgrC9nMa9
+RUPAHAsUrvUjtME6gAOG/YDTXi54HG8wCgYIKoZIzj0EAwIDSAAwRQIhAIgEj0dk
+SCeLrNNnwJve2a9RoGJd1NcpbktIvVReEzucAiAqRcoLZcwz2d+a4Oo6ZDFPrfgD
+AXdRDfcTsVIzE7yqeg==
+-----END CERTIFICATE-----
+"""

{pyptt-2.0.8 → pyptt-2.0.10}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.0.8
+Version: 2.0.10
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

pyptt-2.0.8/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIERB+UA+r+F9qEtBJ52f9p3sWAQkNIl0UZJv6O3vj3qtoAoGCCqGSM49
-AwEHoUQDQgAEgTo7bZCEZpOdQa2o6P6KnSyVhfsFpvnEK0FGiU/V6xz6XWUMIVSy
-+7dG5zGx7/OHa3iK6txCh11mPb+w/DYe8w==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6TCCAY8CFCwmWlM+i2IbtHKF0gLrHa2/PqvPMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA0MDUxNTIyNTZaFw0zNjA0MDIxNTIy
-NTZaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABIE6O22QhGaTnUGtqOj+ip0slYX7Bab5xCtBRolP1esc+l1lDCFUsvu3
-Rucxse/zh2t4iurcQoddZj2/sPw2HvMwCgYIKoZIzj0EAwIDSAAwRQIgc2K0N6II
-gvywv1b/rDjIhQdXK6/TF62MWyk5GtrX7N0CIQCMyhwOeA+HYyh4yBbrbP5pA70b
-n6j6snhIR6x2l0HWSw==
------END CERTIFICATE-----
-"""