From 7f41b2df7c65341e3e96a9bc9ecd737bc3a5de19 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Thu, 20 Jan 2022 17:07:15 -0800
Subject: Strip any trailing slash when saving server URL

---
 controllers/admin/config.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/config.go b/controllers/admin/config.go
index 529ace488..ed56ac05f 100644
--- a/controllers/admin/config.go
+++ b/controllers/admin/config.go
@@ -391,7 +391,16 @@ func SetServerURL(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := data.SetServerURL(configValue.Value.(string)); err != nil {
+	rawValue, ok := configValue.Value.(string)
+	if !ok {
+		controllers.WriteSimpleResponse(w, false, "server url value invalid")
+		return
+	}
+
+	// Trim any trailing slash
+	serverURL := strings.TrimRight(rawValue, "/")
+
+	if err := data.SetServerURL(serverURL); err != nil {
 		controllers.WriteSimpleResponse(w, false, err.Error())
 		return
 	}
-- 
cgit v1.2.3