From b25be0bbcd71020dd40a9b7bd601aa8a5d306852 Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Thu, 6 May 2021 12:01:48 -0700
Subject: [PATCH] Fixes bug when auth and base are enabled. Fixes #1205 (#1206)

---
 Makefile                       |  2 +-
 web/__snapshots__/web.snapshot |  9 +++++++++
 web/auth.go                    |  1 +
 web/routes.go                  |  3 ++-
 web/routes_test.go             | 13 +++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3dec83272ef..c626d33258c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: clean
 clean:
 	@rm -rf static
-	@go clean
+	@go clean -i
 
 .PHONY: static
 static:
diff --git a/web/__snapshots__/web.snapshot b/web/__snapshots__/web.snapshot
index a3161a7f9f3..a2aa281b507 100644
--- a/web/__snapshots__/web.snapshot
+++ b/web/__snapshots__/web.snapshot
@@ -23,6 +23,15 @@ Location: /foobar/
 
 <a href="/foobar/">Moved Permanently</a>.
 
+/* snapshot: Test_createRoutes_redirect_with_auth */
+HTTP/1.1 307 Temporary Redirect
+Connection: close
+Content-Security-Policy: default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self'; manifest-src 'self'; connect-src 'self' api.github.com; require-trusted-types-for 'script'
+Content-Type: text/html; charset=utf-8
+Location: /foobar/login
+
+<a href="/foobar/login">Temporary Redirect</a>.
+
 /* snapshot: Test_createRoutes_username_password */
 HTTP/1.1 307 Temporary Redirect
 Connection: close
diff --git a/web/auth.go b/web/auth.go
index 384d189188f..424bc17a795 100644
--- a/web/auth.go
+++ b/web/auth.go
@@ -15,6 +15,7 @@ const authorityKey = "AUTH_TIMESTAMP"
 const sessionName = "session"
 
 func initializeAuth(h *handler) {
+	secured = false
 	if h.config.Username != "" && h.config.Password != "" {
 		store = sessions.NewCookieStore([]byte(h.config.Key))
 		store.Options.HttpOnly = true
diff --git a/web/routes.go b/web/routes.go
index c7658e77e15..4f3c2b4eeb2 100644
--- a/web/routes.go
+++ b/web/routes.go
@@ -6,6 +6,7 @@ import (
 	"io/fs"
 	"io/ioutil"
 	"net/http"
+	"path"
 
 	"github.com/amir20/dozzle/docker"
 
@@ -83,7 +84,7 @@ func (h *handler) index(w http.ResponseWriter, req *http.Request) {
 		fileServer.ServeHTTP(w, req)
 	} else {
 		if !isAuthorized(req) && req.URL.Path != "login" {
-			http.Redirect(w, req, h.config.Base+"login", http.StatusTemporaryRedirect)
+			http.Redirect(w, req, path.Clean(h.config.Base+"/login"), http.StatusTemporaryRedirect)
 			return
 		}
 		h.executeTemplate(w, req)
diff --git a/web/routes_test.go b/web/routes_test.go
index ed5460de288..1ad8bc787ac 100644
--- a/web/routes_test.go
+++ b/web/routes_test.go
@@ -267,6 +267,19 @@ func Test_createRoutes_redirect(t *testing.T) {
 	abide.AssertHTTPResponse(t, t.Name(), rr.Result())
 }
 
+func Test_createRoutes_redirect_with_auth(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("index page"), 0644), "WriteFile should have no error.")
+
+	handler := createHandler(nil, afero.NewIOFS(fs), Config{Base: "/foobar", Username: "amir", Password: "password", Key: "key"})
+	req, err := http.NewRequest("GET", "/foobar/", nil)
+	require.NoError(t, err, "NewRequest should not return an error.")
+	rr := httptest.NewRecorder()
+
+	handler.ServeHTTP(rr, req)
+	abide.AssertHTTPResponse(t, t.Name(), rr.Result())
+}
+
 func Test_createRoutes_foobar(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	require.NoError(t, afero.WriteFile(fs, "index.html", []byte("foo page"), 0644), "WriteFile should have no error.")