testmatrix 0.0.9__tar.gz → 0.1.0__tar.gz

{testmatrix-0.0.9/testmatrix.egg-info → testmatrix-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testmatrix
-Version: 0.0.9
+Version: 0.1.0
 Summary: A matrix server sanity tester
 Author-email: Sebastian Spaeth <Sebastian@SSpaeth.de>
 License-Expression: AGPL-3.0-or-later
@@ -17,7 +17,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Dynamic: license-file
 
-# testmatrix
+# testmatrix [![PyPI version](https://badge.fury.io/py/testmatrix.svg)](https://badge.fury.io/py/testmatrix) ![Matrix](https://img.shields.io/matrix/testmatrix:sspaeth.de?server_fqdn=chat.sspaeth.de&fetchMode=summary&link=https://matrix.to/#/#testmatrix:sspaeth.de)
 
 A matrix server sanity tester. Relased under the GNU AGPLv3+.
 

{testmatrix-0.0.9 → testmatrix-0.1.0}/README.md

@@ -1,4 +1,4 @@
-# testmatrix
+# testmatrix [![PyPI version](https://badge.fury.io/py/testmatrix.svg)](https://badge.fury.io/py/testmatrix) ![Matrix](https://img.shields.io/matrix/testmatrix:sspaeth.de?server_fqdn=chat.sspaeth.de&fetchMode=summary&link=https://matrix.to/#/#testmatrix:sspaeth.de)
 
 A matrix server sanity tester. Relased under the GNU AGPLv3+.
 

{testmatrix-0.0.9 → testmatrix-0.1.0}/src/testmatrix/__init__.py

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

{testmatrix-0.0.9 → testmatrix-0.1.0}/src/testmatrix/matrixserver.py

@@ -37,7 +37,7 @@ class MatrixServer:
                        about results of our sanity checks.
         """
         self.args = args
-        self.servername: str = servername
+        self.servername: str = servername.lower()
         self.federation_baseurl: str = ""
         self.client_baseurl: str = ""
         # result of client/versions as dict
@@ -147,16 +147,31 @@ class MatrixServer:
         self.client_baseurl = ""
         try:
             url = f"https://{self.servername}/.well-known/matrix/client"
+            # The .well-known file could sit behind redirects, and we need to
+            # manually check the CORS headers for each redirect step. Standard
+            # requests does not do this, so we need to do that manually. Sigh.
+            # TODO: a candidate for factoring out.
             r = requests.get(url, headers = req_headers)
-            r.raise_for_status() # raise e.g. on 404
+            r.raise_for_status() # raise on status 400-600
             if self.diagnostics:
+                i = 0
+                for redirect in r.history:
+                    i += 1
+                    if not "Access-Control-Allow-Origin" in redirect.headers:
+                        logging.error("𐄂 Client well-known redirect #{i} has no CORS header")
+                    elif redirect.headers["Access-Control-Allow-Origin"] != "*":
+                        logging.error("𐄂 Client well-known redirect #{i} has no proper CORS header: '%s'",
+                                      redirect.headers["Access-Control-Allow-Origin"])
+                    else:
+                        logging.info("✔ Client well-known redirect #{i} has proper CORS header")
                 if not "Access-Control-Allow-Origin" in r.headers:
                     logging.error("𐄂 Client well-known has no CORS header")
                 elif r.headers["Access-Control-Allow-Origin"] != "*":
                     logging.error("𐄂 Client well-known has no proper CORS header: '%s'",
                                   r.headers["Access-Control-Allow-Origin"])
                 else:
-                    logging.info("✔ Client well-known exists and has proper CORS header")
+                    logging.info("✔ Client well-known has proper CORS header")
+
             wellknown_client = r.json()
         except requests.exceptions.ConnectionError as e:
             if ("[Errno 11001] getaddrinfo failed" in str(e) or     # Windows
@@ -251,7 +266,7 @@ class MatrixServer:
                 logging.error("𐄂 Server keys response is no valid json")
             return False
 
-        server_key_name = server_keys.get("server_name", None)
+        server_key_name = server_keys.get("server_name", "").lower()
         if self.servername != server_key_name:
             if self.diagnostics:
                 logging.error("𐄂 Configured server name mismatch! "\

{testmatrix-0.0.9 → testmatrix-0.1.0/testmatrix.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testmatrix
-Version: 0.0.9
+Version: 0.1.0
 Summary: A matrix server sanity tester
 Author-email: Sebastian Spaeth <Sebastian@SSpaeth.de>
 License-Expression: AGPL-3.0-or-later
@@ -17,7 +17,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Dynamic: license-file
 
-# testmatrix
+# testmatrix [![PyPI version](https://badge.fury.io/py/testmatrix.svg)](https://badge.fury.io/py/testmatrix) ![Matrix](https://img.shields.io/matrix/testmatrix:sspaeth.de?server_fqdn=chat.sspaeth.de&fetchMode=summary&link=https://matrix.to/#/#testmatrix:sspaeth.de)
 
 A matrix server sanity tester. Relased under the GNU AGPLv3+.