From 9fb258b9e2c30b96a4432aeedd2aff1ba64fd6cf Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Thu, 8 Aug 2019 14:17:41 +0100
Subject: [PATCH] Handle relative paths correctly!

---
 synapse_topology/controller/server/server.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/synapse_topology/controller/server/server.py b/synapse_topology/controller/server/server.py
index 36a334941d..b53476a3c5 100644
--- a/synapse_topology/controller/server/server.py
+++ b/synapse_topology/controller/server/server.py
@@ -80,12 +80,14 @@ with app.subroute("/config") as app:
 @validate_schema(CERT_PATHS_SCHEMA)
 def test_cert_paths(request, body):
     result = {}
-    for path in ["cert_path", "cert_key_path"]:
+    config_path = model.get_config_dir()
+    for name, path in body.items():
+        path = abspath(join(config_path, path))
         try:
-            with open(body[path], "r"):
-                result[path + "_invalid"] = False
+            with open(path, "r"):
+                result[name] = {"invalid": False, "absolute_path": path}
         except:
-            result[path + "_invalid"] = True
+            result[name] = {"invalid": True}
     return json.dumps(result)