Fix duplicate key in connect-inject ACL policy #4434
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
This was referenced Nov 27, 2024
nathancoleman
added
pr/no-changelog
nathancoleman
commented
Nov 27, 2024
Comment on lines
925
to
940
| partition "part-1" { | ||
| mesh = "write" | ||
| acl = "write" | ||
| node_prefix "" { | ||
| policy = "write" | ||
| } | ||
| policy = "write" | ||
| acl = "write" | ||
| service_prefix "" { | ||
| policy = "write" | ||
| intentions = "write" | ||
| } | ||
| identity_prefix "" { | ||
| policy = "write" | ||
| intentions = "write" | ||
| } |
There was a problem hiding this comment.
You can see the bug here where acl = "write" winds up being included twice in the root of the policy whenever namespaces are disabled.
The later commit in this PR that adjusts the test assertions after the fix should indicate no scenario in which acl or any other type of rule is included twice at the same level.
sarahalsmiller
approved these changes
Nov 27, 2024
sarahalsmiller
added
backport/1.1.x
sarahalsmiller
added
backport/1.4.x
and removed
backport/1.1.x
This was referenced Nov 27, 2024
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.
Changes proposed in this PR
Stop including a duplicate
acl = "write"rule at the root level of the connect-inject ACL policy when namespaces are not enabled. The security patch in hashicorp/consul#21908 led to the connect-injector being unable to start up as its ACL policy is rejected by Consul.How I've tested this PR
acl = "write"never appears twice at the root level of the policy with any combination of flagsHow I expect reviewers to test this PR
Review commit-by-commit observing the above
Checklist