luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Remove structs package from auth/aws

Browse source
This commit is contained in:
Jeff Mitchell 2018-02-27 13:22:47 -05:00
parent 6cd6a7b773
commit c695023bab
6 changed files with 92 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
builtin/credential/aws/path_config_client.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/fatih/structs"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
@ -115,7 +114,15 @@ func (b *backend) pathConfigClientRead(ctx context.Context, req *logical.Request
} }
return &logical.Response{ return &logical.Response{
Data: structs.New(clientConfig).Map(), Data: map[string]interface{}{
"access_key": clientConfig.AccessKey,
"secret_key": clientConfig.SecretKey,
"endpoint": clientConfig.Endpoint,
"iam_endpoint": clientConfig.IAMEndpoint,
"sts_endpoint": clientConfig.STSEndpoint,
"iam_server_id_header_value": clientConfig.IAMServerIdHeaderValue,
"max_retries": clientConfig.MaxRetries,
},
}, nil }, nil
} }
@ -261,12 +268,12 @@ func (b *backend) pathConfigClientCreateUpdate(ctx context.Context, req *logical
// Struct to hold 'aws_access_key' and 'aws_secret_key' that are required to // Struct to hold 'aws_access_key' and 'aws_secret_key' that are required to
// interact with the AWS EC2 API. // interact with the AWS EC2 API.
type clientConfig struct { type clientConfig struct {
AccessKey string `json:"access_key" structs:"access_key" mapstructure:"access_key"` AccessKey string `json:"access_key" mapstructure:"access_key"`
SecretKey string `json:"secret_key" structs:"secret_key" mapstructure:"secret_key"` SecretKey string `json:"secret_key" mapstructure:"secret_key"`
Endpoint string `json:"endpoint" structs:"endpoint" mapstructure:"endpoint"` Endpoint string `json:"endpoint" mapstructure:"endpoint"`
IAMEndpoint string `json:"iam_endpoint" structs:"iam_endpoint" mapstructure:"iam_endpoint"` IAMEndpoint string `json:"iam_endpoint" mapstructure:"iam_endpoint"`
STSEndpoint string `json:"sts_endpoint" structs:"sts_endpoint" mapstructure:"sts_endpoint"` STSEndpoint string `json:"sts_endpoint" mapstructure:"sts_endpoint"`
IAMServerIdHeaderValue string `json:"iam_server_id_header_value" structs:"iam_server_id_header_value" mapstructure:"iam_server_id_header_value"` IAMServerIdHeaderValue string `json:"iam_server_id_header_value" mapstructure:"iam_server_id_header_value"`
MaxRetries int `json:"max_retries"` MaxRetries int `json:"max_retries"`
} }

7
builtin/credential/aws/path_config_sts.go
View file

@ -4,14 +4,13 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/fatih/structs"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
// awsStsEntry is used to store details of an STS role for assumption // awsStsEntry is used to store details of an STS role for assumption
type awsStsEntry struct { type awsStsEntry struct {
StsRole string `json:"sts_role" structs:"sts_role" mapstructure:"sts_role"` StsRole string `json:"sts_role" mapstructure:"sts_role"`
} }
func pathListSts(b *backend) *framework.Path { func pathListSts(b *backend) *framework.Path {
@ -170,7 +169,9 @@ func (b *backend) pathConfigStsRead(ctx context.Context, req *logical.Request, d
} }
return &logical.Response{ return &logical.Response{
Data: structs.New(stsEntry).Map(), Data: map[string]interface{}{
"sts_role": stsEntry.StsRole,
},
}, nil }, nil
} }

