Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 12:54:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix redirect loops in login, migrate and setup pages (#549)

Browse Source 
* Fix redirect loop when setup and migrate required
* Fix redirect loop between setup and login
This commit is contained in:
WithoutPants
2020-05-18 08:55:01 +10:00
committed by GitHub
parent 215c4e3bde
commit 46746e6848
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/api/server.go
View File

@@ -94,6 +94,10 @@ func authenticateHandler() func(http.Handler) http.Handler {
} }
} }
const setupEndPoint = "/setup"
const migrateEndPoint = "/migrate"
const loginEndPoint = "/login"
func Start() { func Start() {
uiBox = packr.New("UI Box", "../../ui/v2.5/build") uiBox = packr.New("UI Box", "../../ui/v2.5/build")
//legacyUiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend") //legacyUiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend")
@@ -140,10 +144,10 @@ func Start() {
r.Handle("/playground", handler.Playground("GraphQL playground", "/graphql")) r.Handle("/playground", handler.Playground("GraphQL playground", "/graphql"))
// session handlers // session handlers
r.Post("/login", handleLogin) r.Post(loginEndPoint, handleLogin)
r.Get("/logout", handleLogout) r.Get("/logout", handleLogout)
r.Get("/login", getLoginHandler) r.Get(loginEndPoint, getLoginHandler)
r.Mount("/gallery", galleryRoutes{}.Routes()) r.Mount("/gallery", galleryRoutes{}.Routes())
r.Mount("/performer", performerRoutes{}.Routes()) r.Mount("/performer", performerRoutes{}.Routes())
@@ -188,7 +192,7 @@ func Start() {
data, _ := loginUIBox.Find("login.html") data, _ := loginUIBox.Find("login.html")
_, _ = w.Write(data) _, _ = w.Write(data)
} else { } else {
r.URL.Path = strings.Replace(r.URL.Path, "/login", "", 1) r.URL.Path = strings.Replace(r.URL.Path, loginEndPoint, "", 1)
http.FileServer(loginUIBox).ServeHTTP(w, r) http.FileServer(loginUIBox).ServeHTTP(w, r)
} }
}) })
@@ -369,10 +373,11 @@ func BaseURLMiddleware(next http.Handler) http.Handler {
func ConfigCheckMiddleware(next http.Handler) http.Handler { func ConfigCheckMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ext := path.Ext(r.URL.Path) ext := path.Ext(r.URL.Path)
shouldRedirect := ext == "" && r.Method == "GET" && r.URL.Path != "/init" shouldRedirect := ext == "" && r.Method == "GET"
if !config.IsValid() && shouldRedirect { if !config.IsValid() && shouldRedirect {
if !strings.HasPrefix(r.URL.Path, "/setup") { // #539 - don't redirect if loading login page
http.Redirect(w, r, "/setup", 301) if !strings.HasPrefix(r.URL.Path, setupEndPoint) && !strings.HasPrefix(r.URL.Path, loginEndPoint) {
http.Redirect(w, r, setupEndPoint, 301)
return return
} }
} }
@@ -386,8 +391,9 @@ func DatabaseCheckMiddleware(next http.Handler) http.Handler {
shouldRedirect := ext == "" && r.Method == "GET" shouldRedirect := ext == "" && r.Method == "GET"
if shouldRedirect && database.NeedsMigration() { if shouldRedirect && database.NeedsMigration() {
// #451 - don't redirect if loading login page // #451 - don't redirect if loading login page
if !strings.HasPrefix(r.URL.Path, "/migrate") && !strings.HasPrefix(r.URL.Path, "/login") { // #539 - or setup page
http.Redirect(w, r, "/migrate", 301) if !strings.HasPrefix(r.URL.Path, migrateEndPoint) && !strings.HasPrefix(r.URL.Path, loginEndPoint) && !strings.HasPrefix(r.URL.Path, setupEndPoint) {
http.Redirect(w, r, migrateEndPoint, 301)
return return
} }
} }