2020-07-30 12:37:55 +00:00
|
|
|
package model
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/json"
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
"time"
|
|
|
|
|
2020-07-30 12:37:55 +00:00
|
|
|
"github.com/caos/logging"
|
2020-09-04 13:20:39 +00:00
|
|
|
"github.com/lib/pq"
|
|
|
|
|
2020-07-30 12:37:55 +00:00
|
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
2021-02-23 14:13:04 +00:00
|
|
|
"github.com/caos/zitadel/internal/eventstore/v1/models"
|
2020-08-25 14:08:51 +00:00
|
|
|
iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
|
2020-07-30 12:37:55 +00:00
|
|
|
org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
|
|
|
|
proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
|
|
|
|
"github.com/caos/zitadel/internal/user/model"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
UserMembershipKeyUserID = "user_id"
|
|
|
|
UserMembershipKeyAggregateID = "aggregate_id"
|
|
|
|
UserMembershipKeyObjectID = "object_id"
|
|
|
|
UserMembershipKeyResourceOwner = "resource_owner"
|
|
|
|
UserMembershipKeyMemberType = "member_type"
|
|
|
|
)
|
|
|
|
|
|
|
|
type UserMembershipView struct {
|
|
|
|
UserID string `json:"-" gorm:"column:user_id;primary_key"`
|
|
|
|
MemberType int32 `json:"-" gorm:"column:member_type;primary_key"`
|
|
|
|
AggregateID string `json:"-" gorm:"column:aggregate_id;primary_key"`
|
|
|
|
ObjectID string `json:"-" gorm:"column:object_id;primary_key"`
|
|
|
|
|
2020-09-04 13:20:39 +00:00
|
|
|
Roles pq.StringArray `json:"-" gorm:"column:roles"`
|
|
|
|
DisplayName string `json:"-" gorm:"column:display_name"`
|
|
|
|
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
|
|
|
|
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
|
|
|
|
ResourceOwner string `json:"-" gorm:"column:resource_owner"`
|
|
|
|
ResourceOwnerName string `json:"-" gorm:"column:resource_owner_name"`
|
|
|
|
Sequence uint64 `json:"-" gorm:"column:sequence"`
|
2020-07-30 12:37:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func UserMembershipToModel(membership *UserMembershipView) *model.UserMembershipView {
|
|
|
|
return &model.UserMembershipView{
|
2020-09-04 13:20:39 +00:00
|
|
|
UserID: membership.UserID,
|
|
|
|
MemberType: model.MemberType(membership.MemberType),
|
|
|
|
AggregateID: membership.AggregateID,
|
|
|
|
ObjectID: membership.ObjectID,
|
|
|
|
Roles: membership.Roles,
|
|
|
|
DisplayName: membership.DisplayName,
|
|
|
|
ChangeDate: membership.ChangeDate,
|
|
|
|
CreationDate: membership.CreationDate,
|
|
|
|
ResourceOwner: membership.ResourceOwner,
|
|
|
|
ResourceOwnerName: membership.ResourceOwnerName,
|
|
|
|
Sequence: membership.Sequence,
|
2020-07-30 12:37:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func UserMembershipsToModel(memberships []*UserMembershipView) []*model.UserMembershipView {
|
|
|
|
result := make([]*model.UserMembershipView, len(memberships))
|
|
|
|
for i, m := range memberships {
|
|
|
|
result[i] = UserMembershipToModel(m)
|
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserMembershipView) AppendEvent(event *models.Event) (err error) {
|
|
|
|
u.ChangeDate = event.CreationDate
|
|
|
|
u.Sequence = event.Sequence
|
|
|
|
|
|
|
|
switch event.Type {
|
2020-08-26 07:56:23 +00:00
|
|
|
case iam_es_model.IAMMemberAdded:
|
2020-08-25 14:08:51 +00:00
|
|
|
u.setRootData(event, model.MemberTypeIam)
|
|
|
|
err = u.setIamMemberData(event)
|
2020-09-04 13:20:39 +00:00
|
|
|
case iam_es_model.IAMMemberChanged,
|
|
|
|
iam_es_model.IAMMemberRemoved:
|
2020-08-25 14:08:51 +00:00
|
|
|
err = u.setIamMemberData(event)
|
2020-07-30 12:37:55 +00:00
|
|
|
case org_es_model.OrgMemberAdded:
|
|
|
|
u.setRootData(event, model.MemberTypeOrganisation)
|
|
|
|
err = u.setOrgMemberData(event)
|
2020-09-04 13:20:39 +00:00
|
|
|
case org_es_model.OrgMemberChanged,
|
|
|
|
org_es_model.OrgMemberRemoved:
|
2020-07-30 12:37:55 +00:00
|
|
|
err = u.setOrgMemberData(event)
|
|
|
|
case proj_es_model.ProjectMemberAdded:
|
|
|
|
u.setRootData(event, model.MemberTypeProject)
|
|
|
|
err = u.setProjectMemberData(event)
|
2020-09-04 13:20:39 +00:00
|
|
|
case proj_es_model.ProjectMemberChanged,
|
|
|
|
proj_es_model.ProjectMemberRemoved:
|
2020-07-30 12:37:55 +00:00
|
|
|
err = u.setProjectMemberData(event)
|
|
|
|
case proj_es_model.ProjectGrantMemberAdded:
|
|
|
|
u.setRootData(event, model.MemberTypeProjectGrant)
|
2020-10-13 05:46:44 +00:00
|
|
|
err = u.setProjectGrantMemberData(event)
|
2020-09-04 13:20:39 +00:00
|
|
|
case proj_es_model.ProjectGrantMemberChanged,
|
|
|
|
proj_es_model.ProjectGrantMemberRemoved:
|
2020-10-13 05:46:44 +00:00
|
|
|
err = u.setProjectGrantMemberData(event)
|
2020-07-30 12:37:55 +00:00
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserMembershipView) setRootData(event *models.Event, memberType model.MemberType) {
|
|
|
|
u.CreationDate = event.CreationDate
|
|
|
|
u.AggregateID = event.AggregateID
|
|
|
|
u.ObjectID = event.AggregateID
|
|
|
|
u.ResourceOwner = event.ResourceOwner
|
|
|
|
u.MemberType = int32(memberType)
|
|
|
|
}
|
|
|
|
|
2020-08-25 14:08:51 +00:00
|
|
|
func (u *UserMembershipView) setIamMemberData(event *models.Event) error {
|
2020-08-26 07:56:23 +00:00
|
|
|
member := new(iam_es_model.IAMMember)
|
2020-08-25 14:08:51 +00:00
|
|
|
if err := json.Unmarshal(event.Data, member); err != nil {
|
|
|
|
logging.Log("MODEL-Ec9sf").WithError(err).Error("could not unmarshal event data")
|
|
|
|
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
|
|
|
}
|
|
|
|
u.UserID = member.UserID
|
|
|
|
u.Roles = member.Roles
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-07-30 12:37:55 +00:00
|
|
|
func (u *UserMembershipView) setOrgMemberData(event *models.Event) error {
|
|
|
|
member := new(org_es_model.OrgMember)
|
|
|
|
if err := json.Unmarshal(event.Data, member); err != nil {
|
|
|
|
logging.Log("MODEL-Lps0e").WithError(err).Error("could not unmarshal event data")
|
|
|
|
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
|
|
|
}
|
|
|
|
u.UserID = member.UserID
|
|
|
|
u.Roles = member.Roles
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserMembershipView) setProjectMemberData(event *models.Event) error {
|
|
|
|
member := new(proj_es_model.ProjectMember)
|
|
|
|
if err := json.Unmarshal(event.Data, member); err != nil {
|
|
|
|
logging.Log("MODEL-Esu8k").WithError(err).Error("could not unmarshal event data")
|
|
|
|
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
|
|
|
}
|
|
|
|
u.UserID = member.UserID
|
|
|
|
u.Roles = member.Roles
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserMembershipView) setProjectGrantMemberData(event *models.Event) error {
|
|
|
|
member := new(proj_es_model.ProjectGrantMember)
|
|
|
|
if err := json.Unmarshal(event.Data, member); err != nil {
|
|
|
|
logging.Log("MODEL-MCn8s").WithError(err).Error("could not unmarshal event data")
|
|
|
|
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
|
|
|
}
|
|
|
|
u.UserID = member.UserID
|
|
|
|
u.ObjectID = member.GrantID
|
|
|
|
u.Roles = member.Roles
|
|
|
|
return nil
|
|
|
|
}
|