fix: improvements for login and oidc (#227)

* add csrf

* caching

* caching

* caching

* caching

* security headers

* csp and security headers

* error handler csp

* select user with display name

* csp

* user selection styling

* username to loginname

* regenerate grpc

* regenerate

* change to login name

internal/login/handler/change_password_handler.go

@@ -36,8 +36,8 @@ func (l *Login) renderChangePassword(w http.ResponseWriter, r *http.Request, aut
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Change Password", errType, errMessage),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Change Password", errType, errMessage),
+		LoginName: authReq.LoginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangePassword], data, nil)
 }
@@ -45,8 +45,8 @@ func (l *Login) renderChangePassword(w http.ResponseWriter, r *http.Request, aut
 func (l *Login) renderChangePasswordDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
 	var errType, errMessage string
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Password Change Done", errType, errMessage),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Password Change Done", errType, errMessage),
+		LoginName: authReq.LoginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplChangePasswordDone], data, nil)
 }

internal/login/handler/init_password_handler.go

@@ -72,7 +72,7 @@ func (l *Login) resendPasswordSet(w http.ResponseWriter, r *http.Request, authRe
 	if authReq != nil {
 		userOrg = authReq.UserOrgID
 	}
-	err := l.authRepo.RequestPasswordReset(setContext(r.Context(), userOrg), authReq.UserName)
+	err := l.authRepo.RequestPasswordReset(setContext(r.Context(), userOrg), authReq.LoginName)
 	l.renderInitPassword(w, r, authReq, authReq.UserID, "", err)
 }
 
@@ -94,8 +94,8 @@ func (l *Login) renderInitPassword(w http.ResponseWriter, r *http.Request, authR
 
 func (l *Login) renderInitPasswordDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Password Init Done", "", ""),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Password Init Done", "", ""),
+		LoginName: authReq.LoginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitPasswordDone], data, nil)
 }

internal/login/handler/init_user_handler.go

@@ -93,13 +93,13 @@ func (l *Login) renderInitUser(w http.ResponseWriter, r *http.Request, authReq *
 }
 
 func (l *Login) renderInitUserDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest) {
-	var userName string
+	var loginName string
 	if authReq != nil {
-		userName = authReq.UserName
+		loginName = authReq.LoginName
 	}
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "User Init Done", "", ""),
-		UserName: userName,
+		baseData:  l.getBaseData(r, authReq, "User Init Done", "", ""),
+		LoginName: loginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplInitUserDone], data, nil)
 }

internal/login/handler/login.go

