Changeset 1181:52dda2b6d0eb

Timestamp:

12/29/24 13:34:24 (4 days ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Tags:

tip

Message:

The Trac server can be accessed with password authentication only

Files:

• setup.py (modified) (1 diff)
• src/mlx/gui/gui.py (modified) (1 diff)
• src/mlx/web.py (modified) (6 diffs)

setup.py

@@ -51 +51 @@
 
 rootFiles = ["logo.png", "conn_grey.png", "conn_red.png", "conn_green.png",
-             "mavalogo.png", "fleet.json", "gates.json"]
+             "mavalogo.png", "fleet.json", "gates.json", "bugreport.txt"]
 if os.name!="nt":
     rootFiles.append("Microsoft.VC90.CRT.manifest")

src/mlx/gui/gui.py

@@ -105 +105 @@
         self._bookFlightsBusyCallback = None
 
-        self.webHandler = web.Handler(config, self._getCredentialsCallback)
+        self.webHandler = web.Handler(config, self._getCredentialsCallback,
+                                      programDirectory)
         self.webHandler.start()
 

src/mlx/web.py

@@ -24 +24 @@
 import certifi
 import base64
+import os.path
+import ssl
 
 #---------------------------------------------------------------------------------------
@@ -723 +725 @@
 #------------------------------------------------------------------------------
 
+class BugReportPasswordManager:
+    """Password manager for the Trac XML-RPC server"""
+    def __init__(self, programDirectory):
+        """Construct the password manager by reading the password from
+        the bugreport.txt file"""
+        with open(os.path.join(programDirectory, "bugreport.txt")) as f:
+            self._password = f.read().strip()
+
+    def add_password(self, realm, uri, username, password):
+        pass
+
+    def find_user_password(self, realm, uri):
+        return ("mlxbugreport", self._password)
+
+#------------------------------------------------------------------------------
+
+class BugReportTransport(xmlrpc.client.Transport):
+    """A transport for digest authentication towards the Trac XML-RPC server"""
+    verbose = True
+
+    def __init__(self, programDirectory):
+        """Construct the transport for the given program directory."""
+        super().__init__()
+
+        sslContext = ssl.create_default_context(ssl.Purpose.SERVER_AUTH,
+                                                cafile = certifi.where())
+        sslContext.set_alpn_protocols(['http/1.1'])
+        httpsHandler = urllib.request.HTTPSHandler(context = sslContext)
+
+        authHandler = urllib.request.HTTPDigestAuthHandler(
+            BugReportPasswordManager(programDirectory))
+
+        self._opener = urllib.request.build_opener(httpsHandler, authHandler)
+
+    def single_request(self, host, handler, request_body, verbose=False):
+        """Perform a single request"""
+        url = "https://" + host + handler
+        request = urllib.request.Request(url, data = request_body)
+        request.add_header("User-Agent", self.user_agent)
+        request.add_header("Content-Type", "text/xml")
+
+        with self._opener.open(request) as f:
+            if f.status==200:
+                return self.parse_response(f)
+            else:
+                raise xmlrpc.client.ProtocolError(
+                    host + handler,
+                    f.status, f.reason,
+                    f.getheaders())
+
+#------------------------------------------------------------------------------
+
 class SendBugReport(Request):
     """A request to send a bug report to the project homepage."""
     _latin2Encoder = codecs.getencoder("iso-8859-2")
 
-    def __init__(self, callback, summary, description, email, debugLog):
+    def __init__(self, callback, summary, description, email, debugLog,
+                 transport):
         """Construct the request for the given bug report."""
         super(SendBugReport, self).__init__(callback)
@@ -734 +789 @@
         self._email = email
         self._debugLog = debugLog
+        self._transport = transport
 
     def run(self):
         """Perform the sending of the bug report."""
-        serverProxy = xmlrpc.client.ServerProxy("http://mlx.varadiistvan.hu/rpc")
-
+        serverProxy = xmlrpc.client.ServerProxy("https://mlx.varadiistvan.hu/login/rpc",
+                                                transport = self._transport)
         result = Result()
         result.success = False
@@ -905 +961 @@
     It can process one request at a time. The results are passed to a callback
     function."""
-    def __init__(self, config, getCredentialsFn):
+    def __init__(self, config, getCredentialsFn, programDirectory):
         """Construct the handler."""
         super(Handler, self).__init__()
@@ -917 +973 @@
         if config.rememberPassword:
             self._rpcClient.setCredentials(config.pilotID, config.password)
+        self._bugReportTransport = BugReportTransport(programDirectory)
 
     def register(self, callback, registrationData):
@@ -964 +1021 @@
         """Send a bug report with the given data."""
         self._addRequest(SendBugReport(callback, summary, description, email,
-                                       debugLog = debugLog))
+                                       debugLog = debugLog,
+                                       transport = self._bugReportTransport))
 
     def setCheckFlightPassed(self, callback, aircraftType):