From a04c6bbf8f31aaafa0a67813621b85cb26179d34 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 22 Aug 2017 11:19:30 +0100
Subject: [PATCH] test federation client: Allow server-name and key-file as
 options

so that you don't necessarily need a config file.
---
 scripts-dev/federation_client.py | 36 +++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py
index c840acb923..82a90ef6fa 100755
--- a/scripts-dev/federation_client.py
+++ b/scripts-dev/federation_client.py
@@ -160,12 +160,23 @@ def main():
             "Signs and sends a federation request to a matrix homeserver",
     )
 
+    parser.add_argument(
+        "-N", "--server-name",
+        help="Name to give as the local homeserver. If unspecified, will be "
+             "read from the config file.",
+    )
+
+    parser.add_argument(
+        "-k", "--signing-key-path",
+        help="Path to the file containing the private ed25519 key to sign the "
+             "request with.",
+    )
+
     parser.add_argument(
         "-c", "--config",
-        type=argparse.FileType('r'),
         default="homeserver.yaml",
-        help="Path to server config file. Used to read in server name and key "
-             "file",
+        help="Path to server config file. Ignored if --server-name and "
+             "--signing-key-path are both given.",
     )
 
     parser.add_argument(
@@ -182,19 +193,28 @@ def main():
 
     args = parser.parse_args()
 
-    config = yaml.safe_load(args.config)
-    origin_name = config['server_name']
-    keyfile = config['signing_key_path']
+    if not args.server_name or not args.signing_key_path:
+        read_args_from_config(args)
 
-    with open(keyfile) as f:
+    with open(args.signing_key_path) as f:
         key = read_signing_keys(f)[0]
 
     result = get_json(
-        origin_name, key, args.destination, "/_matrix/federation/v1/" + args.path
+        args.server_name, key, args.destination, "/_matrix/federation/v1/" + args.path
     )
 
     json.dump(result, sys.stdout)
     print ("")
 
+
+def read_args_from_config(args):
+    with open(args.config, 'r') as fh:
+        config = yaml.safe_load(fh)
+        if not args.server_name:
+            args.server_name = config['server_name']
+        if not args.signing_key_path:
+            args.signing_key_path = config['signing_key_path']
+
+
 if __name__ == "__main__":
     main()