mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-29 02:21:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1542 from hashicorp/aws-ec2-identity-nil-check

Browse Source 
aws-ec2: added a nil check for storedIdentity in login renewal
This commit is contained in:
Vishal Nayak 2016-06-20 10:51:16 -04:00 committed by GitHub
commit 5772c21ef0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/credential/aws-ec2/path_login.go
View File

@ -501,13 +501,16 @@ func (b *backend) pathLoginRenew(
// Cross check that the instance is still in 'running' state
_, err := b.validateInstance(req.Storage, instanceID, region)
if err != nil {
return nil, fmt.Errorf("failed to verify instance ID: %s", err)
return nil, fmt.Errorf("failed to verify instance ID '%s': %s", instanceID, err)
}
storedIdentity, err := whitelistIdentityEntry(req.Storage, instanceID)
if err != nil {
return nil, err
}
if storedIdentity == nil {
return nil, fmt.Errorf("failed to verify the whitelist identity entry for instance ID: %s", instanceID)
}
// Ensure that role entry is not deleted.
roleEntry, err := b.lockedAWSRole(req.Storage, storedIdentity.Role)