summary refs log tree commit diff
path: root/scripts-dev/federation_client.py
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xscripts-dev/federation_client.py32
1 files changed, 13 insertions, 19 deletions
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py
index 41e7b24418..7c19e405d4 100755
--- a/scripts-dev/federation_client.py
+++ b/scripts-dev/federation_client.py
@@ -63,7 +63,7 @@ def encode_canonical_json(value):
         # Encode code-points outside of ASCII as UTF-8 rather than \u escapes
         ensure_ascii=False,
         # Remove unecessary white space.
-        separators=(',', ':'),
+        separators=(",", ":"),
         # Sort the keys of dictionaries.
         sort_keys=True,
         # Encode the resulting unicode as UTF-8 bytes.
@@ -145,7 +145,7 @@ def request_json(method, origin_name, origin_key, destination, path, content):
     authorization_headers = []
 
     for key, sig in signed_json["signatures"][origin_name].items():
-        header = "X-Matrix origin=%s,key=\"%s\",sig=\"%s\"" % (origin_name, key, sig)
+        header = 'X-Matrix origin=%s,key="%s",sig="%s"' % (origin_name, key, sig)
         authorization_headers.append(header.encode("ascii"))
         print("Authorization: %s" % header, file=sys.stderr)
 
@@ -161,11 +161,7 @@ def request_json(method, origin_name, origin_key, destination, path, content):
         headers["Content-Type"] = "application/json"
 
     result = s.request(
-        method=method,
-        url=dest,
-        headers=headers,
-        verify=False,
-        data=content,
+        method=method, url=dest, headers=headers, verify=False, data=content
     )
     sys.stderr.write("Status Code: %d\n" % (result.status_code,))
     return result.json()
@@ -241,18 +237,18 @@ def main():
 
 
 def read_args_from_config(args):
-    with open(args.config, 'r') as fh:
+    with open(args.config, "r") as fh:
         config = yaml.safe_load(fh)
         if not args.server_name:
-            args.server_name = config['server_name']
+            args.server_name = config["server_name"]
         if not args.signing_key_path:
-            args.signing_key_path = config['signing_key_path']
+            args.signing_key_path = config["signing_key_path"]
 
 
 class MatrixConnectionAdapter(HTTPAdapter):
     @staticmethod
     def lookup(s, skip_well_known=False):
-        if s[-1] == ']':
+        if s[-1] == "]":
             # ipv6 literal (with no port)
             return s, 8448
 
@@ -268,9 +264,7 @@ class MatrixConnectionAdapter(HTTPAdapter):
         if not skip_well_known:
             well_known = MatrixConnectionAdapter.get_well_known(s)
             if well_known:
-                return MatrixConnectionAdapter.lookup(
-                    well_known, skip_well_known=True
-                )
+                return MatrixConnectionAdapter.lookup(well_known, skip_well_known=True)
 
         try:
             srv = srvlookup.lookup("matrix", "tcp", s)[0]
@@ -280,8 +274,8 @@ class MatrixConnectionAdapter(HTTPAdapter):
 
     @staticmethod
     def get_well_known(server_name):
-        uri = "https://%s/.well-known/matrix/server" % (server_name, )
-        print("fetching %s" % (uri, ), file=sys.stderr)
+        uri = "https://%s/.well-known/matrix/server" % (server_name,)
+        print("fetching %s" % (uri,), file=sys.stderr)
 
         try:
             resp = requests.get(uri)
@@ -294,12 +288,12 @@ class MatrixConnectionAdapter(HTTPAdapter):
                 raise Exception("not a dict")
             if "m.server" not in parsed_well_known:
                 raise Exception("Missing key 'm.server'")
-            new_name = parsed_well_known['m.server']
-            print("well-known lookup gave %s" % (new_name, ), file=sys.stderr)
+            new_name = parsed_well_known["m.server"]
+            print("well-known lookup gave %s" % (new_name,), file=sys.stderr)
             return new_name
 
         except Exception as e:
-            print("Invalid response from %s: %s" % (uri, e, ), file=sys.stderr)
+            print("Invalid response from %s: %s" % (uri, e), file=sys.stderr)
         return None
 
     def get_connection(self, url, proxies=None):