Skip to content

SWI-8638 || Updating some deprecated params and cleanup #1

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

Open
noahg1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SWI-8638 || Updating some deprecated params and cleanup #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 18 additions & 23 deletions path_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"fmt"
"net/http"
"strings"
"time"

"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/logical"
Expand Down Expand Up @@ -104,9 +103,9 @@ func (b *backend) pathLogin(ctx context.Context, req *logical.Request, d *framew
return logical.ErrorResponse("missing vmname"), nil
}

role := d.Get("role").(string)
roleName := d.Get("role").(string)

if role == "" {
if roleName == "" {
return logical.ErrorResponse("missing role"), nil
}

Expand Down Expand Up @@ -143,7 +142,7 @@ func (b *backend) pathLogin(ctx context.Context, req *logical.Request, d *framew
return logical.ErrorResponse("Invalid VM name"), nil
}

if role != vmoutput.Role {
if roleName != vmoutput.Role {
return logical.ErrorResponse("Invalid role"), nil
}

Expand All @@ -155,30 +154,26 @@ func (b *backend) pathLogin(ctx context.Context, req *logical.Request, d *framew
return logical.ErrorResponse("Invalid secret key"), nil
}

vmdata, _ := b.role(ctx, req.Storage, role)
role, _ := b.role(ctx, req.Storage, roleName)

policies := vmdata.Policies
policies := role.TokenPolicies

resp := &logical.Response{
Auth: &logical.Auth{
Metadata: map[string]string{
"vmname": vmname,
"policies": strings.Join(policies, ","),
},
DisplayName: vmname,
LeaseOptions: logical.LeaseOptions{
TTL: 30 * time.Minute,
MaxTTL: 60 * time.Minute,
Renewable: true,
},
Alias: &logical.Alias{
Name: vmname,
},
auth := &logical.Auth{
Metadata: map[string]string{
"vmname": vmname,
"policies": strings.Join(policies, ","),
},
DisplayName: vmname,
Alias: &logical.Alias{
Name: vmname,
},
}
resp.Auth.Policies = append(resp.Auth.Policies, policies...)

return resp, nil
role.PopulateTokenAuth(auth)

return &logical.Response{
Auth: auth,
}, nil
}

const pathLoginSyn = `
Expand Down
17 changes: 12 additions & 5 deletions path_roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/policyutil"
"github.com/hashicorp/vault/sdk/helper/tokenutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand All @@ -24,17 +25,17 @@ func pathListRoles(b *backend) *framework.Path {
}

func pathRoles(b *backend) *framework.Path {
return &framework.Path{
p := &framework.Path{
Pattern: "role/" + framework.GenericNameRegex("role"),
Fields: map[string]*framework.FieldSchema{
"role": {
Type: framework.TypeString,
Description: "Role associated with the virtual machine.",
},

"policies": {
Type: framework.TypeCommaStringSlice,
Description: "Comma-separated list of policies associated to the vm.",
Description: tokenutil.DeprecationText("token_policies"),
Deprecated: true,
},
},

Expand All @@ -48,6 +49,9 @@ func pathRoles(b *backend) *framework.Path {
HelpSynopsis: pathUserHelpSyn,
HelpDescription: pathUserHelpDesc,
}

tokenutil.AddTokenFields(p.Fields)
return p
}

func (b *backend) pathRoleDelete(ctx context.Context, req *logical.Request, d *framework.FieldData) (*logical.Response, error) {
Expand Down Expand Up @@ -131,8 +135,11 @@ func (b *backend) pathRoleList(ctx context.Context, req *logical.Request, d *fra

// RoleEntry stores all the options that are set on a VM
type RoleEntry struct {
Role string
Policies []string
tokenutil.TokenParams
// Role is the role name
Role string
// Deprecated by TokenParams
Policies []string `json:"policies"`
}

const pathUserHelpSyn = `
Expand Down