Skip to content

Throw an error if aws session token is detected #842

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

Merged
merged 7 commits into from
Mar 4, 2020
Merged

Throw an error if aws session token is detected #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a45f5d2
Throw an error if aws session token is detected
vishalbollu Mar 4, 2020
9bcabcb
Only check if session token was specified after validation has failed
vishalbollu Mar 4, 2020
4c9ecc0
Throw a warning if default credentials stored in .aws has session tok…
vishalbollu Mar 4, 2020
c59b06c
Merge branch 'master' into error-when-aws-session-detected
vishalbollu Mar 4, 2020
e74b795
Throw warning is aws session key is detected
vishalbollu Mar 4, 2020
006ae47
Revert error
vishalbollu Mar 4, 2020
bb9a41b
Update warning message
vishalbollu Mar 4, 2020
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
4 changes: 4 additions & 0 deletions cli/cmd/lib_aws_creds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ func readAWSCredsFromConfigFile(awsCreds *AWSCredentials, path string) error {
// awsCreds is what was read from the cluster config YAML
func setInstallAWSCredentials(awsCreds *AWSCredentials) error {
// First check env vars
if os.Getenv("AWS_SESSION_TOKEN") != "" {
fmt.Println("warning: credentials requiring aws session tokens are not supported")
}

if os.Getenv("AWS_ACCESS_KEY_ID") != "" && os.Getenv("AWS_SECRET_ACCESS_KEY") != "" {
awsCreds.AWSAccessKeyID = os.Getenv("AWS_ACCESS_KEY_ID")
awsCreds.AWSSecretAccessKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
Expand Down
6 changes: 6 additions & 0 deletions pkg/lib/aws/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package aws

import (
"fmt"

"github.com/aws/aws-sdk-go/aws/credentials"
)

Expand All @@ -31,6 +33,10 @@ func GetCredentialsFromCLIConfigFile() (string, string, error) {
return "", "", err
}

if value.SessionToken != "" {
fmt.Println("warning: credentials requiring aws session tokens are not supported")
}

if value.AccessKeyID == "" || value.SecretAccessKey == "" {
return "", "", ErrorReadCredentials()
}
Expand Down