e06a78a474
* Rename builtin/credential/aws-ec2 to aws The aws-ec2 authentication backend is being expanded and will become the generic aws backend. This is a small rename commit to keep the commit history clean. * Expand aws-ec2 backend to more generic aws This adds the ability to authenticate arbitrary AWS IAM principals using AWS's sts:GetCallerIdentity method. The AWS-EC2 auth backend is being to just AWS with the expansion. * Add missing aws auth handler to CLI This was omitted from the previous commit * aws auth backend general variable name cleanup Also fixed a bug where allowed auth types weren't being checked upon login, and added tests for it. * Update docs for the aws auth backend * Refactor aws bind validation * Fix env var override in aws backend test Intent is to override the AWS environment variables with the TEST_* versions if they are set, but the reverse was happening. * Update docs on use of IAM authentication profile AWS now allows you to change the instance profile of a running instance, so the use case of "a long-lived instance that's not in an instance profile" no longer means you have to use the the EC2 auth method. You can now just change the instance profile on the fly. * Fix typo in aws auth cli help * Respond to PR feedback * More PR feedback * Respond to additional PR feedback * Address more feedback on aws auth PR * Make aws auth_type immutable per role * Address more aws auth PR feedback * Address more iam auth PR feedback * Rename aws-ec2.html.md to aws.html.md Per PR feedback, to go along with new backend name. * Add MountType to logical.Request * Make default aws auth_type dependent upon MountType When MountType is aws-ec2, default to ec2 auth_type for backwards compatibility with legacy roles. Otherwise, default to iam. * Pass MountPoint and MountType back up to the core Previously the request router reset the MountPoint and MountType back to the empty string before returning to the core. This ensures they get set back to the correct values.
97 lines
3 KiB
Go
97 lines
3 KiB
Go
package awsauth
|
|
|
|
import (
|
|
"fmt"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/hashicorp/vault/logical"
|
|
"github.com/hashicorp/vault/logical/framework"
|
|
)
|
|
|
|
func pathTidyIdentityWhitelist(b *backend) *framework.Path {
|
|
return &framework.Path{
|
|
Pattern: "tidy/identity-whitelist$",
|
|
Fields: map[string]*framework.FieldSchema{
|
|
"safety_buffer": &framework.FieldSchema{
|
|
Type: framework.TypeDurationSecond,
|
|
Default: 259200,
|
|
Description: `The amount of extra time that must have passed beyond the identity's
|
|
expiration, before it is removed from the backend storage.`,
|
|
},
|
|
},
|
|
|
|
Callbacks: map[logical.Operation]framework.OperationFunc{
|
|
logical.UpdateOperation: b.pathTidyIdentityWhitelistUpdate,
|
|
},
|
|
|
|
HelpSynopsis: pathTidyIdentityWhitelistSyn,
|
|
HelpDescription: pathTidyIdentityWhitelistDesc,
|
|
}
|
|
}
|
|
|
|
// tidyWhitelistIdentity is used to delete entries in the whitelist that are expired.
|
|
func (b *backend) tidyWhitelistIdentity(s logical.Storage, safety_buffer int) error {
|
|
grabbed := atomic.CompareAndSwapUint32(&b.tidyWhitelistCASGuard, 0, 1)
|
|
if grabbed {
|
|
defer atomic.StoreUint32(&b.tidyWhitelistCASGuard, 0)
|
|
} else {
|
|
return fmt.Errorf("identity whitelist tidy operation already running")
|
|
}
|
|
|
|
bufferDuration := time.Duration(safety_buffer) * time.Second
|
|
|
|
identities, err := s.List("whitelist/identity/")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, instanceID := range identities {
|
|
identityEntry, err := s.Get("whitelist/identity/" + instanceID)
|
|
if err != nil {
|
|
return fmt.Errorf("error fetching identity of instanceID %s: %s", instanceID, err)
|
|
}
|
|
|
|
if identityEntry == nil {
|
|
return fmt.Errorf("identity entry for instanceID %s is nil", instanceID)
|
|
}
|
|
|
|
if identityEntry.Value == nil || len(identityEntry.Value) == 0 {
|
|
return fmt.Errorf("found identity entry for instanceID %s but actual identity is empty", instanceID)
|
|
}
|
|
|
|
var result whitelistIdentity
|
|
if err := identityEntry.DecodeJSON(&result); err != nil {
|
|
return err
|
|
}
|
|
|
|
if time.Now().After(result.ExpirationTime.Add(bufferDuration)) {
|
|
if err := s.Delete("whitelist/identity" + instanceID); err != nil {
|
|
return fmt.Errorf("error deleting identity of instanceID %s from storage: %s", instanceID, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// pathTidyIdentityWhitelistUpdate is used to delete entries in the whitelist that are expired.
|
|
func (b *backend) pathTidyIdentityWhitelistUpdate(
|
|
req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
|
|
return nil, b.tidyWhitelistIdentity(req.Storage, data.Get("safety_buffer").(int))
|
|
}
|
|
|
|
const pathTidyIdentityWhitelistSyn = `
|
|
Clean-up the whitelist instance identity entries.
|
|
`
|
|
|
|
const pathTidyIdentityWhitelistDesc = `
|
|
When an instance identity is whitelisted, the expiration time of the whitelist
|
|
entry is set based on the maximum 'max_ttl' value set on: the role, the role tag
|
|
and the backend's mount.
|
|
|
|
When this endpoint is invoked, all the entries that are expired will be deleted.
|
|
A 'safety_buffer' (duration in seconds) can be provided, to ensure deletion of
|
|
only those entries that are expired before 'safety_buffer' seconds.
|
|
`
|