Changeset 1191:0db341c8c3b3 for src/mlx

Timestamp:

05/30/25 17:37:04 (2 days ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Tags:

tip

Message:

context is used instead of cafile in urlopen()

Location:

src/mlx

Files:

• common.py (modified) (2 diffs)
• gui/flight.py (modified) (2 diffs)
• rpc.py (modified) (3 diffs)
• update.py (modified) (3 diffs)
• web.py (modified) (3 diffs)

src/mlx/common.py

@@ -1 +1 @@
 import os
+import ssl
+import certifi
 
 #-----------------------------------------------------------------------------
@@ -44 +46 @@
 
     return newDict
+
+#-------------------------------------------------------------------------------
+
+sslContext = ssl.create_default_context(cafile = certifi.where())

src/mlx/gui/flight.py

@@ -30 +30 @@
 from io import StringIO
 import lxml.html
-import certifi
 
 #-----------------------------------------------------------------------------
@@ -3883 +3882 @@
 
             # Obtaining the xml
-            response = urllib.request.urlopen(link,
-                                              cafile = certifi.where())
+            response = urllib.request.urlopen(link, context = sslContext)
             content = etree.iterparse(response)
 

src/mlx/rpc.py

@@ -3 +3 @@
 from . import gates
 
-from .common import MAVA_BASE_URL, fixUnpickled
+from .common import MAVA_BASE_URL, fixUnpickled, sslContext
 
 import jsonrpclib
@@ -10 +10 @@
 import calendar
 import sys
-import ssl
-import certifi
 
 #---------------------------------------------------------------------------------------
@@ -727 +725 @@
         self._getCredentialsFn = getCredentialsFn
 
-        sslContext = ssl.SSLContext()
-        sslContext.load_verify_locations(cafile = certifi.where())
         transport = jsonrpclib.jsonrpc.SafeTransport(jsonrpclib.config.DEFAULT,
                                                      sslContext)

src/mlx/update.py

@@ -12 +12 @@
 import traceback
 import io
-import certifi
 
 if os.name=="nt":
@@ -233 +232 @@
     f = None
     try:
+        from .common import sslContext
+
         updateManifest = Manifest()
         reply = urllib.request.urlopen(updateURL + "/" + manifestName,
-                                       cafile = certifi.where())
+                                       context = sslContext)
         charset = reply.headers.get_content_charset()
         content = reply.read().decode("utf-8" if charset is None else charset)
@@ -370 +371 @@
                 
             with open(targetFile, "wb") as fout:
+                from .common import sslContext
+
                 fin = urllib.request.urlopen(updateURL + "/" + path,
-                                             cafile = certifi.where())
+                                             context = sslContext)
                 while True:
                     data = fin.read(256*1024)

src/mlx/web.py

@@ -6 +6 @@
 from . import rpccommon
 
-from .common import MAVA_BASE_URL
+from .common import MAVA_BASE_URL, sslContext
 from .pirep import PIREP
 
@@ -629 +629 @@
                 "cookie": "akamai_pilotweb_access=true;"
             });
-            f = urllib.request.urlopen(request, timeout = 10.0, cafile=certifi.where())
+            f = urllib.request.urlopen(request, timeout = 10.0,
+                                       context = sslContext)
             try:
                 data = f.read(16384)
@@ -666 +667 @@
         try:
             url += data
-            f = urllib.request.urlopen(url, timeout = 10.0, cafile = certifi.where())
+            f = urllib.request.urlopen(url, timeout = 10.0,
+                                       context = sslContext)
             try:
                 for line in f.readlines():