Upgrade to go-chi 5

server/app/app.go

@@ -7,11 +7,9 @@ import (
 	"strings"
 
 	"github.com/deluan/rest"
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/httprate"
-	"github.com/go-chi/jwtauth"
 	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/core/auth"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/server/events"
@@ -55,7 +53,7 @@ func (app *Router) routes(path string) http.Handler {
 
 	r.Route("/api", func(r chi.Router) {
 		r.Use(mapAuthHeader())
-		r.Use(jwtauth.Verifier(auth.TokenAuth))
+		r.Use(verifier())
 		r.Use(authenticator(app.ds))
 		app.R(r, "/user", model.User{}, true)
 		app.R(r, "/song", model.MediaFile{}, true)

server/app/auth.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/deluan/rest"
-	"github.com/dgrijalva/jwt-go"
-	"github.com/go-chi/jwtauth"
+	"github.com/go-chi/jwtauth/v5"
 	"github.com/google/uuid"
+	"github.com/lestrrat-go/jwx/jwt"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core/auth"
@@ -149,16 +149,16 @@ func validateLogin(userRepo model.UserRepository, userName, password string) (*m
 	return u, nil
 }
 
-func contextWithUser(ctx context.Context, ds model.DataStore, claims jwt.MapClaims) context.Context {
-	userName := claims["sub"].(string)
+func contextWithUser(ctx context.Context, ds model.DataStore, token jwt.Token) context.Context {
+	userName := token.Subject()
 	user, _ := ds.User(ctx).FindByUsername(userName)
 	return request.WithUser(ctx, *user)
 }
 
-func getToken(ds model.DataStore, ctx context.Context) (*jwt.Token, error) {
+func getToken(ds model.DataStore, ctx context.Context) (jwt.Token, error) {
 	token, claims, err := jwtauth.FromContext(ctx)
 
-	valid := err == nil && token != nil && token.Valid
+	valid := err == nil && token != nil
 	valid = valid && claims["sub"] != nil
 	if valid {
 		return token, nil
@@ -183,6 +183,12 @@ func mapAuthHeader() func(next http.Handler) http.Handler {
 	}
 }
 
+func verifier() func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return jwtauth.Verify(auth.TokenAuth, jwtauth.TokenFromHeader, jwtauth.TokenFromCookie, jwtauth.TokenFromQuery)(next)
+	}
+}
+
 func authenticator(ds model.DataStore) func(next http.Handler) http.Handler {
 	auth.InitTokenAuth(ds)
 
@@ -198,9 +204,7 @@ func authenticator(ds model.DataStore) func(next http.Handler) http.Handler {
 				return
 			}
 
-			claims := token.Claims.(jwt.MapClaims)
-
-			newCtx := contextWithUser(r.Context(), ds, claims)
+			newCtx := contextWithUser(r.Context(), ds, token)
 			newTokenString, err := auth.TouchToken(token)
 			if err != nil {
 				log.Error(r, "signing new token", err)

server/app/playlists.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/deluan/rest"
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/utils"

server/middlewares.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5/middleware"
 	"github.com/navidrome/navidrome/log"
 	"github.com/unrolled/secure"
 )

server/server.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"path"
 
-	"github.com/go-chi/chi"
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 	"github.com/go-chi/cors"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"

server/subsonic/api.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"runtime"
 
-	"github.com/go-chi/chi"
-	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/log"

server/subsonic/middlewares_test.go

@@ -6,7 +6,9 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"strings"
+	"time"
 
+	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/core/auth"
 	"github.com/navidrome/navidrome/log"
@@ -268,6 +270,9 @@ var _ = Describe("Middlewares", func() {
 		Context("JWT based authentication", func() {
 			var validToken string
 			BeforeEach(func() {
+				auth.InitTokenAuth(ds)
+				conf.Server.SessionTimeout = time.Minute
+
 				u := &model.User{UserName: "admin"}
 				var err error
 				validToken, err = auth.CreateToken(u)