Browse Source

etcdserver: key, rangeEnd in []byte for auth

Gyu-Ho Lee 9 years ago
parent
commit
5d6af0b51f
2 changed files with 3 additions and 3 deletions
  1. 2 2
      etcdserver/apply.go
  2. 1 1
      etcdserver/v3_server.go

+ 2 - 2
etcdserver/apply.go

@@ -92,13 +92,13 @@ func (s *EtcdServer) applyV3Request(r *pb.InternalRaftRequest) *applyResult {
 
 	switch {
 	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)
 		} else {
 			ar.err = auth.ErrPermissionDenied
 		}
 	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)
 		} else {
 			ar.err = auth.ErrPermissionDenied

+ 1 - 1
etcdserver/v3_server.go

@@ -82,7 +82,7 @@ func (s *EtcdServer) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeRe
 			return nil, err
 		}
 		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 s.applyV3.Range(noTxn, r)