From e48cd26cb01219973c730c9583c9a6ab871469d0 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 1 Nov 2018 12:56:24 +0200
Subject: [PATCH] Fix docker-run and login endpoint

---
 docker-run.sh                 | 11 ++++++-----
 maubot/management/api/auth.py |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker-run.sh b/docker-run.sh
index ffeab63..424953a 100755
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -5,19 +5,20 @@ cd /opt/maubot
 # Replace database path in config.
 sed -i "s#sqlite:///maubot.db#sqlite:////data/maubot.db#" /data/config.yaml
 sed -i "s#- ./plugins#- /data/plugins#" /data/config.yaml
+sed -i "s#upload: ./plugins#upload: /data/plugins#" /data/config.yaml
+sed -i "s#trash: ./trash#trash: /data/trash#" /data/config.yaml
+sed -i "s#db: ./plugins#trash: /data/dbs#" /data/config.yaml
 sed -i "s#./logs/maubot.log#/var/log/maubot/maubot.log#" /data/config.yaml
 
-mkdir -p /var/log/maubot
+mkdir -p /var/log/maubot /data/plugins /data/trash /data/dbs
 
 # Check that database is in the right state
 alembic -x config=/data/config.yaml upgrade head
 
 if [ ! -f /data/config.yaml ]; then
 	cp example-config.yaml /data/config.yaml
-	echo "Didn't find a config file."
-	echo "Copied default config file to /data/config.yaml"
-	echo "Modify that config file to your liking."
-	echo "Start the container again after that to generate the registration file."
+	echo "Config file not found. Example config copied to /data/config.yaml"
+	echo "Please modify the config file to your liking and restart the container."
 	exit
 fi
 
diff --git a/maubot/management/api/auth.py b/maubot/management/api/auth.py
index 1b0bcf3..fcca6fb 100644
--- a/maubot/management/api/auth.py
+++ b/maubot/management/api/auth.py
@@ -43,7 +43,7 @@ async def login(request: web.Request) -> web.Response:
     except json.JSONDecodeError:
         return ErrBodyNotJSON
     secret = data.get("secret")
-    if secret and config["server.unshared_secret"] == secret:
+    if secret and get_config()["server.unshared_secret"] == secret:
         user = data.get("user") or "root"
         return web.json_response({
             "token": create_token(user),
@@ -51,7 +51,7 @@ async def login(request: web.Request) -> web.Response:
 
     username = data.get("username")
     password = data.get("password")
-    if config.check_password(username, password):
+    if get_config().check_password(username, password):
         return web.json_response({
             "token": create_token(username),
         })