fix: Addressed permission error in redis v7 #4027 #4118
Merged
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
Signed-off-by: Kyle Morton <kylex.f.morton@intel.com>
|
Testing Notes: Unit test Tested in redis v6 & v7 |
bnevis-i
reviewed
Aug 4, 2022
| @@ -103,7 +103,7 @@ const ( | |||
| aclFileConfigTemplate = "aclfile {{.ACLFilePath}}" | |||
|
|
|||
| // aclDefaultUserTemplate is the ACL rule for "default" user | |||
| aclDefaultUserTemplate = "user {{.RedisUser}} on allkeys +@all -@dangerous #{{.Sha256RedisPwd}}" | |||
| aclDefaultUserTemplate = "user {{.RedisUser}} on allkeys &* +@all -@dangerous #{{.Sha256RedisPwd}}" | |||
There was a problem hiding this comment.
Suggested change
| aclDefaultUserTemplate = "user {{.RedisUser}} on allkeys &* +@all -@dangerous #{{.Sha256RedisPwd}}" | |
| aclDefaultUserTemplate = "user {{.RedisUser}} on allkeys allchannels +@all -@dangerous #{{.Sha256RedisPwd}}" |
| @@ -81,9 +81,9 @@ func TestGenerateACLConfig(t *testing.T) { | |||
| } | |||
|
|
|||
| require.Equal(t, 1, len(outputlines)) | |||
| require.Equal(t, fmt.Sprintf("user default on allkeys +@all -@dangerous #%x", | |||
| require.Equal(t, fmt.Sprintf("user default on allkeys &* +@all -@dangerous #%x", | |||
There was a problem hiding this comment.
Suggested change
| require.Equal(t, fmt.Sprintf("user default on allkeys &* +@all -@dangerous #%x", | |
| require.Equal(t, fmt.Sprintf("user default on allkeys allchannels +@all -@dangerous #%x", |
| sha256.Sum256([]byte(testFakePwd))), outputlines[0]) | ||
| // should not be equal if use different password | ||
| require.NotEqual(t, fmt.Sprintf("user default on allkeys +@all -@dangerous #%x", | ||
| require.NotEqual(t, fmt.Sprintf("user default on allkeys &* +@all -@dangerous #%x", |
There was a problem hiding this comment.
Suggested change
| require.NotEqual(t, fmt.Sprintf("user default on allkeys &* +@all -@dangerous #%x", | |
| require.NotEqual(t, fmt.Sprintf("user default on allkeys allchannels +@all -@dangerous #%x", |
Signed-off-by: Kyle Morton <kylex.f.morton@intel.com>
|
Kudos, SonarCloud Quality Gate passed!
|
bnevis-i
approved these changes
Aug 4, 2022
3 tasks
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.
Signed-off-by: Kyle Morton kylex.f.morton@intel.com
Closes #4027
PR Checklist
Please check if your PR fulfills the following requirements:
BREAKING CHANGE:describing the break)Testing Instructions
New Dependency Instructions (If applicable)