feat: policies on aggregates (#799)

* feat: move pw policy * feat: default pw complexity policy * fix: org password complexity policy * fix: org password complexity policy * fix: pw complexity policy with setup * fix: age and lockout policies on aggregates * fix: migration * fix: org iam policy * fix: org iam policy * fix: org iam policy * fix: tests * fix: policy request * fix: merge master * fix(console): policies frontend (#817) * fix policy build * fix: age, complexity, lockout policies * fix: ready return err of setup not done * fix: fix remove policies in spoolers * fix: fix remove policies in spoolers * feat(console): policy settings for iam and org (#824) * fix policy build * fix: age, complexity, lockout policies * fix pwd complexity * policy remove action * add imports * fix accounts card, enable mgmt login policy * lint * add iam policy to admin * toasts, i18n, show default * routing, i18n * reset policy, toast i18n, cleanup, routing * policy delete permission * lint style * delete iam policy * delete non project from grid list, i18n * lint ts, style * fix: remove instead delete * feat(console): delete external idp from user (#835) * dialog i18n, delete column and function * dialog i18n * fix rm button * Update console/src/assets/i18n/de.json Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * Update console/src/assets/i18n/de.json Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * fix: revert env, rename policy, remove comments * fix: lowercase sich * fix: pr requests * Update internal/iam/repository/eventsourcing/eventstore_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * fix: tests * fix: tests * fix(console): policies (#839) * fix: nil pointer on get userdata (#815) * fix: external login (#818) * fix: external login * fix: external login * feat(console): delete user (#819) * add action col to user table, i18n * delete user from detail component * lint * fix(console): cleanup user detail and member components, user/me redirect, permission guards, filter, org policy guard, user table, scss cleanup (#808) * fix: remove user.write guard for filtering * border color * fix user routing from member tables * idp detail layout * generic contact component * fix redirect to auth user, user grant disable * disable policy action without permission, i18n * user-create flex fix, contact ng-content * rm unused styles * sidenav divider * lint * chore(deps-dev): bump @angular/cli from 10.1.3 to 10.1.4 in /console (#806) * fix: user session with external login (#797) * fix: user session with external login * fix: tests * fix: tests * fix: change idp config name * fix(container): stop copying / and instead only copy zitadel (#691) * chore: stop copying / and instead only copy zitadel * Update Dockerfile * Update release.yml * enable anchors debug * fix(container): don't copy alpine content into scratch execpt pwd * chore: remove need step * merge master * chore(deps-dev): bump @angular/cli from 10.1.3 to 10.1.4 in /console Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.1.3 to 10.1.4. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/compare/v10.1.3...v10.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular/language-service from 10.1.3 to 10.1.4 in /console (#805) * fix: user session with external login (#797) * fix: user session with external login * fix: tests * fix: tests * fix: change idp config name * fix(container): stop copying / and instead only copy zitadel (#691) * chore: stop copying / and instead only copy zitadel * Update Dockerfile * Update release.yml * enable anchors debug * fix(container): don't copy alpine content into scratch execpt pwd * chore: remove need step * merge master * chore(deps-dev): bump @angular/language-service in /console Bumps [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) from 10.1.3 to 10.1.4. - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/10.1.4/packages/language-service) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump codelyzer from 6.0.0 to 6.0.1 in /console (#804) * fix: user session with external login (#797) * fix: user session with external login * fix: tests * fix: tests * fix: change idp config name * fix(container): stop copying / and instead only copy zitadel (#691) * chore: stop copying / and instead only copy zitadel * Update Dockerfile * Update release.yml * enable anchors debug * fix(container): don't copy alpine content into scratch execpt pwd * chore: remove need step * merge master * chore(deps-dev): bump codelyzer from 6.0.0 to 6.0.1 in /console Bumps [codelyzer](https://github.com/mgechev/codelyzer) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/mgechev/codelyzer/releases) - [Changelog](https://github.com/mgechev/codelyzer/blob/master/CHANGELOG.md) - [Commits](https://github.com/mgechev/codelyzer/commits/6.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular-devkit/build-angular from 0.1000.8 to 0.1001.4 in /console (#803) * fix: user session with external login (#797) * fix: user session with external login * fix: tests * fix: tests * fix: change idp config name * fix(container): stop copying / and instead only copy zitadel (#691) * chore: stop copying / and instead only copy zitadel * Update Dockerfile * Update release.yml * enable anchors debug * fix(container): don't copy alpine content into scratch execpt pwd * chore: remove need step * merge master * chore(deps-dev): bump @angular-devkit/build-angular in /console Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.8 to 0.1001.4. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> * chore(deps): bump uuid from 8.3.0 to 8.3.1 in /console (#802) * fix: user session with external login (#797) * fix: user session with external login * fix: tests * fix: tests * fix: change idp config name * fix(container): stop copying / and instead only copy zitadel (#691) * chore: stop copying / and instead only copy zitadel * Update Dockerfile * Update release.yml * enable anchors debug * fix(container): don't copy alpine content into scratch execpt pwd * chore: remove need step * merge master * chore(deps): bump uuid from 8.3.0 to 8.3.1 in /console Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.0 to 8.3.1. - [Release notes](https://github.com/uuidjs/uuid/releases) - [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md) - [Commits](https://github.com/uuidjs/uuid/compare/v8.3.0...v8.3.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * create memberstable as common component * iam member cleanup * iam + org m table, user table service user avatar * toast config * fix selection emitter * fix project grant table width * project grant members refactor * theme optimizations * member table col delete * lint * fix table row color * refactor grey color * lint scss * org list redirect on click, fix user table undef * refresh table after grant add Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> * fix(console): intercept navigator.language, set browser lang as default for user without explicit setting, user table outline, member create dialog import (#820) * i18n interceptor, set language to browser lang * nullcheck * rm external idp log * fix module imports, rm user displayname from i18n * Update console/src/assets/i18n/de.json Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * fix: delete external idps from users (#822) * fix(console): permission regex, account switcher null check, restrict app and member create access (#821) * fix member table disable, gerneal regexp * fix user session card, app disable * memberships max count * fix policy permissions * permission check for member add dialog * lint * rm accounts log * rm id regex * fix: handle usermemberships on project and project grant delete (#825) * fix: go handler Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch> * fix: tests * fix: not needed error handling Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Florian Forster <florian@caos.ch>
2025-08-23 18:07:57 +00:00 · 2020-10-15 10:27:13 +02:00
parent adb24a52fc
commit fbb30840f1
248 changed files with 23960 additions and 13843 deletions
--- a/internal/setup/config.go
+++ b/internal/setup/config.go
@@ -7,8 +7,10 @@ import (

 type IAMSetUp struct {
 	Step1 *Step1
-	//TODO: label policy
-	// Step2 *Step2
+	Step2 *Step2
+	Step3 *Step3
+	Step4 *Step4
+	Step5 *Step5
 }

 func (setup *IAMSetUp) steps(currentDone iam_model.Step) ([]step, error) {
@@ -17,8 +19,10 @@ func (setup *IAMSetUp) steps(currentDone iam_model.Step) ([]step, error) {

 	for _, step := range []step{
 		setup.Step1,
-		//TODO: label policy
-		// setup.Step2,
+		setup.Step2,
+		setup.Step3,
+		setup.Step4,
+		setup.Step5,
 	} {
 		if step.step() <= currentDone {
 			continue
@@ -44,12 +48,6 @@ type LoginPolicy struct {
 	AllowExternalIdp      bool
 }

-//TODO: label policy
-// type LabelPolicy struct {
-// 	PrimaryColor  string
-// 	SecondayColor string
-// }
-
 type User struct {
 	FirstName string
 	LastName  string
--- a/internal/setup/setup.go
+++ b/internal/setup/setup.go
@@ -16,8 +16,6 @@ import (
 	iam_event "github.com/caos/zitadel/internal/iam/repository/eventsourcing"
 	es_org "github.com/caos/zitadel/internal/org/repository/eventsourcing"
 	org_event "github.com/caos/zitadel/internal/org/repository/eventsourcing"
-	es_policy "github.com/caos/zitadel/internal/policy/repository/eventsourcing"
-	policy_event "github.com/caos/zitadel/internal/policy/repository/eventsourcing"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	es_proj "github.com/caos/zitadel/internal/project/repository/eventsourcing"
 	proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing"
@@ -31,7 +29,6 @@ type Setup struct {
 	OrgEvents     *org_event.OrgEventstore
 	UserEvents    *usr_event.UserEventstore
 	ProjectEvents *proj_event.ProjectEventstore
-	PolicyEvents  *policy_event.PolicyEventstore
 }

 const (
@@ -86,13 +83,6 @@ func StartSetup(esConfig es_int.Config, sd systemdefaults.SystemDefaults) (*Setu
 		return nil, err
 	}

-	setup.PolicyEvents, err = es_policy.StartPolicy(es_policy.PolicyConfig{
-		Eventstore: es,
-		Cache:      esConfig.Cache,
-	}, sd)
-	if err != nil {
-		return nil, err
-	}
 	return setup, nil
 }

@@ -130,7 +120,7 @@ func (s *Setup) Execute(ctx context.Context, setUpConfig IAMSetUp) error {
 			return err
 		}

-		err = step.execute(ctx)
+		iam, err = step.execute(ctx)
 		if err != nil {
 			return err
 		}
--- a/internal/setup/step.go
+++ b/internal/setup/step.go
@@ -8,7 +8,7 @@ import (

 type step interface {
 	step() iam_model.Step
-	execute(context.Context) error
+	execute(context.Context) (*iam_model.IAM, error)
 	init(*Setup)
 	isNil() bool
 }
--- a/internal/setup/step1.go
+++ b/internal/setup/step1.go
@@ -9,7 +9,6 @@ import (
 	"github.com/caos/zitadel/internal/eventstore/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	org_model "github.com/caos/zitadel/internal/org/model"
-	policy_model "github.com/caos/zitadel/internal/policy/model"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 )
@@ -25,7 +24,7 @@ type Step1 struct {
 	createdUsers       map[string]*usr_model.User
 	createdOrgs        map[string]*org_model.Org
 	createdProjects    map[string]*proj_model.Project
-	pwComplexityPolicy *policy_model.PasswordComplexityPolicy
+	pwComplexityPolicy *iam_model.PasswordComplexityPolicyView
 }

 func (s *Step1) isNil() bool {
@@ -43,51 +42,46 @@ func (step *Step1) init(setup *Setup) {
 	step.createdProjects = make(map[string]*proj_model.Project)
 }

-func (step *Step1) execute(ctx context.Context) (err error) {
-	err = step.loginPolicy(ctx, step.DefaultLoginPolicy)
+func (step *Step1) execute(ctx context.Context) (*iam_model.IAM, error) {
+	err := step.loginPolicy(ctx, step.DefaultLoginPolicy)
 	if err != nil {
 		logging.Log("SETUP-Hdu8S").WithError(err).Error("unable to create login policy")
-		return err
+		return nil, err
 	}

-	pwComplexityPolicy, err := step.setup.PolicyEvents.GetPasswordComplexityPolicy(ctx, policy_model.DefaultPolicy)
-	if err != nil {
-		logging.Log("SETUP-9osWF").WithError(err).Error("unable to read complexity policy")
-		return err
-	}
-	step.pwComplexityPolicy = pwComplexityPolicy
+	step.pwComplexityPolicy = new(iam_model.PasswordComplexityPolicyView)

 	err = step.orgs(ctx, step.Orgs)
 	if err != nil {
 		logging.Log("SETUP-p4oWq").WithError(err).Error("unable to set up orgs")
-		return err
+		return nil, err
 	}

 	ctx = setSetUpContextData(ctx, step.setup.iamID)
 	err = step.iamOwners(ctx, step.Owners)
 	if err != nil {
 		logging.Log("SETUP-WHr01").WithError(err).Error("unable to set up iam owners")
-		return err
+		return nil, err
 	}

 	err = step.setGlobalOrg(ctx, step.GlobalOrg)
 	if err != nil {
 		logging.Log("SETUP-0874m").WithError(err).Error("unable to set global org")
-		return err
+		return nil, err
 	}

 	err = step.setIamProject(ctx, step.IAMProject)
 	if err != nil {
 		logging.Log("SETUP-kaWjq").WithError(err).Error("unable to set zitadel project")
-		return err
+		return nil, err
 	}

-	_, err = step.setup.IamEvents.SetupDone(ctx, step.setup.iamID, step.step())
+	iam, err := step.setup.IamEvents.SetupDone(ctx, step.setup.iamID, step.step())
 	if err != nil {
 		logging.Log("SETUP-de342").WithField("step", step.step()).WithError(err).Error("unable to finish setup")
-		return err
+		return nil, err
 	}
-	return nil
+	return iam, nil
 }

 func (step *Step1) loginPolicy(ctx context.Context, policy LoginPolicy) error {
@@ -114,7 +108,7 @@ func (step *Step1) orgs(ctx context.Context, orgs []Org) error {
 		}
 		step.createdOrgs[iamOrg.Name] = org

-		var policy *org_model.OrgIAMPolicy
+		var policy *iam_model.OrgIAMPolicyView
 		if iamOrg.OrgIamPolicy {
 			policy, err = step.iamorgpolicy(ctx, org)
 			if err != nil {
@@ -122,10 +116,8 @@ func (step *Step1) orgs(ctx context.Context, orgs []Org) error {
 				return err
 			}
 		} else {
-			policy, err = step.setup.OrgEvents.GetOrgIAMPolicy(ctx, policy_model.DefaultPolicy)
-			if err != nil {
-				logging.LogWithFields("SETUP-IS8wS", "Org IAM Policy", iamOrg.Name).WithError(err).Error("unable to get default iam org policy")
-				return err
+			policy = &iam_model.OrgIAMPolicyView{
+				UserLoginMustBeDomain: true,
 			}
 		}

@@ -161,13 +153,20 @@ func (step *Step1) org(ctx context.Context, org Org) (*org_model.Org, error) {
 	return step.setup.OrgEvents.CreateOrg(ctx, createOrg, nil)
 }

-func (step *Step1) iamorgpolicy(ctx context.Context, org *org_model.Org) (*org_model.OrgIAMPolicy, error) {
+func (step *Step1) iamorgpolicy(ctx context.Context, org *org_model.Org) (*iam_model.OrgIAMPolicyView, error) {
 	ctx = setSetUpContextData(ctx, org.AggregateID)
-	policy := &org_model.OrgIAMPolicy{
+	policy := &iam_model.OrgIAMPolicy{
 		ObjectRoot:            models.ObjectRoot{AggregateID: org.AggregateID},
 		UserLoginMustBeDomain: false,
 	}
-	return step.setup.OrgEvents.AddOrgIAMPolicy(ctx, policy)
+	createdpolicy, err := step.setup.OrgEvents.AddOrgIAMPolicy(ctx, policy)
+	if err != nil {
+		return nil, err
+	}
+	return &iam_model.OrgIAMPolicyView{
+		AggregateID:           org.AggregateID,
+		UserLoginMustBeDomain: createdpolicy.UserLoginMustBeDomain,
+	}, nil
 }

 func (step *Step1) iamOwners(ctx context.Context, owners []string) error {
@@ -220,7 +219,7 @@ func (step *Step1) setIamProject(ctx context.Context, iamProjectName string) err
 	return nil
 }

-func (step *Step1) users(ctx context.Context, users []User, orgPolicy *org_model.OrgIAMPolicy) error {
+func (step *Step1) users(ctx context.Context, users []User, orgPolicy *iam_model.OrgIAMPolicyView) error {
 	for _, user := range users {
 		created, err := step.user(ctx, user, orgPolicy)
 		if err != nil {
@@ -232,7 +231,7 @@ func (step *Step1) users(ctx context.Context, users []User, orgPolicy *org_model
 	return nil
 }

-func (step *Step1) user(ctx context.Context, user User, orgPolicy *org_model.OrgIAMPolicy) (*usr_model.User, error) {
+func (step *Step1) user(ctx context.Context, user User, orgPolicy *iam_model.OrgIAMPolicyView) (*usr_model.User, error) {
 	createUser := &usr_model.User{
 		UserName: user.UserName,
 		Human: &usr_model.Human{
--- a/internal/setup/step2.go
+++ b/internal/setup/step2.go
@@ -1,30 +1,57 @@
 package setup

-//TODO: label policy
-// import (
-// 	"context"
+import (
+	"context"
+	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	iam_model "github.com/caos/zitadel/internal/iam/model"
+	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+)

-// 	iam_model "github.com/caos/zitadel/internal/iam/model"
-// )
+type Step2 struct {
+	DefaultPasswordComplexityPolicy iam_model.PasswordComplexityPolicy

-// type Step2 struct {
-// 	DefaultLabelPolicy LabelPolicy
+	setup *Setup
+}

-// 	setup *Setup
-// }
+func (s *Step2) isNil() bool {
+	return s == nil
+}

-// func (s *Step2) isNil() bool {
-// 	return s == nil
-// }
+func (step *Step2) step() iam_model.Step {
+	return iam_model.Step2
+}

-// func (step *Step2) step() iam_model.Step {
-// 	return iam_model.Step2
-// }
+func (step *Step2) init(setup *Setup) {
+	step.setup = setup
+}

-// func (step *Step2) init(setup *Setup) {
-// 	step.setup = setup
-// }
+func (step *Step2) execute(ctx context.Context) (*iam_model.IAM, error) {
+	iam, agg, err := step.passwordComplexityPolicy(ctx, &step.DefaultPasswordComplexityPolicy)
+	if err != nil {
+		logging.Log("SETUP-Ms9fl").WithField("step", step.step()).WithError(err).Error("unable to finish setup (pw complexity policy)")
+		return nil, err
+	}
+	iam, agg, push, err := step.setup.IamEvents.PrepareSetupDone(ctx, iam, agg, step.step())
+	if err != nil {
+		logging.Log("SETUP-V8sui").WithField("step", step.step()).WithError(err).Error("unable to finish setup (prepare setup done)")
+		return nil, err
+	}
+	err = es_sdk.PushAggregates(ctx, push, iam.AppendEvents, agg)
+	if err != nil {
+		logging.Log("SETUP-V8sui").WithField("step", step.step()).WithError(err).Error("unable to finish setup")
+		return nil, err
+	}
+	return iam_es_model.IAMToModel(iam), nil
+}

-// func (step *Step2) execute(ctx context.Context) error {
-// 	return nil
-// }
+func (step *Step2) passwordComplexityPolicy(ctx context.Context, policy *iam_model.PasswordComplexityPolicy) (*iam_es_model.IAM, *models.Aggregate, error) {
+	logging.Log("SETUP-Bs8id").Info("setting up password complexity policy")
+	policy.AggregateID = step.setup.iamID
+	iam, aggregate, err := step.setup.IamEvents.PrepareAddPasswordComplexityPolicy(ctx, policy)
+	if err != nil {
+		return nil, nil, err
+	}
+	return iam, aggregate, nil
+}
--- a/internal/setup/step3.go
+++ b/internal/setup/step3.go
@@ -0,0 +1,57 @@
+package setup
+
+import (
+	"context"
+	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	iam_model "github.com/caos/zitadel/internal/iam/model"
+	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+)
+
+type Step3 struct {
+	DefaultPasswordAgePolicy iam_model.PasswordAgePolicy
+
+	setup *Setup
+}
+
+func (s *Step3) isNil() bool {
+	return s == nil
+}
+
+func (step *Step3) step() iam_model.Step {
+	return iam_model.Step3
+}
+
+func (step *Step3) init(setup *Setup) {
+	step.setup = setup
+}
+
+func (step *Step3) execute(ctx context.Context) (*iam_model.IAM, error) {
+	iam, agg, err := step.passwordAgePolicy(ctx, &step.DefaultPasswordAgePolicy)
+	if err != nil {
+		logging.Log("SETUP-Mski9").WithField("step", step.step()).WithError(err).Error("unable to finish setup (pw age policy)")
+		return nil, err
+	}
+	iam, agg, push, err := step.setup.IamEvents.PrepareSetupDone(ctx, iam, agg, step.step())
+	if err != nil {
+		logging.Log("SETUP-4Gsny").WithField("step", step.step()).WithError(err).Error("unable to finish setup (prepare setup done)")
+		return nil, err
+	}
+	err = es_sdk.PushAggregates(ctx, push, iam.AppendEvents, agg)
+	if err != nil {
+		logging.Log("SETUP-Yc8ui").WithField("step", step.step()).WithError(err).Error("unable to finish setup")
+		return nil, err
+	}
+	return iam_es_model.IAMToModel(iam), nil
+}
+
+func (step *Step3) passwordAgePolicy(ctx context.Context, policy *iam_model.PasswordAgePolicy) (*iam_es_model.IAM, *models.Aggregate, error) {
+	logging.Log("SETUP-bVs8i").Info("setting up password complexity policy")
+	policy.AggregateID = step.setup.iamID
+	iam, aggregate, err := step.setup.IamEvents.PrepareAddPasswordAgePolicy(ctx, policy)
+	if err != nil {
+		return nil, nil, err
+	}
+	return iam, aggregate, nil
+}
--- a/internal/setup/step4.go
+++ b/internal/setup/step4.go
@@ -0,0 +1,57 @@
+package setup
+
+import (
+	"context"
+	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	iam_model "github.com/caos/zitadel/internal/iam/model"
+	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+)
+
+type Step4 struct {
+	DefaultPasswordLockoutPolicy iam_model.PasswordLockoutPolicy
+
+	setup *Setup
+}
+
+func (s *Step4) isNil() bool {
+	return s == nil
+}
+
+func (step *Step4) step() iam_model.Step {
+	return iam_model.Step4
+}
+
+func (step *Step4) init(setup *Setup) {
+	step.setup = setup
+}
+
+func (step *Step4) execute(ctx context.Context) (*iam_model.IAM, error) {
+	iam, agg, err := step.passwordLockoutPolicy(ctx, &step.DefaultPasswordLockoutPolicy)
+	if err != nil {
+		logging.Log("SETUP-xCd9i").WithField("step", step.step()).WithError(err).Error("unable to finish setup (pw age policy)")
+		return nil, err
+	}
+	iam, agg, push, err := step.setup.IamEvents.PrepareSetupDone(ctx, iam, agg, step.step())
+	if err != nil {
+		logging.Log("SETUP-bVsm9").WithField("step", step.step()).WithError(err).Error("unable to finish setup (prepare setup done)")
+		return nil, err
+	}
+	err = es_sdk.PushAggregates(ctx, push, iam.AppendEvents, agg)
+	if err != nil {
+		logging.Log("SETUP-wCxko").WithField("step", step.step()).WithError(err).Error("unable to finish setup")
+		return nil, err
+	}
+	return iam_es_model.IAMToModel(iam), nil
+}
+
+func (step *Step4) passwordLockoutPolicy(ctx context.Context, policy *iam_model.PasswordLockoutPolicy) (*iam_es_model.IAM, *models.Aggregate, error) {
+	logging.Log("SETUP-vSfr4").Info("setting up password complexity policy")
+	policy.AggregateID = step.setup.iamID
+	iam, aggregate, err := step.setup.IamEvents.PrepareAddPasswordLockoutPolicy(ctx, policy)
+	if err != nil {
+		return nil, nil, err
+	}
+	return iam, aggregate, nil
+}
--- a/internal/setup/step5.go
+++ b/internal/setup/step5.go
@@ -0,0 +1,57 @@
+package setup
+
+import (
+	"context"
+	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	iam_model "github.com/caos/zitadel/internal/iam/model"
+	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+)
+
+type Step5 struct {
+	DefaultOrgIAMPolicy iam_model.OrgIAMPolicy
+
+	setup *Setup
+}
+
+func (s *Step5) isNil() bool {
+	return s == nil
+}
+
+func (step *Step5) step() iam_model.Step {
+	return iam_model.Step5
+}
+
+func (step *Step5) init(setup *Setup) {
+	step.setup = setup
+}
+
+func (step *Step5) execute(ctx context.Context) (*iam_model.IAM, error) {
+	iam, agg, err := step.orgIAMPolicy(ctx, &step.DefaultOrgIAMPolicy)
+	if err != nil {
+		logging.Log("SETUP-3nKd9").WithField("step", step.step()).WithError(err).Error("unable to finish setup (org iam policy)")
+		return nil, err
+	}
+	iam, agg, push, err := step.setup.IamEvents.PrepareSetupDone(ctx, iam, agg, step.step())
+	if err != nil {
+		logging.Log("SETUP-5h8Ds").WithField("step", step.step()).WithError(err).Error("unable to finish setup (prepare setup done)")
+		return nil, err
+	}
+	err = es_sdk.PushAggregates(ctx, push, iam.AppendEvents, agg)
+	if err != nil {
+		logging.Log("SETUP-3fGk0").WithField("step", step.step()).WithError(err).Error("unable to finish setup")
+		return nil, err
+	}
+	return iam_es_model.IAMToModel(iam), nil
+}
+
+func (step *Step5) orgIAMPolicy(ctx context.Context, policy *iam_model.OrgIAMPolicy) (*iam_es_model.IAM, *models.Aggregate, error) {
+	logging.Log("SETUP-5Gn8s").Info("setting up org iam policy")
+	policy.AggregateID = step.setup.iamID
+	iam, aggregate, err := step.setup.IamEvents.PrepareAddOrgIAMPolicy(ctx, policy)
+	if err != nil {
+		return nil, nil, err
+	}
+	return iam, aggregate, nil
+}