mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 03:37:34 +00:00
feat: Config to eventstore (#3158)
* feat: add default language to eventstore * feat: add secret generator configs events * feat: tests * feat: secret generators in eventstore * feat: secret generators in eventstore * feat: smtp config in eventstore * feat: smtp config in eventstore * feat: smtp config in eventstore * feat: smtp config in eventstore * feat: smtp config in eventstore * fix: migrations * fix migration version * fix test * feat: change secret generator type to enum * feat: change smtp attribute names * feat: change smtp attribute names * feat: remove engryption algorithms from command side * feat: remove engryption algorithms from command side * feat: smtp config * feat: smtp config * format smtp from header Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
@@ -186,7 +186,7 @@ func (q *Queries) readLoginTranslationFile(lang string) ([]byte, error) {
|
||||
if !ok {
|
||||
contents, err = q.readTranslationFile(q.LoginDir, fmt.Sprintf("/i18n/%s.yaml", lang))
|
||||
if errors.IsNotFound(err) {
|
||||
contents, err = q.readTranslationFile(q.LoginDir, fmt.Sprintf("/i18n/%s.yaml", q.DefaultLanguage.String()))
|
||||
contents, err = q.readTranslationFile(q.LoginDir, fmt.Sprintf("/i18n/%s.yaml", q.GetDefaultLanguage(context.Background()).String()))
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
"golang.org/x/text/language"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -44,6 +45,10 @@ var (
|
||||
name: projection.IAMColumnSetUpDone,
|
||||
table: iamTable,
|
||||
}
|
||||
IAMColumnDefaultLanguage = Column{
|
||||
name: projection.IAMColumnDefaultLanguage,
|
||||
table: iamTable,
|
||||
}
|
||||
)
|
||||
|
||||
type IAM struct {
|
||||
@@ -51,10 +56,11 @@ type IAM struct {
|
||||
ChangeDate time.Time
|
||||
Sequence uint64
|
||||
|
||||
GlobalOrgID string
|
||||
IAMProjectID string
|
||||
SetupStarted domain.Step
|
||||
SetupDone domain.Step
|
||||
GlobalOrgID string
|
||||
IAMProjectID string
|
||||
DefaultLanguage language.Tag
|
||||
SetupStarted domain.Step
|
||||
SetupDone domain.Step
|
||||
}
|
||||
|
||||
type IAMSearchQueries struct {
|
||||
@@ -83,6 +89,14 @@ func (q *Queries) IAMByID(ctx context.Context, id string) (*IAM, error) {
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) GetDefaultLanguage(ctx context.Context) language.Tag {
|
||||
iam, err := q.IAMByID(ctx, domain.IAMID)
|
||||
if err != nil {
|
||||
return language.Und
|
||||
}
|
||||
return iam.DefaultLanguage
|
||||
}
|
||||
|
||||
func prepareIAMQuery() (sq.SelectBuilder, func(*sql.Row) (*IAM, error)) {
|
||||
return sq.Select(
|
||||
IAMColumnID.identifier(),
|
||||
@@ -92,18 +106,21 @@ func prepareIAMQuery() (sq.SelectBuilder, func(*sql.Row) (*IAM, error)) {
|
||||
IAMColumnProjectID.identifier(),
|
||||
IAMColumnSetupStarted.identifier(),
|
||||
IAMColumnSetupDone.identifier(),
|
||||
IAMColumnDefaultLanguage.identifier(),
|
||||
).
|
||||
From(iamTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(row *sql.Row) (*IAM, error) {
|
||||
o := new(IAM)
|
||||
iam := new(IAM)
|
||||
lang := ""
|
||||
err := row.Scan(
|
||||
&o.ID,
|
||||
&o.ChangeDate,
|
||||
&o.Sequence,
|
||||
&o.GlobalOrgID,
|
||||
&o.IAMProjectID,
|
||||
&o.SetupStarted,
|
||||
&o.SetupDone,
|
||||
&iam.ID,
|
||||
&iam.ChangeDate,
|
||||
&iam.Sequence,
|
||||
&iam.GlobalOrgID,
|
||||
&iam.IAMProjectID,
|
||||
&iam.SetupStarted,
|
||||
&iam.SetupDone,
|
||||
&lang,
|
||||
)
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
@@ -111,6 +128,7 @@ func prepareIAMQuery() (sq.SelectBuilder, func(*sql.Row) (*IAM, error)) {
|
||||
}
|
||||
return nil, errors.ThrowInternal(err, "QUERY-d9nw", "Errors.Internal")
|
||||
}
|
||||
return o, nil
|
||||
iam.DefaultLanguage = language.Make(lang)
|
||||
return iam, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
errs "github.com/caos/zitadel/internal/errors"
|
||||
"golang.org/x/text/language"
|
||||
)
|
||||
|
||||
func Test_IAMPrepares(t *testing.T) {
|
||||
@@ -34,7 +35,8 @@ func Test_IAMPrepares(t *testing.T) {
|
||||
` zitadel.projections.iam.global_org_id,`+
|
||||
` zitadel.projections.iam.iam_project_id,`+
|
||||
` zitadel.projections.iam.setup_started,`+
|
||||
` zitadel.projections.iam.setup_done`+
|
||||
` zitadel.projections.iam.setup_done,`+
|
||||
` zitadel.projections.iam.default_language`+
|
||||
` FROM zitadel.projections.iam`),
|
||||
nil,
|
||||
nil,
|
||||
@@ -59,7 +61,8 @@ func Test_IAMPrepares(t *testing.T) {
|
||||
` zitadel.projections.iam.global_org_id,`+
|
||||
` zitadel.projections.iam.iam_project_id,`+
|
||||
` zitadel.projections.iam.setup_started,`+
|
||||
` zitadel.projections.iam.setup_done`+
|
||||
` zitadel.projections.iam.setup_done,`+
|
||||
` zitadel.projections.iam.default_language`+
|
||||
` FROM zitadel.projections.iam`),
|
||||
[]string{
|
||||
"id",
|
||||
@@ -69,6 +72,7 @@ func Test_IAMPrepares(t *testing.T) {
|
||||
"iam_project_id",
|
||||
"setup_started",
|
||||
"setup_done",
|
||||
"default_language",
|
||||
},
|
||||
[]driver.Value{
|
||||
"id",
|
||||
@@ -78,17 +82,19 @@ func Test_IAMPrepares(t *testing.T) {
|
||||
"project-id",
|
||||
domain.Step2,
|
||||
domain.Step1,
|
||||
"en",
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &IAM{
|
||||
ID: "id",
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211108,
|
||||
GlobalOrgID: "global-org-id",
|
||||
IAMProjectID: "project-id",
|
||||
SetupStarted: domain.Step2,
|
||||
SetupDone: domain.Step1,
|
||||
ID: "id",
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211108,
|
||||
GlobalOrgID: "global-org-id",
|
||||
IAMProjectID: "project-id",
|
||||
SetupStarted: domain.Step2,
|
||||
SetupDone: domain.Step1,
|
||||
DefaultLanguage: language.English,
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -102,7 +108,8 @@ func Test_IAMPrepares(t *testing.T) {
|
||||
` zitadel.projections.iam.global_org_id,`+
|
||||
` zitadel.projections.iam.iam_project_id,`+
|
||||
` zitadel.projections.iam.setup_started,`+
|
||||
` zitadel.projections.iam.setup_done`+
|
||||
` zitadel.projections.iam.setup_done,`+
|
||||
` zitadel.projections.iam.default_language`+
|
||||
` FROM zitadel.projections.iam`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/lib/pq"
|
||||
|
||||
|
||||
"github.com/caos/zitadel/internal/crypto"
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
@@ -186,7 +186,7 @@ func (q *Queries) IDPByIDAndResourceOwner(ctx context.Context, id, resourceOwner
|
||||
IDPResourceOwnerCol.identifier(): resourceOwner,
|
||||
},
|
||||
sq.Eq{
|
||||
IDPResourceOwnerCol.identifier(): q.iamID,
|
||||
IDPResourceOwnerCol.identifier(): domain.IAMID,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -47,7 +47,7 @@ func (q *Queries) ActiveLabelPolicyByOrg(ctx context.Context, orgID string) (*La
|
||||
LabelPolicyColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
LabelPolicyColID.identifier(): q.iamID,
|
||||
LabelPolicyColID.identifier(): domain.IAMID,
|
||||
},
|
||||
},
|
||||
sq.Eq{
|
||||
@@ -73,7 +73,7 @@ func (q *Queries) PreviewLabelPolicyByOrg(ctx context.Context, orgID string) (*L
|
||||
LabelPolicyColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
LabelPolicyColID.identifier(): q.iamID,
|
||||
LabelPolicyColID.identifier(): domain.IAMID,
|
||||
},
|
||||
},
|
||||
sq.Eq{
|
||||
@@ -93,7 +93,7 @@ func (q *Queries) PreviewLabelPolicyByOrg(ctx context.Context, orgID string) (*L
|
||||
func (q *Queries) DefaultActiveLabelPolicy(ctx context.Context) (*LabelPolicy, error) {
|
||||
stmt, scan := prepareLabelPolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
LabelPolicyColID.identifier(): q.iamID,
|
||||
LabelPolicyColID.identifier(): domain.IAMID,
|
||||
LabelPolicyColState.identifier(): domain.LabelPolicyStateActive,
|
||||
}).
|
||||
OrderBy(LabelPolicyColIsDefault.identifier()).
|
||||
@@ -109,7 +109,7 @@ func (q *Queries) DefaultActiveLabelPolicy(ctx context.Context) (*LabelPolicy, e
|
||||
func (q *Queries) DefaultPreviewLabelPolicy(ctx context.Context) (*LabelPolicy, error) {
|
||||
stmt, scan := prepareLabelPolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
LabelPolicyColID.identifier(): q.iamID,
|
||||
LabelPolicyColID.identifier(): domain.IAMID,
|
||||
LabelPolicyColState.identifier(): domain.LabelPolicyStatePreview,
|
||||
}).
|
||||
OrderBy(LabelPolicyColIsDefault.identifier()).
|
||||
|
||||
@@ -76,7 +76,7 @@ func (q *Queries) LockoutPolicyByOrg(ctx context.Context, orgID string) (*Lockou
|
||||
LockoutColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
LockoutColID.identifier(): q.iamID,
|
||||
LockoutColID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(LockoutColIsDefault.identifier()).
|
||||
@@ -92,7 +92,7 @@ func (q *Queries) LockoutPolicyByOrg(ctx context.Context, orgID string) (*Lockou
|
||||
func (q *Queries) DefaultLockoutPolicy(ctx context.Context) (*LockoutPolicy, error) {
|
||||
stmt, scan := prepareLockoutPolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
LockoutColID.identifier(): q.iamID,
|
||||
LockoutColID.identifier(): domain.IAMID,
|
||||
}).
|
||||
OrderBy(LockoutColIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
|
||||
@@ -65,7 +65,7 @@ func (q *Queries) MailTemplateByOrg(ctx context.Context, orgID string) (*MailTem
|
||||
MailTemplateColAggregateID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
MailTemplateColAggregateID.identifier(): q.iamID,
|
||||
MailTemplateColAggregateID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(MailTemplateColIsDefault.identifier()).
|
||||
@@ -81,7 +81,7 @@ func (q *Queries) MailTemplateByOrg(ctx context.Context, orgID string) (*MailTem
|
||||
func (q *Queries) DefaultMailTemplate(ctx context.Context) (*MailTemplate, error) {
|
||||
stmt, scan := prepareMailTemplateQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
MailTemplateColAggregateID.identifier(): q.iamID,
|
||||
MailTemplateColAggregateID.identifier(): domain.IAMID,
|
||||
}).
|
||||
OrderBy(MailTemplateColIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
|
||||
@@ -119,7 +119,7 @@ func (q *Queries) MessageTextByOrg(ctx context.Context, orgID string) (*MessageT
|
||||
MessageTextColAggregateID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
MessageTextColAggregateID.identifier(): q.iamID,
|
||||
MessageTextColAggregateID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(MessageTextColAggregateID.identifier()).
|
||||
@@ -135,7 +135,7 @@ func (q *Queries) MessageTextByOrg(ctx context.Context, orgID string) (*MessageT
|
||||
func (q *Queries) DefaultMessageText(ctx context.Context) (*MessageText, error) {
|
||||
stmt, scan := prepareMessageTextQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
MessageTextColAggregateID.identifier(): q.iamID,
|
||||
MessageTextColAggregateID.identifier(): domain.IAMID,
|
||||
}).
|
||||
Limit(1).ToSql()
|
||||
if err != nil {
|
||||
@@ -230,7 +230,7 @@ func (q *Queries) readNotificationTextMessages(language string) ([]byte, error)
|
||||
if !ok {
|
||||
contents, err = q.readTranslationFile(q.NotificationDir, fmt.Sprintf("/i18n/%s.yaml", language))
|
||||
if errors.IsNotFound(err) {
|
||||
contents, err = q.readTranslationFile(q.NotificationDir, fmt.Sprintf("/i18n/%s.yaml", q.DefaultLanguage.String()))
|
||||
contents, err = q.readTranslationFile(q.NotificationDir, fmt.Sprintf("/i18n/%s.yaml", q.GetDefaultLanguage(context.Background()).String()))
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -71,7 +71,7 @@ func (q *Queries) OrgIAMPolicyByOrg(ctx context.Context, orgID string) (*OrgIAMP
|
||||
OrgIAMColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
OrgIAMColID.identifier(): q.iamID,
|
||||
OrgIAMColID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(OrgIAMColIsDefault.identifier()).
|
||||
@@ -87,7 +87,7 @@ func (q *Queries) OrgIAMPolicyByOrg(ctx context.Context, orgID string) (*OrgIAMP
|
||||
func (q *Queries) DefaultOrgIAMPolicy(ctx context.Context) (*OrgIAMPolicy, error) {
|
||||
stmt, scan := prepareOrgIAMPolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
OrgIAMColID.identifier(): q.iamID,
|
||||
OrgIAMColID.identifier(): domain.IAMID,
|
||||
}).
|
||||
OrderBy(OrgIAMColIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
|
||||
@@ -76,7 +76,7 @@ func (q *Queries) PasswordAgePolicyByOrg(ctx context.Context, orgID string) (*Pa
|
||||
PasswordAgeColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
PasswordAgeColID.identifier(): q.iamID,
|
||||
PasswordAgeColID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(PasswordAgeColIsDefault.identifier()).
|
||||
@@ -92,7 +92,7 @@ func (q *Queries) PasswordAgePolicyByOrg(ctx context.Context, orgID string) (*Pa
|
||||
func (q *Queries) DefaultPasswordAgePolicy(ctx context.Context) (*PasswordAgePolicy, error) {
|
||||
stmt, scan := preparePasswordAgePolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
PasswordAgeColID.identifier(): q.iamID,
|
||||
PasswordAgeColID.identifier(): domain.IAMID,
|
||||
}).
|
||||
OrderBy(PasswordAgeColIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
|
||||
@@ -37,7 +37,7 @@ func (q *Queries) PasswordComplexityPolicyByOrg(ctx context.Context, orgID strin
|
||||
PasswordComplexityColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
PasswordComplexityColID.identifier(): q.iamID,
|
||||
PasswordComplexityColID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(PasswordComplexityColIsDefault.identifier()).
|
||||
@@ -53,7 +53,7 @@ func (q *Queries) PasswordComplexityPolicyByOrg(ctx context.Context, orgID strin
|
||||
func (q *Queries) DefaultPasswordComplexityPolicy(ctx context.Context) (*PasswordComplexityPolicy, error) {
|
||||
stmt, scan := preparePasswordComplexityPolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
PasswordComplexityColID.identifier(): q.iamID,
|
||||
PasswordComplexityColID.identifier(): domain.IAMID,
|
||||
}).
|
||||
OrderBy(PasswordComplexityColIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
|
||||
@@ -76,7 +76,7 @@ func (q *Queries) PrivacyPolicyByOrg(ctx context.Context, orgID string) (*Privac
|
||||
PrivacyColID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
PrivacyColID.identifier(): q.iamID,
|
||||
PrivacyColID.identifier(): domain.IAMID,
|
||||
},
|
||||
}).
|
||||
OrderBy(PrivacyColIsDefault.identifier()).
|
||||
@@ -92,7 +92,7 @@ func (q *Queries) PrivacyPolicyByOrg(ctx context.Context, orgID string) (*Privac
|
||||
func (q *Queries) DefaultPrivacyPolicy(ctx context.Context) (*PrivacyPolicy, error) {
|
||||
stmt, scan := preparePrivacyPolicyQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
PrivacyColID.identifier(): q.iamID,
|
||||
PrivacyColID.identifier(): domain.IAMID,
|
||||
}).
|
||||
OrderBy(PrivacyColIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
|
||||
@@ -40,6 +40,10 @@ func (p *IAMProjection) reducers() []handler.AggregateReducer {
|
||||
Event: iam.ProjectSetEventType,
|
||||
Reduce: p.reduceIAMProjectSet,
|
||||
},
|
||||
{
|
||||
Event: iam.DefaultLanguageSetEventType,
|
||||
Reduce: p.reduceDefaultLanguageSet,
|
||||
},
|
||||
{
|
||||
Event: iam.SetupStartedEventType,
|
||||
Reduce: p.reduceSetupEvent,
|
||||
@@ -56,13 +60,14 @@ func (p *IAMProjection) reducers() []handler.AggregateReducer {
|
||||
type IAMColumn string
|
||||
|
||||
const (
|
||||
IAMColumnID = "id"
|
||||
IAMColumnChangeDate = "change_date"
|
||||
IAMColumnGlobalOrgID = "global_org_id"
|
||||
IAMColumnProjectID = "iam_project_id"
|
||||
IAMColumnSequence = "sequence"
|
||||
IAMColumnSetUpStarted = "setup_started"
|
||||
IAMColumnSetUpDone = "setup_done"
|
||||
IAMColumnID = "id"
|
||||
IAMColumnChangeDate = "change_date"
|
||||
IAMColumnGlobalOrgID = "global_org_id"
|
||||
IAMColumnProjectID = "iam_project_id"
|
||||
IAMColumnSequence = "sequence"
|
||||
IAMColumnSetUpStarted = "setup_started"
|
||||
IAMColumnSetUpDone = "setup_done"
|
||||
IAMColumnDefaultLanguage = "default_language"
|
||||
)
|
||||
|
||||
func (p *IAMProjection) reduceGlobalOrgSet(event eventstore.Event) (*handler.Statement, error) {
|
||||
@@ -99,6 +104,23 @@ func (p *IAMProjection) reduceIAMProjectSet(event eventstore.Event) (*handler.St
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *IAMProjection) reduceDefaultLanguageSet(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.DefaultLanguageSetEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-3n9le", "seq", event.Sequence(), "expectedType", iam.DefaultLanguageSetEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-30o0e", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewUpsertStatement(
|
||||
e,
|
||||
[]handler.Column{
|
||||
handler.NewCol(IAMColumnID, e.Aggregate().ID),
|
||||
handler.NewCol(IAMColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(IAMColumnSequence, e.Sequence()),
|
||||
handler.NewCol(IAMColumnDefaultLanguage, e.Language.String()),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *IAMProjection) reduceSetupEvent(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SetupStepEvent)
|
||||
if !ok {
|
||||
|
||||
@@ -52,7 +52,7 @@ func TestIAMProjection_reduces(t *testing.T) {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceGlobalOrgSet",
|
||||
name: "reduceProjectIDSet",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.ProjectSetEventType),
|
||||
@@ -81,6 +81,36 @@ func TestIAMProjection_reduces(t *testing.T) {
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceDefaultLanguageSet",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.DefaultLanguageSetEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{"language": "en"}`),
|
||||
), iam.DefaultLanguageSetMapper),
|
||||
},
|
||||
reduce: (&IAMProjection{}).reduceDefaultLanguageSet,
|
||||
want: wantReduce{
|
||||
projection: IAMProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPSERT INTO zitadel.projections.iam (id, change_date, sequence, default_language) VALUES ($1, $2, $3, $4)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
"en",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceSetupStarted",
|
||||
args: args{
|
||||
|
||||
@@ -69,6 +69,8 @@ func Start(ctx context.Context, sqlClient *sql.DB, es *eventstore.Eventstore, co
|
||||
NewUserMetadataProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["user_metadata"]))
|
||||
NewUserAuthMethodProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["user_auth_method"]))
|
||||
NewIAMProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["iam"]))
|
||||
NewSecretGeneratorProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["secret_generators"]))
|
||||
NewSMTPConfigProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["smtp_configs"]))
|
||||
_, err := NewKeyProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["keys"]), keyConfig, keyChan)
|
||||
|
||||
return err
|
||||
|
||||
144
internal/query/projection/secret_generator.go
Normal file
144
internal/query/projection/secret_generator.go
Normal file
@@ -0,0 +1,144 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/caos/logging"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler/crdb"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
"github.com/caos/zitadel/internal/repository/project"
|
||||
)
|
||||
|
||||
type SecretGeneratorProjection struct {
|
||||
crdb.StatementHandler
|
||||
}
|
||||
|
||||
const (
|
||||
SecretGeneratorProjectionTable = "zitadel.projections.secret_generators"
|
||||
)
|
||||
|
||||
func NewSecretGeneratorProjection(ctx context.Context, config crdb.StatementHandlerConfig) *SecretGeneratorProjection {
|
||||
p := &SecretGeneratorProjection{}
|
||||
config.ProjectionName = SecretGeneratorProjectionTable
|
||||
config.Reducers = p.reducers()
|
||||
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
||||
return p
|
||||
}
|
||||
|
||||
func (p *SecretGeneratorProjection) reducers() []handler.AggregateReducer {
|
||||
return []handler.AggregateReducer{
|
||||
{
|
||||
Aggregate: project.AggregateType,
|
||||
EventRedusers: []handler.EventReducer{
|
||||
{
|
||||
Event: iam.SecretGeneratorAddedEventType,
|
||||
Reduce: p.reduceSecretGeneratorAdded,
|
||||
},
|
||||
{
|
||||
Event: iam.SecretGeneratorChangedEventType,
|
||||
Reduce: p.reduceSecretGeneratorChanged,
|
||||
},
|
||||
{
|
||||
Event: iam.SecretGeneratorRemovedEventType,
|
||||
Reduce: p.reduceSecretGeneratorRemoved,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const (
|
||||
SecretGeneratorColumnGeneratorType = "generator_type"
|
||||
SecretGeneratorColumnAggregateID = "aggregate_id"
|
||||
SecretGeneratorColumnCreationDate = "creation_date"
|
||||
SecretGeneratorColumnChangeDate = "change_date"
|
||||
SecretGeneratorColumnResourceOwner = "resource_owner"
|
||||
SecretGeneratorColumnSequence = "sequence"
|
||||
SecretGeneratorColumnLength = "length"
|
||||
SecretGeneratorColumnExpiry = "expiry"
|
||||
SecretGeneratorColumnIncludeLowerLetters = "include_lower_letters"
|
||||
SecretGeneratorColumnIncludeUpperLetters = "include_upper_letters"
|
||||
SecretGeneratorColumnIncludeDigits = "include_digits"
|
||||
SecretGeneratorColumnIncludeSymbols = "include_symbols"
|
||||
)
|
||||
|
||||
func (p *SecretGeneratorProjection) reduceSecretGeneratorAdded(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SecretGeneratorAddedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-nf9sl", "seq", event.Sequence(), "expectedType", iam.SecretGeneratorAddedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-sk99F", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewCreateStatement(
|
||||
e,
|
||||
[]handler.Column{
|
||||
handler.NewCol(SecretGeneratorColumnAggregateID, e.Aggregate().ID),
|
||||
handler.NewCol(SecretGeneratorColumnGeneratorType, e.GeneratorType),
|
||||
handler.NewCol(SecretGeneratorColumnCreationDate, e.CreationDate()),
|
||||
handler.NewCol(SecretGeneratorColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SecretGeneratorColumnResourceOwner, e.Aggregate().ResourceOwner),
|
||||
handler.NewCol(SecretGeneratorColumnSequence, e.Sequence()),
|
||||
handler.NewCol(SecretGeneratorColumnLength, e.Length),
|
||||
handler.NewCol(SecretGeneratorColumnExpiry, e.Expiry),
|
||||
handler.NewCol(SecretGeneratorColumnIncludeLowerLetters, e.IncludeLowerLetters),
|
||||
handler.NewCol(SecretGeneratorColumnIncludeUpperLetters, e.IncludeUpperLetters),
|
||||
handler.NewCol(SecretGeneratorColumnIncludeDigits, e.IncludeDigits),
|
||||
handler.NewCol(SecretGeneratorColumnIncludeSymbols, e.IncludeSymbols),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SecretGeneratorProjection) reduceSecretGeneratorChanged(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SecretGeneratorChangedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-sn9jd", "seq", event.Sequence(), "expected", iam.SecretGeneratorChangedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-s00Fs", "reduce.wrong.event.type")
|
||||
}
|
||||
|
||||
columns := make([]handler.Column, 0, 7)
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SecretGeneratorColumnSequence, e.Sequence()))
|
||||
if e.Length != nil {
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnLength, *e.Length))
|
||||
}
|
||||
if e.Expiry != nil {
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnExpiry, *e.Expiry))
|
||||
}
|
||||
if e.IncludeLowerLetters != nil {
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnIncludeLowerLetters, *e.IncludeLowerLetters))
|
||||
}
|
||||
if e.IncludeUpperLetters != nil {
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnIncludeUpperLetters, *e.IncludeUpperLetters))
|
||||
}
|
||||
if e.IncludeDigits != nil {
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnIncludeDigits, *e.IncludeDigits))
|
||||
}
|
||||
if e.IncludeSymbols != nil {
|
||||
columns = append(columns, handler.NewCol(SecretGeneratorColumnIncludeSymbols, *e.IncludeSymbols))
|
||||
}
|
||||
return crdb.NewUpdateStatement(
|
||||
e,
|
||||
columns,
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SecretGeneratorColumnAggregateID, e.Aggregate().ID),
|
||||
handler.NewCond(SecretGeneratorColumnGeneratorType, e.GeneratorType),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SecretGeneratorProjection) reduceSecretGeneratorRemoved(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SecretGeneratorRemovedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-30oEF", "seq", event.Sequence(), "expectedType", iam.SecretGeneratorRemovedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-fmiIf", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewDeleteStatement(
|
||||
e,
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SecretGeneratorColumnAggregateID, e.Aggregate().ID),
|
||||
handler.NewCond(SecretGeneratorColumnGeneratorType, e.GeneratorType),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
141
internal/query/projection/secret_generator_test.go
Normal file
141
internal/query/projection/secret_generator_test.go
Normal file
@@ -0,0 +1,141 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||
"github.com/caos/zitadel/internal/eventstore/repository"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
)
|
||||
|
||||
func TestSecretGeneratorProjection_reduces(t *testing.T) {
|
||||
type args struct {
|
||||
event func(t *testing.T) eventstore.Event
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
reduce func(event eventstore.Event) (*handler.Statement, error)
|
||||
want wantReduce
|
||||
}{
|
||||
{
|
||||
name: "reduceSecretGeneratorRemoved",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SecretGeneratorRemovedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{"generatorType": 1}`),
|
||||
), iam.SecretGeneratorRemovedEventMapper),
|
||||
},
|
||||
reduce: (&SecretGeneratorProjection{}).reduceSecretGeneratorRemoved,
|
||||
want: wantReduce{
|
||||
projection: SecretGeneratorProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "DELETE FROM zitadel.projections.secret_generators WHERE (aggregate_id = $1) AND (generator_type = $2)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeInitCode,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceSecretGeneratorChanged",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SecretGeneratorChangedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{"generatorType": 1, "length": 4, "expiry": 10000000, "includeLowerLetters": true, "includeUpperLetters": true, "includeDigits": true, "includeSymbols": true}`),
|
||||
), iam.SecretGeneratorChangedEventMapper),
|
||||
},
|
||||
reduce: (&SecretGeneratorProjection{}).reduceSecretGeneratorChanged,
|
||||
want: wantReduce{
|
||||
projection: SecretGeneratorProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.secret_generators SET (change_date, sequence, length, expiry, include_lower_letters, include_upper_letters, include_digits, include_symbols) = ($1, $2, $3, $4, $5, $6, $7, $8) WHERE (aggregate_id = $9) AND (generator_type = $10)",
|
||||
expectedArgs: []interface{}{
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
uint(4),
|
||||
time.Millisecond * 10,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeInitCode,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceSecretGeneratorAdded",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SecretGeneratorAddedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{"generatorType": 1, "length": 4, "expiry": 10000000, "includeLowerLetters": true, "includeUpperLetters": true, "includeDigits": true, "includeSymbols": true}`),
|
||||
), iam.SecretGeneratorAddedEventMapper),
|
||||
},
|
||||
reduce: (&SecretGeneratorProjection{}).reduceSecretGeneratorAdded,
|
||||
want: wantReduce{
|
||||
projection: SecretGeneratorProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "INSERT INTO zitadel.projections.secret_generators (aggregate_id, generator_type, creation_date, change_date, resource_owner, sequence, length, expiry, include_lower_letters, include_upper_letters, include_digits, include_symbols) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeInitCode,
|
||||
anyArg{},
|
||||
anyArg{},
|
||||
"ro-id",
|
||||
uint64(15),
|
||||
uint(4),
|
||||
time.Millisecond * 10,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
event := baseEvent(t)
|
||||
got, err := tt.reduce(event)
|
||||
if _, ok := err.(errors.InvalidArgument); !ok {
|
||||
t.Errorf("no wrong event mapping: %v, got: %v", err, got)
|
||||
}
|
||||
|
||||
event = tt.args.event(t)
|
||||
got, err = tt.reduce(event)
|
||||
assertReduce(t, got, err, tt.want)
|
||||
})
|
||||
}
|
||||
}
|
||||
143
internal/query/projection/smtp.go
Normal file
143
internal/query/projection/smtp.go
Normal file
@@ -0,0 +1,143 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/caos/logging"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler/crdb"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
"github.com/caos/zitadel/internal/repository/project"
|
||||
)
|
||||
|
||||
type SMTPConfigProjection struct {
|
||||
crdb.StatementHandler
|
||||
}
|
||||
|
||||
const (
|
||||
SMTPConfigProjectionTable = "zitadel.projections.smtp_configs"
|
||||
)
|
||||
|
||||
func NewSMTPConfigProjection(ctx context.Context, config crdb.StatementHandlerConfig) *SMTPConfigProjection {
|
||||
p := &SMTPConfigProjection{}
|
||||
config.ProjectionName = SMTPConfigProjectionTable
|
||||
config.Reducers = p.reducers()
|
||||
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
||||
return p
|
||||
}
|
||||
|
||||
func (p *SMTPConfigProjection) reducers() []handler.AggregateReducer {
|
||||
return []handler.AggregateReducer{
|
||||
{
|
||||
Aggregate: project.AggregateType,
|
||||
EventRedusers: []handler.EventReducer{
|
||||
{
|
||||
Event: iam.SMTPConfigAddedEventType,
|
||||
Reduce: p.reduceSMTPConfigAdded,
|
||||
},
|
||||
{
|
||||
Event: iam.SMTPConfigChangedEventType,
|
||||
Reduce: p.reduceSMTPConfigChanged,
|
||||
},
|
||||
{
|
||||
Event: iam.SMTPConfigPasswordChangedEventType,
|
||||
Reduce: p.reduceSMTPConfigPasswordChanged,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const (
|
||||
SMTPConfigColumnAggregateID = "aggregate_id"
|
||||
SMTPConfigColumnCreationDate = "creation_date"
|
||||
SMTPConfigColumnChangeDate = "change_date"
|
||||
SMTPConfigColumnResourceOwner = "resource_owner"
|
||||
SMTPConfigColumnSequence = "sequence"
|
||||
SMTPConfigColumnTLS = "tls"
|
||||
SMTPConfigColumnFromAddress = "sender_address"
|
||||
SMTPConfigColumnFromName = "sender_name"
|
||||
SMTPConfigColumnSMTPHost = "host"
|
||||
SMTPConfigColumnSMTPUser = "username"
|
||||
SMTPConfigColumnSMTPPassword = "password"
|
||||
)
|
||||
|
||||
func (p *SMTPConfigProjection) reduceSMTPConfigAdded(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMTPConfigAddedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-wkofs", "seq", event.Sequence(), "expectedType", iam.SMTPConfigAddedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-sk99F", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewCreateStatement(
|
||||
e,
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMTPConfigColumnAggregateID, e.Aggregate().ID),
|
||||
handler.NewCol(SMTPConfigColumnCreationDate, e.CreationDate()),
|
||||
handler.NewCol(SMTPConfigColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMTPConfigColumnResourceOwner, e.Aggregate().ResourceOwner),
|
||||
handler.NewCol(SMTPConfigColumnSequence, e.Sequence()),
|
||||
handler.NewCol(SMTPConfigColumnTLS, e.TLS),
|
||||
handler.NewCol(SMTPConfigColumnFromAddress, e.SenderAddress),
|
||||
handler.NewCol(SMTPConfigColumnFromName, e.SenderName),
|
||||
handler.NewCol(SMTPConfigColumnSMTPHost, e.Host),
|
||||
handler.NewCol(SMTPConfigColumnSMTPUser, e.User),
|
||||
handler.NewCol(SMTPConfigColumnSMTPPassword, e.Password),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SMTPConfigProjection) reduceSMTPConfigChanged(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMTPConfigChangedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-wo00f", "seq", event.Sequence(), "expected", iam.SMTPConfigChangedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-wl0wd", "reduce.wrong.event.type")
|
||||
}
|
||||
|
||||
columns := make([]handler.Column, 0, 7)
|
||||
columns = append(columns, handler.NewCol(SMTPConfigColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMTPConfigColumnSequence, e.Sequence()))
|
||||
if e.TLS != nil {
|
||||
columns = append(columns, handler.NewCol(SMTPConfigColumnTLS, *e.TLS))
|
||||
}
|
||||
if e.FromAddress != nil {
|
||||
columns = append(columns, handler.NewCol(SMTPConfigColumnFromAddress, *e.FromAddress))
|
||||
}
|
||||
if e.FromName != nil {
|
||||
columns = append(columns, handler.NewCol(SMTPConfigColumnFromName, *e.FromName))
|
||||
}
|
||||
if e.Host != nil {
|
||||
columns = append(columns, handler.NewCol(SMTPConfigColumnSMTPHost, *e.Host))
|
||||
}
|
||||
if e.User != nil {
|
||||
columns = append(columns, handler.NewCol(SMTPConfigColumnSMTPUser, *e.User))
|
||||
}
|
||||
return crdb.NewUpdateStatement(
|
||||
e,
|
||||
columns,
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMTPConfigColumnAggregateID, e.Aggregate().ID),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SMTPConfigProjection) reduceSMTPConfigPasswordChanged(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMTPConfigPasswordChangedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-f92sf", "seq", event.Sequence(), "expected", iam.SMTPConfigChangedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-fk02f", "reduce.wrong.event.type")
|
||||
}
|
||||
|
||||
return crdb.NewUpdateStatement(
|
||||
e,
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMTPConfigColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMTPConfigColumnSequence, e.Sequence()),
|
||||
handler.NewCol(SMTPConfigColumnSMTPPassword, e.Password),
|
||||
},
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMTPConfigColumnAggregateID, e.Aggregate().ID),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
162
internal/query/projection/smtp_test.go
Normal file
162
internal/query/projection/smtp_test.go
Normal file
@@ -0,0 +1,162 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||
"github.com/caos/zitadel/internal/eventstore/repository"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
)
|
||||
|
||||
func TestSMTPConfigProjection_reduces(t *testing.T) {
|
||||
type args struct {
|
||||
event func(t *testing.T) eventstore.Event
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
reduce func(event eventstore.Event) (*handler.Statement, error)
|
||||
want wantReduce
|
||||
}{
|
||||
{
|
||||
name: "reduceSMTPConfigChanged",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMTPConfigChangedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"tls": true,
|
||||
"senderAddress": "sender",
|
||||
"senderName": "name",
|
||||
"host": "host",
|
||||
"user": "user"
|
||||
}`,
|
||||
),
|
||||
), iam.SMTPConfigChangedEventMapper),
|
||||
},
|
||||
reduce: (&SMTPConfigProjection{}).reduceSMTPConfigChanged,
|
||||
want: wantReduce{
|
||||
projection: SMTPConfigProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.smtp_configs SET (change_date, sequence, tls, sender_address, sender_name, host, username) = ($1, $2, $3, $4, $5, $6, $7) WHERE (aggregate_id = $8)",
|
||||
expectedArgs: []interface{}{
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
true,
|
||||
"sender",
|
||||
"name",
|
||||
"host",
|
||||
"user",
|
||||
"agg-id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceSMTPConfigAdded",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMTPConfigAddedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"tls": true,
|
||||
"senderAddress": "sender",
|
||||
"senderName": "name",
|
||||
"host": "host",
|
||||
"user": "user",
|
||||
"password": {
|
||||
"cryptoType": 0,
|
||||
"algorithm": "RSA-265",
|
||||
"keyId": "key-id"
|
||||
}
|
||||
}`),
|
||||
), iam.SMTPConfigAddedEventMapper),
|
||||
},
|
||||
reduce: (&SMTPConfigProjection{}).reduceSMTPConfigAdded,
|
||||
want: wantReduce{
|
||||
projection: SMTPConfigProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "INSERT INTO zitadel.projections.smtp_configs (aggregate_id, creation_date, change_date, resource_owner, sequence, tls, sender_address, sender_name, host, username, password) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
anyArg{},
|
||||
anyArg{},
|
||||
"ro-id",
|
||||
uint64(15),
|
||||
true,
|
||||
"sender",
|
||||
"name",
|
||||
"host",
|
||||
"user",
|
||||
anyArg{},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "reduceSMTPConfigPasswordChanged",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMTPConfigPasswordChangedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"password": {
|
||||
"cryptoType": 0,
|
||||
"algorithm": "RSA-265",
|
||||
"keyId": "key-id"
|
||||
}
|
||||
}`),
|
||||
), iam.SMTPConfigPasswordChangedEventMapper),
|
||||
},
|
||||
reduce: (&SMTPConfigProjection{}).reduceSMTPConfigPasswordChanged,
|
||||
want: wantReduce{
|
||||
projection: SMTPConfigProjectionTable,
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.smtp_configs SET (change_date, sequence, password) = ($1, $2, $3) WHERE (aggregate_id = $4)",
|
||||
expectedArgs: []interface{}{
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
anyArg{},
|
||||
"agg-id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
event := baseEvent(t)
|
||||
got, err := tt.reduce(event)
|
||||
if _, ok := err.(errors.InvalidArgument); !ok {
|
||||
t.Errorf("no wrong event mapping: %v, got: %v", err, got)
|
||||
}
|
||||
|
||||
event = tt.args.event(t)
|
||||
got, err = tt.reduce(event)
|
||||
assertReduce(t, got, err, tt.want)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,6 @@ import (
|
||||
)
|
||||
|
||||
type Queries struct {
|
||||
iamID string
|
||||
eventstore *eventstore.Eventstore
|
||||
client *sql.DB
|
||||
|
||||
@@ -51,10 +50,9 @@ func StartQueries(ctx context.Context, es *eventstore.Eventstore, sqlClient *sql
|
||||
}
|
||||
|
||||
repo = &Queries{
|
||||
iamID: defaults.IamID,
|
||||
eventstore: es,
|
||||
client: sqlClient,
|
||||
DefaultLanguage: defaults.DefaultLanguage,
|
||||
DefaultLanguage: language.Und,
|
||||
LoginDir: statikLoginFS,
|
||||
NotificationDir: statikNotificationFS,
|
||||
LoginTranslationFileContents: make(map[string][]byte),
|
||||
|
||||
386
internal/query/secret_generator_test.go
Normal file
386
internal/query/secret_generator_test.go
Normal file
@@ -0,0 +1,386 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"database/sql/driver"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
errs "github.com/caos/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
func Test_SecretGeneratorsPrepares(t *testing.T) {
|
||||
type want struct {
|
||||
sqlExpectations sqlExpectation
|
||||
err checkErr
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
prepare interface{}
|
||||
want want
|
||||
object interface{}
|
||||
}{
|
||||
{
|
||||
name: "prepareSecretGeneratorsQuery no result",
|
||||
prepare: prepareSecretGeneratorsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM zitadel.projections.secret_generators`),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
},
|
||||
object: &SecretGenerators{SecretGenerators: []*SecretGenerator{}},
|
||||
},
|
||||
{
|
||||
name: "prepareSecretGeneratorsQuery one result",
|
||||
prepare: prepareSecretGeneratorsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM zitadel.projections.secret_generators`),
|
||||
[]string{
|
||||
"aggregate_id",
|
||||
"generator_type",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"resource_owner",
|
||||
"sequence",
|
||||
"length",
|
||||
"expiry",
|
||||
"include_lower_letters",
|
||||
"include_upper_letters",
|
||||
"include_digits",
|
||||
"include_symbols",
|
||||
"count",
|
||||
},
|
||||
[][]driver.Value{
|
||||
{
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeInitCode,
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
uint64(20211108),
|
||||
4,
|
||||
time.Minute * 1,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
},
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SecretGenerators{
|
||||
SearchResponse: SearchResponse{
|
||||
Count: 1,
|
||||
},
|
||||
SecretGenerators: []*SecretGenerator{
|
||||
{
|
||||
AggregateID: "agg-id",
|
||||
GeneratorType: 1,
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
Sequence: 20211108,
|
||||
Length: 4,
|
||||
Expiry: time.Minute * 1,
|
||||
IncludeLowerLetters: true,
|
||||
IncludeUpperLetters: true,
|
||||
IncludeDigits: true,
|
||||
IncludeSymbols: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSecretGeneratorsQuery multiple result",
|
||||
prepare: prepareSecretGeneratorsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM zitadel.projections.secret_generators`),
|
||||
[]string{
|
||||
"aggregate_id",
|
||||
"generator_type",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"resource_owner",
|
||||
"sequence",
|
||||
"length",
|
||||
"expiry",
|
||||
"include_lower_letters",
|
||||
"include_upper_letters",
|
||||
"include_digits",
|
||||
"include_symbols",
|
||||
"count",
|
||||
},
|
||||
[][]driver.Value{
|
||||
{
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeInitCode,
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
uint64(20211108),
|
||||
4,
|
||||
time.Minute * 1,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
},
|
||||
{
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeVerifyEmailCode,
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
uint64(20211108),
|
||||
4,
|
||||
time.Minute * 1,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
},
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SecretGenerators{
|
||||
SearchResponse: SearchResponse{
|
||||
Count: 2,
|
||||
},
|
||||
SecretGenerators: []*SecretGenerator{
|
||||
{
|
||||
AggregateID: "agg-id",
|
||||
GeneratorType: 1,
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
Sequence: 20211108,
|
||||
Length: 4,
|
||||
Expiry: time.Minute * 1,
|
||||
IncludeLowerLetters: true,
|
||||
IncludeUpperLetters: true,
|
||||
IncludeDigits: true,
|
||||
IncludeSymbols: true,
|
||||
},
|
||||
{
|
||||
AggregateID: "agg-id",
|
||||
GeneratorType: 2,
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
Sequence: 20211108,
|
||||
Length: 4,
|
||||
Expiry: time.Minute * 1,
|
||||
IncludeLowerLetters: true,
|
||||
IncludeUpperLetters: true,
|
||||
IncludeDigits: true,
|
||||
IncludeSymbols: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSecretGeneratorsQuery sql err",
|
||||
prepare: prepareSecretGeneratorsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols,`+
|
||||
` COUNT(*) OVER ()`+
|
||||
` FROM zitadel.projections.secret_generators`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errors.Is(err, sql.ErrConnDone) {
|
||||
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
{
|
||||
name: "prepareSecretGeneratorQuery no result",
|
||||
prepare: prepareSecretGeneratorQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols`+
|
||||
` FROM zitadel.projections.secret_generators`,
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errs.IsNotFound(err) {
|
||||
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: (*SecretGenerator)(nil),
|
||||
},
|
||||
{
|
||||
name: "prepareSecretGeneratorQuery found",
|
||||
prepare: prepareSecretGeneratorQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols`+
|
||||
` FROM zitadel.projections.secret_generators`),
|
||||
[]string{
|
||||
"aggregate_id",
|
||||
"generator_type",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"resource_owner",
|
||||
"sequence",
|
||||
"length",
|
||||
"expiry",
|
||||
"include_lower_letters",
|
||||
"include_upper_letters",
|
||||
"include_digits",
|
||||
"include_symbols",
|
||||
},
|
||||
[]driver.Value{
|
||||
"agg-id",
|
||||
domain.SecretGeneratorTypeInitCode,
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
uint64(20211108),
|
||||
4,
|
||||
time.Minute * 1,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SecretGenerator{
|
||||
AggregateID: "agg-id",
|
||||
GeneratorType: domain.SecretGeneratorTypeInitCode,
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
Sequence: 20211108,
|
||||
Length: 4,
|
||||
Expiry: time.Minute * 1,
|
||||
IncludeLowerLetters: true,
|
||||
IncludeUpperLetters: true,
|
||||
IncludeDigits: true,
|
||||
IncludeSymbols: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSecretGeneratorQuery sql err",
|
||||
prepare: prepareSecretGeneratorQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.secret_generators.aggregate_id,`+
|
||||
` zitadel.projections.secret_generators.generator_type,`+
|
||||
` zitadel.projections.secret_generators.creation_date,`+
|
||||
` zitadel.projections.secret_generators.change_date,`+
|
||||
` zitadel.projections.secret_generators.resource_owner,`+
|
||||
` zitadel.projections.secret_generators.sequence,`+
|
||||
` zitadel.projections.secret_generators.length,`+
|
||||
` zitadel.projections.secret_generators.expiry,`+
|
||||
` zitadel.projections.secret_generators.include_lower_letters,`+
|
||||
` zitadel.projections.secret_generators.include_upper_letters,`+
|
||||
` zitadel.projections.secret_generators.include_digits,`+
|
||||
` zitadel.projections.secret_generators.include_symbols`+
|
||||
` FROM zitadel.projections.secret_generators`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errors.Is(err, sql.ErrConnDone) {
|
||||
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
||||
})
|
||||
}
|
||||
}
|
||||
268
internal/query/secret_generators.go
Normal file
268
internal/query/secret_generators.go
Normal file
@@ -0,0 +1,268 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
errs "errors"
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
|
||||
"github.com/caos/zitadel/internal/crypto"
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
var (
|
||||
secretGeneratorsTable = table{
|
||||
name: projection.SecretGeneratorProjectionTable,
|
||||
}
|
||||
SecretGeneratorColumnAggregateID = Column{
|
||||
name: projection.SecretGeneratorColumnAggregateID,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnGeneratorType = Column{
|
||||
name: projection.SecretGeneratorColumnGeneratorType,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnCreationDate = Column{
|
||||
name: projection.SecretGeneratorColumnCreationDate,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnChangeDate = Column{
|
||||
name: projection.SecretGeneratorColumnChangeDate,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnResourceOwner = Column{
|
||||
name: projection.SecretGeneratorColumnResourceOwner,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnSequence = Column{
|
||||
name: projection.SecretGeneratorColumnSequence,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnLength = Column{
|
||||
name: projection.SecretGeneratorColumnLength,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnExpiry = Column{
|
||||
name: projection.SecretGeneratorColumnExpiry,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnIncludeLowerLetters = Column{
|
||||
name: projection.SecretGeneratorColumnIncludeLowerLetters,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnIncludeUpperLetters = Column{
|
||||
name: projection.SecretGeneratorColumnIncludeUpperLetters,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnIncludeDigits = Column{
|
||||
name: projection.SecretGeneratorColumnIncludeDigits,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
SecretGeneratorColumnIncludeSymbols = Column{
|
||||
name: projection.SecretGeneratorColumnIncludeSymbols,
|
||||
table: secretGeneratorsTable,
|
||||
}
|
||||
)
|
||||
|
||||
type SecretGenerators struct {
|
||||
SearchResponse
|
||||
SecretGenerators []*SecretGenerator
|
||||
}
|
||||
|
||||
type SecretGenerator struct {
|
||||
AggregateID string
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
ResourceOwner string
|
||||
Sequence uint64
|
||||
|
||||
GeneratorType domain.SecretGeneratorType
|
||||
Length uint
|
||||
Expiry time.Duration
|
||||
IncludeLowerLetters bool
|
||||
IncludeUpperLetters bool
|
||||
IncludeDigits bool
|
||||
IncludeSymbols bool
|
||||
}
|
||||
|
||||
type SecretGeneratorSearchQueries struct {
|
||||
SearchRequest
|
||||
Queries []SearchQuery
|
||||
}
|
||||
|
||||
func (q *Queries) InitEncryptionGenerator(ctx context.Context, generatorType domain.SecretGeneratorType, algorithm crypto.EncryptionAlgorithm) (crypto.Generator, error) {
|
||||
generatorConfig, err := q.SecretGeneratorByType(ctx, generatorType)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
cryptoConfig := crypto.GeneratorConfig{
|
||||
Length: generatorConfig.Length,
|
||||
Expiry: generatorConfig.Expiry,
|
||||
IncludeLowerLetters: generatorConfig.IncludeLowerLetters,
|
||||
IncludeUpperLetters: generatorConfig.IncludeUpperLetters,
|
||||
IncludeDigits: generatorConfig.IncludeDigits,
|
||||
IncludeSymbols: generatorConfig.IncludeSymbols,
|
||||
}
|
||||
return crypto.NewEncryptionGenerator(cryptoConfig, algorithm), nil
|
||||
}
|
||||
|
||||
func (q *Queries) InitHashGenerator(ctx context.Context, generatorType domain.SecretGeneratorType, algorithm crypto.HashAlgorithm) (crypto.Generator, error) {
|
||||
generatorConfig, err := q.SecretGeneratorByType(ctx, generatorType)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
cryptoConfig := crypto.GeneratorConfig{
|
||||
Length: generatorConfig.Length,
|
||||
Expiry: generatorConfig.Expiry,
|
||||
IncludeLowerLetters: generatorConfig.IncludeLowerLetters,
|
||||
IncludeUpperLetters: generatorConfig.IncludeUpperLetters,
|
||||
IncludeDigits: generatorConfig.IncludeDigits,
|
||||
IncludeSymbols: generatorConfig.IncludeSymbols,
|
||||
}
|
||||
return crypto.NewHashGenerator(cryptoConfig, algorithm), nil
|
||||
}
|
||||
|
||||
func (q *Queries) SecretGeneratorByType(ctx context.Context, generatorType domain.SecretGeneratorType) (*SecretGenerator, error) {
|
||||
stmt, scan := prepareSecretGeneratorQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
SecretGeneratorColumnGeneratorType.identifier(): generatorType,
|
||||
}).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-3k99f", "Errors.Query.SQLStatment")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, query, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) SearchSecretGenerators(ctx context.Context, queries *SecretGeneratorSearchQueries) (secretGenerators *SecretGenerators, err error) {
|
||||
query, scan := prepareSecretGeneratorsQuery()
|
||||
stmt, args, err := queries.toQuery(query).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInvalidArgument(err, "QUERY-sn9lw", "Errors.Query.InvalidRequest")
|
||||
}
|
||||
|
||||
rows, err := q.client.QueryContext(ctx, stmt, args...)
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-4miii", "Errors.Internal")
|
||||
}
|
||||
secretGenerators, err = scan(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
secretGenerators.LatestSequence, err = q.latestSequence(ctx, secretGeneratorsTable)
|
||||
return secretGenerators, err
|
||||
}
|
||||
|
||||
func (q *SecretGeneratorSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
||||
query = q.SearchRequest.toQuery(query)
|
||||
for _, q := range q.Queries {
|
||||
query = q.toQuery(query)
|
||||
}
|
||||
return query
|
||||
}
|
||||
|
||||
func NewSecretGeneratorTypeSearchQuery(value int32) (SearchQuery, error) {
|
||||
return NewNumberQuery(SecretGeneratorColumnGeneratorType, value, NumberEquals)
|
||||
}
|
||||
|
||||
func prepareSecretGeneratorQuery() (sq.SelectBuilder, func(*sql.Row) (*SecretGenerator, error)) {
|
||||
return sq.Select(
|
||||
SecretGeneratorColumnAggregateID.identifier(),
|
||||
SecretGeneratorColumnGeneratorType.identifier(),
|
||||
SecretGeneratorColumnCreationDate.identifier(),
|
||||
SecretGeneratorColumnChangeDate.identifier(),
|
||||
SecretGeneratorColumnResourceOwner.identifier(),
|
||||
SecretGeneratorColumnSequence.identifier(),
|
||||
SecretGeneratorColumnLength.identifier(),
|
||||
SecretGeneratorColumnExpiry.identifier(),
|
||||
SecretGeneratorColumnIncludeLowerLetters.identifier(),
|
||||
SecretGeneratorColumnIncludeUpperLetters.identifier(),
|
||||
SecretGeneratorColumnIncludeDigits.identifier(),
|
||||
SecretGeneratorColumnIncludeSymbols.identifier()).
|
||||
From(secretGeneratorsTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(row *sql.Row) (*SecretGenerator, error) {
|
||||
secretGenerator := new(SecretGenerator)
|
||||
err := row.Scan(
|
||||
&secretGenerator.AggregateID,
|
||||
&secretGenerator.GeneratorType,
|
||||
&secretGenerator.CreationDate,
|
||||
&secretGenerator.ChangeDate,
|
||||
&secretGenerator.ResourceOwner,
|
||||
&secretGenerator.Sequence,
|
||||
&secretGenerator.Length,
|
||||
&secretGenerator.Expiry,
|
||||
&secretGenerator.IncludeLowerLetters,
|
||||
&secretGenerator.IncludeUpperLetters,
|
||||
&secretGenerator.IncludeDigits,
|
||||
&secretGenerator.IncludeSymbols,
|
||||
)
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-m9wff", "Errors.SecretGenerator.NotFound")
|
||||
}
|
||||
return nil, errors.ThrowInternal(err, "QUERY-2k99d", "Errors.Internal")
|
||||
}
|
||||
return secretGenerator, nil
|
||||
}
|
||||
}
|
||||
|
||||
func prepareSecretGeneratorsQuery() (sq.SelectBuilder, func(*sql.Rows) (*SecretGenerators, error)) {
|
||||
return sq.Select(
|
||||
SecretGeneratorColumnAggregateID.identifier(),
|
||||
SecretGeneratorColumnGeneratorType.identifier(),
|
||||
SecretGeneratorColumnCreationDate.identifier(),
|
||||
SecretGeneratorColumnChangeDate.identifier(),
|
||||
SecretGeneratorColumnResourceOwner.identifier(),
|
||||
SecretGeneratorColumnSequence.identifier(),
|
||||
SecretGeneratorColumnLength.identifier(),
|
||||
SecretGeneratorColumnExpiry.identifier(),
|
||||
SecretGeneratorColumnIncludeLowerLetters.identifier(),
|
||||
SecretGeneratorColumnIncludeUpperLetters.identifier(),
|
||||
SecretGeneratorColumnIncludeDigits.identifier(),
|
||||
SecretGeneratorColumnIncludeSymbols.identifier(),
|
||||
countColumn.identifier()).
|
||||
From(secretGeneratorsTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(rows *sql.Rows) (*SecretGenerators, error) {
|
||||
secretGenerators := make([]*SecretGenerator, 0)
|
||||
var count uint64
|
||||
for rows.Next() {
|
||||
secretGenerator := new(SecretGenerator)
|
||||
err := rows.Scan(
|
||||
&secretGenerator.AggregateID,
|
||||
&secretGenerator.GeneratorType,
|
||||
&secretGenerator.CreationDate,
|
||||
&secretGenerator.ChangeDate,
|
||||
&secretGenerator.ResourceOwner,
|
||||
&secretGenerator.Sequence,
|
||||
&secretGenerator.Length,
|
||||
&secretGenerator.Expiry,
|
||||
&secretGenerator.IncludeLowerLetters,
|
||||
&secretGenerator.IncludeUpperLetters,
|
||||
&secretGenerator.IncludeDigits,
|
||||
&secretGenerator.IncludeSymbols,
|
||||
&count,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
secretGenerators = append(secretGenerators, secretGenerator)
|
||||
}
|
||||
|
||||
if err := rows.Close(); err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-em9fs", "Errors.Query.CloseRows")
|
||||
}
|
||||
|
||||
return &SecretGenerators{
|
||||
SecretGenerators: secretGenerators,
|
||||
SearchResponse: SearchResponse{
|
||||
Count: count,
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
139
internal/query/smtp.go
Normal file
139
internal/query/smtp.go
Normal file
@@ -0,0 +1,139 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
errs "errors"
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/caos/zitadel/internal/crypto"
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
var (
|
||||
smtpConfigsTable = table{
|
||||
name: projection.SMTPConfigProjectionTable,
|
||||
}
|
||||
SMTPConfigColumnAggregateID = Column{
|
||||
name: projection.SMTPConfigColumnAggregateID,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnCreationDate = Column{
|
||||
name: projection.SMTPConfigColumnCreationDate,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnChangeDate = Column{
|
||||
name: projection.SMTPConfigColumnChangeDate,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnResourceOwner = Column{
|
||||
name: projection.SMTPConfigColumnResourceOwner,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnSequence = Column{
|
||||
name: projection.SMTPConfigColumnSequence,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnTLS = Column{
|
||||
name: projection.SMTPConfigColumnTLS,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnFromAddress = Column{
|
||||
name: projection.SMTPConfigColumnFromAddress,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnFromName = Column{
|
||||
name: projection.SMTPConfigColumnFromName,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnSMTPHost = Column{
|
||||
name: projection.SMTPConfigColumnSMTPHost,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnSMTPUser = Column{
|
||||
name: projection.SMTPConfigColumnSMTPUser,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
SMTPConfigColumnSMTPPassword = Column{
|
||||
name: projection.SMTPConfigColumnSMTPPassword,
|
||||
table: smtpConfigsTable,
|
||||
}
|
||||
)
|
||||
|
||||
type SMTPConfigs struct {
|
||||
SearchResponse
|
||||
SMTPConfigs []*SMTPConfig
|
||||
}
|
||||
|
||||
type SMTPConfig struct {
|
||||
AggregateID string
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
ResourceOwner string
|
||||
Sequence uint64
|
||||
|
||||
TLS bool
|
||||
SenderAddress string
|
||||
SenderName string
|
||||
Host string
|
||||
User string
|
||||
Password *crypto.CryptoValue
|
||||
}
|
||||
|
||||
func (q *Queries) SMTPConfigByAggregateID(ctx context.Context, aggregateID string) (*SMTPConfig, error) {
|
||||
stmt, scan := prepareSMTPConfigQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
SMTPConfigColumnAggregateID.identifier(): aggregateID,
|
||||
}).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-3m9sl", "Errors.Query.SQLStatment")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, query, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func prepareSMTPConfigQuery() (sq.SelectBuilder, func(*sql.Row) (*SMTPConfig, error)) {
|
||||
password := new(crypto.CryptoValue)
|
||||
|
||||
return sq.Select(
|
||||
SMTPConfigColumnAggregateID.identifier(),
|
||||
SMTPConfigColumnCreationDate.identifier(),
|
||||
SMTPConfigColumnChangeDate.identifier(),
|
||||
SMTPConfigColumnResourceOwner.identifier(),
|
||||
SMTPConfigColumnSequence.identifier(),
|
||||
SMTPConfigColumnTLS.identifier(),
|
||||
SMTPConfigColumnFromAddress.identifier(),
|
||||
SMTPConfigColumnFromName.identifier(),
|
||||
SMTPConfigColumnSMTPHost.identifier(),
|
||||
SMTPConfigColumnSMTPUser.identifier(),
|
||||
SMTPConfigColumnSMTPPassword.identifier()).
|
||||
From(smtpConfigsTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(row *sql.Row) (*SMTPConfig, error) {
|
||||
config := new(SMTPConfig)
|
||||
err := row.Scan(
|
||||
&config.AggregateID,
|
||||
&config.CreationDate,
|
||||
&config.ChangeDate,
|
||||
&config.ResourceOwner,
|
||||
&config.Sequence,
|
||||
&config.TLS,
|
||||
&config.SenderAddress,
|
||||
&config.SenderName,
|
||||
&config.Host,
|
||||
&config.User,
|
||||
&password,
|
||||
)
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-fwofw", "Errors.SMTPConfig.NotFound")
|
||||
}
|
||||
return nil, errors.ThrowInternal(err, "QUERY-9k87F", "Errors.Internal")
|
||||
}
|
||||
config.Password = password
|
||||
return config, nil
|
||||
}
|
||||
}
|
||||
148
internal/query/smtp_test.go
Normal file
148
internal/query/smtp_test.go
Normal file
@@ -0,0 +1,148 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"database/sql/driver"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
"github.com/caos/zitadel/internal/crypto"
|
||||
errs "github.com/caos/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
func Test_SMTPConfigsPrepares(t *testing.T) {
|
||||
type want struct {
|
||||
sqlExpectations sqlExpectation
|
||||
err checkErr
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
prepare interface{}
|
||||
want want
|
||||
object interface{}
|
||||
}{
|
||||
{
|
||||
name: "prepareSMTPConfigQuery no result",
|
||||
prepare: prepareSMTPConfigQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
`SELECT zitadel.projections.smtp_configs.aggregate_id,`+
|
||||
` zitadel.projections.smtp_configs.creation_date,`+
|
||||
` zitadel.projections.smtp_configs.change_date,`+
|
||||
` zitadel.projections.smtp_configs.resource_owner,`+
|
||||
` zitadel.projections.smtp_configs.sequence,`+
|
||||
` zitadel.projections.smtp_configs.tls,`+
|
||||
` zitadel.projections.smtp_configs.sender_address,`+
|
||||
` zitadel.projections.smtp_configs.sender_name,`+
|
||||
` zitadel.projections.smtp_configs.host,`+
|
||||
` zitadel.projections.smtp_configs.username,`+
|
||||
` zitadel.projections.smtp_configs.password`+
|
||||
` FROM zitadel.projections.smtp_configs`,
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errs.IsNotFound(err) {
|
||||
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: (*SMTPConfig)(nil),
|
||||
},
|
||||
{
|
||||
name: "prepareSMTPConfigQuery found",
|
||||
prepare: prepareSMTPConfigQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.smtp_configs.aggregate_id,`+
|
||||
` zitadel.projections.smtp_configs.creation_date,`+
|
||||
` zitadel.projections.smtp_configs.change_date,`+
|
||||
` zitadel.projections.smtp_configs.resource_owner,`+
|
||||
` zitadel.projections.smtp_configs.sequence,`+
|
||||
` zitadel.projections.smtp_configs.tls,`+
|
||||
` zitadel.projections.smtp_configs.sender_address,`+
|
||||
` zitadel.projections.smtp_configs.sender_name,`+
|
||||
` zitadel.projections.smtp_configs.host,`+
|
||||
` zitadel.projections.smtp_configs.username,`+
|
||||
` zitadel.projections.smtp_configs.password`+
|
||||
` FROM zitadel.projections.smtp_configs`),
|
||||
[]string{
|
||||
"aggregate_id",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"resource_owner",
|
||||
"sequence",
|
||||
"tls",
|
||||
"sender_address",
|
||||
"sender_name",
|
||||
"smtp_host",
|
||||
"smtp_user",
|
||||
"smtp_password",
|
||||
},
|
||||
[]driver.Value{
|
||||
"agg-id",
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
uint64(20211108),
|
||||
true,
|
||||
"sender",
|
||||
"name",
|
||||
"host",
|
||||
"user",
|
||||
&crypto.CryptoValue{},
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SMTPConfig{
|
||||
AggregateID: "agg-id",
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
Sequence: 20211108,
|
||||
TLS: true,
|
||||
SenderAddress: "sender",
|
||||
SenderName: "name",
|
||||
Host: "host",
|
||||
User: "user",
|
||||
Password: &crypto.CryptoValue{},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSMTPConfigQuery sql err",
|
||||
prepare: prepareSMTPConfigQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT zitadel.projections.smtp_configs.aggregate_id,`+
|
||||
` zitadel.projections.smtp_configs.creation_date,`+
|
||||
` zitadel.projections.smtp_configs.change_date,`+
|
||||
` zitadel.projections.smtp_configs.resource_owner,`+
|
||||
` zitadel.projections.smtp_configs.sequence,`+
|
||||
` zitadel.projections.smtp_configs.tls,`+
|
||||
` zitadel.projections.smtp_configs.sender_address,`+
|
||||
` zitadel.projections.smtp_configs.sender_name,`+
|
||||
` zitadel.projections.smtp_configs.host,`+
|
||||
` zitadel.projections.smtp_configs.username,`+
|
||||
` zitadel.projections.smtp_configs.password`+
|
||||
` FROM zitadel.projections.smtp_configs`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errors.Is(err, sql.ErrConnDone) {
|
||||
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user