feat: run on a single port (#3163)

* start v2 * start * run * some cleanup * remove v2 pkg again * simplify * webauthn * remove unused config * fix login path in Dockerfile * fix asset_generator.go * health handler * fix grpc web * refactor * merge * build new main.go * run new main.go * update logging pkg * fix error msg * update logging * cleanup * cleanup * go mod tidy * change localDevMode * fix customEndpoints * update logging * comments * change local flag to external configs * fix location generated go code * fix Co-authored-by: fforootd <florian@caos.ch>
2025-12-14 09:22:09 +00:00 · 2022-02-14 17:22:30 +01:00
parent 2f3a482ade
commit 389eb4a27a
306 changed files with 1708 additions and 1567 deletions
--- a/internal/api/ui/login/mfa_verify_u2f_handler.go
+++ b/internal/api/ui/login/mfa_verify_u2f_handler.go
@@ -0,0 +1,79 @@
+package login
+
+import (
+	"encoding/base64"
+	"net/http"
+
+	"github.com/caos/zitadel/internal/domain"
+
+	http_mw "github.com/caos/zitadel/internal/api/http/middleware"
+)
+
+const (
+	tmplU2FVerification = "u2fverification"
+)
+
+type mfaU2FData struct {
+	webAuthNData
+	MFAProviders     []domain.MFAType
+	SelectedProvider domain.MFAType
+}
+
+type mfaU2FFormData struct {
+	webAuthNFormData
+	SelectedProvider domain.MFAType `schema:"provider"`
+}
+
+func (l *Login) renderU2FVerification(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, providers []domain.MFAType, err error) {
+	var errID, errMessage, credentialData string
+	var webAuthNLogin *domain.WebAuthNLogin
+	if err == nil {
+		userAgentID, _ := http_mw.UserAgentIDFromCtx(r.Context())
+		webAuthNLogin, err = l.authRepo.BeginMFAU2FLogin(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, authReq.UserOrgID, authReq.ID, userAgentID)
+	}
+	if err != nil {
+		errID, errMessage = l.getErrorMessage(r, err)
+	}
+	if webAuthNLogin != nil {
+		credentialData = base64.RawURLEncoding.EncodeToString(webAuthNLogin.CredentialAssertionData)
+	}
+	data := &mfaU2FData{
+		webAuthNData: webAuthNData{
+			userData:               l.getUserData(r, authReq, "Login WebAuthNToken", errID, errMessage),
+			CredentialCreationData: credentialData,
+		},
+		MFAProviders:     providers,
+		SelectedProvider: -1,
+	}
+	l.renderer.RenderTemplate(w, r, l.getTranslator(authReq), l.renderer.Templates[tmplU2FVerification], data, nil)
+}
+
+func (l *Login) handleU2FVerification(w http.ResponseWriter, r *http.Request) {
+	formData := new(mfaU2FFormData)
+	authReq, err := l.getAuthRequestAndParseData(r, formData)
+	if err != nil {
+		l.renderError(w, r, authReq, err)
+		return
+	}
+	step, ok := authReq.PossibleSteps[0].(*domain.MFAVerificationStep)
+	if !ok {
+		l.renderError(w, r, authReq, err)
+		return
+	}
+	if formData.CredentialData == "" {
+		l.renderMFAVerifySelected(w, r, authReq, step, formData.SelectedProvider, nil)
+		return
+	}
+	credData, err := base64.URLEncoding.DecodeString(formData.CredentialData)
+	if err != nil {
+		l.renderU2FVerification(w, r, authReq, step.MFAProviders, err)
+		return
+	}
+	userAgentID, _ := http_mw.UserAgentIDFromCtx(r.Context())
+	err = l.authRepo.VerifyMFAU2F(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, authReq.UserOrgID, authReq.ID, userAgentID, credData, domain.BrowserInfoFromRequest(r))
+	if err != nil {
+		l.renderU2FVerification(w, r, authReq, step.MFAProviders, err)
+		return
+	}
+	l.renderNextStep(w, r, authReq)
+}