add ns path to granting_policies (#20522)
This commit is contained in:
parent
949979dd14
commit
7b807a9bb0
|
@ -152,6 +152,7 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
|
|||
reqEntry.Auth.PolicyResults.GrantingPolicies = append(reqEntry.Auth.PolicyResults.GrantingPolicies, PolicyInfo{
|
||||
Name: p.Name,
|
||||
NamespaceId: p.NamespaceId,
|
||||
NamespacePath: p.NamespacePath,
|
||||
Type: p.Type,
|
||||
})
|
||||
}
|
||||
|
@ -369,6 +370,7 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
|
|||
respEntry.Auth.PolicyResults.GrantingPolicies = append(respEntry.Auth.PolicyResults.GrantingPolicies, PolicyInfo{
|
||||
Name: p.Name,
|
||||
NamespaceId: p.NamespaceId,
|
||||
NamespacePath: p.NamespacePath,
|
||||
Type: p.Type,
|
||||
})
|
||||
}
|
||||
|
@ -477,6 +479,7 @@ type AuditPolicyResults struct {
|
|||
type PolicyInfo struct {
|
||||
Name string `json:"name,omitempty"`
|
||||
NamespaceId string `json:"namespace_id,omitempty"`
|
||||
NamespacePath string `json:"namespace_path,omitempty"`
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
||||
|
|
|
@ -128,5 +128,6 @@ type PolicyResults struct {
|
|||
type PolicyInfo struct {
|
||||
Name string `json:"name"`
|
||||
NamespaceId string `json:"namespace_id"`
|
||||
NamespacePath string `json:"namespace_path"`
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
|
|
@ -343,6 +343,7 @@ func (a *ACL) AllowOperation(ctx context.Context, req *logical.Request, capCheck
|
|||
ret.GrantingPolicies = []logical.PolicyInfo{{
|
||||
Name: "root",
|
||||
NamespaceId: "root",
|
||||
NamespacePath: "",
|
||||
Type: "acl",
|
||||
}}
|
||||
return
|
||||
|
|
|
@ -876,11 +876,13 @@ func TestACLGrantingPolicies(t *testing.T) {
|
|||
policyInfo := logical.PolicyInfo{
|
||||
Name: "granting_policy",
|
||||
NamespaceId: "root",
|
||||
NamespacePath: "",
|
||||
Type: "acl",
|
||||
}
|
||||
mergedInfo := logical.PolicyInfo{
|
||||
Name: "granting_policy_merged",
|
||||
NamespaceId: "root",
|
||||
NamespacePath: "",
|
||||
Type: "acl",
|
||||
}
|
||||
|
||||
|
|
|
@ -271,6 +271,7 @@ func addGrantingPoliciesToMap(m map[uint32][]logical.PolicyInfo, policy *Policy,
|
|||
m[capability] = append(m[capability], logical.PolicyInfo{
|
||||
Name: policy.Name,
|
||||
NamespaceId: policy.namespace.ID,
|
||||
NamespacePath: policy.namespace.Path,
|
||||
Type: "acl",
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue