Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3032 from xiang90/refactor_update_role

Browse Source 
auth: refactor updateRole
This commit is contained in:
Xiang Li 2015-06-23 11:17:45 -07:00
commit 4f47a6ebfb
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etcdserver/auth/auth.go
View File

@ -353,15 +353,12 @@ func (s *Store) UpdateRole(role Role) (Role, error) {
}
return old, err
}
newRole, err := old.Merge(role)
newRole, err := old.merge(role)
if err != nil {
return old, err
}
if reflect.DeepEqual(old, newRole) {
if role.Revoke != nil || role.Grant != nil {
return old, authErr(http.StatusConflict, "Role not updated. Grant/Revoke lists didn't match any current permissions.")
}
return old, authErr(http.StatusBadRequest, "Role not updated. Use Grant/Revoke to update the role.")
return old, authErr(http.StatusBadRequest, "Role not updated. Use grant/revoke to update the role.")
}
_, err = s.updateResource("/roles/"+role.Role, newRole)
if err == nil {
@ -456,9 +453,9 @@ func (u User) CheckPassword(password string) bool {
return err == nil
}
// Merge for a role works the same as User above -- atomic Role application to
// merge for a role works the same as User above -- atomic Role application to
// each of the substructures.
func (r Role) Merge(n Role) (Role, error) {
func (r Role) merge(n Role) (Role, error) {
var out Role
var err error
if r.Role != n.Role {