Skip to content

fix: skip plaintext cache tokens with non-SSO scopes #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salimesmailjee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: skip plaintext cache tokens with non-SSO scopes #941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions pkg/cfaws/ssotoken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ import (
)

type SSOPlainTextOut struct {
AccessToken string `json:"accessToken"`
ExpiresAt string `json:"expiresAt"`
SSOSessionName string `json:"ssoSessionName"`
StartUrl string `json:"startUrl"`
Region string `json:"region"`
AccessToken string `json:"accessToken"`
ExpiresAt string `json:"expiresAt"`
SSOSessionName string `json:"ssoSessionName"`
StartUrl string `json:"startUrl"`
Region string `json:"region"`
Scopes []string `json:"scopes,omitempty"`
}

// CreatePlainTextSSO is currently unused. In a future version of the Granted CLI,
Expand Down Expand Up @@ -182,8 +183,8 @@ func ReadPlaintextSsoCreds(startUrl string) (SSOPlainTextOut, error) {
if err != nil {
return SSOPlainTextOut{}, err
}
// check if the startUrl matches
if sso.StartUrl == startUrl {
// check if the startUrl matches and the token has appropriate scopes
if sso.StartUrl == startUrl && hasSSOScopes(sso.Scopes) {
return sso, nil
}
}
Expand All @@ -192,6 +193,21 @@ func ReadPlaintextSsoCreds(startUrl string) (SSOPlainTextOut, error) {
return SSOPlainTextOut{}, fmt.Errorf("no valid sso token found")
}

// hasSSOScopes returns true if the token has scopes that include SSO account
// access, or if no scopes are specified (for backwards compatibility with
// tokens that don't include scope metadata).
func hasSSOScopes(scopes []string) bool {
if len(scopes) == 0 {
return true
}
for _, scope := range scopes {
if strings.HasPrefix(scope, "sso:") {
return true
}
}
return false
}

func GetValidSSOTokenFromPlaintextCache(startUrl string) *securestorage.SSOToken {
if SsoCredsAreInConfigCache() {
creds, err := ReadPlaintextSsoCreds(startUrl)
Expand Down