etcd/auth: fix range handling bugs. #6404
Merged
+23
−8
Conversation
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
glycerine
force-pushed
the
range_fixes
branch
from
3a9c2c7 to
fd1d20e
Compare
| func isSubset(a, b *rangePerm) bool { | ||
| switch { | ||
| case len(a.end) == 0 && len(b.end) == 0: | ||
| // a, b are both keys | ||
| return bytes.Equal(a.begin, b.begin) | ||
| case len(b.end) == 0: | ||
| // b is a key, a is a range | ||
| // b is a key, a is a range (even a prefix range has infinite membership) |
There was a problem hiding this comment.
Maybe the part (even a prefix range has infinite membership) is outdated?
|
Thanks a lot! I commented on two points which would need to be fixed. |
|
Also, please update the commit log title to |
Test 15, counting from zero, in TestGetMergedPerms in etcd/auth/range_perm_cache_test.go, was trying incorrectly assert that [a, b) merged with [b, "") should be [a, b). Added a test specifically for this. This patch fixes the incorrect larger test and the bugs in the code that it was hiding. Fixes etcd-io#6359
glycerine
force-pushed
the
range_fixes
branch
from
fd1d20e to
ef1ef0b
Compare
|
all requested updates done. |
|
lgtm |
|
@glycerine Thanks a lot! |
|
@glycerine thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As discussed in #6359, I found some range handling
bugs and fixed them while looking at how to add
prefix based auth. I had a few minutes and put
together this cherry picked pr that contains only
the bug fixes, and no prefix expansion.
Test 15, counting from zero, in TestGetMergedPerms
in etcd/auth/range_perm_cache_test.go, was trying
incorrectly assert that [a, b) merged with [b, "")
should be [a, b). Added a test specifically for
this. This patch also fixes the incorrect larger test
and the bugs in the code that it was hiding.
Fixes #6359