2020-05-18 10:06:36 +00:00
|
|
|
package eventstore
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-09-18 11:26:28 +00:00
|
|
|
"github.com/caos/zitadel/internal/api/authz"
|
|
|
|
"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/view/model"
|
|
|
|
org_event "github.com/caos/zitadel/internal/org/repository/eventsourcing"
|
|
|
|
policy_event "github.com/caos/zitadel/internal/policy/repository/eventsourcing"
|
2020-05-18 10:06:36 +00:00
|
|
|
"time"
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
"github.com/caos/logging"
|
|
|
|
|
2020-05-18 10:06:36 +00:00
|
|
|
"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
|
|
|
|
"github.com/caos/zitadel/internal/auth_request/model"
|
2020-06-05 05:50:04 +00:00
|
|
|
cache "github.com/caos/zitadel/internal/auth_request/repository"
|
2020-05-18 10:06:36 +00:00
|
|
|
"github.com/caos/zitadel/internal/errors"
|
2020-06-05 05:50:04 +00:00
|
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
2020-09-18 11:26:28 +00:00
|
|
|
iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model"
|
2020-05-18 10:06:36 +00:00
|
|
|
"github.com/caos/zitadel/internal/id"
|
2020-06-19 12:52:04 +00:00
|
|
|
org_model "github.com/caos/zitadel/internal/org/model"
|
|
|
|
org_view_model "github.com/caos/zitadel/internal/org/repository/view/model"
|
2020-05-18 10:06:36 +00:00
|
|
|
user_model "github.com/caos/zitadel/internal/user/model"
|
|
|
|
user_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
|
2020-06-05 05:50:04 +00:00
|
|
|
es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
|
2020-06-19 12:52:04 +00:00
|
|
|
user_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
|
2020-05-18 10:06:36 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
type AuthRequestRepo struct {
|
|
|
|
UserEvents *user_event.UserEventstore
|
2020-09-18 11:26:28 +00:00
|
|
|
OrgEvents *org_event.OrgEventstore
|
|
|
|
PolicyEvents *policy_event.PolicyEventstore
|
2020-06-05 05:50:04 +00:00
|
|
|
AuthRequests cache.AuthRequestCache
|
2020-05-18 10:06:36 +00:00
|
|
|
View *view.View
|
|
|
|
|
|
|
|
UserSessionViewProvider userSessionViewProvider
|
|
|
|
UserViewProvider userViewProvider
|
2020-06-05 05:50:04 +00:00
|
|
|
UserEventProvider userEventProvider
|
2020-06-19 12:52:04 +00:00
|
|
|
OrgViewProvider orgViewProvider
|
2020-09-18 11:26:28 +00:00
|
|
|
LoginPolicyViewProvider loginPolicyViewProvider
|
|
|
|
IDPProviderViewProvider idpProviderViewProvider
|
2020-05-18 10:06:36 +00:00
|
|
|
|
|
|
|
IdGenerator id.Generator
|
|
|
|
|
|
|
|
PasswordCheckLifeTime time.Duration
|
|
|
|
MfaInitSkippedLifeTime time.Duration
|
|
|
|
MfaSoftwareCheckLifeTime time.Duration
|
|
|
|
MfaHardwareCheckLifeTime time.Duration
|
2020-09-18 11:26:28 +00:00
|
|
|
|
|
|
|
IAMID string
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type userSessionViewProvider interface {
|
2020-06-19 12:52:04 +00:00
|
|
|
UserSessionByIDs(string, string) (*user_view_model.UserSessionView, error)
|
|
|
|
UserSessionsByAgentID(string) ([]*user_view_model.UserSessionView, error)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
type userViewProvider interface {
|
2020-06-19 12:52:04 +00:00
|
|
|
UserByID(string) (*user_view_model.UserView, error)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
type loginPolicyViewProvider interface {
|
|
|
|
LoginPolicyByAggregateID(string) (*iam_view_model.LoginPolicyView, error)
|
|
|
|
}
|
|
|
|
|
|
|
|
type idpProviderViewProvider interface {
|
2020-09-23 14:52:19 +00:00
|
|
|
IDPProvidersByAggregateIDAndState(string, iam_model.IDPConfigState) ([]*iam_view_model.IDPProviderView, error)
|
2020-09-18 11:26:28 +00:00
|
|
|
}
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
type userEventProvider interface {
|
|
|
|
UserEventsByID(ctx context.Context, id string, sequence uint64) ([]*es_models.Event, error)
|
2020-09-18 11:26:28 +00:00
|
|
|
BulkAddExternalIDPs(ctx context.Context, userID string, externalIDPs []*user_model.ExternalIDP) error
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
|
2020-06-19 12:52:04 +00:00
|
|
|
type orgViewProvider interface {
|
|
|
|
OrgByID(string) (*org_view_model.OrgView, error)
|
2020-09-28 07:29:41 +00:00
|
|
|
OrgByPrimaryDomain(string) (*org_view_model.OrgView, error)
|
2020-06-19 12:52:04 +00:00
|
|
|
}
|
|
|
|
|
2020-05-18 10:06:36 +00:00
|
|
|
func (repo *AuthRequestRepo) Health(ctx context.Context) error {
|
|
|
|
if err := repo.UserEvents.Health(ctx); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return repo.AuthRequests.Health(ctx)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) CreateAuthRequest(ctx context.Context, request *model.AuthRequest) (*model.AuthRequest, error) {
|
|
|
|
reqID, err := repo.IdGenerator.Next()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
request.ID = reqID
|
2020-06-05 05:50:04 +00:00
|
|
|
ids, err := repo.View.AppIDsFromProjectByClientID(ctx, request.ApplicationID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
request.Audience = ids
|
2020-07-07 06:14:44 +00:00
|
|
|
if request.LoginHint != "" {
|
2020-09-18 11:26:28 +00:00
|
|
|
err = repo.checkLoginName(ctx, request, request.LoginHint)
|
2020-07-07 06:14:44 +00:00
|
|
|
logging.LogWithFields("EVENT-aG311", "login name", request.LoginHint, "id", request.ID, "applicationID", request.ApplicationID).Debug("login hint invalid")
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
err = repo.AuthRequests.SaveAuthRequest(ctx, request)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return request, nil
|
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) AuthRequestByID(ctx context.Context, id, userAgentID string) (*model.AuthRequest, error) {
|
|
|
|
return repo.getAuthRequestNextSteps(ctx, id, userAgentID, false)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) AuthRequestByIDCheckLoggedIn(ctx context.Context, id, userAgentID string) (*model.AuthRequest, error) {
|
|
|
|
return repo.getAuthRequestNextSteps(ctx, id, userAgentID, true)
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) SaveAuthCode(ctx context.Context, id, code, userAgentID string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, id, userAgentID)
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
request.Code = code
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) AuthRequestByCode(ctx context.Context, code string) (*model.AuthRequest, error) {
|
|
|
|
request, err := repo.AuthRequests.GetAuthRequestByCode(ctx, code)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-06-05 05:50:04 +00:00
|
|
|
steps, err := repo.nextSteps(ctx, request, true)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
request.PossibleSteps = steps
|
|
|
|
return request, nil
|
|
|
|
}
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
func (repo *AuthRequestRepo) DeleteAuthRequest(ctx context.Context, id string) error {
|
|
|
|
return repo.AuthRequests.DeleteAuthRequest(ctx, id)
|
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) CheckLoginName(ctx context.Context, id, loginName, userAgentID string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, id, userAgentID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-18 11:26:28 +00:00
|
|
|
err = repo.checkLoginName(ctx, request, loginName)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) SelectExternalIDP(ctx context.Context, authReqID, idpConfigID, userAgentID string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, authReqID, userAgentID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = repo.checkSelectedExternalIDP(request, idpConfigID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-05 05:50:04 +00:00
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
func (repo *AuthRequestRepo) CheckExternalUserLogin(ctx context.Context, authReqID, userAgentID string, externalUser *model.ExternalUser) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, authReqID, userAgentID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = repo.checkExternalUserLogin(request, externalUser.IDPConfigID, externalUser.ExternalUserID)
|
|
|
|
if errors.IsNotFound(err) {
|
|
|
|
return repo.setLinkingUser(ctx, request, externalUser)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) setLinkingUser(ctx context.Context, request *model.AuthRequest, externalUser *model.ExternalUser) error {
|
|
|
|
request.LinkingUsers = append(request.LinkingUsers, externalUser)
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) SelectUser(ctx context.Context, id, userID, userAgentID string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, id, userAgentID)
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
user, err := activeUserByID(ctx, repo.UserViewProvider, repo.UserEventProvider, repo.OrgViewProvider, userID)
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-07-20 08:00:29 +00:00
|
|
|
request.SetUserInfo(user.ID, user.PreferredLoginName, user.DisplayName, user.ResourceOwner)
|
2020-06-05 05:50:04 +00:00
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) VerifyPassword(ctx context.Context, id, userID, password, userAgentID string, info *model.BrowserInfo) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, id, userAgentID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-05 05:50:04 +00:00
|
|
|
if request.UserID != userID {
|
2020-06-11 11:22:24 +00:00
|
|
|
return errors.ThrowPreconditionFailed(nil, "EVENT-ds35D", "Errors.User.NotMatchingUserID")
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
return repo.UserEvents.CheckPassword(ctx, userID, password, request.WithCurrentInfo(info))
|
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) VerifyMfaOTP(ctx context.Context, authRequestID, userID, code, userAgentID string, info *model.BrowserInfo) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, authRequestID, userAgentID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if request.UserID != userID {
|
2020-06-11 11:22:24 +00:00
|
|
|
return errors.ThrowPreconditionFailed(nil, "EVENT-ADJ26", "Errors.User.NotMatchingUserID")
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
return repo.UserEvents.CheckMfaOTP(ctx, userID, code, request.WithCurrentInfo(info))
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
func (repo *AuthRequestRepo) LinkExternalUsers(ctx context.Context, authReqID, userAgentID string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, authReqID, userAgentID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = linkExternalIDPs(ctx, repo.UserEventProvider, request)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
request.LinkingUsers = nil
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
2020-09-28 07:29:41 +00:00
|
|
|
func (repo *AuthRequestRepo) ResetLinkingUsers(ctx context.Context, authReqID, userAgentID string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, authReqID, userAgentID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
request.LinkingUsers = nil
|
|
|
|
request.SelectedIDPConfigID = ""
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
func (repo *AuthRequestRepo) AutoRegisterExternalUser(ctx context.Context, registerUser *user_model.User, externalIDP *user_model.ExternalIDP, orgMember *org_model.OrgMember, authReqID, userAgentID, resourceOwner string) error {
|
|
|
|
request, err := repo.getAuthRequest(ctx, authReqID, userAgentID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
policyResourceOwner := authz.GetCtxData(ctx).OrgID
|
|
|
|
if resourceOwner != "" {
|
|
|
|
policyResourceOwner = resourceOwner
|
|
|
|
}
|
|
|
|
pwPolicy, err := repo.PolicyEvents.GetPasswordComplexityPolicy(ctx, policyResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
orgPolicy, err := repo.OrgEvents.GetOrgIAMPolicy(ctx, policyResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
user, aggregates, err := repo.UserEvents.PrepareRegisterUser(ctx, registerUser, externalIDP, pwPolicy, orgPolicy, resourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if orgMember != nil {
|
|
|
|
orgMember.UserID = user.AggregateID
|
|
|
|
_, memberAggregate, err := repo.OrgEvents.PrepareAddOrgMember(ctx, orgMember, policyResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
aggregates = append(aggregates, memberAggregate)
|
|
|
|
}
|
|
|
|
|
|
|
|
err = sdk.PushAggregates(ctx, repo.UserEvents.PushAggregates, user.AppendEvents, aggregates...)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
request.UserID = user.AggregateID
|
|
|
|
request.SelectedIDPConfigID = externalIDP.IDPConfigID
|
|
|
|
request.LinkingUsers = nil
|
|
|
|
return repo.AuthRequests.UpdateAuthRequest(ctx, request)
|
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) getAuthRequestNextSteps(ctx context.Context, id, userAgentID string, checkLoggedIn bool) (*model.AuthRequest, error) {
|
|
|
|
request, err := repo.getAuthRequest(ctx, id, userAgentID)
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
steps, err := repo.nextSteps(ctx, request, checkLoggedIn)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
request.PossibleSteps = steps
|
|
|
|
return request, nil
|
|
|
|
}
|
|
|
|
|
2020-08-31 06:49:35 +00:00
|
|
|
func (repo *AuthRequestRepo) getAuthRequest(ctx context.Context, id, userAgentID string) (*model.AuthRequest, error) {
|
|
|
|
request, err := repo.AuthRequests.GetAuthRequestByID(ctx, id)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if request.AgentID != userAgentID {
|
|
|
|
return nil, errors.ThrowPermissionDenied(nil, "EVENT-adk13", "Errors.AuthRequest.UserAgentNotCorresponding")
|
|
|
|
}
|
2020-09-18 11:26:28 +00:00
|
|
|
err = repo.fillLoginPolicy(ctx, request)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-08-31 06:49:35 +00:00
|
|
|
return request, nil
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
func (repo *AuthRequestRepo) getLoginPolicyAndIDPProviders(ctx context.Context, orgID string) (*iam_model.LoginPolicyView, []*iam_model.IDPProviderView, error) {
|
|
|
|
policy, err := repo.getLoginPolicy(ctx, orgID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
if !policy.AllowExternalIDP {
|
|
|
|
return policy, nil, nil
|
|
|
|
}
|
|
|
|
idpProviders, err := getLoginPolicyIDPProviders(repo.IDPProviderViewProvider, repo.IAMID, orgID, policy.Default)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
return policy, idpProviders, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) fillLoginPolicy(ctx context.Context, request *model.AuthRequest) error {
|
|
|
|
orgID := request.UserOrgID
|
|
|
|
if orgID == "" {
|
2020-09-28 07:29:41 +00:00
|
|
|
primaryDomain := request.GetScopeOrgPrimaryDomain()
|
|
|
|
if primaryDomain != "" {
|
|
|
|
org, err := repo.GetOrgByPrimaryDomain(primaryDomain)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
orgID = org.ID
|
|
|
|
}
|
2020-09-18 11:26:28 +00:00
|
|
|
}
|
|
|
|
if orgID == "" {
|
|
|
|
orgID = repo.IAMID
|
|
|
|
}
|
|
|
|
|
|
|
|
policy, idpProviders, err := repo.getLoginPolicyAndIDPProviders(ctx, orgID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
request.LoginPolicy = policy
|
|
|
|
if idpProviders != nil {
|
|
|
|
request.AllowedExternalIDPs = idpProviders
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) checkLoginName(ctx context.Context, request *model.AuthRequest, loginName string) (err error) {
|
2020-09-28 07:29:41 +00:00
|
|
|
primaryDomain := request.GetScopeOrgPrimaryDomain()
|
|
|
|
orgID := ""
|
|
|
|
if primaryDomain != "" {
|
|
|
|
org, err := repo.GetOrgByPrimaryDomain(primaryDomain)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
orgID = org.ID
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
user := new(user_view_model.UserView)
|
|
|
|
if orgID != "" {
|
|
|
|
user, err = repo.View.UserByLoginNameAndResourceOwner(loginName, orgID)
|
|
|
|
} else {
|
|
|
|
user, err = repo.View.UserByLoginName(loginName)
|
|
|
|
if err == nil {
|
|
|
|
err = repo.checkLoginPolicyWithResourceOwner(ctx, request, user)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-07-07 06:14:44 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-18 11:26:28 +00:00
|
|
|
|
2020-07-20 08:00:29 +00:00
|
|
|
request.SetUserInfo(user.ID, loginName, "", user.ResourceOwner)
|
2020-07-07 06:14:44 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-09-28 07:29:41 +00:00
|
|
|
func (repo AuthRequestRepo) GetOrgByPrimaryDomain(primaryDomain string) (*org_model.OrgView, error) {
|
|
|
|
org, err := repo.OrgViewProvider.OrgByPrimaryDomain(primaryDomain)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return org_view_model.OrgToModel(org), nil
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
func (repo AuthRequestRepo) checkLoginPolicyWithResourceOwner(ctx context.Context, request *model.AuthRequest, user *user_view_model.UserView) error {
|
|
|
|
loginPolicy, idpProviders, err := repo.getLoginPolicyAndIDPProviders(ctx, user.ResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if len(request.LinkingUsers) != 0 && !loginPolicy.AllowExternalIDP {
|
|
|
|
return errors.ThrowInvalidArgument(nil, "LOGIN-s9sio", "Errors.User.NotAllowedToLink")
|
|
|
|
}
|
|
|
|
if len(request.LinkingUsers) != 0 {
|
|
|
|
exists := linkingIDPConfigExistingInAllowedIDPs(request.LinkingUsers, idpProviders)
|
|
|
|
if !exists {
|
|
|
|
return errors.ThrowInvalidArgument(nil, "LOGIN-Dj89o", "Errors.User.NotAllowedToLink")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
request.LoginPolicy = loginPolicy
|
|
|
|
request.AllowedExternalIDPs = idpProviders
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) checkSelectedExternalIDP(request *model.AuthRequest, idpConfigID string) error {
|
|
|
|
for _, externalIDP := range request.AllowedExternalIDPs {
|
|
|
|
if externalIDP.IDPConfigID == idpConfigID {
|
|
|
|
request.SelectedIDPConfigID = idpConfigID
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return errors.ThrowNotFound(nil, "LOGIN-Nsm8r", "Errors.User.ExternalIDP.NotAllowed")
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) checkExternalUserLogin(request *model.AuthRequest, idpConfigID, externalUserID string) (err error) {
|
2020-09-28 07:29:41 +00:00
|
|
|
primaryDomain := request.GetScopeOrgPrimaryDomain()
|
2020-09-18 11:26:28 +00:00
|
|
|
externalIDP := new(user_view_model.ExternalIDPView)
|
2020-09-28 07:29:41 +00:00
|
|
|
org := new(org_model.OrgView)
|
|
|
|
if primaryDomain != "" {
|
|
|
|
org, err = repo.GetOrgByPrimaryDomain(primaryDomain)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
externalIDP, err = repo.View.ExternalIDPByExternalUserIDAndIDPConfigIDAndResourceOwner(externalUserID, idpConfigID, org.ID)
|
2020-09-18 11:26:28 +00:00
|
|
|
} else {
|
|
|
|
externalIDP, err = repo.View.ExternalIDPByExternalUserIDAndIDPConfigID(externalUserID, idpConfigID)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
request.SetUserInfo(externalIDP.UserID, "", "", externalIDP.ResourceOwner)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
func (repo *AuthRequestRepo) nextSteps(ctx context.Context, request *model.AuthRequest, checkLoggedIn bool) ([]model.NextStep, error) {
|
2020-05-18 10:06:36 +00:00
|
|
|
if request == nil {
|
2020-06-19 12:52:04 +00:00
|
|
|
return nil, errors.ThrowInvalidArgument(nil, "EVENT-ds27a", "Errors.Internal")
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
steps := make([]model.NextStep, 0)
|
2020-06-05 05:50:04 +00:00
|
|
|
if !checkLoggedIn && request.Prompt == model.PromptNone {
|
|
|
|
return append(steps, &model.RedirectToCallbackStep{}), nil
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
if request.UserID == "" {
|
2020-09-18 11:26:28 +00:00
|
|
|
if request.LinkingUsers != nil && len(request.LinkingUsers) > 0 {
|
|
|
|
steps = append(steps, new(model.ExternalNotFoundOptionStep))
|
|
|
|
return steps, nil
|
|
|
|
}
|
|
|
|
steps = append(steps, new(model.LoginStep))
|
2020-07-07 06:14:44 +00:00
|
|
|
if request.Prompt == model.PromptSelectAccount || request.Prompt == model.PromptUnspecified {
|
2020-05-18 10:06:36 +00:00
|
|
|
users, err := repo.usersForUserSelection(request)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-07-07 06:14:44 +00:00
|
|
|
if len(users) > 0 || request.Prompt == model.PromptSelectAccount {
|
|
|
|
steps = append(steps, &model.SelectUserStep{Users: users})
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
return steps, nil
|
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
user, err := activeUserByID(ctx, repo.UserViewProvider, repo.UserEventProvider, repo.OrgViewProvider, request.UserID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-09-18 11:26:28 +00:00
|
|
|
request.LoginName = user.PreferredLoginName
|
2020-06-05 05:50:04 +00:00
|
|
|
userSession, err := userSessionByIDs(ctx, repo.UserSessionViewProvider, repo.UserEventProvider, request.AgentID, user)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2020-09-28 07:29:41 +00:00
|
|
|
if request.SelectedIDPConfigID == "" || (request.SelectedIDPConfigID != "" && request.LinkingUsers != nil && len(request.LinkingUsers) > 0) {
|
2020-09-18 11:26:28 +00:00
|
|
|
if user.InitRequired {
|
|
|
|
return append(steps, &model.InitUserStep{PasswordSet: user.PasswordSet}), nil
|
|
|
|
}
|
|
|
|
if !user.PasswordSet {
|
|
|
|
return append(steps, &model.InitPasswordStep{}), nil
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
if !checkVerificationTime(userSession.PasswordVerification, repo.PasswordCheckLifeTime) {
|
|
|
|
return append(steps, &model.PasswordStep{}), nil
|
|
|
|
}
|
|
|
|
request.PasswordVerified = true
|
|
|
|
request.AuthTime = userSession.PasswordVerification
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if step, ok := repo.mfaChecked(userSession, request, user); !ok {
|
|
|
|
return append(steps, step), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
if user.PasswordChangeRequired {
|
|
|
|
steps = append(steps, &model.ChangePasswordStep{})
|
|
|
|
}
|
|
|
|
if !user.IsEmailVerified {
|
|
|
|
steps = append(steps, &model.VerifyEMailStep{})
|
|
|
|
}
|
2020-08-27 15:18:23 +00:00
|
|
|
if user.UsernameChangeRequired {
|
|
|
|
steps = append(steps, &model.ChangeUsernameStep{})
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
|
2020-08-27 15:18:23 +00:00
|
|
|
if user.PasswordChangeRequired || !user.IsEmailVerified || user.UsernameChangeRequired {
|
2020-05-18 10:06:36 +00:00
|
|
|
return steps, nil
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
if request.LinkingUsers != nil && len(request.LinkingUsers) != 0 {
|
|
|
|
return append(steps, &model.LinkUsersStep{}), nil
|
|
|
|
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
//PLANNED: consent step
|
|
|
|
return append(steps, &model.RedirectToCallbackStep{}), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) usersForUserSelection(request *model.AuthRequest) ([]model.UserSelection, error) {
|
|
|
|
userSessions, err := userSessionsByUserAgentID(repo.UserSessionViewProvider, request.AgentID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
users := make([]model.UserSelection, len(userSessions))
|
|
|
|
for i, session := range userSessions {
|
|
|
|
users[i] = model.UserSelection{
|
|
|
|
UserID: session.UserID,
|
2020-06-17 06:06:40 +00:00
|
|
|
DisplayName: session.DisplayName,
|
|
|
|
LoginName: session.LoginName,
|
2020-05-18 10:06:36 +00:00
|
|
|
UserSessionState: session.State,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return users, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) mfaChecked(userSession *user_model.UserSessionView, request *model.AuthRequest, user *user_model.UserView) (model.NextStep, bool) {
|
|
|
|
mfaLevel := request.MfaLevel()
|
2020-06-05 05:50:04 +00:00
|
|
|
promptRequired := user.MfaMaxSetUp < mfaLevel
|
|
|
|
if promptRequired || !repo.mfaSkippedOrSetUp(user) {
|
2020-05-18 10:06:36 +00:00
|
|
|
return &model.MfaPromptStep{
|
2020-06-05 05:50:04 +00:00
|
|
|
Required: promptRequired,
|
2020-05-18 10:06:36 +00:00
|
|
|
MfaProviders: user.MfaTypesSetupPossible(mfaLevel),
|
|
|
|
}, false
|
|
|
|
}
|
|
|
|
switch mfaLevel {
|
|
|
|
default:
|
|
|
|
fallthrough
|
2020-06-05 05:50:04 +00:00
|
|
|
case model.MfaLevelNotSetUp:
|
|
|
|
if user.MfaMaxSetUp == model.MfaLevelNotSetUp {
|
|
|
|
return nil, true
|
|
|
|
}
|
|
|
|
fallthrough
|
2020-05-18 10:06:36 +00:00
|
|
|
case model.MfaLevelSoftware:
|
|
|
|
if checkVerificationTime(userSession.MfaSoftwareVerification, repo.MfaSoftwareCheckLifeTime) {
|
2020-06-05 05:50:04 +00:00
|
|
|
request.MfasVerified = append(request.MfasVerified, userSession.MfaSoftwareVerificationType)
|
|
|
|
request.AuthTime = userSession.MfaSoftwareVerification
|
2020-05-18 10:06:36 +00:00
|
|
|
return nil, true
|
|
|
|
}
|
|
|
|
fallthrough
|
|
|
|
case model.MfaLevelHardware:
|
|
|
|
if checkVerificationTime(userSession.MfaHardwareVerification, repo.MfaHardwareCheckLifeTime) {
|
2020-06-05 05:50:04 +00:00
|
|
|
request.MfasVerified = append(request.MfasVerified, userSession.MfaHardwareVerificationType)
|
|
|
|
request.AuthTime = userSession.MfaHardwareVerification
|
2020-05-18 10:06:36 +00:00
|
|
|
return nil, true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return &model.MfaVerificationStep{
|
|
|
|
MfaProviders: user.MfaTypesAllowed(mfaLevel),
|
|
|
|
}, false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *AuthRequestRepo) mfaSkippedOrSetUp(user *user_model.UserView) bool {
|
2020-06-05 05:50:04 +00:00
|
|
|
if user.MfaMaxSetUp > model.MfaLevelNotSetUp {
|
2020-05-18 10:06:36 +00:00
|
|
|
return true
|
|
|
|
}
|
|
|
|
return checkVerificationTime(user.MfaInitSkipped, repo.MfaInitSkippedLifeTime)
|
|
|
|
}
|
|
|
|
|
2020-09-18 11:26:28 +00:00
|
|
|
func (repo *AuthRequestRepo) getLoginPolicy(ctx context.Context, orgID string) (*iam_model.LoginPolicyView, error) {
|
|
|
|
policy, err := repo.View.LoginPolicyByAggregateID(orgID)
|
|
|
|
if errors.IsNotFound(err) {
|
|
|
|
policy, err = repo.View.LoginPolicyByAggregateID(repo.IAMID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
policy.Default = true
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return iam_es_model.LoginPolicyViewToModel(policy), err
|
|
|
|
}
|
|
|
|
|
|
|
|
func getLoginPolicyIDPProviders(provider idpProviderViewProvider, iamID, orgID string, defaultPolicy bool) ([]*iam_model.IDPProviderView, error) {
|
|
|
|
if defaultPolicy {
|
2020-09-23 14:52:19 +00:00
|
|
|
idpProviders, err := provider.IDPProvidersByAggregateIDAndState(iamID, iam_model.IDPConfigStateActive)
|
2020-09-18 11:26:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return iam_es_model.IDPProviderViewsToModel(idpProviders), nil
|
|
|
|
}
|
2020-09-23 14:52:19 +00:00
|
|
|
idpProviders, err := provider.IDPProvidersByAggregateIDAndState(orgID, iam_model.IDPConfigStateActive)
|
2020-09-18 11:26:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return iam_es_model.IDPProviderViewsToModel(idpProviders), nil
|
|
|
|
}
|
|
|
|
|
2020-05-18 10:06:36 +00:00
|
|
|
func checkVerificationTime(verificationTime time.Time, lifetime time.Duration) bool {
|
|
|
|
return verificationTime.Add(lifetime).After(time.Now().UTC())
|
|
|
|
}
|
|
|
|
|
|
|
|
func userSessionsByUserAgentID(provider userSessionViewProvider, agentID string) ([]*user_model.UserSessionView, error) {
|
|
|
|
session, err := provider.UserSessionsByAgentID(agentID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserSessionsToModel(session), nil
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
func userSessionByIDs(ctx context.Context, provider userSessionViewProvider, eventProvider userEventProvider, agentID string, user *user_model.UserView) (*user_model.UserSessionView, error) {
|
|
|
|
session, err := provider.UserSessionByIDs(agentID, user.ID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
2020-06-05 05:50:04 +00:00
|
|
|
if !errors.IsNotFound(err) {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
session = &user_view_model.UserSessionView{}
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
events, err := eventProvider.UserEventsByID(ctx, user.ID, session.Sequence)
|
|
|
|
if err != nil {
|
|
|
|
logging.Log("EVENT-Hse6s").WithError(err).Debug("error retrieving new events")
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserSessionToModel(session), nil
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
sessionCopy := *session
|
|
|
|
for _, event := range events {
|
|
|
|
switch event.Type {
|
|
|
|
case es_model.UserPasswordCheckSucceeded,
|
|
|
|
es_model.UserPasswordCheckFailed,
|
2020-09-15 13:04:02 +00:00
|
|
|
es_model.MFAOTPCheckSucceeded,
|
|
|
|
es_model.MFAOTPCheckFailed,
|
2020-06-19 12:52:04 +00:00
|
|
|
es_model.SignedOut,
|
|
|
|
es_model.UserLocked,
|
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
|
|
|
es_model.UserDeactivated,
|
|
|
|
es_model.HumanPasswordCheckSucceeded,
|
|
|
|
es_model.HumanPasswordCheckFailed,
|
2020-09-15 13:04:02 +00:00
|
|
|
es_model.HumanMFAOTPCheckSucceeded,
|
|
|
|
es_model.HumanMFAOTPCheckFailed,
|
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
|
|
|
es_model.HumanSignedOut:
|
2020-06-19 12:52:04 +00:00
|
|
|
eventData, err := user_view_model.UserSessionFromEvent(event)
|
2020-06-05 05:50:04 +00:00
|
|
|
if err != nil {
|
|
|
|
logging.Log("EVENT-sdgT3").WithError(err).Debug("error getting event data")
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserSessionToModel(session), nil
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
if eventData.UserAgentID != agentID {
|
|
|
|
continue
|
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
case es_model.UserRemoved:
|
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-dG2fe", "Errors.User.NotActive")
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
sessionCopy.AppendEvent(event)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserSessionToModel(&sessionCopy), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func activeUserByID(ctx context.Context, userViewProvider userViewProvider, userEventProvider userEventProvider, orgViewProvider orgViewProvider, userID string) (*user_model.UserView, error) {
|
|
|
|
user, err := userByID(ctx, userViewProvider, userEventProvider, userID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
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 user.HumanView == nil {
|
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-Lm69x", "Errors.User.NotHuman")
|
|
|
|
}
|
|
|
|
|
2020-06-23 12:47:47 +00:00
|
|
|
if user.State == user_model.UserStateLocked || user.State == user_model.UserStateSuspend {
|
2020-06-19 12:52:04 +00:00
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.Locked")
|
|
|
|
}
|
2020-06-23 12:47:47 +00:00
|
|
|
if !(user.State == user_model.UserStateActive || user.State == user_model.UserStateInitial) {
|
2020-06-19 12:52:04 +00:00
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.NotActive")
|
|
|
|
}
|
|
|
|
org, err := orgViewProvider.OrgByID(user.ResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-06-23 12:47:47 +00:00
|
|
|
if org.State != int32(org_model.OrgStateActive) {
|
2020-06-19 12:52:04 +00:00
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-Zws3s", "Errors.User.NotActive")
|
|
|
|
}
|
|
|
|
return user, nil
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2020-06-05 05:50:04 +00:00
|
|
|
func userByID(ctx context.Context, viewProvider userViewProvider, eventProvider userEventProvider, userID string) (*user_model.UserView, error) {
|
|
|
|
user, err := viewProvider.UserByID(userID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-06-05 05:50:04 +00:00
|
|
|
events, err := eventProvider.UserEventsByID(ctx, userID, user.Sequence)
|
|
|
|
if err != nil {
|
|
|
|
logging.Log("EVENT-dfg42").WithError(err).Debug("error retrieving new events")
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserToModel(user), nil
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
userCopy := *user
|
|
|
|
for _, event := range events {
|
|
|
|
if err := userCopy.AppendEvent(event); err != nil {
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserToModel(user), nil
|
2020-06-05 05:50:04 +00:00
|
|
|
}
|
|
|
|
}
|
2020-06-19 12:52:04 +00:00
|
|
|
return user_view_model.UserToModel(&userCopy), nil
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
2020-09-18 11:26:28 +00:00
|
|
|
|
|
|
|
func linkExternalIDPs(ctx context.Context, userEventProvider userEventProvider, request *model.AuthRequest) error {
|
|
|
|
externalIDPs := make([]*user_model.ExternalIDP, len(request.LinkingUsers))
|
|
|
|
for i, linkingUser := range request.LinkingUsers {
|
|
|
|
externalIDP := &user_model.ExternalIDP{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: request.UserID},
|
|
|
|
IDPConfigID: linkingUser.IDPConfigID,
|
|
|
|
UserID: linkingUser.ExternalUserID,
|
|
|
|
DisplayName: linkingUser.DisplayName,
|
|
|
|
}
|
|
|
|
externalIDPs[i] = externalIDP
|
|
|
|
}
|
|
|
|
data := authz.CtxData{
|
|
|
|
UserID: "LOGIN",
|
|
|
|
OrgID: request.UserOrgID,
|
|
|
|
}
|
|
|
|
return userEventProvider.BulkAddExternalIDPs(authz.SetCtxData(ctx, data), request.UserID, externalIDPs)
|
|
|
|
}
|
|
|
|
|
|
|
|
func linkingIDPConfigExistingInAllowedIDPs(linkingUsers []*model.ExternalUser, idpProviders []*iam_model.IDPProviderView) bool {
|
|
|
|
for _, linkingUser := range linkingUsers {
|
|
|
|
exists := false
|
|
|
|
for _, idp := range idpProviders {
|
|
|
|
if idp.IDPConfigID == linkingUser.IDPConfigID {
|
|
|
|
exists = true
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !exists {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|