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-10-15 11:00:46 +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_init_verify_handler.go
+++ b/internal/api/ui/login/mfa_init_verify_handler.go
@@ -0,0 +1,100 @@
+package login
+
+import (
+	"bytes"
+	"net/http"
+
+	"github.com/caos/zitadel/internal/domain"
+
+	svg "github.com/ajstarks/svgo"
+	"github.com/boombuler/barcode/qr"
+
+	http_mw "github.com/caos/zitadel/internal/api/http/middleware"
+	"github.com/caos/zitadel/internal/qrcode"
+)
+
+const (
+	tmplMFAInitVerify = "mfainitverify"
+)
+
+type mfaInitVerifyData struct {
+	MFAType domain.MFAType `schema:"mfaType"`
+	Code    string         `schema:"code"`
+	URL     string         `schema:"url"`
+	Secret  string         `schema:"secret"`
+}
+
+func (l *Login) handleMFAInitVerify(w http.ResponseWriter, r *http.Request) {
+	data := new(mfaInitVerifyData)
+	authReq, err := l.getAuthRequestAndParseData(r, data)
+	if err != nil {
+		l.renderError(w, r, authReq, err)
+		return
+	}
+	var verifyData *mfaVerifyData
+	switch data.MFAType {
+	case domain.MFATypeOTP:
+		verifyData = l.handleOTPVerify(w, r, authReq, data)
+	}
+
+	if verifyData != nil {
+		l.renderMFAInitVerify(w, r, authReq, verifyData, err)
+		return
+	}
+
+	done := &mfaDoneData{
+		MFAType: data.MFAType,
+	}
+	l.renderMFAInitDone(w, r, authReq, done)
+}
+
+func (l *Login) handleOTPVerify(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *mfaInitVerifyData) *mfaVerifyData {
+	userAgentID, _ := http_mw.UserAgentIDFromCtx(r.Context())
+	_, err := l.command.HumanCheckMFAOTPSetup(setContext(r.Context(), authReq.UserOrgID), authReq.UserID, data.Code, userAgentID, authReq.UserOrgID)
+	if err == nil {
+		return nil
+	}
+	mfadata := &mfaVerifyData{
+		MFAType: data.MFAType,
+		otpData: otpData{
+			Secret: data.Secret,
+			Url:    data.URL,
+		},
+	}
+
+	return mfadata
+}
+
+func (l *Login) renderMFAInitVerify(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *mfaVerifyData, err error) {
+	var errID, errMessage string
+	if err != nil {
+		errID, errMessage = l.getErrorMessage(r, err)
+	}
+	data.baseData = l.getBaseData(r, authReq, "MFA Init Verify", errID, errMessage)
+	data.profileData = l.getProfileData(authReq)
+	if data.MFAType == domain.MFATypeOTP {
+		code, err := generateQrCode(data.otpData.Url)
+		if err == nil {
+			data.otpData.QrCode = code
+		}
+	}
+
+	translator := l.getTranslator(authReq)
+	l.renderer.RenderTemplate(w, r, translator, l.renderer.Templates[tmplMFAInitVerify], data, nil)
+}
+
+func generateQrCode(url string) (string, error) {
+	var b bytes.Buffer
+	s := svg.New(&b)
+
+	qrCode, err := qr.Encode(url, qr.M, qr.Auto)
+	if err != nil {
+		return "", err
+	}
+	qs := qrcode.NewQrSVG(qrCode, 5)
+	qs.StartQrSVG(s)
+	qs.WriteQrSVG(s)
+
+	s.End()
+	return string(b.Bytes()), nil
+}