10
builtin/credential/aws/path_config_tidy_identity_whitelist.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/fatih/structs"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
@ -123,7 +122,10 @@ func (b *backend) pathConfigTidyIdentityWhitelistRead(ctx context.Context, req *
} }
return &logical.Response{ return &logical.Response{
Data: structs.New(clientConfig).Map(), Data: map[string]interface{}{
"safety_buffer": clientConfig.SafetyBuffer,
"disable_periodic_tidy": clientConfig.DisablePeriodicTidy,
},
}, nil }, nil
} }
@ -135,8 +137,8 @@ func (b *backend) pathConfigTidyIdentityWhitelistDelete(ctx context.Context, req
} }
type tidyWhitelistIdentityConfig struct { type tidyWhitelistIdentityConfig struct {
SafetyBuffer int `json:"safety_buffer" structs:"safety_buffer" mapstructure:"safety_buffer"` SafetyBuffer int `json:"safety_buffer" mapstructure:"safety_buffer"`
DisablePeriodicTidy bool `json:"disable_periodic_tidy" structs:"disable_periodic_tidy" mapstructure:"disable_periodic_tidy"` DisablePeriodicTidy bool `json:"disable_periodic_tidy" mapstructure:"disable_periodic_tidy"`
} }
const pathConfigTidyIdentityWhitelistHelpSyn = ` const pathConfigTidyIdentityWhitelistHelpSyn = `

10
builtin/credential/aws/path_config_tidy_roletag_blacklist.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/fatih/structs"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
@ -124,7 +123,10 @@ func (b *backend) pathConfigTidyRoletagBlacklistRead(ctx context.Context, req *l
} }
return &logical.Response{ return &logical.Response{
Data: structs.New(clientConfig).Map(), Data: map[string]interface{}{
"safety_buffer": clientConfig.SafetyBuffer,
"disable_periodic_tidy": clientConfig.DisablePeriodicTidy,
},
}, nil }, nil
} }
@ -136,8 +138,8 @@ func (b *backend) pathConfigTidyRoletagBlacklistDelete(ctx context.Context, req
} }
type tidyBlacklistRoleTagConfig struct { type tidyBlacklistRoleTagConfig struct {
SafetyBuffer int `json:"safety_buffer" structs:"safety_buffer" mapstructure:"safety_buffer"` SafetyBuffer int `json:"safety_buffer" mapstructure:"safety_buffer"`
DisablePeriodicTidy bool `json:"disable_periodic_tidy" structs:"disable_periodic_tidy" mapstructure:"disable_periodic_tidy"` DisablePeriodicTidy bool `json:"disable_periodic_tidy" mapstructure:"disable_periodic_tidy"`
} }
const pathConfigTidyRoletagBlacklistHelpSyn = ` const pathConfigTidyRoletagBlacklistHelpSyn = `

34
builtin/credential/aws/path_identity_whitelist.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"time" "time"
"github.com/fatih/structs"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
@ -109,25 +108,28 @@ func (b *backend) pathIdentityWhitelistRead(ctx context.Context, req *logical.Re
return nil, nil return nil, nil
} }
resp := &logical.Response{ return &logical.Response{
Data: structs.New(entry).Map(), Data: map[string]interface{}{
} "role": entry.Role,
resp.Data["creation_time"] = entry.CreationTime.Format(time.RFC3339Nano) "client_nonce": entry.ClientNonce,
resp.Data["expiration_time"] = entry.ExpirationTime.Format(time.RFC3339Nano) "creation_time": entry.CreationTime.Format(time.RFC3339Nano),
resp.Data["last_updated_time"] = entry.LastUpdatedTime.Format(time.RFC3339Nano) "disallow_reauthentication": entry.DisallowReauthentication,
"pending_time": entry.PendingTime,
return resp, nil "expiration_time": entry.ExpirationTime.Format(time.RFC3339Nano),
"last_updated_time": entry.LastUpdatedTime.Format(time.RFC3339Nano),
},
}, nil
} }
// Struct to represent each item in the identity whitelist. // Struct to represent each item in the identity whitelist.
type whitelistIdentity struct { type whitelistIdentity struct {
Role string `json:"role" structs:"role" mapstructure:"role"` Role string `json:"role" mapstructure:"role"`
ClientNonce string `json:"client_nonce" structs:"client_nonce" mapstructure:"client_nonce"` ClientNonce string `json:"client_nonce" mapstructure:"client_nonce"`
CreationTime time.Time `json:"creation_time" structs:"creation_time" mapstructure:"creation_time"` CreationTime time.Time `json:"creation_time" mapstructure:"creation_time"`
DisallowReauthentication bool `json:"disallow_reauthentication" structs:"disallow_reauthentication" mapstructure:"disallow_reauthentication"` DisallowReauthentication bool `json:"disallow_reauthentication" mapstructure:"disallow_reauthentication"`
PendingTime string `json:"pending_time" structs:"pending_time" mapstructure:"pending_time"` PendingTime string `json:"pending_time" mapstructure:"pending_time"`
ExpirationTime time.Time `json:"expiration_time" structs:"expiration_time" mapstructure:"expiration_time"` ExpirationTime time.Time `json:"expiration_time" mapstructure:"expiration_time"`
LastUpdatedTime time.Time `json:"last_updated_time" structs:"last_updated_time" mapstructure:"last_updated_time"` LastUpdatedTime time.Time `json:"last_updated_time" mapstructure:"last_updated_time"`
} }
const pathIdentityWhitelistSyn = ` const pathIdentityWhitelistSyn = `

