backport of commit c73eacbaf6ae6b5860e1ad9a3b6ce930c093a105 (#23174)
Co-authored-by: akshya96 <87045294+akshya96@users.noreply.github.com>
This commit is contained in:
parent
e5bee669e4
commit
693ba0eddc
|
@ -0,0 +1,3 @@
|
||||||
|
```release-note:bug
|
||||||
|
core: Fixes list password policy to include those with names containing / characters.
|
||||||
|
```
|
|
@ -3003,11 +3003,13 @@ const (
|
||||||
|
|
||||||
// handlePoliciesPasswordList returns the list of password policies
|
// handlePoliciesPasswordList returns the list of password policies
|
||||||
func (*SystemBackend) handlePoliciesPasswordList(ctx context.Context, req *logical.Request, data *framework.FieldData) (resp *logical.Response, err error) {
|
func (*SystemBackend) handlePoliciesPasswordList(ctx context.Context, req *logical.Request, data *framework.FieldData) (resp *logical.Response, err error) {
|
||||||
keys, err := req.Storage.List(ctx, "password_policy/")
|
keys, err := logical.CollectKeysWithPrefix(ctx, req.Storage, "password_policy/")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
for i := range keys {
|
||||||
|
keys[i] = strings.TrimPrefix(keys[i], "password_policy/")
|
||||||
|
}
|
||||||
return logical.ListResponse(keys), nil
|
return logical.ListResponse(keys), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4671,6 +4671,66 @@ func TestHandlePoliciesPasswordList(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"policy with /": {
|
||||||
|
storage: makeStorage(t,
|
||||||
|
&logical.StorageEntry{
|
||||||
|
Key: getPasswordPolicyKey("testpolicy/testpolicy1"),
|
||||||
|
Value: toJson(t,
|
||||||
|
passwordPolicyConfig{
|
||||||
|
HCLPolicy: "length = 18\n" +
|
||||||
|
"rule \"charset\" {\n" +
|
||||||
|
" charset=\"ABCDEFGHIJ\"\n" +
|
||||||
|
"}",
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
|
||||||
|
expectedResp: &logical.Response{
|
||||||
|
Data: map[string]interface{}{
|
||||||
|
"keys": []string{"testpolicy/testpolicy1"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"list path/to/policy": {
|
||||||
|
storage: makeStorage(t,
|
||||||
|
&logical.StorageEntry{
|
||||||
|
Key: getPasswordPolicyKey("path/to/policy"),
|
||||||
|
Value: toJson(t,
|
||||||
|
passwordPolicyConfig{
|
||||||
|
HCLPolicy: "length = 18\n" +
|
||||||
|
"rule \"charset\" {\n" +
|
||||||
|
" charset=\"ABCDEFGHIJ\"\n" +
|
||||||
|
"}",
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
|
||||||
|
expectedResp: &logical.Response{
|
||||||
|
Data: map[string]interface{}{
|
||||||
|
"keys": []string{"path/to/policy"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"policy ending with /": {
|
||||||
|
storage: makeStorage(t,
|
||||||
|
&logical.StorageEntry{
|
||||||
|
Key: getPasswordPolicyKey("path/to/policy/"),
|
||||||
|
Value: toJson(t,
|
||||||
|
passwordPolicyConfig{
|
||||||
|
HCLPolicy: "length = 18\n" +
|
||||||
|
"rule \"charset\" {\n" +
|
||||||
|
" charset=\"ABCDEFGHIJ\"\n" +
|
||||||
|
"}",
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
|
||||||
|
expectedResp: &logical.Response{
|
||||||
|
Data: map[string]interface{}{
|
||||||
|
"keys": []string{"path/to/policy/"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
"storage failure": {
|
"storage failure": {
|
||||||
storage: new(logical.InmemStorage).FailList(true),
|
storage: new(logical.InmemStorage).FailList(true),
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue