From 804d70386d126e4c0b5b77a9410feaba7bcc75e3 Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Thu, 11 Aug 2022 12:15:16 +0200 Subject: [PATCH] Switch to nodekey in urls --- app.go | 2 +- oidc.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app.go b/app.go index 60258e6e..50676679 100644 --- a/app.go +++ b/app.go @@ -420,7 +420,7 @@ func (h *Headscale) createRouter(grpcMux *runtime.ServeMux) *mux.Router { router.HandleFunc("/register/{nkey}", h.RegisterWebAPI).Methods(http.MethodGet) router.HandleFunc("/machine/{mkey}/map", h.PollNetMapHandler).Methods(http.MethodPost) router.HandleFunc("/machine/{mkey}", h.RegistrationHandler).Methods(http.MethodPost) - router.HandleFunc("/oidc/register/{mkey}", h.RegisterOIDC).Methods(http.MethodGet) + router.HandleFunc("/oidc/register/{nkey}", h.RegisterOIDC).Methods(http.MethodGet) router.HandleFunc("/oidc/callback", h.OIDCCallback).Methods(http.MethodGet) router.HandleFunc("/apple", h.AppleConfigMessage).Methods(http.MethodGet) router.HandleFunc("/apple/{platform}", h.ApplePlatformConfig).Methods(http.MethodGet) diff --git a/oidc.go b/oidc.go index a9309191..553bb788 100644 --- a/oidc.go +++ b/oidc.go @@ -68,8 +68,8 @@ func (h *Headscale) initOIDC() error { } // RegisterOIDC redirects to the OIDC provider for authentication -// Puts node key in cache so the callback can retrieve it using the oidc state param -// Listens in /oidc/register/:mKey. +// Puts NodeKey in cache so the callback can retrieve it using the oidc state param +// Listens in /oidc/register/:nKey. func (h *Headscale) RegisterOIDC( writer http.ResponseWriter, req *http.Request, @@ -135,7 +135,7 @@ var oidcCallbackTemplate = template.Must( ) // OIDCCallback handles the callback from the OIDC endpoint -// Retrieves the mkey from the state cache and adds the machine to the users email namespace +// Retrieves the nkey from the state cache and adds the machine to the users email namespace // TODO: A confirmation page for new machines should be added to avoid phishing vulnerabilities // TODO: Add groups information from OIDC tokens into machine HostInfo // Listens in /oidc/callback.