merge main into next

2025-08-12 01:47:33 +00:00 · 2023-10-19 12:34:00 +02:00
parent b5564572bc
commit bd23a7a56f
107 changed files with 1321 additions and 554 deletions
--- a/internal/query/projection/session.go
+++ b/internal/query/projection/session.go
@@ -14,27 +14,31 @@ import (
 )

 const (
-	SessionsProjectionTable = "projections.sessions5"
+	SessionsProjectionTable = "projections.sessions6"

-	SessionColumnID                   = "id"
-	SessionColumnCreationDate         = "creation_date"
-	SessionColumnChangeDate           = "change_date"
-	SessionColumnSequence             = "sequence"
-	SessionColumnState                = "state"
-	SessionColumnResourceOwner        = "resource_owner"
-	SessionColumnInstanceID           = "instance_id"
-	SessionColumnCreator              = "creator"
-	SessionColumnUserID               = "user_id"
-	SessionColumnUserCheckedAt        = "user_checked_at"
-	SessionColumnPasswordCheckedAt    = "password_checked_at"
-	SessionColumnIntentCheckedAt      = "intent_checked_at"
-	SessionColumnWebAuthNCheckedAt    = "webauthn_checked_at"
-	SessionColumnWebAuthNUserVerified = "webauthn_user_verified"
-	SessionColumnTOTPCheckedAt        = "totp_checked_at"
-	SessionColumnOTPSMSCheckedAt      = "otp_sms_checked_at"
-	SessionColumnOTPEmailCheckedAt    = "otp_email_checked_at"
-	SessionColumnMetadata             = "metadata"
-	SessionColumnTokenID              = "token_id"
+	SessionColumnID                     = "id"
+	SessionColumnCreationDate           = "creation_date"
+	SessionColumnChangeDate             = "change_date"
+	SessionColumnSequence               = "sequence"
+	SessionColumnState                  = "state"
+	SessionColumnResourceOwner          = "resource_owner"
+	SessionColumnInstanceID             = "instance_id"
+	SessionColumnCreator                = "creator"
+	SessionColumnUserID                 = "user_id"
+	SessionColumnUserCheckedAt          = "user_checked_at"
+	SessionColumnPasswordCheckedAt      = "password_checked_at"
+	SessionColumnIntentCheckedAt        = "intent_checked_at"
+	SessionColumnWebAuthNCheckedAt      = "webauthn_checked_at"
+	SessionColumnWebAuthNUserVerified   = "webauthn_user_verified"
+	SessionColumnTOTPCheckedAt          = "totp_checked_at"
+	SessionColumnOTPSMSCheckedAt        = "otp_sms_checked_at"
+	SessionColumnOTPEmailCheckedAt      = "otp_email_checked_at"
+	SessionColumnMetadata               = "metadata"
+	SessionColumnTokenID                = "token_id"
+	SessionColumnUserAgentFingerprintID = "user_agent_fingerprint_id"
+	SessionColumnUserAgentIP            = "user_agent_ip"
+	SessionColumnUserAgentDescription   = "user_agent_description"
+	SessionColumnUserAgentHeader        = "user_agent_header"
 )

 type sessionProjection struct{}
@@ -69,8 +73,16 @@ func (*sessionProjection) Init() *old_handler.Check {
 			handler.NewColumn(SessionColumnOTPEmailCheckedAt, handler.ColumnTypeTimestamp, handler.Nullable()),
 			handler.NewColumn(SessionColumnMetadata, handler.ColumnTypeJSONB, handler.Nullable()),
 			handler.NewColumn(SessionColumnTokenID, handler.ColumnTypeText, handler.Nullable()),
+			handler.NewColumn(SessionColumnUserAgentFingerprintID, handler.ColumnTypeText, handler.Nullable()),
+			handler.NewColumn(SessionColumnUserAgentIP, handler.ColumnTypeText, handler.Nullable()),
+			handler.NewColumn(SessionColumnUserAgentDescription, handler.ColumnTypeText, handler.Nullable()),
+			handler.NewColumn(SessionColumnUserAgentHeader, handler.ColumnTypeJSONB, handler.Nullable()),
 		},
 			handler.NewPrimaryKey(SessionColumnInstanceID, SessionColumnID),
+			handler.WithIndex(handler.NewIndex(
+				SessionColumnUserAgentFingerprintID+"_idx",
+				[]string{SessionColumnUserAgentFingerprintID},
+			)),
 		),
 	)
 }
@@ -153,19 +165,35 @@ func (p *sessionProjection) reduceSessionAdded(event eventstore.Event) (*handler
 		return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Sfrgf", "reduce.wrong.event.type %s", session.AddedType)
 	}

