all: Redirect to slash

TheThingsNetwork · Nov 29, 2021 · e39e618 · e39e618
1 parent a78cf47
commit e39e618
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/pkg/account/server.go b/pkg/account/server.go
@@ -17,6 +17,7 @@ package account
 import (
 	"context"
 	"net/http"
+	"strings"
 
 	"github.com/gorilla/csrf"
 	"github.com/gorilla/mux"
@@ -94,7 +95,13 @@ func (s *server) RegisterRoutes(server *web.Server) {
 		csrf.FieldName("_csrf"),
 		csrf.Path("/"),
 	)
-	router := server.Router().NewRoute().PathPrefix(s.config.Mount).Subrouter()
+	prefix := "/" + strings.Trim(s.config.Mount, "/")
+	prefixWithSlash := prefix
+	if prefix != "/" {
+		prefixWithSlash = prefix + "/"
+		server.Router().Path(prefix).Handler(http.RedirectHandler(prefixWithSlash, http.StatusPermanentRedirect))
+	}
+	router := server.Prefix(prefixWithSlash).Subrouter()
 	router.Use(
 		func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

diff --git a/pkg/console/console.go b/pkg/console/console.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/gorilla/csrf"
 	"github.com/gorilla/mux"
@@ -130,7 +131,13 @@ func generateConsoleCSPString(config *Config, nonce string) string {
 
 // RegisterRoutes implements web.Registerer. It registers the Console to the web server.
 func (console *Console) RegisterRoutes(server *web.Server) {
-	router := server.Router().NewRoute().PathPrefix(console.config.Mount).Subrouter()
+	prefix := "/" + strings.Trim(console.config.Mount, "/")
+	prefixWithSlash := prefix
+	if prefix != "/" {
+		prefixWithSlash = prefix + "/"
+		server.Router().Path(prefix).Handler(http.RedirectHandler(prefixWithSlash, http.StatusPermanentRedirect))
+	}
+	router := server.Prefix(prefixWithSlash).Subrouter()
 	router.Use(
 		mux.MiddlewareFunc(func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

diff --git a/pkg/oauth/server.go b/pkg/oauth/server.go
@@ -246,7 +246,13 @@ func (s *server) output(w http.ResponseWriter, r *http.Request, resp *osin.Respo
 }
 
 func (s *server) RegisterRoutes(server *web.Server) {
-	router := server.Router().NewRoute().PathPrefix(s.config.Mount).Subrouter()
+	prefix := "/" + strings.Trim(s.config.Mount, "/")
+	prefixWithSlash := prefix
+	if prefix != "/" {
+		prefixWithSlash = prefix + "/"
+		server.Router().Path(prefix).Handler(http.RedirectHandler(prefixWithSlash, http.StatusPermanentRedirect))
+	}
+	router := server.Prefix(prefixWithSlash).Subrouter()
 	router.Use(
 		func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

diff --git a/pkg/web/redirect.go b/pkg/web/redirect.go
@@ -25,9 +25,7 @@ type redirector struct {
 }
 
 func (red redirector) RegisterRoutes(s *Server) {
-	s.RootRouter().Path(red.Path).HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, red.Location, red.Code)
-	})
+	s.RootRouter().Path(red.Path).Handler(http.RedirectHandler(red.Location, red.Code))
 }
 
 // Redirect returns a Registerer that redirects requests to the given path to