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

etcdserver: key, rangeEnd in []byte for auth

Browse Source
This commit is contained in:
Gyu-Ho Lee 2016-06-13 14:17:46 -07:00
parent e9d2eb2b54
commit 5d6af0b51f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/apply.go
View File

@ -92,13 +92,13 @@ func (s *EtcdServer) applyV3Request(r *pb.InternalRaftRequest) *applyResult {
switch { switch {
case r.Range != nil: case r.Range != nil:
if s.AuthStore().IsRangePermitted(r.Header, string(r.Range.Key), string(r.Range.RangeEnd)) { if s.AuthStore().IsRangePermitted(r.Header, r.Range.Key, r.Range.RangeEnd) {
ar.resp, ar.err = s.applyV3.Range(noTxn, r.Range) ar.resp, ar.err = s.applyV3.Range(noTxn, r.Range)
} else { } else {
ar.err = auth.ErrPermissionDenied ar.err = auth.ErrPermissionDenied
} }
case r.Put != nil: case r.Put != nil:
if s.AuthStore().IsPutPermitted(r.Header, string(r.Put.Key)) { if s.AuthStore().IsPutPermitted(r.Header, r.Put.Key) {
ar.resp, ar.err = s.applyV3.Put(noTxn, r.Put) ar.resp, ar.err = s.applyV3.Put(noTxn, r.Put)
} else { } else {
ar.err = auth.ErrPermissionDenied ar.err = auth.ErrPermissionDenied

2
etcdserver/v3_server.go
View File

@ -82,7 +82,7 @@ func (s *EtcdServer) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeRe
return nil, err return nil, err
} }
hdr := &pb.RequestHeader{Username: user} hdr := &pb.RequestHeader{Username: user}
if !s.AuthStore().IsRangePermitted(hdr, string(r.Key), string(r.RangeEnd)) { if !s.AuthStore().IsRangePermitted(hdr, r.Key, r.RangeEnd) {
return nil, auth.ErrPermissionDenied return nil, auth.ErrPermissionDenied
} }
return s.applyV3.Range(noTxn, r) return s.applyV3.Range(noTxn, r)