Log redirects; fix login socket URL format bug (#28)

* Log redirects; fix login socket URL format bug * Bump version
Backblaze · Nov 11, 2022 · 72499bd · 72499bd
1 parent b5ed28f
commit 72499bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.7
+0.7.8
diff --git a/src/boardwalkd/server.py b/src/boardwalkd/server.py
@@ -55,8 +55,11 @@ def prepare(self):
         req_url = urlparse(self.request.full_url())
         svr_url: ParseResult = self.settings["url"]
         if req_url.scheme != svr_url.scheme or req_url.netloc != svr_url.netloc:
-            req_url = req_url._replace(scheme=svr_url.scheme, netloc=svr_url.netloc)
-            return self.redirect(req_url.geturl())
+            redir_url = req_url._replace(scheme=svr_url.scheme, netloc=svr_url.netloc)
+            app_log.info(
+                f"Redirecting request {req_url.geturl()} to {redir_url.geturl()}"
+            )
+            return self.redirect(redir_url.geturl())
 
     def get_current_user(self) -> bytes | None:
         """Required method for @tornado.web.authenticated to work"""
@@ -382,7 +385,9 @@ def id_client() -> str:
 
         this_client_id = id_client()
         app_log.info(f"Login client ID {this_client_id} opened")
-        login_url = f"{self.settings['url']}/api/auth/login?id={this_client_id}"
+        login_url = urljoin(
+            self.settings["url"].geturl(), f"/api/auth/login?id={this_client_id}"
+        )
         return self.write_message(ApiLoginMessage(login_url=login_url).dict())
 
     def on_close(self):