-
Notifications
You must be signed in to change notification settings - Fork 9.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auth, etcdserver: separate auth checking apply from core apply
- Loading branch information
Anthony Romano
committed
Jun 15, 2016
1 parent
16d86fd
commit 84ba5ea
Showing
5 changed files
with
159 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // Copyright 2016 The etcd Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package etcdserver | ||
|
|
||
| import ( | ||
| "github.com/coreos/etcd/auth" | ||
| pb "github.com/coreos/etcd/etcdserver/etcdserverpb" | ||
| ) | ||
|
|
||
| type authApplierV3 struct { | ||
| applierV3 | ||
| as auth.AuthStore | ||
| user string | ||
| } | ||
|
|
||
| func newAuthApplierV3(as auth.AuthStore, base applierV3) *authApplierV3 { | ||
| return &authApplierV3{base, as, ""} | ||
| } | ||
|
|
||
| func (aa *authApplierV3) Apply(r *pb.InternalRaftRequest) *applyResult { | ||
| user, err := aa.username(r) | ||
| if err != nil { | ||
| return &applyResult{err: err} | ||
| } | ||
| aa.user = user | ||
| return aa.applierV3.Apply(r) | ||
| } | ||
|
|
||
| func (aa *authApplierV3) Put(txnID int64, r *pb.PutRequest) (*pb.PutResponse, error) { | ||
| if !aa.as.IsPutPermitted(aa.user, r.Key) { | ||
| return nil, auth.ErrPermissionDenied | ||
| } | ||
| return aa.applierV3.Put(txnID, r) | ||
| } | ||
|
|
||
| func (aa *authApplierV3) Range(txnID int64, r *pb.RangeRequest) (*pb.RangeResponse, error) { | ||
| if !aa.as.IsRangePermitted(aa.user, r.Key, r.RangeEnd) { | ||
| return nil, auth.ErrPermissionDenied | ||
| } | ||
| return aa.applierV3.Range(txnID, r) | ||
| } | ||
|
|
||
| func (aa *authApplierV3) DeleteRange(txnID int64, r *pb.DeleteRangeRequest) (*pb.DeleteRangeResponse, error) { | ||
| if !aa.as.IsDeleteRangePermitted(aa.user, r.Key, r.RangeEnd) { | ||
| return nil, auth.ErrPermissionDenied | ||
| } | ||
| return aa.applierV3.DeleteRange(txnID, r) | ||
| } | ||
|
|
||
| func (aa *authApplierV3) username(r *pb.InternalRaftRequest) (string, error) { | ||
| user := r.Header.Username | ||
| if needAdminPermission(r) && !aa.as.IsAdminPermitted(user) { | ||
| return "", auth.ErrPermissionDenied | ||
| } | ||
| return user, nil | ||
| } | ||
|
|
||
| func needAdminPermission(r *pb.InternalRaftRequest) bool { | ||
| switch { | ||
| case r.AuthEnable != nil: | ||
| return true | ||
| case r.AuthDisable != nil: | ||
| return true | ||
| case r.AuthUserAdd != nil: | ||
| return true | ||
| case r.AuthUserDelete != nil: | ||
| return true | ||
| case r.AuthUserChangePassword != nil: | ||
| return true | ||
| case r.AuthUserGrantRole != nil: | ||
| return true | ||
| case r.AuthUserGet != nil: | ||
| return true | ||
| case r.AuthUserRevokeRole != nil: | ||
| return true | ||
| case r.AuthRoleAdd != nil: | ||
| return true | ||
| case r.AuthRoleGrantPermission != nil: | ||
| return true | ||
| case r.AuthRoleGet != nil: | ||
| return true | ||
| case r.AuthRoleRevokePermission != nil: | ||
| return true | ||
| case r.AuthRoleDelete != nil: | ||
| return true | ||
| default: | ||
| return false | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters