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

add ns path to granting_policies (#20522)

This commit is contained in:
Pratyoy Mukhopadhyay 2023-05-04 15:08:22 -07:00 committed by GitHub
parent 949979dd14
commit 7b807a9bb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audit/format.go
View File

@ -150,9 +150,10 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
for _, p := range auth.PolicyResults.GrantingPolicies {
reqEntry.Auth.PolicyResults.GrantingPolicies = append(reqEntry.Auth.PolicyResults.GrantingPolicies, PolicyInfo{
Name: p.Name,
NamespaceId: p.NamespaceId,
Type: p.Type,
Name: p.Name,
NamespaceId: p.NamespaceId,
NamespacePath: p.NamespacePath,
Type: p.Type,
})
}
}
@ -367,9 +368,10 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
for _, p := range auth.PolicyResults.GrantingPolicies {
respEntry.Auth.PolicyResults.GrantingPolicies = append(respEntry.Auth.PolicyResults.GrantingPolicies, PolicyInfo{
Name: p.Name,
NamespaceId: p.NamespaceId,
Type: p.Type,
Name: p.Name,
NamespaceId: p.NamespaceId,
NamespacePath: p.NamespacePath,
Type: p.Type,
})
}
}
@ -475,9 +477,10 @@ type AuditPolicyResults struct {
}
type PolicyInfo struct {
Name string `json:"name,omitempty"`
NamespaceId string `json:"namespace_id,omitempty"`
Type string `json:"type"`
Name string `json:"name,omitempty"`
NamespaceId string `json:"namespace_id,omitempty"`
NamespacePath string `json:"namespace_path,omitempty"`
Type string `json:"type"`
}
type AuditSecret struct {

7
sdk/logical/auth.go
View File

@ -126,7 +126,8 @@ type PolicyResults struct {
}
type PolicyInfo struct {
Name string `json:"name"`
NamespaceId string `json:"namespace_id"`
Type string `json:"type"`
Name string `json:"name"`
NamespaceId string `json:"namespace_id"`
NamespacePath string `json:"namespace_path"`
Type string `json:"type"`
}

7
vault/acl.go
View File

@ -341,9 +341,10 @@ func (a *ACL) AllowOperation(ctx context.Context, req *logical.Request, capCheck
ret.RootPrivs = true
ret.IsRoot = true
ret.GrantingPolicies = []logical.PolicyInfo{{
Name: "root",
NamespaceId: "root",
Type: "acl",
Name: "root",
NamespaceId: "root",
NamespacePath: "",
Type: "acl",
}}
return
}

14
vault/acl_test.go
View File

@ -874,14 +874,16 @@ func TestACLGrantingPolicies(t *testing.T) {
}
policyInfo := logical.PolicyInfo{
Name: "granting_policy",
NamespaceId: "root",
Type: "acl",
Name: "granting_policy",
NamespaceId: "root",
NamespacePath: "",
Type: "acl",
}
mergedInfo := logical.PolicyInfo{
Name: "granting_policy_merged",
NamespaceId: "root",
Type: "acl",
Name: "granting_policy_merged",
NamespaceId: "root",
NamespacePath: "",
Type: "acl",
}
tcases := []tcase{

7
vault/policy.go
View File

@ -269,9 +269,10 @@ func addGrantingPoliciesToMap(m map[uint32][]logical.PolicyInfo, policy *Policy,
}
m[capability] = append(m[capability], logical.PolicyInfo{
Name: policy.Name,
NamespaceId: policy.namespace.ID,
Type: "acl",
Name: policy.Name,
NamespaceId: policy.namespace.ID,
NamespacePath: policy.namespace.Path,
Type: "acl",
})
}