Approle: Fix CIDR validation for /32 masks on Token Bound CIDRs #18145
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
davidadeleon
requested review from
jasonodonnell,
ltcarbonell and
elliesterner
ltcarbonell
approved these changes
Dec 1, 2022
elliesterner
approved these changes
Dec 2, 2022
hghaf099
reviewed
Dec 9, 2022
This was referenced Dec 16, 2022
AnPucel
pushed a commit
that referenced
this pull request
Jan 14, 2023
* Fix CIDR validation for /32 masks * run go fmt * add changelog
AnPucel
pushed a commit
that referenced
this pull request
Feb 3, 2023
* Fix CIDR validation for /32 masks * run go fmt * add changelog
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.
This PR fixes an issue when attempting to use /32 CIDR blocks for Token Bound CIDR restrictions and Secret ID CIDR restrictions. When setting
token_bound_cidrson a role definition containing a CIDR block with the /32 mask, the block gets stored as a single IP address string. When settingtoken_bound_cidrswhen generating a new Secret ID, Vault validates that the blocks defined in the Secret ID configuration are a subset of the CIDR blocks defined on the role. In the case of a /32 mask, since we store it as a single IP without the mask, this validation fails. This change checks for any blocks that may exist in thetoken_bound_cidrsconfiguration on the role definition that do not have a mask, and append a/32to the block to allow for proper validation.