-
Notifications
You must be signed in to change notification settings - Fork 9.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
auth, etcdserver: separate auth checking apply from core apply #5672
Merged
heyitsanthony
merged 1 commit into
etcd-io:master
from
heyitsanthony:applier-auth-layer
Jun 15, 2016
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,95 @@ | ||
| // 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 := r.Header.Username | ||
| if needAdminPermission(r) && !aa.as.IsAdminPermitted(user) { | ||
| return &applyResult{err: auth.ErrPermissionDenied} | ||
| } | ||
| aa.user = user | ||
| ret := aa.applierV3.Apply(r) | ||
| aa.user = "" | ||
| return ret | ||
| } | ||
|
|
||
| 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 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about clearing
aa.userafter checking for ensuring the field is not used more than once?