Skip to content

Commit

Permalink
[v14] Fix UserContext SSO detection in UI for Okta Users (#47944) (#4…
Browse files Browse the repository at this point in the history
…7959)

* Fix UserContext SSO detection in UI for Okta Users (#47944)

* Fix UserContext SSO detection in UI for Okta Users

Okta imported users are not being properly identified as SSO users.
Okta does not set any of the Users' identities and instead only sets the
User.Connector.CreatedBy field.

When building the UserContext, which is used by the WebUI, it was
returning `local` user type for Okta users.

* move usertype check to types.User

* remove User.Status field which only exists on 15+
  • Loading branch information
marcoandredinis authored Oct 28, 2024
1 parent 3195740 commit 4d6b4bb
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
10 changes: 7 additions & 3 deletions api/types/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -497,11 +497,15 @@ func (u UserV2) GetGCPServiceAccounts() []string {

// GetUserType indicates if the User was created by an SSO Provider or locally.
func (u UserV2) GetUserType() UserType {
if u.GetCreatedBy().Connector == nil {
return UserTypeLocal
if u.GetCreatedBy().Connector != nil ||
len(u.GetOIDCIdentities()) > 0 ||
len(u.GetGithubIdentities()) > 0 ||
len(u.GetSAMLIdentities()) > 0 {

return UserTypeSSO
}

return UserTypeSSO
return UserTypeLocal
}

// IsBot returns true if the user is a bot.
Expand Down
4 changes: 1 addition & 3 deletions lib/web/ui/usercontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ func NewUserContext(user types.User, userRoles services.RoleSet, features proto.
authType := authLocal

// check for any SSO identities
isSSO := len(user.GetOIDCIdentities()) > 0 ||
len(user.GetGithubIdentities()) > 0 ||
len(user.GetSAMLIdentities()) > 0
isSSO := user.GetUserType() == types.UserTypeSSO

if isSSO {
// SSO user
Expand Down
18 changes: 17 additions & 1 deletion lib/web/ui/usercontext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,23 @@ func TestNewUserContext(t *testing.T) {
user.Spec.GithubIdentities = []types.ExternalIdentity{{ConnectorID: "foo", Username: "bar"}}
userContext, err = NewUserContext(user, roleSet, proto.Features{}, true, false)
require.NoError(t, err)
require.Equal(t, userContext.AuthType, authSSO)
require.Equal(t, authSSO, userContext.AuthType)

// test sso auth type for users with the CreatedBy.Connector field set.
// Eg users import from okta do not have any <IdP>Identities, so the CreatedBy.Connector must be checked.
userCreatedExternally := &types.UserV2{
Metadata: types.Metadata{
Name: "root",
},
Spec: types.UserSpecV2{
CreatedBy: types.CreatedBy{
Connector: &types.ConnectorRef{},
},
},
}
userContext, err = NewUserContext(userCreatedExternally, roleSet, proto.Features{}, true, false)
require.NoError(t, err)
require.Equal(t, authSSO, userContext.AuthType)
}

func TestNewUserContextCloud(t *testing.T) {
Expand Down

0 comments on commit 4d6b4bb

Please sign in to comment.