testmatrix 0.2.2__tar.gz → 0.2.4__tar.gz

{testmatrix-0.2.2 → testmatrix-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testmatrix
-Version: 0.2.2
+Version: 0.2.4
 Summary: A matrix server sanity tester
 Author-email: Sebastian Spaeth <Sebastian@SSpaeth.de>
 License-Expression: AGPL-3.0-or-later

{testmatrix-0.2.2 → testmatrix-0.2.4}/src/testmatrix/__init__.py

@@ -5,7 +5,7 @@
 from .matrixserver import MatrixServer
 from .jwtauth import JWTAuth
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 __all__ = ["MatrixServer", "JWTAuth"]
 
 # User Agent and possibly other required headers that we need for all requests

{testmatrix-0.2.2 → testmatrix-0.2.4}/src/testmatrix/jwtauth.py

@@ -38,7 +38,6 @@ class JWTAuth:
                 s = f"𐄂 DNS Error resolving host {self.baseurl}"
                 logging.error(s)
         else:
-            logging.debug("  JWTauth healtz url: %s", self.loganon(self.baseurl))
             if r.status_code == 404:
                 logging.info(" jwtauth healthz endpoint does not exist at %s (404)",
                                 self.loganon(url))

{testmatrix-0.2.2 → testmatrix-0.2.4}/src/testmatrix/matrixserver.py

@@ -65,9 +65,12 @@ class MatrixServer:
 
     def parse_livekit_json(self, livekit_json: Optional[list]) \
             -> Optional[bool]:
-        """Parses client well-known livekit parts and initiates self.livekits
+        """Parses livekit json parts and initiates self.livekits
+        It works both with the client well-known and the
+        /_matrix/client/v1/rtc/transports endpoint.
 
-        Returns True (success), False (no Livekit) or None (Error)"""
+        Returns True (success), False (no Livekit) or None (Error)
+        """
         self.livekits = []
         if livekit_json is None:
             self.livekits = None
@@ -86,8 +89,6 @@ class MatrixServer:
                 continue
             anon: bool = (self.args is not None) and self.args.anonymize
             self.livekits.append(JWTAuth(livekit["livekit_service_url"], anon))
-            logging.debug("  Adding livekit service URL: %s",
-                          livekit["livekit_service_url"])
         return len(self.livekits) > 0
 
     def get_server_baseurl(self) -> Optional[str]:
@@ -122,14 +123,18 @@ class MatrixServer:
                     logging.error("𐄂 Server well-known error %s", str(e))
         except requests.exceptions.JSONDecodeError as e:
             if self.diagnostics:
-                logging.error("𐄂 Server well known is no valid json")
+                logging.error("𐄂 Server well-known is no valid json")
         else:
-            self.federation_baseurl = "https://" + wellknown_server["m.server"]
-            if self.diagnostics:
-                logging.debug("  Federation url: %s",
-                              self.loganon(self.federation_baseurl,
-                                           self.servername))
-                logging.info("✔ Server well-known exists")
+            if not "m.server" in wellknown_server:
+                logging.warning("𐄂 Server well-known does not contain information about server!")
+            else:
+                self.federation_baseurl = \
+                    "https://" + wellknown_server["m.server"]
+                if self.diagnostics:
+                    logging.debug("  Federation url: %s",
+                                  self.loganon(self.federation_baseurl,
+                                               self.servername))
+                    logging.info("✔ Server well-known exists")
 
         # use default address in case of failed well-known
         if not self.federation_baseurl:
@@ -195,7 +200,9 @@ class MatrixServer:
             if self.diagnostics:
                 logging.error("𐄂 Client well known is no valid json")
         else:
-            self.client_baseurl = wellknown_client["m.homeserver"]["base_url"]
+            client_baseurl = wellknown_client["m.homeserver"]["base_url"]
+             # strip final dashes
+            self.client_baseurl = client_baseurl.rstrip("/")
             if self.diagnostics:
                 logging.debug("  Client url: %s",
                               self.loganon(self.client_baseurl,
@@ -217,7 +224,9 @@ class MatrixServer:
         # Retrieve array of livekit instances or None
         livekit_json = wellknown_client.get("org.matrix.msc4143.rtc_foci",
                                             None)
-        self.parse_livekit_json(livekit_json)
+        livekit_detected = self.parse_livekit_json(livekit_json)
+        if livekit_detected:
+            logging.debug("  Livekit detected via client .well-known (deprecated)")
         return self.client_baseurl
 
     def get_server_version(self) -> str:
@@ -343,6 +352,44 @@ class MatrixServer:
             logging.debug("✔ Server oauth metadata endpoint exists")
         return res
 
+    def test_rtc_endpoint_msc4195(self) -> bool:
+        """returns true if unstable rtc/transports returns info"""
+        res:bool = False # result
+        if self.args is None or self.args.token is None:
+            logging.info("  RTC Transport endpoint skipped, no auth token")
+            return False
+        try:
+            # TODO: once stable, use /_matrix/client/v1/rtc/transports
+            url = f"{self.client_baseurl}/_matrix/client/unstable/org.matrix.msc4143/rtc/transports"
+            headers = {"Authorization": f"Bearer {self.args.token}"}
+            headers.update(req_headers)
+            r = requests.get(url, headers = headers)
+            r.raise_for_status() # raise e.g. on 404
+            rtc_transports = r.json()
+            res = True
+        except requests.exceptions.HTTPError as e:
+            if e.response.status_code == 404:
+                logging.info("𐄂 RTC Transport (unstable) returns (404)")
+            elif e.response.status_code == 401:
+                logging.warning("𐄂 RTC Transport discovery needs authentication (use a token) (401)")
+            else:
+                logging.error("𐄂 RTC transport endpoints returns error %s", str(e))
+            res = False
+        except requests.exceptions.JSONDecodeError as e:
+            if self.diagnostics:
+                logging.error("𐄂 RTC transport response is no valid json")
+            res = False
+        if res:
+            rtc_transports = rtc_transports.get("rtc_transports", None)
+            livekit_detected = self.parse_livekit_json(rtc_transports)
+            if livekit_detected:
+                logging.debug("✔ Livekit detected via RTC transport endpoint")
+            else:
+                logging.warn("𐄂 RTC transport endpoints exists but no livekit detected")
+        elif self.diagnostics:
+            logging.info("𐄂 RTC transport endpoint problem")
+        return res
+
 
     def test_qrcode_login(self) -> bool:
         """Returns true if QRcode login is setup (msc4108)"""
@@ -538,6 +585,7 @@ class MatrixServer:
         self.get_server_version()
         self.test_client_endpoint()
         self.test_oauth_metadata()
+        self.test_rtc_endpoint_msc4195()
         if self.diagnostics:
             self.test_qrcode_login()
             self.test_room_directory()

{testmatrix-0.2.2 → testmatrix-0.2.4}/testmatrix.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testmatrix
-Version: 0.2.2
+Version: 0.2.4
 Summary: A matrix server sanity tester
 Author-email: Sebastian Spaeth <Sebastian@SSpaeth.de>
 License-Expression: AGPL-3.0-or-later