-	return handler.NewCreateStatement(
-		e,
-		[]handler.Column{
-			handler.NewCol(SessionColumnID, e.Aggregate().ID),
-			handler.NewCol(SessionColumnInstanceID, e.Aggregate().InstanceID),
-			handler.NewCol(SessionColumnCreationDate, e.CreationDate()),
-			handler.NewCol(SessionColumnChangeDate, e.CreationDate()),
-			handler.NewCol(SessionColumnResourceOwner, e.Aggregate().ResourceOwner),
-			handler.NewCol(SessionColumnState, domain.SessionStateActive),
-			handler.NewCol(SessionColumnSequence, e.Sequence()),
-			handler.NewCol(SessionColumnCreator, e.User),
-		},
-	), nil
+	cols := make([]handler.Column, 0, 12)
+	cols = append(cols,
+		handler.NewCol(SessionColumnID, e.Aggregate().ID),
+		handler.NewCol(SessionColumnInstanceID, e.Aggregate().InstanceID),
+		handler.NewCol(SessionColumnCreationDate, e.CreationDate()),
+		handler.NewCol(SessionColumnChangeDate, e.CreationDate()),
+		handler.NewCol(SessionColumnResourceOwner, e.Aggregate().ResourceOwner),
+		handler.NewCol(SessionColumnState, domain.SessionStateActive),
+		handler.NewCol(SessionColumnSequence, e.Sequence()),
+		handler.NewCol(SessionColumnCreator, e.User),
+	)
+	if e.UserAgent != nil {
+		cols = append(cols,
+			handler.NewCol(SessionColumnUserAgentFingerprintID, e.UserAgent.FingerprintID),
+			handler.NewCol(SessionColumnUserAgentDescription, e.UserAgent.Description),
+		)
+		if e.UserAgent.IP != nil {
+			cols = append(cols,
+				handler.NewCol(SessionColumnUserAgentIP, e.UserAgent.IP.String()),
+			)
+		}
+		if e.UserAgent.Header != nil {
+			cols = append(cols,
+				handler.NewJSONCol(SessionColumnUserAgentHeader, e.UserAgent.Header),
+			)
+		}
+	}
+
+	return handler.NewCreateStatement(e, cols), nil
 }

 func (p *sessionProjection) reduceUserChecked(event eventstore.Event) (*handler.Statement, error) {
--- a/internal/query/projection/session_test.go
+++ b/internal/query/projection/session_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 	"time"

+	"github.com/muhlemmer/gu"
+
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
@@ -30,7 +32,15 @@ func TestSessionProjection_reduces(t *testing.T) {
 					session.AddedType,
 					session.AggregateType,
 					[]byte(`{
-						"domain": "domain"
+						"domain": "domain",
+						"user_agent": {
+							"fingerprint_id": "fp1",
+							"ip": "1.2.3.4",
+							"description": "firefox",
+							"header": {
+								"foo": ["bar"]
+							}
+						}
 					}`),
 				), session.AddedEventMapper),
 			},
@@ -41,7 +51,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "INSERT INTO projections.sessions5 (id, instance_id, creation_date, change_date, resource_owner, state, sequence, creator) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
+							expectedStmt: "INSERT INTO projections.sessions6 (id, instance_id, creation_date, change_date, resource_owner, state, sequence, creator, user_agent_fingerprint_id, user_agent_description, user_agent_ip, user_agent_header) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)",
 							expectedArgs: []interface{}{
 								"agg-id",
 								"instance-id",
@@ -51,6 +61,10 @@ func TestSessionProjection_reduces(t *testing.T) {
 								domain.SessionStateActive,
 								uint64(15),
 								"editor-user",
+								gu.Ptr("fp1"),
+								gu.Ptr("firefox"),
+								"1.2.3.4",
+								[]byte(`{"foo":["bar"]}`),
 							},
 						},
 					},
@@ -76,7 +90,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, user_id, user_checked_at) = ($1, $2, $3, $4) WHERE (id = $5) AND (instance_id = $6)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, user_id, user_checked_at) = ($1, $2, $3, $4) WHERE (id = $5) AND (instance_id = $6)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -108,7 +122,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, password_checked_at) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, password_checked_at) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -140,7 +154,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, webauthn_checked_at, webauthn_user_verified) = ($1, $2, $3, $4) WHERE (id = $5) AND (instance_id = $6)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, webauthn_checked_at, webauthn_user_verified) = ($1, $2, $3, $4) WHERE (id = $5) AND (instance_id = $6)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -172,7 +186,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, intent_checked_at) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, intent_checked_at) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -203,7 +217,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, totp_checked_at) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, totp_checked_at) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -234,7 +248,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, token_id) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, token_id) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -267,7 +281,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET (change_date, sequence, metadata) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
+							expectedStmt: "UPDATE projections.sessions6 SET (change_date, sequence, metadata) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
 							expectedArgs: []interface{}{
 								anyArg{},
 								anyArg{},
@@ -298,7 +312,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "DELETE FROM projections.sessions5 WHERE (id = $1) AND (instance_id = $2)",
+							expectedStmt: "DELETE FROM projections.sessions6 WHERE (id = $1) AND (instance_id = $2)",
 							expectedArgs: []interface{}{
 								"agg-id",
 								"instance-id",
@@ -325,7 +339,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "DELETE FROM projections.sessions5 WHERE (instance_id = $1)",
+							expectedStmt: "DELETE FROM projections.sessions6 WHERE (instance_id = $1)",
 							expectedArgs: []interface{}{
 								"agg-id",
 							},
@@ -355,7 +369,7 @@ func TestSessionProjection_reduces(t *testing.T) {
 				executer: &testExecuter{
 					executions: []execution{
 						{
-							expectedStmt: "UPDATE projections.sessions5 SET password_checked_at = $1 WHERE (user_id = $2) AND (password_checked_at < $3)",
+							expectedStmt: "UPDATE projections.sessions6 SET password_checked_at = $1 WHERE (user_id = $2) AND (password_checked_at < $3)",
 							expectedArgs: []interface{}{
 								nil,
 								"agg-id",