@@ -6,12 +6,14 @@ import (
 	"net/http"
 
 	"github.com/caos/logging"
-	"github.com/gorilla/mux"
+	"github.com/gorilla/csrf"
 	"github.com/rakyll/statik/fs"
 	"golang.org/x/text/language"
 
 	"github.com/caos/zitadel/internal/api/auth"
+	"github.com/caos/zitadel/internal/api/http/middleware"
 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing"
+	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/form"
 
 	_ "github.com/caos/zitadel/internal/login/statik"
@@ -19,7 +21,7 @@ import (
 
 type Login struct {
 	endpoint            string
-	router              *mux.Router
+	router              http.Handler
 	renderer            *Renderer
 	parser              *form.Parser
 	authRepo            *eventsourcing.EsRepository
@@ -33,6 +35,14 @@ type Config struct {
 	ZitadelURL          string
 	LanguageCookieName  string
 	DefaultLanguage     language.Tag
+	CSRF                CSRF
+	Cache               middleware.CacheConfig
+}
+
+type CSRF struct {
+	CookieName  string
+	Key         *crypto.KeyConfig
+	Development bool
 }
 
 const (
@@ -47,14 +57,39 @@ func StartLogin(ctx context.Context, config Config, authRepo *eventsourcing.EsRe
 		authRepo:            authRepo,
 	}
 	statikFS, err := fs.NewWithNamespace("login")
-	logging.Log("CONFI-7usEW").OnError(err).Panic("unable to start listener")
+	logging.Log("CONFI-Ga21f").OnError(err).Panic("unable to create filesystem")
 
-	login.router = CreateRouter(login, statikFS)
+	csrf, err := csrfInterceptor(config.CSRF, login.csrfErrorHandler())
+	logging.Log("CONFI-dHR2a").OnError(err).Panic("unable to create csrfInterceptor")
+	cache, err := middleware.DefaultCacheInterceptor(EndpointResources, config.Cache.MaxAge.Duration, config.Cache.SharedMaxAge.Duration)
+	logging.Log("CONFI-BHq2a").OnError(err).Panic("unable to create cacheInterceptor")
+	security := middleware.SecurityHeaders(csp(), login.cspErrorHandler)
+	login.router = CreateRouter(login, statikFS, csrf, cache, security)
 	login.renderer = CreateRenderer(statikFS, config.LanguageCookieName, config.DefaultLanguage)
 	login.parser = form.NewParser()
 	login.Listen(ctx)
 }
 
+func csp() *middleware.CSP {
+	csp := middleware.DefaultSCP
+	csp.ObjectSrc = middleware.CSPSourceOptsSelf()
+	csp.StyleSrc = csp.StyleSrc.AddNonce()
+	csp.ScriptSrc = csp.ScriptSrc.AddNonce()
+	return &csp
+}
+
+func csrfInterceptor(config CSRF, errorHandler http.Handler) (func(http.Handler) http.Handler, error) {
+	csrfKey, err := crypto.LoadKey(config.Key, config.Key.EncryptionKeyID)
+	if err != nil {
+		return nil, err
+	}
+	return csrf.Protect([]byte(csrfKey),
+		csrf.Secure(!config.Development),
+		csrf.CookieName(config.CookieName),
+		csrf.ErrorHandler(errorHandler),
+	), nil
+}
+
 func (l *Login) Listen(ctx context.Context) {
 	if l.endpoint == "" {
 		l.endpoint = ":80"

internal/login/handler/login_handler.go

@@ -10,7 +10,7 @@ const (
 )
 
 type loginData struct {
-	UserName string `schema:"username"`
+	LoginName string `schema:"loginName"`
 }
 
 func (l *Login) handleLogin(w http.ResponseWriter, r *http.Request) {
@@ -26,7 +26,7 @@ func (l *Login) handleLogin(w http.ResponseWriter, r *http.Request) {
 	l.renderNextStep(w, r, authReq)
 }
 
-func (l *Login) handleUsername(w http.ResponseWriter, r *http.Request) {
+func (l *Login) handleLoginName(w http.ResponseWriter, r *http.Request) {
 	authSession, err := l.getAuthRequest(r)
 	if err != nil {
 		l.renderError(w, r, authSession, err)
@@ -35,14 +35,14 @@ func (l *Login) handleUsername(w http.ResponseWriter, r *http.Request) {
 	l.renderLogin(w, r, authSession, nil)
 }
 
-func (l *Login) handleUsernameCheck(w http.ResponseWriter, r *http.Request) {
+func (l *Login) handleLoginNameCheck(w http.ResponseWriter, r *http.Request) {
 	data := new(loginData)
 	authReq, err := l.getAuthRequestAndParseData(r, data)
 	if err != nil {
 		l.renderError(w, r, authReq, err)
 		return
 	}
-	err = l.authRepo.CheckUsername(r.Context(), authReq.ID, data.UserName)
+	err = l.authRepo.CheckLoginName(r.Context(), authReq.ID, data.LoginName)
 	if err != nil {
 		l.renderLogin(w, r, authReq, err)
 		return
@@ -56,8 +56,8 @@ func (l *Login) renderLogin(w http.ResponseWriter, r *http.Request, authReq *mod
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Login", errType, errMessage),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Login", errType, errMessage),
+		LoginName: authReq.LoginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplLogin], data, nil)
 }

internal/login/handler/mfa_init_done_handler.go

@@ -15,6 +15,6 @@ type mfaInitDoneData struct {
 func (l *Login) renderMfaInitDone(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, data *mfaDoneData) {
 	var errType, errMessage string
 	data.baseData = l.getBaseData(r, authReq, "Mfa Init Done", errType, errMessage)
-	data.UserName = authReq.UserName
+	data.LoginName = authReq.LoginName
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplMfaInitDone], data, nil)
 }

internal/login/handler/mfa_init_verify_handler.go

@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"net/http"
 
-	"github.com/aaronarduino/goqrsvg"
 	svg "github.com/ajstarks/svgo"
 	"github.com/boombuler/barcode/qr"
+
 	"github.com/caos/zitadel/internal/auth_request/model"
+	"github.com/caos/zitadel/internal/qrcode"
 )
 
 const (
@@ -67,7 +68,7 @@ func (l *Login) renderMfaInitVerify(w http.ResponseWriter, r *http.Request, auth
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data.baseData = l.getBaseData(r, authReq, "Mfa Init Verify", errType, errMessage)
-	data.UserName = authReq.UserName
+	data.LoginName = authReq.LoginName
 	if data.MfaType == model.MfaTypeOTP {
 		code, err := generateQrCode(data.otpData.Url)
 		if err == nil {
@@ -86,7 +87,7 @@ func generateQrCode(url string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	qs := goqrsvg.NewQrSVG(qrCode, 5)
+	qs := qrcode.NewQrSVG(qrCode, 5)
 	qs.StartQrSVG(s)
 	qs.WriteQrSVG(s)
 

internal/login/handler/mfa_prompt_handler.go

@@ -42,8 +42,8 @@ func (l *Login) renderMfaPrompt(w http.ResponseWriter, r *http.Request, authSess
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data := mfaData{
-		baseData: l.getBaseData(r, authSession, "Mfa Prompt", errType, errMessage),
-		UserName: authSession.UserName,
+		baseData:  l.getBaseData(r, authSession, "Mfa Prompt", errType, errMessage),
+		LoginName: authSession.LoginName,
 	}
 
 	if mfaPromptData == nil {

internal/login/handler/mfa_verify_handler.go

@@ -38,8 +38,8 @@ func (l *Login) renderMfaVerify(w http.ResponseWriter, r *http.Request, authReq
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Mfa Verify", errType, errMessage),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Mfa Verify", errType, errMessage),
+		LoginName: authReq.LoginName,
 	}
 	if verificationStep != nil {
 		data.MfaProviders = verificationStep.MfaProviders

internal/login/handler/password_handler.go

@@ -20,8 +20,8 @@ func (l *Login) renderPassword(w http.ResponseWriter, r *http.Request, authReq *
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Password", errType, errMessage),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Password", errType, errMessage),
+		LoginName: authReq.LoginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPassword], data, nil)
 }

internal/login/handler/password_reset_handler.go

@@ -15,7 +15,7 @@ func (l *Login) handlePasswordReset(w http.ResponseWriter, r *http.Request) {
 		l.renderError(w, r, authReq, err)
 		return
 	}
-	err = l.authRepo.RequestPasswordReset(setContext(r.Context(), authReq.UserOrgID), authReq.UserName)
+	err = l.authRepo.RequestPasswordReset(setContext(r.Context(), authReq.UserOrgID), authReq.LoginName)
 	l.renderPasswordResetDone(w, r, authReq, err)
 }
 
@@ -25,8 +25,8 @@ func (l *Login) renderPasswordResetDone(w http.ResponseWriter, r *http.Request,
 		errMessage = l.getErrorMessage(r, err)
 	}
 	data := userData{
-		baseData: l.getBaseData(r, authReq, "Password Reset Done", errType, errMessage),
-		UserName: authReq.UserName,
+		baseData:  l.getBaseData(r, authReq, "Password Reset Done", errType, errMessage),
+		LoginName: authReq.LoginName,
 	}
 	l.renderer.RenderTemplate(w, r, l.renderer.Templates[tmplPasswordResetDone], data, nil)
 }

internal/login/handler/register_handler.go

@@ -71,7 +71,7 @@ func (l *Login) handleRegisterCheck(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, l.zitadelURL, http.StatusFound)
 		return
 	}
-	authRequest.UserName = user.UserName
+	authRequest.LoginName = user.PreferredLoginName
 	l.renderNextStep(w, r, authRequest)
 }
 

internal/login/handler/renderer.go

@@ -3,6 +3,11 @@ package handler
 import (
 	"errors"
 	"fmt"
+	"html/template"
+
+	"github.com/gorilla/csrf"
+
+	"github.com/caos/zitadel/internal/api/http/middleware"
 	"github.com/caos/zitadel/internal/auth_request/model"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/i18n"
@@ -58,11 +63,11 @@ func CreateRenderer(staticDir http.FileSystem, cookieName string, defaultLanguag
 		"registerUrl": func(id string) string {
 			return fmt.Sprintf("%s?%s=%s", EndpointRegister, queryAuthRequestID, id)
 		},
-		"usernameUrl": func() string {
-			return EndpointUsername
+		"loginNameUrl": func() string {
+			return EndpointLoginName
 		},
-		"usernameChangeUrl": func(id string) string {
-			return fmt.Sprintf("%s?%s=%s", EndpointUsername, queryAuthRequestID, id)
+		"loginNameChangeUrl": func(id string) string {
+			return fmt.Sprintf("%s?%s=%s", EndpointLoginName, queryAuthRequestID, id)
 		},
 		"userSelectionUrl": func() string {
 			return EndpointUserSelection
@@ -189,6 +194,8 @@ func (l *Login) getBaseData(r *http.Request, authReq *model.AuthRequest, title s
 		Theme:     l.getTheme(r),
 		ThemeMode: l.getThemeMode(r),
 		AuthReqID: getRequestID(authReq, r),
+		CSRF:      csrf.TemplateField(r),
+		Nonce:     middleware.GetNonce(r),
 	}
 }
 
@@ -217,6 +224,19 @@ func getRequestID(authReq *model.AuthRequest, r *http.Request) string {
 	return r.FormValue(queryAuthRequestID)
 }
 
+func (l *Login) csrfErrorHandler() http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		err := csrf.FailureReason(r)
+		l.renderInternalError(w, r, nil, err)
+	})
+}
+
+func (l *Login) cspErrorHandler(err error) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		l.renderInternalError(w, r, nil, err)
+	})
+}
+
 type baseData struct {
 	errorData
 	Lang      string
@@ -224,6 +244,8 @@ type baseData struct {
 	Theme     string
 	ThemeMode string
 	AuthReqID string
+	CSRF      template.HTML
+	Nonce     string
 }
 
 type errorData struct {
@@ -233,7 +255,7 @@ type errorData struct {
 
 type userData struct {
 	baseData
-	UserName            string
+	LoginName           string
 	PasswordChecked     string
 	MfaProviders        []model.MfaType
 	SelectedMfaProvider model.MfaType
@@ -246,22 +268,22 @@ type userSelectionData struct {
 
 type mfaData struct {
 	baseData
-	UserName     string
+	LoginName    string
 	MfaProviders []model.MfaType
 	MfaRequired  bool
 }
 
 type mfaVerifyData struct {
 	baseData
-	UserName string
-	MfaType  model.MfaType
+	LoginName string
+	MfaType   model.MfaType
 	otpData
 }
 
 type mfaDoneData struct {
 	baseData
-	UserName string
-	MfaType  model.MfaType
+	LoginName string
+	MfaType   model.MfaType
 }
 
 type otpData struct {

internal/login/handler/router.go

@@ -11,7 +11,7 @@ const (
 	EndpointHealthz          = "/healthz"
 	EndpointReadiness        = "/ready"
 	EndpointLogin            = "/login"
-	EndpointUsername         = "/username"
+	EndpointLoginName        = "/loginname"
 	EndpointUserSelection    = "/userselection"
 	EndpointPassword         = "/password"
 	EndpointInitPassword     = "/password/init"
@@ -29,14 +29,15 @@ const (
 	EndpointResources = "/resources"
 )
 
-func CreateRouter(login *Login, staticDir http.FileSystem) *mux.Router {
+func CreateRouter(login *Login, staticDir http.FileSystem, interceptors ...mux.MiddlewareFunc) *mux.Router {
 	router := mux.NewRouter()
+	router.Use(interceptors...)
 	router.HandleFunc(EndpointRoot, login.handleLogin).Methods(http.MethodGet)
 	router.HandleFunc(EndpointHealthz, login.handleHealthz).Methods(http.MethodGet)
 	router.HandleFunc(EndpointReadiness, login.handleReadiness).Methods(http.MethodGet)
 	router.HandleFunc(EndpointLogin, login.handleLogin).Methods(http.MethodGet, http.MethodPost)
-	router.HandleFunc(EndpointUsername, login.handleUsername).Methods(http.MethodGet)
-	router.HandleFunc(EndpointUsername, login.handleUsernameCheck).Methods(http.MethodPost)
+	router.HandleFunc(EndpointLoginName, login.handleLoginName).Methods(http.MethodGet)
+	router.HandleFunc(EndpointLoginName, login.handleLoginNameCheck).Methods(http.MethodPost)
 	router.HandleFunc(EndpointUserSelection, login.handleSelectUser).Methods(http.MethodPost)
 	router.HandleFunc(EndpointPassword, login.handlePasswordCheck).Methods(http.MethodPost)
 	router.HandleFunc(EndpointInitPassword, login.handleInitPassword).Methods(http.MethodGet)