2020-05-18 10:06:36 +00:00
package eventstore
import (
"context"
2021-06-11 11:20:39 +00:00
"time"
2021-02-23 14:13:04 +00:00
"github.com/caos/zitadel/internal/command"
"github.com/caos/zitadel/internal/domain"
2020-05-18 10:06:36 +00:00
2020-06-05 05:50:04 +00:00
"github.com/caos/logging"
2020-10-16 05:49:38 +00:00
"github.com/caos/zitadel/internal/api/authz"
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"
2021-02-08 10:30:30 +00:00
auth_req_model "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"
2021-02-23 14:13:04 +00:00
es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
2020-10-16 05:49:38 +00:00
iam_model "github.com/caos/zitadel/internal/iam/model"
iam_es_model "github.com/caos/zitadel/internal/iam/repository/view/model"
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-10-16 05:49:38 +00:00
project_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
2020-12-02 07:50:59 +00:00
"github.com/caos/zitadel/internal/telemetry/tracing"
2020-05-18 10:06:36 +00:00
user_model "github.com/caos/zitadel/internal/user/model"
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-10-16 05:49:38 +00:00
grant_view_model "github.com/caos/zitadel/internal/usergrant/repository/view/model"
2020-05-18 10:06:36 +00:00
)
type AuthRequestRepo struct {
2021-02-24 10:17:39 +00:00
Command * command . Commands
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
2021-02-08 10:30:30 +00:00
UserCommandProvider userCommandProvider
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-10-16 05:49:38 +00:00
UserGrantProvider userGrantProvider
2020-05-18 10:06:36 +00:00
IdGenerator id . Generator
2020-10-02 06:02:09 +00:00
PasswordCheckLifeTime time . Duration
ExternalLoginCheckLifeTime time . Duration
2020-12-02 16:00:04 +00:00
MFAInitSkippedLifeTime time . Duration
2020-11-04 10:26:10 +00:00
SecondFactorCheckLifeTime time . Duration
MultiFactorCheckLifeTime 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 )
2021-06-11 11:20:39 +00:00
PrefixAvatarURL ( ) string
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 )
2021-06-11 11:20:39 +00:00
PrefixAvatarURL ( ) string
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 )
2021-02-08 10:30:30 +00:00
}
type userCommandProvider interface {
BulkAddedHumanExternalIDP ( ctx context . Context , userID , resourceOwner string , externalIDPs [ ] * domain . 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-10-16 05:49:38 +00:00
type userGrantProvider interface {
ApplicationByClientID ( context . Context , string ) ( * project_view_model . ApplicationView , error )
UserGrantsByProjectAndUserID ( string , string ) ( [ ] * grant_view_model . UserGrantView , error )
}
2020-05-18 10:06:36 +00:00
func ( repo * AuthRequestRepo ) Health ( ctx context . Context ) error {
return repo . AuthRequests . Health ( ctx )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) CreateAuthRequest ( ctx context . Context , request * domain . AuthRequest ) ( _ * domain . AuthRequest , err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-05-18 10:06:36 +00:00
reqID , err := repo . IdGenerator . Next ( )
if err != nil {
return nil , err
}
request . ID = reqID
2020-10-16 05:49:38 +00:00
app , err := repo . View . ApplicationByClientID ( ctx , request . ApplicationID )
if err != nil {
return nil , err
}
appIDs , err := repo . View . AppIDsFromProjectID ( ctx , app . ProjectID )
2020-06-05 05:50:04 +00:00
if err != nil {
return nil , err
}
2020-10-16 05:49:38 +00:00
request . Audience = appIDs
2020-11-16 09:54:48 +00:00
request . AppendAudIfNotExisting ( app . ProjectID )
2020-12-14 09:54:29 +00:00
if err := setOrgID ( repo . OrgViewProvider , request ) ; err != nil {
return nil , err
}
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-11-20 06:57:39 +00:00
logging . LogWithFields ( "EVENT-aG311" , "login name" , request . LoginHint , "id" , request . ID , "applicationID" , request . ApplicationID , "traceID" , tracing . TraceIDFromCtx ( ctx ) ) . OnError ( err ) . Debug ( "login hint invalid" )
2020-07-07 06:14:44 +00:00
}
2020-05-18 10:06:36 +00:00
err = repo . AuthRequests . SaveAuthRequest ( ctx , request )
if err != nil {
return nil , err
}
return request , nil
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) AuthRequestByID ( ctx context . Context , id , userAgentID string ) ( _ * domain . AuthRequest , err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-08-31 06:49:35 +00:00
return repo . getAuthRequestNextSteps ( ctx , id , userAgentID , false )
2020-06-05 05:50:04 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) AuthRequestByIDCheckLoggedIn ( ctx context . Context , id , userAgentID string ) ( _ * domain . AuthRequest , err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-08-31 06:49:35 +00:00
return repo . getAuthRequestNextSteps ( ctx , id , userAgentID , true )
2020-06-05 05:50:04 +00:00
}
2020-10-21 08:18:34 +00:00
func ( repo * AuthRequestRepo ) SaveAuthCode ( ctx context . Context , id , code , userAgentID string ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-08-31 06:49:35 +00:00
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 )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) AuthRequestByCode ( ctx context . Context , code string ) ( _ * domain . AuthRequest , err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-06-05 05:50:04 +00:00
request , err := repo . AuthRequests . GetAuthRequestByCode ( ctx , code )
2020-05-18 10:06:36 +00:00
if err != nil {
return nil , err
}
2021-07-05 13:10:49 +00:00
err = repo . fillPolicies ( ctx , request )
2020-11-04 10:26:10 +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-10-21 08:18:34 +00:00
func ( repo * AuthRequestRepo ) DeleteAuthRequest ( ctx context . Context , id string ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-06-05 05:50:04 +00:00
return repo . AuthRequests . DeleteAuthRequest ( ctx , id )
}
2020-10-21 08:18:34 +00:00
func ( repo * AuthRequestRepo ) CheckLoginName ( ctx context . Context , id , loginName , userAgentID string ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-08-31 06:49:35 +00:00
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 )
}
2020-10-21 08:18:34 +00:00
func ( repo * AuthRequestRepo ) SelectExternalIDP ( ctx context . Context , authReqID , idpConfigID , userAgentID string ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-09-18 11:26:28 +00:00
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 )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) CheckExternalUserLogin ( ctx context . Context , authReqID , userAgentID string , externalUser * domain . ExternalUser , info * domain . BrowserInfo ) ( err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-09-18 11:26:28 +00:00
request , err := repo . getAuthRequest ( ctx , authReqID , userAgentID )
if err != nil {
return err
}
err = repo . checkExternalUserLogin ( request , externalUser . IDPConfigID , externalUser . ExternalUserID )
if errors . IsNotFound ( err ) {
2020-10-07 14:29:56 +00:00
if err := repo . setLinkingUser ( ctx , request , externalUser ) ; err != nil {
return err
}
return err
2020-09-18 11:26:28 +00:00
}
if err != nil {
return err
}
2020-10-02 06:02:09 +00:00
2021-02-08 10:30:30 +00:00
err = repo . Command . HumanExternalLoginChecked ( ctx , request . UserOrgID , request . UserID , request . WithCurrentInfo ( info ) )
2020-10-02 06:02:09 +00:00
if err != nil {
return err
}
2020-09-18 11:26:28 +00:00
return repo . AuthRequests . UpdateAuthRequest ( ctx , request )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) setLinkingUser ( ctx context . Context , request * domain . AuthRequest , externalUser * domain . ExternalUser ) error {
2020-09-18 11:26:28 +00:00
request . LinkingUsers = append ( request . LinkingUsers , externalUser )
return repo . AuthRequests . UpdateAuthRequest ( ctx , request )
}
2020-10-21 08:18:34 +00:00
func ( repo * AuthRequestRepo ) SelectUser ( ctx context . Context , id , userID , userAgentID string ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-08-31 06:49:35 +00:00
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-12-14 09:54:29 +00:00
if request . RequestedOrgID != "" && request . RequestedOrgID != user . ResourceOwner {
return errors . ThrowPreconditionFailed ( nil , "EVENT-fJe2a" , "Errors.User.NotAllowedOrg" )
}
2021-03-26 15:29:26 +00:00
username := user . UserName
if request . RequestedOrgID == "" {
username = user . PreferredLoginName
}
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
request . SetUserInfo ( user . ID , username , user . PreferredLoginName , user . DisplayName , user . AvatarKey , user . ResourceOwner )
2020-06-05 05:50:04 +00:00
return repo . AuthRequests . UpdateAuthRequest ( ctx , request )
2020-05-18 10:06:36 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) VerifyPassword ( ctx context . Context , id , userID , resourceOwner , password , userAgentID string , info * domain . BrowserInfo ) ( err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-12-02 16:00:04 +00:00
request , err := repo . getAuthRequestEnsureUser ( ctx , id , userAgentID , userID )
2020-05-18 10:06:36 +00:00
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
return repo . Command . HumanCheckPassword ( ctx , resourceOwner , userID , password , request . WithCurrentInfo ( info ) )
2020-05-18 10:06:36 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) VerifyMFAOTP ( ctx context . Context , authRequestID , userID , resourceOwner , code , userAgentID string , info * domain . BrowserInfo ) ( err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-12-02 16:00:04 +00:00
request , err := repo . getAuthRequestEnsureUser ( ctx , authRequestID , userAgentID , userID )
2020-05-18 10:06:36 +00:00
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
return repo . Command . HumanCheckMFAOTP ( ctx , userID , code , resourceOwner , request . WithCurrentInfo ( info ) )
2020-12-02 16:00:04 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) BeginMFAU2FLogin ( ctx context . Context , userID , resourceOwner , authRequestID , userAgentID string ) ( login * domain . WebAuthNLogin , err error ) {
2020-12-02 16:00:04 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
request , err := repo . getAuthRequestEnsureUser ( ctx , authRequestID , userAgentID , userID )
if err != nil {
return nil , err
}
2021-02-08 10:30:30 +00:00
return repo . Command . HumanBeginU2FLogin ( ctx , userID , resourceOwner , request , true )
2020-12-02 16:00:04 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) VerifyMFAU2F ( ctx context . Context , userID , resourceOwner , authRequestID , userAgentID string , credentialData [ ] byte , info * domain . BrowserInfo ) ( err error ) {
2020-12-02 16:00:04 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
request , err := repo . getAuthRequestEnsureUser ( ctx , authRequestID , userAgentID , userID )
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
return repo . Command . HumanFinishU2FLogin ( ctx , userID , resourceOwner , credentialData , request , true )
2020-12-02 16:00:04 +00:00
}
2021-08-02 13:24:58 +00:00
func ( repo * AuthRequestRepo ) BeginPasswordlessSetup ( ctx context . Context , userID , resourceOwner string ) ( login * domain . WebAuthNToken , err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
return repo . Command . HumanAddPasswordlessSetup ( ctx , userID , resourceOwner , true )
}
func ( repo * AuthRequestRepo ) VerifyPasswordlessSetup ( ctx context . Context , userID , resourceOwner , userAgentID , tokenName string , credentialData [ ] byte ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
_ , err = repo . Command . HumanHumanPasswordlessSetup ( ctx , userID , resourceOwner , tokenName , userAgentID , credentialData )
return err
}
func ( repo * AuthRequestRepo ) BeginPasswordlessInitCodeSetup ( ctx context . Context , userID , resourceOwner , codeID , verificationCode string ) ( login * domain . WebAuthNToken , err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
return repo . Command . HumanAddPasswordlessSetupInitCode ( ctx , userID , resourceOwner , codeID , verificationCode )
}
func ( repo * AuthRequestRepo ) VerifyPasswordlessInitCodeSetup ( ctx context . Context , userID , resourceOwner , userAgentID , tokenName , codeID , verificationCode string , credentialData [ ] byte ) ( err error ) {
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
_ , err = repo . Command . HumanPasswordlessSetupInitCode ( ctx , userID , resourceOwner , userAgentID , tokenName , codeID , verificationCode , credentialData )
return err
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) BeginPasswordlessLogin ( ctx context . Context , userID , resourceOwner , authRequestID , userAgentID string ) ( login * domain . WebAuthNLogin , err error ) {
2020-12-02 16:00:04 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
request , err := repo . getAuthRequestEnsureUser ( ctx , authRequestID , userAgentID , userID )
if err != nil {
return nil , err
}
2021-02-08 10:30:30 +00:00
return repo . Command . HumanBeginPasswordlessLogin ( ctx , userID , resourceOwner , request , true )
2020-12-02 16:00:04 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) VerifyPasswordless ( ctx context . Context , userID , resourceOwner , authRequestID , userAgentID string , credentialData [ ] byte , info * domain . BrowserInfo ) ( err error ) {
2020-12-02 16:00:04 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
request , err := repo . getAuthRequestEnsureUser ( ctx , authRequestID , userAgentID , userID )
if err != nil {
return err
2020-05-18 10:06:36 +00:00
}
2021-02-08 10:30:30 +00:00
return repo . Command . HumanFinishPasswordlessLogin ( ctx , userID , resourceOwner , credentialData , request , true )
2020-05-18 10:06:36 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) LinkExternalUsers ( ctx context . Context , authReqID , userAgentID string , info * domain . BrowserInfo ) ( err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-09-18 11:26:28 +00:00
request , err := repo . getAuthRequest ( ctx , authReqID , userAgentID )
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
err = linkExternalIDPs ( ctx , repo . UserCommandProvider , request )
2020-09-18 11:26:28 +00:00
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
err = repo . Command . HumanExternalLoginChecked ( ctx , request . UserOrgID , request . UserID , request . WithCurrentInfo ( info ) )
2020-10-02 06:02:09 +00:00
if err != nil {
return err
}
2020-09-18 11:26:28 +00:00
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 )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) AutoRegisterExternalUser ( ctx context . Context , registerUser * domain . Human , externalIDP * domain . ExternalIDP , orgMemberRoles [ ] string , authReqID , userAgentID , resourceOwner string , info * domain . BrowserInfo ) ( err error ) {
2020-10-21 08:18:34 +00:00
ctx , span := tracing . NewSpan ( ctx )
defer func ( ) { span . EndWithError ( err ) } ( )
2020-09-18 11:26:28 +00:00
request , err := repo . getAuthRequest ( ctx , authReqID , userAgentID )
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
human , err := repo . Command . RegisterHuman ( ctx , resourceOwner , registerUser , externalIDP , orgMemberRoles )
2020-09-18 11:26:28 +00:00
if err != nil {
return err
}
2021-02-08 10:30:30 +00:00
request . UserID = human . AggregateID
request . UserOrgID = human . ResourceOwner
2020-09-18 11:26:28 +00:00
request . SelectedIDPConfigID = externalIDP . IDPConfigID
request . LinkingUsers = nil
2021-02-08 10:30:30 +00:00
err = repo . Command . HumanExternalLoginChecked ( ctx , request . UserOrgID , request . UserID , request . WithCurrentInfo ( info ) )
2020-10-02 06:02:09 +00:00
if err != nil {
return err
}
2020-09-18 11:26:28 +00:00
return repo . AuthRequests . UpdateAuthRequest ( ctx , request )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) getAuthRequestNextSteps ( ctx context . Context , id , userAgentID string , checkLoggedIn bool ) ( * domain . AuthRequest , error ) {
2020-08-31 06:49:35 +00:00
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
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) getAuthRequestEnsureUser ( ctx context . Context , authRequestID , userAgentID , userID string ) ( * domain . AuthRequest , error ) {
2020-12-02 16:00:04 +00:00
request , err := repo . getAuthRequest ( ctx , authRequestID , userAgentID )
if err != nil {
return nil , err
}
if request . UserID != userID {
return nil , errors . ThrowPreconditionFailed ( nil , "EVENT-GBH32" , "Errors.User.NotMatchingUserID" )
}
return request , nil
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) getAuthRequest ( ctx context . Context , id , userAgentID string ) ( * domain . AuthRequest , error ) {
2020-08-31 06:49:35 +00:00
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" )
}
2021-07-05 13:10:49 +00:00
err = repo . fillPolicies ( ctx , request )
2020-09-18 11:26:28 +00:00
if err != nil {
return nil , err
}
2020-08-31 06:49:35 +00:00
return request , nil
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) getLoginPolicyAndIDPProviders ( ctx context . Context , orgID string ) ( * domain . LoginPolicy , [ ] * domain . IDPProvider , error ) {
2020-09-18 11:26:28 +00:00
policy , err := repo . getLoginPolicy ( ctx , orgID )
if err != nil {
return nil , nil , err
}
if ! policy . AllowExternalIDP {
2021-02-08 10:30:30 +00:00
return policy . ToLoginPolicyDomain ( ) , nil , nil
2020-09-18 11:26:28 +00:00
}
idpProviders , err := getLoginPolicyIDPProviders ( repo . IDPProviderViewProvider , repo . IAMID , orgID , policy . Default )
if err != nil {
return nil , nil , err
}
2021-02-08 10:30:30 +00:00
providers := iam_model . IdpProviderViewsToDomain ( idpProviders )
return policy . ToLoginPolicyDomain ( ) , providers , nil
2020-09-18 11:26:28 +00:00
}
2021-07-05 13:10:49 +00:00
func ( repo * AuthRequestRepo ) fillPolicies ( ctx context . Context , request * domain . AuthRequest ) error {
2020-12-14 09:54:29 +00:00
orgID := request . RequestedOrgID
2020-09-18 11:26:28 +00:00
if orgID == "" {
2020-12-14 09:54:29 +00:00
orgID = request . UserOrgID
2020-09-18 11:26:28 +00:00
}
if orgID == "" {
orgID = repo . IAMID
}
2021-03-25 13:41:07 +00:00
loginPolicy , idpProviders , err := repo . getLoginPolicyAndIDPProviders ( ctx , orgID )
2020-09-18 11:26:28 +00:00
if err != nil {
return err
}
2021-03-25 13:41:07 +00:00
request . LoginPolicy = loginPolicy
2020-09-18 11:26:28 +00:00
if idpProviders != nil {
request . AllowedExternalIDPs = idpProviders
}
2021-07-05 08:36:51 +00:00
privacyPolicy , err := repo . getPrivacyPolicy ( ctx , orgID )
if err != nil {
return err
}
request . PrivacyPolicy = privacyPolicy
2021-03-25 13:41:07 +00:00
labelPolicy , err := repo . getLabelPolicy ( ctx , orgID )
if err != nil {
return err
}
request . LabelPolicy = labelPolicy
2021-07-05 13:10:49 +00:00
defaultLoginTranslations , err := repo . getLoginTexts ( ctx , domain . IAMID )
if err != nil {
return err
}
request . DefaultTranslations = defaultLoginTranslations
orgLoginTranslations , err := repo . getLoginTexts ( ctx , orgID )
if err != nil {
return err
}
request . OrgTranslations = orgLoginTranslations
2020-09-18 11:26:28 +00:00
return nil
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) checkLoginName ( ctx context . Context , request * domain . AuthRequest , loginName string ) ( err error ) {
2020-09-18 11:26:28 +00:00
user := new ( user_view_model . UserView )
2020-12-14 09:54:29 +00:00
if request . RequestedOrgID != "" {
2021-03-25 13:41:07 +00:00
preferredLoginName := loginName
if request . RequestedOrgID != "" {
preferredLoginName += "@" + request . RequestedPrimaryDomain
}
user , err = repo . View . UserByLoginNameAndResourceOwner ( preferredLoginName , request . RequestedOrgID )
2020-09-18 11:26:28 +00:00
} 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
}
2021-06-10 11:49:10 +00:00
if user . State == int32 ( domain . UserStateInactive ) {
return errors . ThrowPreconditionFailed ( nil , "AUTH-2n8fs" , "Errors.User.Inactive" )
}
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
request . SetUserInfo ( user . ID , loginName , user . PreferredLoginName , "" , "" , user . ResourceOwner )
2020-07-07 06:14:44 +00:00
return nil
}
2021-02-08 10:30:30 +00:00
func ( repo AuthRequestRepo ) checkLoginPolicyWithResourceOwner ( ctx context . Context , request * domain . AuthRequest , user * user_view_model . UserView ) error {
2020-09-18 11:26:28 +00:00
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
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) checkSelectedExternalIDP ( request * domain . AuthRequest , idpConfigID string ) error {
2020-09-18 11:26:28 +00:00
for _ , externalIDP := range request . AllowedExternalIDPs {
if externalIDP . IDPConfigID == idpConfigID {
request . SelectedIDPConfigID = idpConfigID
return nil
}
}
return errors . ThrowNotFound ( nil , "LOGIN-Nsm8r" , "Errors.User.ExternalIDP.NotAllowed" )
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) checkExternalUserLogin ( request * domain . AuthRequest , idpConfigID , externalUserID string ) ( err error ) {
2020-09-18 11:26:28 +00:00
externalIDP := new ( user_view_model . ExternalIDPView )
2020-12-14 09:54:29 +00:00
if request . RequestedOrgID != "" {
externalIDP , err = repo . View . ExternalIDPByExternalUserIDAndIDPConfigIDAndResourceOwner ( externalUserID , idpConfigID , request . RequestedOrgID )
2020-09-18 11:26:28 +00:00
} else {
externalIDP , err = repo . View . ExternalIDPByExternalUserIDAndIDPConfigID ( externalUserID , idpConfigID )
}
if err != nil {
return err
}
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
request . SetUserInfo ( externalIDP . UserID , "" , "" , "" , "" , externalIDP . ResourceOwner )
2020-09-18 11:26:28 +00:00
return nil
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) nextSteps ( ctx context . Context , request * domain . AuthRequest , checkLoggedIn bool ) ( [ ] domain . 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
}
2021-02-08 10:30:30 +00:00
steps := make ( [ ] domain . NextStep , 0 )
2021-06-16 08:02:15 +00:00
if ! checkLoggedIn && domain . IsPrompt ( request . Prompt , domain . PromptNone ) {
2021-02-08 10:30:30 +00:00
return append ( steps , & domain . RedirectToCallbackStep { } ) , nil
2020-06-05 05:50:04 +00:00
}
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 {
2021-02-08 10:30:30 +00:00
steps = append ( steps , new ( domain . ExternalNotFoundOptionStep ) )
2020-09-18 11:26:28 +00:00
return steps , nil
}
2021-02-08 10:30:30 +00:00
steps = append ( steps , new ( domain . LoginStep ) )
2021-06-16 08:02:15 +00:00
if domain . IsPrompt ( request . Prompt , domain . PromptCreate ) {
2021-06-14 08:40:38 +00:00
return append ( steps , & domain . RegistrationStep { } ) , nil
}
2021-06-16 08:02:15 +00:00
if len ( request . Prompt ) == 0 || domain . IsPrompt ( request . Prompt , domain . PromptSelectAccount ) {
2020-05-18 10:06:36 +00:00
users , err := repo . usersForUserSelection ( request )
if err != nil {
return nil , err
}
2021-06-16 08:02:15 +00:00
if len ( users ) > 0 || domain . IsPrompt ( request . Prompt , domain . PromptSelectAccount ) {
2021-02-08 10:30:30 +00:00
steps = append ( steps , & domain . SelectUserStep { Users : users } )
2020-07-07 06:14:44 +00:00
}
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-12-02 16:00:04 +00:00
isInternalLogin := request . SelectedIDPConfigID == "" && userSession . SelectedIDPConfigID == ""
2021-06-16 08:02:15 +00:00
if ! isInternalLogin && len ( request . LinkingUsers ) == 0 && ! checkVerificationTimeMaxAge ( userSession . ExternalLoginVerification , repo . ExternalLoginCheckLifeTime , request ) {
2020-12-02 16:00:04 +00:00
selectedIDPConfigID := request . SelectedIDPConfigID
if selectedIDPConfigID == "" {
selectedIDPConfigID = userSession . SelectedIDPConfigID
2020-09-18 11:26:28 +00:00
}
2021-02-08 10:30:30 +00:00
return append ( steps , & domain . ExternalLoginStep { SelectedIDPConfigID : selectedIDPConfigID } ) , nil
2020-12-02 16:00:04 +00:00
}
if isInternalLogin || ( ! isInternalLogin && len ( request . LinkingUsers ) > 0 ) {
step := repo . firstFactorChecked ( request , user , userSession )
if step != nil {
return append ( steps , step ) , nil
2020-09-18 11:26:28 +00:00
}
2020-05-18 10:06:36 +00:00
}
2020-11-04 10:26:10 +00:00
step , ok , err := repo . mfaChecked ( userSession , request , user )
if err != nil {
return nil , err
}
if ! ok {
2020-05-18 10:06:36 +00:00
return append ( steps , step ) , nil
}
if user . PasswordChangeRequired {
2021-02-08 10:30:30 +00:00
steps = append ( steps , & domain . ChangePasswordStep { } )
2020-05-18 10:06:36 +00:00
}
if ! user . IsEmailVerified {
2021-02-08 10:30:30 +00:00
steps = append ( steps , & domain . VerifyEMailStep { } )
2020-05-18 10:06:36 +00:00
}
2020-08-27 15:18:23 +00:00
if user . UsernameChangeRequired {
2021-02-08 10:30:30 +00:00
steps = append ( steps , & domain . ChangeUsernameStep { } )
2020-08-27 15:18:23 +00:00
}
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 {
2021-02-08 10:30:30 +00:00
return append ( steps , & domain . LinkUsersStep { } ) , nil
2020-09-18 11:26:28 +00:00
}
2020-05-18 10:06:36 +00:00
//PLANNED: consent step
2020-10-16 05:49:38 +00:00
missing , err := userGrantRequired ( ctx , request , user , repo . UserGrantProvider )
if err != nil {
return nil , err
}
if missing {
2021-02-08 10:30:30 +00:00
return append ( steps , & domain . GrantRequiredStep { } ) , nil
2020-10-16 05:49:38 +00:00
}
2021-02-08 10:30:30 +00:00
return append ( steps , & domain . RedirectToCallbackStep { } ) , nil
2020-05-18 10:06:36 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) usersForUserSelection ( request * domain . AuthRequest ) ( [ ] domain . UserSelection , error ) {
2020-05-18 10:06:36 +00:00
userSessions , err := userSessionsByUserAgentID ( repo . UserSessionViewProvider , request . AgentID )
if err != nil {
return nil , err
}
2021-02-08 10:30:30 +00:00
users := make ( [ ] domain . UserSelection , len ( userSessions ) )
2020-05-18 10:06:36 +00:00
for i , session := range userSessions {
2021-02-08 10:30:30 +00:00
users [ i ] = domain . UserSelection {
2020-12-14 09:54:29 +00:00
UserID : session . UserID ,
DisplayName : session . DisplayName ,
2021-03-25 13:41:07 +00:00
UserName : session . UserName ,
2020-12-14 09:54:29 +00:00
LoginName : session . LoginName ,
2021-06-11 11:20:39 +00:00
ResourceOwner : session . ResourceOwner ,
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
AvatarKey : session . AvatarKey ,
2021-02-08 10:30:30 +00:00
UserSessionState : auth_req_model . UserSessionStateToDomain ( session . State ) ,
2020-12-14 09:54:29 +00:00
SelectionPossible : request . RequestedOrgID == "" || request . RequestedOrgID == session . ResourceOwner ,
2020-05-18 10:06:36 +00:00
}
}
return users , nil
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) firstFactorChecked ( request * domain . AuthRequest , user * user_model . UserView , userSession * user_model . UserSessionView ) domain . NextStep {
2020-12-02 16:00:04 +00:00
if user . InitRequired {
2021-02-08 10:30:30 +00:00
return & domain . InitUserStep { PasswordSet : user . PasswordSet }
2020-12-02 16:00:04 +00:00
}
2021-02-08 10:30:30 +00:00
var step domain . NextStep
if request . LoginPolicy . PasswordlessType != domain . PasswordlessTypeNotAllowed && user . IsPasswordlessReady ( ) {
2021-06-16 08:02:15 +00:00
if checkVerificationTimeMaxAge ( userSession . PasswordlessVerification , repo . MultiFactorCheckLifeTime , request ) {
2020-12-18 12:42:21 +00:00
request . AuthTime = userSession . PasswordlessVerification
return nil
2020-12-02 16:00:04 +00:00
}
2021-08-02 13:24:58 +00:00
step = & domain . PasswordlessStep {
PasswordSet : user . PasswordSet ,
}
}
if user . PasswordlessInitRequired {
return & domain . PasswordlessRegistrationPromptStep { }
2020-12-02 16:00:04 +00:00
}
2021-08-02 13:24:58 +00:00
if user . PasswordInitRequired {
2021-02-08 10:30:30 +00:00
return & domain . InitPasswordStep { }
2020-12-02 16:00:04 +00:00
}
2021-06-16 08:02:15 +00:00
if checkVerificationTimeMaxAge ( userSession . PasswordVerification , repo . PasswordCheckLifeTime , request ) {
2020-12-18 12:42:21 +00:00
request . PasswordVerified = true
request . AuthTime = userSession . PasswordVerification
return nil
2020-12-02 16:00:04 +00:00
}
2020-12-18 12:42:21 +00:00
if step != nil {
return step
}
2021-02-08 10:30:30 +00:00
return & domain . PasswordStep { }
2020-12-02 16:00:04 +00:00
}
2021-02-08 10:30:30 +00:00
func ( repo * AuthRequestRepo ) mfaChecked ( userSession * user_model . UserSessionView , request * domain . AuthRequest , user * user_model . UserView ) ( domain . NextStep , bool , error ) {
2020-12-02 16:00:04 +00:00
mfaLevel := request . MFALevel ( )
allowedProviders , required := user . MFATypesAllowed ( mfaLevel , request . LoginPolicy )
2021-02-08 10:30:30 +00:00
promptRequired := ( auth_req_model . MFALevelToDomain ( user . MFAMaxSetUp ) < mfaLevel ) || ( len ( allowedProviders ) == 0 && required )
2020-11-18 11:56:24 +00:00
if promptRequired || ! repo . mfaSkippedOrSetUp ( user ) {
2020-12-02 16:00:04 +00:00
types := user . MFATypesSetupPossible ( mfaLevel , request . LoginPolicy )
2020-11-04 10:26:10 +00:00
if promptRequired && len ( types ) == 0 {
return nil , false , errors . ThrowPreconditionFailed ( nil , "LOGIN-5Hm8s" , "Errors.Login.LoginPolicy.MFA.ForceAndNotConfigured" )
}
2020-11-18 11:56:24 +00:00
if len ( types ) == 0 {
return nil , true , nil
}
2021-02-08 10:30:30 +00:00
return & domain . MFAPromptStep {
2020-06-05 05:50:04 +00:00
Required : promptRequired ,
2020-12-02 16:00:04 +00:00
MFAProviders : types ,
2020-11-04 10:26:10 +00:00
} , false , nil
2020-05-18 10:06:36 +00:00
}
switch mfaLevel {
default :
fallthrough
2021-02-08 10:30:30 +00:00
case domain . MFALevelNotSetUp :
2020-11-18 11:56:24 +00:00
if len ( allowedProviders ) == 0 {
2020-11-04 10:26:10 +00:00
return nil , true , nil
2020-06-05 05:50:04 +00:00
}
fallthrough
2021-02-08 10:30:30 +00:00
case domain . MFALevelSecondFactor :
2021-06-16 08:02:15 +00:00
if checkVerificationTimeMaxAge ( userSession . SecondFactorVerification , repo . SecondFactorCheckLifeTime , request ) {
2021-02-08 10:30:30 +00:00
request . MFAsVerified = append ( request . MFAsVerified , auth_req_model . MFATypeToDomain ( userSession . SecondFactorVerificationType ) )
2020-11-04 10:26:10 +00:00
request . AuthTime = userSession . SecondFactorVerification
return nil , true , nil
2020-05-18 10:06:36 +00:00
}
fallthrough
2021-02-08 10:30:30 +00:00
case domain . MFALevelMultiFactor :
2021-06-16 08:02:15 +00:00
if checkVerificationTimeMaxAge ( userSession . MultiFactorVerification , repo . MultiFactorCheckLifeTime , request ) {
2021-02-08 10:30:30 +00:00
request . MFAsVerified = append ( request . MFAsVerified , auth_req_model . MFATypeToDomain ( userSession . MultiFactorVerificationType ) )
2020-11-04 10:26:10 +00:00
request . AuthTime = userSession . MultiFactorVerification
return nil , true , nil
2020-05-18 10:06:36 +00:00
}
}
2021-02-08 10:30:30 +00:00
return & domain . MFAVerificationStep {
2020-12-02 16:00:04 +00:00
MFAProviders : allowedProviders ,
2020-11-04 10:26:10 +00:00
} , false , nil
2020-05-18 10:06:36 +00:00
}
2020-11-18 11:56:24 +00:00
func ( repo * AuthRequestRepo ) mfaSkippedOrSetUp ( user * user_model . UserView ) bool {
2020-12-02 16:00:04 +00:00
if user . MFAMaxSetUp > model . MFALevelNotSetUp {
2020-05-18 10:06:36 +00:00
return true
}
2020-12-02 16:00:04 +00:00
return checkVerificationTime ( user . MFAInitSkipped , repo . MFAInitSkippedLifeTime )
2020-05-18 10:06:36 +00:00
}
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 err != nil {
return nil , err
}
return iam_es_model . LoginPolicyViewToModel ( policy ) , err
}
2021-07-05 08:36:51 +00:00
func ( repo * AuthRequestRepo ) getPrivacyPolicy ( ctx context . Context , orgID string ) ( * domain . PrivacyPolicy , error ) {
policy , err := repo . View . PrivacyPolicyByAggregateID ( orgID )
if errors . IsNotFound ( err ) {
policy , err = repo . View . PrivacyPolicyByAggregateID ( repo . IAMID )
if err != nil {
return nil , err
}
policy . Default = true
}
if err != nil {
return nil , err
}
return policy . ToDomain ( ) , err
}
2021-03-25 13:41:07 +00:00
func ( repo * AuthRequestRepo ) getLabelPolicy ( ctx context . Context , orgID string ) ( * domain . LabelPolicy , error ) {
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
policy , err := repo . View . LabelPolicyByAggregateIDAndState ( orgID , int32 ( domain . LabelPolicyStateActive ) )
2021-03-25 13:41:07 +00:00
if errors . IsNotFound ( err ) {
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
policy , err = repo . View . LabelPolicyByAggregateIDAndState ( repo . IAMID , int32 ( domain . LabelPolicyStateActive ) )
2021-03-25 13:41:07 +00:00
if err != nil {
return nil , err
}
policy . Default = true
}
if err != nil {
return nil , err
}
return policy . ToDomain ( ) , err
}
2021-07-05 13:10:49 +00:00
func ( repo * AuthRequestRepo ) getLoginTexts ( ctx context . Context , aggregateID string ) ( [ ] * domain . CustomText , error ) {
loginTexts , err := repo . View . CustomTextsByAggregateIDAndTemplate ( aggregateID , domain . LoginCustomText )
if err != nil {
return nil , err
}
return iam_view_model . CustomTextViewsToDomain ( loginTexts ) , err
}
2021-02-08 10:30:30 +00:00
func setOrgID ( orgViewProvider orgViewProvider , request * domain . AuthRequest ) error {
2020-12-14 09:54:29 +00:00
primaryDomain := request . GetScopeOrgPrimaryDomain ( )
if primaryDomain == "" {
return nil
}
org , err := orgViewProvider . OrgByPrimaryDomain ( primaryDomain )
if err != nil {
return err
}
request . RequestedOrgID = org . ID
request . RequestedOrgName = org . Name
2021-03-25 13:41:07 +00:00
request . RequestedPrimaryDomain = primaryDomain
2020-12-14 09:54:29 +00:00
return nil
}
2020-09-18 11:26:28 +00:00
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
}
2021-06-16 08:02:15 +00:00
func checkVerificationTimeMaxAge ( verificationTime time . Time , lifetime time . Duration , request * domain . AuthRequest ) bool {
if ! checkVerificationTime ( verificationTime , lifetime ) {
return false
}
if request . MaxAuthAge == nil {
return true
}
return verificationTime . After ( request . CreationDate . Add ( - * request . MaxAuthAge ) )
}
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
}
2021-06-11 11:20:39 +00:00
return user_view_model . UserSessionsToModel ( session , provider . PrefixAvatarURL ( ) ) , 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-12-07 11:09:10 +00:00
session = & user_view_model . UserSessionView { UserAgentID : agentID , UserID : user . ID }
2020-06-05 05:50:04 +00:00
}
events , err := eventProvider . UserEventsByID ( ctx , user . ID , session . Sequence )
if err != nil {
2020-11-20 06:57:39 +00:00
logging . Log ( "EVENT-Hse6s" ) . WithError ( err ) . WithField ( "traceID" , tracing . TraceIDFromCtx ( ctx ) ) . Debug ( "error retrieving new events" )
2021-06-11 11:20:39 +00:00
return user_view_model . UserSessionToModel ( session , provider . PrefixAvatarURL ( ) ) , 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-10-02 06:02:09 +00:00
es_model . HumanExternalLoginCheckSucceeded ,
2020-09-15 13:04:02 +00:00
es_model . HumanMFAOTPCheckSucceeded ,
es_model . HumanMFAOTPCheckFailed ,
2020-12-02 16:00:04 +00:00
es_model . HumanSignedOut ,
es_model . HumanPasswordlessTokenCheckSucceeded ,
es_model . HumanPasswordlessTokenCheckFailed ,
es_model . HumanMFAU2FTokenCheckSucceeded ,
es_model . HumanMFAU2FTokenCheckFailed :
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 {
2020-11-20 06:57:39 +00:00
logging . Log ( "EVENT-sdgT3" ) . WithError ( err ) . WithField ( "traceID" , tracing . TraceIDFromCtx ( ctx ) ) . Debug ( "error getting event data" )
2021-06-11 11:20:39 +00:00
return user_view_model . UserSessionToModel ( session , provider . PrefixAvatarURL ( ) ) , 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
}
2020-12-17 15:22:27 +00:00
err := sessionCopy . AppendEvent ( event )
logging . Log ( "EVENT-qbhj3" ) . OnError ( err ) . WithField ( "traceID" , tracing . TraceIDFromCtx ( ctx ) ) . Warn ( "error appending event" )
2020-05-18 10:06:36 +00:00
}
2021-06-11 11:20:39 +00:00
return user_view_model . UserSessionToModel ( & sessionCopy , provider . PrefixAvatarURL ( ) ) , nil
2020-06-19 12:52:04 +00:00
}
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 ) {
2020-10-02 06:02:09 +00:00
user , viewErr := viewProvider . UserByID ( userID )
if viewErr != nil && ! errors . IsNotFound ( viewErr ) {
return nil , viewErr
} else if user == nil {
user = new ( user_view_model . UserView )
2020-05-18 10:06:36 +00:00
}
2020-06-05 05:50:04 +00:00
events , err := eventProvider . UserEventsByID ( ctx , userID , user . Sequence )
if err != nil {
2020-11-20 06:57:39 +00:00
logging . Log ( "EVENT-dfg42" ) . WithError ( err ) . WithField ( "traceID" , tracing . TraceIDFromCtx ( ctx ) ) . Debug ( "error retrieving new events" )
2021-06-11 11:20:39 +00:00
return user_view_model . UserToModel ( user , viewProvider . PrefixAvatarURL ( ) ) , nil
2020-06-05 05:50:04 +00:00
}
2020-10-02 06:02:09 +00:00
if len ( events ) == 0 {
if viewErr != nil {
return nil , viewErr
}
2021-06-11 11:20:39 +00:00
return user_view_model . UserToModel ( user , viewProvider . PrefixAvatarURL ( ) ) , viewErr
2020-10-02 06:02:09 +00:00
}
2020-06-05 05:50:04 +00:00
userCopy := * user
for _ , event := range events {
if err := userCopy . AppendEvent ( event ) ; err != nil {
2021-06-11 11:20:39 +00:00
return user_view_model . UserToModel ( user , viewProvider . PrefixAvatarURL ( ) ) , nil
2020-06-05 05:50:04 +00:00
}
}
2020-10-07 06:16:42 +00:00
if userCopy . State == int32 ( user_model . UserStateDeleted ) {
return nil , errors . ThrowNotFound ( nil , "EVENT-3F9so" , "Errors.User.NotFound" )
}
2021-06-11 11:20:39 +00:00
return user_view_model . UserToModel ( & userCopy , viewProvider . PrefixAvatarURL ( ) ) , nil
2020-05-18 10:06:36 +00:00
}
2020-09-18 11:26:28 +00:00
2021-02-08 10:30:30 +00:00
func linkExternalIDPs ( ctx context . Context , userCommandProvider userCommandProvider , request * domain . AuthRequest ) error {
externalIDPs := make ( [ ] * domain . ExternalIDP , len ( request . LinkingUsers ) )
2020-09-18 11:26:28 +00:00
for i , linkingUser := range request . LinkingUsers {
2021-02-08 10:30:30 +00:00
externalIDP := & domain . ExternalIDP {
ObjectRoot : es_models . ObjectRoot { AggregateID : request . UserID } ,
IDPConfigID : linkingUser . IDPConfigID ,
ExternalUserID : linkingUser . ExternalUserID ,
DisplayName : linkingUser . DisplayName ,
2020-09-18 11:26:28 +00:00
}
externalIDPs [ i ] = externalIDP
}
data := authz . CtxData {
UserID : "LOGIN" ,
OrgID : request . UserOrgID ,
}
2021-02-08 10:30:30 +00:00
return userCommandProvider . BulkAddedHumanExternalIDP ( authz . SetCtxData ( ctx , data ) , request . UserID , request . UserOrgID , externalIDPs )
2020-09-18 11:26:28 +00:00
}
2021-02-08 10:30:30 +00:00
func linkingIDPConfigExistingInAllowedIDPs ( linkingUsers [ ] * domain . ExternalUser , idpProviders [ ] * domain . IDPProvider ) bool {
2020-09-18 11:26:28 +00:00
for _ , linkingUser := range linkingUsers {
exists := false
for _ , idp := range idpProviders {
if idp . IDPConfigID == linkingUser . IDPConfigID {
exists = true
continue
}
}
if ! exists {
return false
}
}
return true
}
2021-02-08 10:30:30 +00:00
func userGrantRequired ( ctx context . Context , request * domain . AuthRequest , user * user_model . UserView , userGrantProvider userGrantProvider ) ( _ bool , err error ) {
2020-10-16 05:49:38 +00:00
var app * project_view_model . ApplicationView
switch request . Request . Type ( ) {
2021-02-08 10:30:30 +00:00
case domain . AuthRequestTypeOIDC :
2020-10-16 05:49:38 +00:00
app , err = userGrantProvider . ApplicationByClientID ( ctx , request . ApplicationID )
if err != nil {
return false , err
}
default :
return false , errors . ThrowPreconditionFailed ( nil , "EVENT-dfrw2" , "Errors.AuthRequest.RequestTypeNotSupported" )
}
if ! app . ProjectRoleCheck {
return false , nil
}
grants , err := userGrantProvider . UserGrantsByProjectAndUserID ( app . ProjectID , user . ID )
if err != nil {
return false , err
}
return len ( grants ) == 0 , nil
}