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

Merge pull request #3 from ChaseLEngel/permissions

Browse source 
Permissions
This commit is contained in:
Mark Woolsey 2016-10-15 16:48:06 -07:00 committed by GitHub
parent 98450c001b 93bb52b733
commit fc179995ea
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
vault/policy.go
View file

@ -117,17 +117,12 @@ func Parse(rules string) (*Policy, error) {
func parsePaths(result *Policy, list *ast.ObjectList) error { func parsePaths(result *Policy, list *ast.ObjectList) error {
// specifically how can we access the key value pairs for // specifically how can we access the key value pairs for
// permissions // permissions
<<<<<<< HEAD
fmt.Println(list);
=======
>>>>>>> a433f41cfb5b15b98e662f10654cc56f8cba8fd9
paths := make([]*PathCapabilities, 0, len(list.Items)) paths := make([]*PathCapabilities, 0, len(list.Items))
for _, item := range list.Items { for _, item := range list.Items {
key := "path" key := "path"
if len(item.Keys) > 0 { if len(item.Keys) > 0 {
key = item.Keys[0].Token.Value().(string) // "secret/foo" key = item.Keys[0].Token.Value().(string) // "secret/foo"
} }
valid := []string{ valid := []string{
"policy", "policy",
"capabilities", "capabilities",
@ -138,11 +133,14 @@ func parsePaths(result *Policy, list *ast.ObjectList) error {
} }
var pc PathCapabilities var pc PathCapabilities
// allocate memory so that DecodeObject can initialize the Permissions struct
pc.Permissions = new(Permissions)
pc.Prefix = key pc.Prefix = key
if err := hcl.DecodeObject(&pc, item.Val); err != nil { if err := hcl.DecodeObject(&pc, item.Val); err != nil {
return multierror.Prefix(err, fmt.Sprintf("path %q:", key)) return multierror.Prefix(err, fmt.Sprintf("path %q:", key))
} }
// Strip a leading '/' as paths in Vault start after the / in the API path // Strip a leading '/' as paths in Vault start after the / in the API path
if len(pc.Prefix) > 0 && pc.Prefix[0] == '/' { if len(pc.Prefix) > 0 && pc.Prefix[0] == '/' {
pc.Prefix = pc.Prefix[1:] pc.Prefix = pc.Prefix[1:]
@ -170,8 +168,6 @@ func parsePaths(result *Policy, list *ast.ObjectList) error {
} }
} }
pc.Permissions = new(Permissions)
// Initialize the map // Initialize the map
pc.Permissions.CapabilitiesBitmap = 0 pc.Permissions.CapabilitiesBitmap = 0
for _, cap := range pc.Capabilities { for _, cap := range pc.Capabilities {
@ -188,15 +184,6 @@ func parsePaths(result *Policy, list *ast.ObjectList) error {
} }
} }
//////////////////////////////////////////////////////////////////////////////
// filter out permissions from list object
// if p := item.Filter("permissions"); len(p.Whatever) > 0 {
// }
// go through p and initialize pc.Permissions.Allowed/Disallowed
//////////////////////////////////////////////////////////////////////////////
PathFinished: PathFinished:
paths = append(paths, &pc) paths = append(paths, &pc)