2020-06-05 05:50:04 +00:00
|
|
|
package handler
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-07-01 05:18:05 +00:00
|
|
|
"strings"
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
"github.com/caos/logging"
|
2020-07-28 07:42:21 +00:00
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
"github.com/caos/zitadel/internal/errors"
|
|
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
|
|
|
"github.com/caos/zitadel/internal/eventstore"
|
|
|
|
"github.com/caos/zitadel/internal/eventstore/models"
|
|
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
2020-12-18 15:47:45 +00:00
|
|
|
"github.com/caos/zitadel/internal/eventstore/query"
|
2020-06-05 05:50:04 +00:00
|
|
|
"github.com/caos/zitadel/internal/eventstore/spooler"
|
2020-09-24 09:38:28 +00:00
|
|
|
iam_model "github.com/caos/zitadel/internal/iam/model"
|
2020-06-05 05:50:04 +00:00
|
|
|
iam_events "github.com/caos/zitadel/internal/iam/repository/eventsourcing"
|
|
|
|
iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
|
|
|
|
org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
|
|
|
|
proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
|
|
|
|
view_model "github.com/caos/zitadel/internal/usergrant/repository/view/model"
|
|
|
|
)
|
|
|
|
|
2020-12-18 15:47:45 +00:00
|
|
|
const (
|
|
|
|
userGrantTable = "authz.user_grants"
|
|
|
|
)
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
type UserGrant struct {
|
|
|
|
handler
|
2020-08-26 07:56:23 +00:00
|
|
|
iamEvents *iam_events.IAMEventstore
|
2020-06-05 05:50:04 +00:00
|
|
|
iamID string
|
|
|
|
iamProjectID string
|
2020-12-18 15:47:45 +00:00
|
|
|
subscription *eventstore.Subscription
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
|
2020-12-18 15:47:45 +00:00
|
|
|
func newUserGrant(
|
|
|
|
handler handler,
|
|
|
|
iamEvents *iam_events.IAMEventstore,
|
|
|
|
iamID string,
|
|
|
|
) *UserGrant {
|
|
|
|
h := &UserGrant{
|
|
|
|
handler: handler,
|
|
|
|
iamEvents: iamEvents,
|
|
|
|
iamID: iamID,
|
|
|
|
}
|
|
|
|
|
|
|
|
h.subscribe()
|
|
|
|
|
|
|
|
return h
|
|
|
|
}
|
|
|
|
|
|
|
|
func (k *UserGrant) subscribe() {
|
|
|
|
k.subscription = k.es.Subscribe(k.AggregateTypes()...)
|
|
|
|
go func() {
|
|
|
|
for event := range k.subscription.Events {
|
|
|
|
query.ReduceEvent(k, event)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
2020-06-05 05:50:04 +00:00
|
|
|
|
|
|
|
func (u *UserGrant) ViewModel() string {
|
|
|
|
return userGrantTable
|
|
|
|
}
|
|
|
|
|
2020-12-18 15:47:45 +00:00
|
|
|
func (_ *UserGrant) AggregateTypes() []es_models.AggregateType {
|
|
|
|
return []es_models.AggregateType{iam_es_model.IAMAggregate, org_es_model.OrgAggregate, proj_es_model.ProjectAggregate}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserGrant) CurrentSequence(event *models.Event) (uint64, error) {
|
|
|
|
sequence, err := u.view.GetLatestUserGrantSequence(string(event.AggregateType))
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
return sequence.CurrentSequence, nil
|
|
|
|
}
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
func (u *UserGrant) EventQuery() (*models.SearchQuery, error) {
|
|
|
|
if u.iamProjectID == "" {
|
|
|
|
err := u.setIamProjectID()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
2020-12-18 15:47:45 +00:00
|
|
|
sequence, err := u.view.GetLatestUserGrantSequence("")
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return es_models.NewSearchQuery().
|
2020-08-26 07:56:23 +00:00
|
|
|
AggregateTypeFilter(iam_es_model.IAMAggregate, org_es_model.OrgAggregate, proj_es_model.ProjectAggregate).
|
2020-07-15 11:24:36 +00:00
|
|
|
LatestSequenceFilter(sequence.CurrentSequence), nil
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
|
2020-06-23 12:47:47 +00:00
|
|
|
func (u *UserGrant) Reduce(event *models.Event) (err error) {
|
2020-06-05 05:50:04 +00:00
|
|
|
switch event.AggregateType {
|
|
|
|
case proj_es_model.ProjectAggregate:
|
|
|
|
err = u.processProject(event)
|
2020-08-26 07:56:23 +00:00
|
|
|
case iam_es_model.IAMAggregate:
|
2020-09-30 08:29:41 +00:00
|
|
|
err = u.processIAMMember(event, "IAM", false)
|
2020-06-05 05:50:04 +00:00
|
|
|
case org_es_model.OrgAggregate:
|
|
|
|
return u.processOrg(event)
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserGrant) processProject(event *models.Event) (err error) {
|
|
|
|
switch event.Type {
|
|
|
|
case proj_es_model.ProjectMemberAdded, proj_es_model.ProjectMemberChanged, proj_es_model.ProjectMemberRemoved:
|
|
|
|
member := new(proj_es_model.ProjectMember)
|
|
|
|
member.SetData(event)
|
2020-06-19 05:27:16 +00:00
|
|
|
return u.processMember(event, "PROJECT", event.AggregateID, member.UserID, member.Roles)
|
2020-06-05 05:50:04 +00:00
|
|
|
case proj_es_model.ProjectGrantMemberAdded, proj_es_model.ProjectGrantMemberChanged, proj_es_model.ProjectGrantMemberRemoved:
|
|
|
|
member := new(proj_es_model.ProjectGrantMember)
|
|
|
|
member.SetData(event)
|
2020-06-19 05:27:16 +00:00
|
|
|
return u.processMember(event, "PROJECT_GRANT", member.GrantID, member.UserID, member.Roles)
|
2020-06-05 05:50:04 +00:00
|
|
|
default:
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserGrantSequence(event)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserGrant) processOrg(event *models.Event) (err error) {
|
|
|
|
switch event.Type {
|
|
|
|
case org_es_model.OrgMemberAdded, org_es_model.OrgMemberChanged, org_es_model.OrgMemberRemoved:
|
|
|
|
member := new(org_es_model.OrgMember)
|
|
|
|
member.SetData(event)
|
2020-06-19 05:27:16 +00:00
|
|
|
return u.processMember(event, "ORG", "", member.UserID, member.Roles)
|
2020-06-05 05:50:04 +00:00
|
|
|
default:
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserGrantSequence(event)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-30 08:29:41 +00:00
|
|
|
func (u *UserGrant) processIAMMember(event *models.Event, rolePrefix string, suffix bool) error {
|
2020-08-26 07:56:23 +00:00
|
|
|
member := new(iam_es_model.IAMMember)
|
2020-06-05 05:50:04 +00:00
|
|
|
|
|
|
|
switch event.Type {
|
2020-08-26 07:56:23 +00:00
|
|
|
case iam_es_model.IAMMemberAdded, iam_es_model.IAMMemberChanged:
|
2020-06-05 05:50:04 +00:00
|
|
|
member.SetData(event)
|
|
|
|
|
|
|
|
grant, err := u.view.UserGrantByIDs(u.iamID, u.iamProjectID, member.UserID)
|
|
|
|
if err != nil && !errors.IsNotFound(err) {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if errors.IsNotFound(err) {
|
|
|
|
grant = &view_model.UserGrantView{
|
|
|
|
ID: u.iamProjectID + member.UserID,
|
|
|
|
ResourceOwner: u.iamID,
|
|
|
|
OrgName: u.iamID,
|
|
|
|
ProjectID: u.iamProjectID,
|
|
|
|
UserID: member.UserID,
|
|
|
|
RoleKeys: member.Roles,
|
|
|
|
CreationDate: event.CreationDate,
|
|
|
|
}
|
|
|
|
if suffix {
|
|
|
|
grant.RoleKeys = suffixRoles(event.AggregateID, grant.RoleKeys)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
newRoles := member.Roles
|
|
|
|
if grant.RoleKeys != nil {
|
2020-06-19 05:27:16 +00:00
|
|
|
grant.RoleKeys = mergeExistingRoles(rolePrefix, "", grant.RoleKeys, newRoles)
|
2020-06-05 05:50:04 +00:00
|
|
|
} else {
|
|
|
|
grant.RoleKeys = newRoles
|
|
|
|
}
|
|
|
|
}
|
|
|
|
grant.Sequence = event.Sequence
|
|
|
|
grant.ChangeDate = event.CreationDate
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.PutUserGrant(grant, event)
|
2020-08-26 07:56:23 +00:00
|
|
|
case iam_es_model.IAMMemberRemoved:
|
2020-06-05 05:50:04 +00:00
|
|
|
member.SetData(event)
|
|
|
|
grant, err := u.view.UserGrantByIDs(u.iamID, u.iamProjectID, member.UserID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.DeleteUserGrant(grant.ID, event)
|
2020-06-05 05:50:04 +00:00
|
|
|
default:
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserGrantSequence(event)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-19 05:27:16 +00:00
|
|
|
func (u *UserGrant) processMember(event *models.Event, rolePrefix, roleSuffix string, userID string, roleKeys []string) error {
|
2020-06-05 05:50:04 +00:00
|
|
|
switch event.Type {
|
|
|
|
case org_es_model.OrgMemberAdded, proj_es_model.ProjectMemberAdded, proj_es_model.ProjectGrantMemberAdded,
|
|
|
|
org_es_model.OrgMemberChanged, proj_es_model.ProjectMemberChanged, proj_es_model.ProjectGrantMemberChanged:
|
|
|
|
|
|
|
|
grant, err := u.view.UserGrantByIDs(event.ResourceOwner, u.iamProjectID, userID)
|
|
|
|
if err != nil && !errors.IsNotFound(err) {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-19 05:27:16 +00:00
|
|
|
if roleSuffix != "" {
|
2020-07-22 12:00:29 +00:00
|
|
|
roleKeys = suffixRoles(roleSuffix, roleKeys)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
if errors.IsNotFound(err) {
|
|
|
|
grant = &view_model.UserGrantView{
|
|
|
|
ID: u.iamProjectID + event.ResourceOwner + userID,
|
|
|
|
ResourceOwner: event.ResourceOwner,
|
|
|
|
ProjectID: u.iamProjectID,
|
|
|
|
UserID: userID,
|
|
|
|
RoleKeys: roleKeys,
|
|
|
|
CreationDate: event.CreationDate,
|
|
|
|
}
|
2020-09-30 08:29:41 +00:00
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
} else {
|
|
|
|
newRoles := roleKeys
|
|
|
|
if grant.RoleKeys != nil {
|
2020-06-19 05:27:16 +00:00
|
|
|
grant.RoleKeys = mergeExistingRoles(rolePrefix, roleSuffix, grant.RoleKeys, newRoles)
|
2020-06-05 05:50:04 +00:00
|
|
|
} else {
|
|
|
|
grant.RoleKeys = newRoles
|
|
|
|
}
|
|
|
|
}
|
|
|
|
grant.Sequence = event.Sequence
|
|
|
|
grant.ChangeDate = event.CreationDate
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.PutUserGrant(grant, event)
|
2020-06-05 05:50:04 +00:00
|
|
|
case org_es_model.OrgMemberRemoved,
|
|
|
|
proj_es_model.ProjectMemberRemoved,
|
|
|
|
proj_es_model.ProjectGrantMemberRemoved:
|
|
|
|
|
|
|
|
grant, err := u.view.UserGrantByIDs(event.ResourceOwner, u.iamProjectID, userID)
|
2020-09-30 08:29:41 +00:00
|
|
|
if err != nil && !errors.IsNotFound(err) {
|
2020-06-05 05:50:04 +00:00
|
|
|
return err
|
|
|
|
}
|
2020-09-30 08:29:41 +00:00
|
|
|
if errors.IsNotFound(err) {
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserGrantSequence(event)
|
2020-09-30 08:29:41 +00:00
|
|
|
}
|
|
|
|
if roleSuffix != "" {
|
|
|
|
roleKeys = suffixRoles(roleSuffix, roleKeys)
|
|
|
|
}
|
|
|
|
if grant.RoleKeys == nil {
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserGrantSequence(event)
|
2020-09-30 08:29:41 +00:00
|
|
|
}
|
|
|
|
grant.RoleKeys = mergeExistingRoles(rolePrefix, roleSuffix, grant.RoleKeys, nil)
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.PutUserGrant(grant, event)
|
2020-06-05 05:50:04 +00:00
|
|
|
default:
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserGrantSequence(event)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func suffixRoles(suffix string, roles []string) []string {
|
|
|
|
suffixedRoles := make([]string, len(roles))
|
|
|
|
for i := 0; i < len(roles); i++ {
|
|
|
|
suffixedRoles[i] = roles[i] + ":" + suffix
|
|
|
|
}
|
|
|
|
return suffixedRoles
|
|
|
|
}
|
|
|
|
|
2020-06-19 05:27:16 +00:00
|
|
|
func mergeExistingRoles(rolePrefix, suffix string, existingRoles, newRoles []string) []string {
|
2020-06-05 05:50:04 +00:00
|
|
|
mergedRoles := make([]string, 0)
|
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
|
|
|
for _, existingRole := range existingRoles {
|
|
|
|
if !strings.HasPrefix(existingRole, rolePrefix) {
|
|
|
|
mergedRoles = append(mergedRoles, existingRole)
|
2020-06-19 05:27:16 +00:00
|
|
|
continue
|
|
|
|
}
|
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
|
|
|
if suffix != "" && !strings.HasSuffix(existingRole, suffix) {
|
|
|
|
mergedRoles = append(mergedRoles, existingRole)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return append(mergedRoles, newRoles...)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserGrant) setIamProjectID() error {
|
|
|
|
if u.iamProjectID != "" {
|
|
|
|
return nil
|
|
|
|
}
|
2020-08-26 07:56:23 +00:00
|
|
|
iam, err := u.iamEvents.IAMByID(context.Background(), u.iamID)
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-24 09:38:28 +00:00
|
|
|
if iam.SetUpDone < iam_model.StepCount-1 {
|
2020-06-05 05:50:04 +00:00
|
|
|
return caos_errs.ThrowPreconditionFailed(nil, "HANDL-s5DTs", "Setup not done")
|
|
|
|
}
|
2020-08-26 07:56:23 +00:00
|
|
|
u.iamProjectID = iam.IAMProjectID
|
2020-06-05 05:50:04 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (u *UserGrant) OnError(event *models.Event, err error) error {
|
2020-07-01 05:18:05 +00:00
|
|
|
logging.LogWithFields("SPOOL-VcVoJ", "id", event.AggregateID).WithError(err).Warn("something went wrong in user grant handler")
|
2020-06-05 05:50:04 +00:00
|
|
|
return spooler.HandleError(event, err, u.view.GetLatestUserGrantFailedEvent, u.view.ProcessedUserGrantFailedEvent, u.view.ProcessedUserGrantSequence, u.errorCountUntilSkip)
|
|
|
|
}
|
2020-12-02 07:50:59 +00:00
|
|
|
|
|
|
|
func (u *UserGrant) OnSuccess() error {
|
|
|
|
return spooler.HandleSuccess(u.view.UpdateUserGrantSpoolerRunTimestamp)
|
|
|
|
}
|