Abstract generate-root authentication into the strategy interface #7698
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
vault/generate_root_recovery.go
Outdated
| return errors.New("recovery key verified but stored keys unsupported") | ||
| } | ||
|
|
||
| masterKeyShares, err := c.seal.GetStoredKeys(ctx) |
There was a problem hiding this comment.
This needs to support the new shamir as kek changes. Maybe @ncabatoff can help?
vishalnayak
force-pushed
the
generate-root-strategy
branch
from
98d960b
to
fed7bcf
Compare
* Adapt to new shamir-as-kek reality.
vishalnayak
force-pushed
the
generate-root-strategy
branch
from
2811dd7
to
f061112
Compare
| @@ -19,6 +19,25 @@ type generateRecoveryToken struct { | |||
| token *atomic.String | |||
| } | |||
|
|
|||
| func (g *generateRecoveryToken) authenticate(ctx context.Context, c *Core, combinedKey []byte) error { | |||
| key, err := c.unsealKeyToMasterKey(ctx, combinedKey) | |||
There was a problem hiding this comment.
If an old style shamir is in use wouldn't this return an error since VerifyMaster requires Vault to already be unsealed?
recovery mode). Instead, verify it in the authenticate methods.
briankassouf
approved these changes
Oct 23, 2019
ncabatoff
added a commit
that referenced
this pull request
Oct 24, 2019
ncabatoff
added a commit
that referenced
this pull request
Oct 24, 2019
catsby
added a commit
that referenced
this pull request
Oct 24, 2019
* master: changelog++ Update CHANGELOG.md Abstract generate-root authentication into the strategy interface (#7698) Changelog: clarify enterprise seal migration fix changelog++ Update transit docs to add aes128/p384/p521 information (#7718) Show versions that are active when delete_version_after is configured (#7685) changelog++ agent: fix data race on inmemSink's token (#7707) Use docker instead of an external LDAP server that sometimes goes down (#7522) changelog++ Fix a nil map pointer in mergeEntity. (#7711) changelog++ TestSysRekey_Verification would fail sometimes when recovery=true (#7710)
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.
No description provided.