77
builtin/credential/aws/path_role.go
View file

@ -6,7 +6,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/fatih/structs"
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/helper/policyutil" "github.com/hashicorp/vault/helper/policyutil"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
@ -405,19 +404,29 @@ func (b *backend) pathRoleRead(ctx context.Context, req *logical.Request, data *
return nil, nil return nil, nil
} }
// Prepare the map of all the entries in the roleEntry.
respData := structs.New(roleEntry).Map()
// HMAC key belonging to the role should NOT be exported.
delete(respData, "hmac_key")
// Display all the durations in seconds
respData["ttl"] = roleEntry.TTL / time.Second
respData["max_ttl"] = roleEntry.MaxTTL / time.Second
respData["period"] = roleEntry.Period / time.Second
return &logical.Response{ return &logical.Response{
Data: respData, Data: map[string]interface{}{
"auth_type": roleEntry.AuthType,
"bound_ami_id": roleEntry.BoundAmiID,
"bound_account_id": roleEntry.BoundAccountID,
"bound_iam_principal_arn": roleEntry.BoundIamPrincipalARN,
"bound_iam_principal_id": roleEntry.BoundIamPrincipalID,
"bound_iam_role_arn": roleEntry.BoundIamRoleARN,
"bound_iam_instance_profile_arn": roleEntry.BoundIamInstanceProfileARN,
"bound_region": roleEntry.BoundRegion,
"bound_subnet_id": roleEntry.BoundSubnetID,
"bound_vpc_id": roleEntry.BoundVpcID,
"inferred_entity_type": roleEntry.InferredEntityType,
"inferred_aws_region": roleEntry.InferredAWSRegion,
"resolve_aws_unique_ids": roleEntry.ResolveAWSUniqueIDs,
"role_tag": roleEntry.RoleTag,
"allow_instance_migration": roleEntry.AllowInstanceMigration,
"ttl": roleEntry.TTL / time.Second,
"max_ttl": roleEntry.MaxTTL / time.Second,
"policies": roleEntry.Policies,
"disallow_reauthentication": roleEntry.DisallowReauthentication,
"period": roleEntry.Period / time.Second,
},
}, nil }, nil
} }
@ -744,27 +753,27 @@ func (b *backend) pathRoleCreateUpdate(ctx context.Context, req *logical.Request
// 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 {
AuthType string `json:"auth_type" structs:"auth_type" mapstructure:"auth_type"` AuthType string `json:"auth_type" mapstructure:"auth_type"`
BoundAmiID string `json:"bound_ami_id" structs:"bound_ami_id" mapstructure:"bound_ami_id"` BoundAmiID string `json:"bound_ami_id" mapstructure:"bound_ami_id"`
BoundAccountID string `json:"bound_account_id" structs:"bound_account_id" mapstructure:"bound_account_id"` BoundAccountID string `json:"bound_account_id" mapstructure:"bound_account_id"`
BoundIamPrincipalARN string `json:"bound_iam_principal_arn" structs:"bound_iam_principal_arn" mapstructure:"bound_iam_principal_arn"` BoundIamPrincipalARN string `json:"bound_iam_principal_arn" mapstructure:"bound_iam_principal_arn"`
BoundIamPrincipalID string `json:"bound_iam_principal_id" structs:"bound_iam_principal_id" mapstructure:"bound_iam_principal_id"` BoundIamPrincipalID string `json:"bound_iam_principal_id" mapstructure:"bound_iam_principal_id"`
BoundIamRoleARN string `json:"bound_iam_role_arn" structs:"bound_iam_role_arn" mapstructure:"bound_iam_role_arn"` BoundIamRoleARN string `json:"bound_iam_role_arn" mapstructure:"bound_iam_role_arn"`
BoundIamInstanceProfileARN string `json:"bound_iam_instance_profile_arn" structs:"bound_iam_instance_profile_arn" mapstructure:"bound_iam_instance_profile_arn"` BoundIamInstanceProfileARN string `json:"bound_iam_instance_profile_arn" mapstructure:"bound_iam_instance_profile_arn"`
BoundRegion string `json:"bound_region" structs:"bound_region" mapstructure:"bound_region"` BoundRegion string `json:"bound_region" mapstructure:"bound_region"`
BoundSubnetID string `json:"bound_subnet_id" structs:"bound_subnet_id" mapstructure:"bound_subnet_id"` BoundSubnetID string `json:"bound_subnet_id" mapstructure:"bound_subnet_id"`
BoundVpcID string `json:"bound_vpc_id" structs:"bound_vpc_id" mapstructure:"bound_vpc_id"` BoundVpcID string `json:"bound_vpc_id" mapstructure:"bound_vpc_id"`
InferredEntityType string `json:"inferred_entity_type" structs:"inferred_entity_type" mapstructure:"inferred_entity_type"` InferredEntityType string `json:"inferred_entity_type" mapstructure:"inferred_entity_type"`
InferredAWSRegion string `json:"inferred_aws_region" structs:"inferred_aws_region" mapstructure:"inferred_aws_region"` InferredAWSRegion string `json:"inferred_aws_region" mapstructure:"inferred_aws_region"`
ResolveAWSUniqueIDs bool `json:"resolve_aws_unique_ids" structs:"resolve_aws_unique_ids" mapstructure:"resolve_aws_unique_ids"` ResolveAWSUniqueIDs bool `json:"resolve_aws_unique_ids" mapstructure:"resolve_aws_unique_ids"`
RoleTag string `json:"role_tag" structs:"role_tag" mapstructure:"role_tag"` RoleTag string `json:"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" mapstructure:"allow_instance_migration"`
TTL time.Duration `json:"ttl" structs:"ttl" mapstructure:"ttl"` TTL time.Duration `json:"ttl" mapstructure:"ttl"`
MaxTTL time.Duration `json:"max_ttl" structs:"max_ttl" mapstructure:"max_ttl"` MaxTTL time.Duration `json:"max_ttl" mapstructure:"max_ttl"`
Policies []string `json:"policies" structs:"policies" mapstructure:"policies"` Policies []string `json:"policies" mapstructure:"policies"`
DisallowReauthentication bool `json:"disallow_reauthentication" structs:"disallow_reauthentication" mapstructure:"disallow_reauthentication"` DisallowReauthentication bool `json:"disallow_reauthentication" mapstructure:"disallow_reauthentication"`
HMACKey string `json:"hmac_key" structs:"hmac_key" mapstructure:"hmac_key"` HMACKey string `json:"hmac_key" mapstructure:"hmac_key"`
Period time.Duration `json:"period" mapstructure:"period" structs:"period"` Period time.Duration `json:"period" mapstructure:"period"`
} }
const pathRoleSyn = ` const pathRoleSyn = `