mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 04:18:01 +00:00
fbb30840f1
* 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>
193 lines
6.2 KiB
Go
193 lines
6.2 KiB
Go
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/caos/logging"
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
|
"github.com/caos/zitadel/internal/iam/model"
|
|
)
|
|
|
|
const (
|
|
IAMVersion = "v1"
|
|
)
|
|
|
|
type Step int
|
|
|
|
const (
|
|
Step1 = Step(model.Step1)
|
|
Step2 = Step(model.Step2)
|
|
StepCount = Step(model.StepCount)
|
|
)
|
|
|
|
type IAM struct {
|
|
es_models.ObjectRoot
|
|
SetUpStarted Step `json:"-"`
|
|
SetUpDone Step `json:"-"`
|
|
GlobalOrgID string `json:"globalOrgId,omitempty"`
|
|
IAMProjectID string `json:"iamProjectId,omitempty"`
|
|
Members []*IAMMember `json:"-"`
|
|
IDPs []*IDPConfig `json:"-"`
|
|
DefaultLoginPolicy *LoginPolicy `json:"-"`
|
|
DefaultOrgIAMPolicy *OrgIAMPolicy `json:"-"`
|
|
DefaultPasswordComplexityPolicy *PasswordComplexityPolicy `json:"-"`
|
|
DefaultPasswordAgePolicy *PasswordAgePolicy `json:"-"`
|
|
DefaultPasswordLockoutPolicy *PasswordLockoutPolicy `json:"-"`
|
|
}
|
|
|
|
func IAMFromModel(iam *model.IAM) *IAM {
|
|
members := IAMMembersFromModel(iam.Members)
|
|
idps := IDPConfigsFromModel(iam.IDPs)
|
|
converted := &IAM{
|
|
ObjectRoot: iam.ObjectRoot,
|
|
SetUpStarted: Step(iam.SetUpStarted),
|
|
SetUpDone: Step(iam.SetUpDone),
|
|
GlobalOrgID: iam.GlobalOrgID,
|
|
IAMProjectID: iam.IAMProjectID,
|
|
Members: members,
|
|
IDPs: idps,
|
|
}
|
|
if iam.DefaultLoginPolicy != nil {
|
|
converted.DefaultLoginPolicy = LoginPolicyFromModel(iam.DefaultLoginPolicy)
|
|
}
|
|
if iam.DefaultPasswordComplexityPolicy != nil {
|
|
converted.DefaultPasswordComplexityPolicy = PasswordComplexityPolicyFromModel(iam.DefaultPasswordComplexityPolicy)
|
|
}
|
|
if iam.DefaultPasswordAgePolicy != nil {
|
|
converted.DefaultPasswordAgePolicy = PasswordAgePolicyFromModel(iam.DefaultPasswordAgePolicy)
|
|
}
|
|
if iam.DefaultPasswordLockoutPolicy != nil {
|
|
converted.DefaultPasswordLockoutPolicy = PasswordLockoutPolicyFromModel(iam.DefaultPasswordLockoutPolicy)
|
|
}
|
|
if iam.DefaultOrgIAMPolicy != nil {
|
|
converted.DefaultOrgIAMPolicy = OrgIAMPolicyFromModel(iam.DefaultOrgIAMPolicy)
|
|
}
|
|
return converted
|
|
}
|
|
|
|
func IAMToModel(iam *IAM) *model.IAM {
|
|
members := IAMMembersToModel(iam.Members)
|
|
idps := IDPConfigsToModel(iam.IDPs)
|
|
converted := &model.IAM{
|
|
ObjectRoot: iam.ObjectRoot,
|
|
SetUpStarted: model.Step(iam.SetUpStarted),
|
|
SetUpDone: model.Step(iam.SetUpDone),
|
|
GlobalOrgID: iam.GlobalOrgID,
|
|
IAMProjectID: iam.IAMProjectID,
|
|
Members: members,
|
|
IDPs: idps,
|
|
}
|
|
if iam.DefaultLoginPolicy != nil {
|
|
converted.DefaultLoginPolicy = LoginPolicyToModel(iam.DefaultLoginPolicy)
|
|
}
|
|
if iam.DefaultPasswordComplexityPolicy != nil {
|
|
converted.DefaultPasswordComplexityPolicy = PasswordComplexityPolicyToModel(iam.DefaultPasswordComplexityPolicy)
|
|
}
|
|
if iam.DefaultPasswordAgePolicy != nil {
|
|
converted.DefaultPasswordAgePolicy = PasswordAgePolicyToModel(iam.DefaultPasswordAgePolicy)
|
|
}
|
|
if iam.DefaultPasswordLockoutPolicy != nil {
|
|
converted.DefaultPasswordLockoutPolicy = PasswordLockoutPolicyToModel(iam.DefaultPasswordLockoutPolicy)
|
|
}
|
|
if iam.DefaultOrgIAMPolicy != nil {
|
|
converted.DefaultOrgIAMPolicy = OrgIAMPolicyToModel(iam.DefaultOrgIAMPolicy)
|
|
}
|
|
return converted
|
|
}
|
|
|
|
func (i *IAM) AppendEvents(events ...*es_models.Event) error {
|
|
for _, event := range events {
|
|
if err := i.AppendEvent(event); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (i *IAM) AppendEvent(event *es_models.Event) (err error) {
|
|
i.ObjectRoot.AppendEvent(event)
|
|
switch event.Type {
|
|
case IAMSetupStarted:
|
|
if len(event.Data) == 0 {
|
|
i.SetUpStarted = Step(model.Step1)
|
|
return
|
|
}
|
|
step := new(struct{ Step Step })
|
|
err = json.Unmarshal(event.Data, step)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
i.SetUpStarted = step.Step
|
|
case IAMSetupDone:
|
|
if len(event.Data) == 0 {
|
|
i.SetUpDone = Step(model.Step1)
|
|
return
|
|
}
|
|
step := new(struct{ Step Step })
|
|
err = json.Unmarshal(event.Data, step)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
i.SetUpDone = step.Step
|
|
case IAMProjectSet,
|
|
GlobalOrgSet:
|
|
err = i.SetData(event)
|
|
case IAMMemberAdded:
|
|
err = i.appendAddMemberEvent(event)
|
|
case IAMMemberChanged:
|
|
err = i.appendChangeMemberEvent(event)
|
|
case IAMMemberRemoved:
|
|
err = i.appendRemoveMemberEvent(event)
|
|
case IDPConfigAdded:
|
|
return i.appendAddIDPConfigEvent(event)
|
|
case IDPConfigChanged:
|
|
return i.appendChangeIDPConfigEvent(event)
|
|
case IDPConfigRemoved:
|
|
return i.appendRemoveIDPConfigEvent(event)
|
|
case IDPConfigDeactivated:
|
|
return i.appendIDPConfigStateEvent(event, model.IDPConfigStateInactive)
|
|
case IDPConfigReactivated:
|
|
return i.appendIDPConfigStateEvent(event, model.IDPConfigStateActive)
|
|
case OIDCIDPConfigAdded:
|
|
return i.appendAddOIDCIDPConfigEvent(event)
|
|
case OIDCIDPConfigChanged:
|
|
return i.appendChangeOIDCIDPConfigEvent(event)
|
|
case LoginPolicyAdded:
|
|
return i.appendAddLoginPolicyEvent(event)
|
|
case LoginPolicyChanged:
|
|
return i.appendChangeLoginPolicyEvent(event)
|
|
case LoginPolicyIDPProviderAdded:
|
|
return i.appendAddIDPProviderToLoginPolicyEvent(event)
|
|
case LoginPolicyIDPProviderRemoved:
|
|
return i.appendRemoveIDPProviderFromLoginPolicyEvent(event)
|
|
case PasswordComplexityPolicyAdded:
|
|
return i.appendAddPasswordComplexityPolicyEvent(event)
|
|
case PasswordComplexityPolicyChanged:
|
|
return i.appendChangePasswordComplexityPolicyEvent(event)
|
|
case PasswordAgePolicyAdded:
|
|
return i.appendAddPasswordAgePolicyEvent(event)
|
|
case PasswordAgePolicyChanged:
|
|
return i.appendChangePasswordAgePolicyEvent(event)
|
|
case PasswordLockoutPolicyAdded:
|
|
return i.appendAddPasswordLockoutPolicyEvent(event)
|
|
case PasswordLockoutPolicyChanged:
|
|
return i.appendChangePasswordLockoutPolicyEvent(event)
|
|
case OrgIAMPolicyAdded:
|
|
return i.appendAddOrgIAMPolicyEvent(event)
|
|
case OrgIAMPolicyChanged:
|
|
return i.appendChangeOrgIAMPolicyEvent(event)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (i *IAM) SetData(event *es_models.Event) error {
|
|
i.ObjectRoot.AppendEvent(event)
|
|
if err := json.Unmarshal(event.Data, i); err != nil {
|
|
logging.Log("EVEN-9sie4").WithError(err).Error("could not unmarshal event data")
|
|
return caos_errs.ThrowInternal(err, "MODEL-slwi3", "could not unmarshal event")
|
|
}
|
|
return nil
|
|
}
|