mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-09-04 13:31:14 +02:00
Code Issues Projects Releases Wiki Activity

adding IAM Role as constrain

Browse Source
This commit is contained in:
root 2016-06-14 14:49:36 +00:00
parent 75937956aa
commit e77652d15d
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,13 +244,21 @@ func (b *backend) pathLoginUpdate(
return logical.ErrorResponse("role entry not found"), nil return logical.ErrorResponse("role entry not found"), nil
} }
// Only 'bound_ami_id' constraint is supported on the role currently. // Only 'bound_ami_id' and 'bound_iam_role_arn' constraints are supported on the role currently.
// Check if the AMI ID of the instance trying to login matches the // Check if the AMI ID of the instance trying to login matches the
// AMI ID specified as a constraint on the role. // AMI ID specified as a constraint on the role.
if identityDoc.AmiID != roleEntry.BoundAmiID { if roleEntry.BoundAmiID != "" && identityDoc.AmiID != roleEntry.BoundAmiID {
return logical.ErrorResponse(fmt.Sprintf("AMI ID %s does not belong to role %s", identityDoc.AmiID, roleName)), nil return logical.ErrorResponse(fmt.Sprintf("AMI ID %s does not belong to role %s", identityDoc.AmiID, roleName)), nil
} }
// Check if the IAM Role ARN of the instance trying to login matches the
// IAM Role ARN specified as a constraint on the role.
iamRoleArn := ""
iamRoleArn = *instanceDesc.Reservations[0].Instances[0].IamInstanceProfile.Arn
if roleEntry.BoundIamARN != "" && iamRoleArn != roleEntry.BoundIamARN {
return logical.ErrorResponse(fmt.Sprintf("IAM Role ARN %s does not belong to role %s", iamRoleArn, roleName)), nil
}
// Get the entry from the identity whitelist, if there is one. // Get the entry from the identity whitelist, if there is one.
storedIdentity, err := whitelistIdentityEntry(req.Storage, identityDoc.InstanceID) storedIdentity, err := whitelistIdentityEntry(req.Storage, identityDoc.InstanceID)
if err != nil { if err != nil {

18
builtin/credential/aws-ec2/path_role.go
View File

@ -27,6 +27,11 @@ func pathRole(b *backend) *framework.Path {
using the AMI ID specified by this parameter.`, using the AMI ID specified by this parameter.`,
}, },
"bound_iam_role_arn": &framework.FieldSchema{
Type: framework.TypeString,
Description: `If set, defines a constraint on the EC2 instances that they should be using the IAM Role ARN specified by this parameter.`,
},
"role_tag": &framework.FieldSchema{ "role_tag": &framework.FieldSchema{
Type: framework.TypeString, Type: framework.TypeString,
Default: "", Default: "",
@ -211,10 +216,18 @@ func (b *backend) pathRoleCreateUpdate(
roleEntry.BoundAmiID = boundAmiIDStr.(string) roleEntry.BoundAmiID = boundAmiIDStr.(string)
} }
boundIamARNStr, ok := data.GetOk("bound_iam_role_arn")
if ok {
roleEntry.BoundIamARN = boundIamARNStr.(string)
}
// At least one bound parameter should be set. Currently, only // At least one bound parameter should be set. Currently, only
// 'bound_ami_id' is supported. Check if that is set. // 'bound_ami_id' and 'bound_iam_role_arn' are supported. Check if one of them is set.
if roleEntry.BoundAmiID == "" { if roleEntry.BoundAmiID == "" {
return logical.ErrorResponse("role is not bounded to any resource; set bound_ami_id"), nil // check if an IAM Role ARN was provided instead of an AMI ID
if roleEntry.BoundIamARN == "" {
return logical.ErrorResponse("role is not bounded to any resource; set bound_ami_id or bount_iam_role_arn"), nil
}
} }
policiesStr, ok := data.GetOk("policies") policiesStr, ok := data.GetOk("policies")
@ -295,6 +308,7 @@ func (b *backend) pathRoleCreateUpdate(
// Struct to hold the information associated with an AMI ID in Vault. // Struct to hold the information associated with an AMI ID in Vault.
type awsRoleEntry struct { type awsRoleEntry struct {
BoundAmiID string `json:"bound_ami_id" structs:"bound_ami_id" mapstructure:"bound_ami_id"` BoundAmiID string `json:"bound_ami_id" structs:"bound_ami_id" mapstructure:"bound_ami_id"`
BoundIamARN string `json:"bound_iam_role_arn" structs:"bound_iam_role_arn" mapstructure:"bound_iam_role_arn"`
RoleTag string `json:"role_tag" structs:"role_tag" mapstructure:"role_tag"` RoleTag string `json:"role_tag" structs:"role_tag" mapstructure:"role_tag"`
AllowInstanceMigration bool `json:"allow_instance_migration" structs:"allow_instance_migration" mapstructure:"allow_instance_migration"` AllowInstanceMigration bool `json:"allow_instance_migration" structs:"allow_instance_migration" mapstructure:"allow_instance_migration"`
MaxTTL time.Duration `json:"max_ttl" structs:"max_ttl" mapstructure:"max_ttl"` MaxTTL time.Duration `json:"max_ttl" structs:"max_ttl" mapstructure:"max_ttl"`