MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-24 21:23:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reload etcd users and policies properly (#6694)

Browse Source 
Currently there was a bug in how we reload users and policies
which leads to users/policies going missing due to wrong path
construction.

Fixes #6693
This commit is contained in:
Harshavardhana 2018-10-24 17:40:06 -07:00 committed by kannappanr
parent fde8c38638
commit bf66e9a529
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/iam.go
View File

@ -458,7 +458,7 @@ func reloadEtcdUsers(prefix string, usersMap map[string]auth.Credentials, policy
// prefix := "config/iam/users/" // prefix := "config/iam/users/"
// v := trim(trim(key, prefix), base(key)) == "newuser" // v := trim(trim(key, prefix), base(key)) == "newuser"
// //
user := strings.TrimSuffix(strings.TrimSuffix(string(kv.Key), prefix), path.Base(string(kv.Key))) user := path.Clean(strings.TrimSuffix(strings.TrimPrefix(string(kv.Key), prefix), path.Base(string(kv.Key))))
if !users.Contains(user) { if !users.Contains(user) {
users.Add(user) users.Add(user)
} }
@ -497,7 +497,7 @@ func reloadEtcdUsers(prefix string, usersMap map[string]auth.Credentials, policy
if err = json.Unmarshal(pdata, &policyName); err != nil { if err = json.Unmarshal(pdata, &policyName); err != nil {
return err return err
} }
policyMap[path.Base(prefix)] = policyName policyMap[user] = policyName
} }
} }
return nil return nil
@ -521,11 +521,11 @@ func reloadEtcdPolicies(prefix string, cannedPolicyMap map[string]iampolicy.Poli
// then strip off the remaining basename to obtain the prefix // then strip off the remaining basename to obtain the prefix
// value, usually in the following form. // value, usually in the following form.
// //
// key := "config/iam/policys/newpolicy/identity.json" // key := "config/iam/policies/newpolicy/identity.json"
// prefix := "config/iam/policys/" // prefix := "config/iam/policies/"
// v := trim(trim(key, prefix), base(key)) == "newpolicy" // v := trim(trim(key, prefix), base(key)) == "newpolicy"
// //
policyName := strings.TrimSuffix(strings.TrimSuffix(string(kv.Key), prefix), path.Base(string(kv.Key))) policyName := path.Clean(strings.TrimSuffix(strings.TrimPrefix(string(kv.Key), prefix), path.Base(string(kv.Key))))
if !policies.Contains(policyName) { if !policies.Contains(policyName) {
policies.Add(policyName) policies.Add(policyName)
} }
@ -542,7 +542,7 @@ func reloadEtcdPolicies(prefix string, cannedPolicyMap map[string]iampolicy.Poli
if err = json.Unmarshal(pdata, &p); err != nil { if err = json.Unmarshal(pdata, &p); err != nil {
return err return err
} }
cannedPolicyMap[path.Base(prefix)] = p cannedPolicyMap[policyName] = p
} }
return nil return nil
} }