Strip empty strings from database revocation stmts #5955
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
It's technically valid to give empty strings as statements to run on
most databases. However, in the case of revocation statements, it's not
only generally inadvisable but can lead to lack of revocations when you
expect them. This strips empty strings from the array of revocation
statements.
It also makes two other changes:
* Return statements on read as empty but valid arrays rather than nulls,
so that typing information is inferred (this is more in line with the
rest of Vault these days)
* Changes field data for TypeStringSlice and TypeCommaStringSlice such
that a client-supplied value of `""` doesn't turn into `[]string{""}`
but rather `[]string{}`.
The latter and the explicit revocation statement changes are related,
and defense in depth.
| @@ -159,6 +160,8 @@ func (b *databaseBackend) Role(ctx context.Context, s logical.Storage, roleName | |||
| result.Statements = stmts | |||
| } | |||
|
|
|||
| result.Statements.Revocation = strutil.RemoveEmpty(result.Statements.Revocation) | |||
There was a problem hiding this comment.
You might want to move this to below the compatibility helper call below
There was a problem hiding this comment.
I specifically didn't as I figured the compatibility helper will then operate on valid data. Do you think that's the wrong approach?
There was a problem hiding this comment.
No, i think it's fine here. I just looked and the compatability helper will not set an empty string into the array.
kalafut
reviewed
Dec 13, 2018
| if len(revStmts) > 0 { | ||
| role.Statements.Revocation = revStmts | ||
| } | ||
| role.Statements.Revocation = revocationStmtsRaw.([]string) |
There was a problem hiding this comment.
Should you still run remove empty on this value?
There was a problem hiding this comment.
It will still be run below.
kalafut
approved these changes
Dec 13, 2018
jefferai
added a commit
that referenced
this pull request
Dec 14, 2018
* Strip empty strings from database revocation stmts
It's technically valid to give empty strings as statements to run on
most databases. However, in the case of revocation statements, it's not
only generally inadvisable but can lead to lack of revocations when you
expect them. This strips empty strings from the array of revocation
statements.
It also makes two other changes:
* Return statements on read as empty but valid arrays rather than nulls,
so that typing information is inferred (this is more in line with the
rest of Vault these days)
* Changes field data for TypeStringSlice and TypeCommaStringSlice such
that a client-supplied value of `""` doesn't turn into `[]string{""}`
but rather `[]string{}`.
The latter and the explicit revocation statement changes are related,
and defense in depth.
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.
It's technically valid to give empty strings as statements to run on
most databases. However, in the case of revocation statements, it's not
only generally inadvisable but can lead to lack of revocations when you
expect them. This strips empty strings from the array of revocation
statements.
It also makes two other changes:
Return statements on read as empty but valid arrays rather than nulls,
so that typing information is inferred (this is more in line with the
rest of Vault these days)
Changes field data for TypeStringSlice and TypeCommaStringSlice such
that a client-supplied value of
""doesn't turn into[]string{""}but rather
[]string{}.The latter and the explicit revocation statement changes are related,
and defense in depth.