remove gorilla/mux dependency

Author: joonas-fi

cmd/id/server.go

@@ -17,7 +17,6 @@ import (
 	"github.com/function61/gokit/net/http/httputils"
 	"github.com/function61/gokit/os/osutil"
 	"github.com/function61/id/pkg/httpauth"
-	"github.com/gorilla/mux"
 	"gopkg.in/square/go-jose.v2"
 )
 
@@ -27,7 +26,7 @@ var templateFiles embed.FS
 var templates, _ = template.ParseFS(templateFiles, "templates/*.html")
 
 func newHttpHandler() (http.Handler, error) {
-	router := mux.NewRouter()
+	router := http.NewServeMux()
 
 	signer, signerPublicKey, err := loadSignerAndPublicKey()
 	if err != nil {
@@ -46,7 +45,7 @@ func newHttpHandler() (http.Handler, error) {
 
 	userRegistry := newUserRegistry()
 
-	router.HandleFunc("/id", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("GET /id", func(w http.ResponseWriter, r *http.Request) {
 		nextValidated, _, err := getValidatedNext(r, redirectAllowList)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
@@ -66,9 +65,9 @@ func newHttpHandler() (http.Handler, error) {
 		}); err != nil {
 			panic(err)
 		}
-	}).Methods(http.MethodGet)
+	})
 
-	router.HandleFunc("/id", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("POST /id", func(w http.ResponseWriter, r *http.Request) {
 		nextValidated, audience, err := getValidatedNext(r, redirectAllowList)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
@@ -110,9 +109,9 @@ func newHttpHandler() (http.Handler, error) {
 
 		httputils.NoCacheHeaders(w)
 		http.Redirect(w, r, nextValidated.String(), http.StatusFound)
-	}).Methods(http.MethodPost)
+	})
 
-	router.HandleFunc("/id/profile", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("GET /id/profile", func(w http.ResponseWriter, r *http.Request) {
 		auth, err := authenticator.Authenticate(r)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusForbidden)
@@ -129,15 +128,15 @@ func newHttpHandler() (http.Handler, error) {
 		_ = jsonfile.Marshal(w, &user)
 	})
 
-	router.HandleFunc("/id/logout", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("GET /id/logout", func(w http.ResponseWriter, r *http.Request) {
 		httputils.NoCacheHeaders(w)
 
 		http.SetCookie(w, httpauth.DeleteLoginCookie())
 
 		fmt.Fprintln(w, "You have been logged out.")
 	})
 
-	router.HandleFunc("/id/.well-known/jwks.json", func(w http.ResponseWriter, r *http.Request) {
+	router.HandleFunc("GET /id/.well-known/jwks.json", func(w http.ResponseWriter, r *http.Request) {
 		// https://tools.ietf.org/html/rfc7517
 		w.Header().Set("Content-Type", "application/jwk-set+json")
 		_, _ = w.Write(signerPubKeySetJson)

go.mod

@@ -5,7 +5,6 @@ go 1.22
 require (
 	github.com/aws/aws-lambda-go v1.47.0
 	github.com/function61/gokit v0.0.0-20240419102346-a5f721139a62
-	github.com/gorilla/mux v1.7.4
 	github.com/kataras/jwt v0.1.2
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/spf13/cobra v1.6.1

go.sum

@@ -9,8 +9,6 @@ github.com/function61/gokit v0.0.0-20240419102346-a5f721139a62 h1:COUqRRf8I+Ppzf
 github.com/function61/gokit v0.0.0-20240419102346-a5f721139a62/go.mod h1:sJY957+7ush4oj4ElOMhUFaFIriAFNAGYzVh2tFJNy0=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
-github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kataras/jwt v0.1.2 h1:827BBMK2/PQc1Y209cPKeAChyx1mvfW9I3LE0GJ5V8A=

pkg/idclient/authgateway.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/function61/gokit/net/http/httputils"
 	"github.com/function61/id/pkg/httpauth"
-	"github.com/gorilla/mux"
 )
 
 type GatewayApi struct {
@@ -23,7 +22,7 @@ type GatewayApi struct {
 // This auth gateway is required because the identity server cannot set cookies on our behalf.
 // The auth gateway simply takes the auth token from URL param, sets cookie and redirects forward.
 
-func (c *Client) CreateAuthGateway(router *mux.Router, audience string) *GatewayApi {
+func (c *Client) CreateAuthGateway(router *http.ServeMux, audience string) *GatewayApi {
 	// we used to fetch the public key here, but that's not ideal. this CreateAuthGateway() is usually
 	// called on application startup to protect specified/all HTTP routes. if we were to error here,
 	// perhaps because network is down, it'd prevent starting the HTTP app.
@@ -123,7 +122,7 @@ func (g *GatewayApi) loginUrlContinueToGateway(continueAfterGateway string, r *h
 	return g.client.loginUrl(gateway)
 }
 
-func (g *GatewayApi) registerGatewayRoutes(router *mux.Router) *GatewayApi {
+func (g *GatewayApi) registerGatewayRoutes(router *http.ServeMux) *GatewayApi {
 	// logs the user out from this website, but also the identity server
 	router.HandleFunc("/_auth/logout", func(w http.ResponseWriter, r *http.Request) {
 		httputils.NoCacheHeaders(w)