Fix 'New Vault password' on vault 'edit' #35923
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
ansibot
added
bugfix_pull_request
needs_triage
|
The test |
ansibot
added
the
needs_revision
samdoran
removed
the
needs_triage
ansibot
removed
the
needs_revision
| @@ -181,7 +181,7 @@ def run(self): | |||
| if not vault_secrets: | |||
| raise AnsibleOptionsError("A vault password is required to use Ansible's Vault") | |||
|
|
|||
| if self.action in ['encrypt', 'encrypt_string', 'create', 'edit']: | |||
| if self.action in ['encrypt', 'encrypt_string', 'create']: | |||
There was a problem hiding this comment.
So following on from my comment in #35834 I thought you added the edit action in PR #31067 to solve #30491
I'm not saying either way is right or wrong, simply asking the question seeing as an issue of the same type introduced a fix, now that code is being removed. Just trying to provide context here.
There was a problem hiding this comment.
In #31067 I thought I was going to try to let the encrypt-vault-id be chosen/overridden for 'edit' but have since decided not to allow that and to always use the decrypt vault-id as the encrypt vault-id for 'edit'.
ansibot
added
stale_ci
ffe0dde introduce a change on 'ansible-vault edit' that tried to check for --encrypt-vault-id in that mode. But '--encrypt-vault-id' is not intended for 'edit' since the 'edit' should always reuse the vault secret that was used to decrypt the text. Change cli to not check for --encrypt-vault-id on 'edit'. VaultLib.decrypt_and_get_vault_id() was change to return the vault secret used to decrypt (in addition to vault_id and the plaintext). VaultEditor.edit_file() will now use 'vault_secret_used' as returned from decrypt_and_get_vault_id() so that an edited file always gets reencrypted with the same secret, regardless of any vault id configuration or cli options. Fixes #35834
ansibot
removed
the
stale_ci
|
Would love for this to be merged! |
This was referenced Mar 27, 2018
ryancurrah
pushed a commit
to ryancurrah/ansible
that referenced
this pull request
Apr 4, 2018
* Fix 'New Vault password' on vault 'edit' ffe0dde introduce a change on 'ansible-vault edit' that tried to check for --encrypt-vault-id in that mode. But '--encrypt-vault-id' is not intended for 'edit' since the 'edit' should always reuse the vault secret that was used to decrypt the text. Change cli to not check for --encrypt-vault-id on 'edit'. VaultLib.decrypt_and_get_vault_id() was change to return the vault secret used to decrypt (in addition to vault_id and the plaintext). VaultEditor.edit_file() will now use 'vault_secret_used' as returned from decrypt_and_get_vault_id() so that an edited file always gets reencrypted with the same secret, regardless of any vault id configuration or cli options. Fixes ansible#35834
nitzmahone
pushed a commit
that referenced
this pull request
Apr 9, 2018
* Fix 'New Vault password' on vault 'edit' ffe0dde introduce a change on 'ansible-vault edit' that tried to check for --encrypt-vault-id in that mode. But '--encrypt-vault-id' is not intended for 'edit' since the 'edit' should always reuse the vault secret that was used to decrypt the text. Change cli to not check for --encrypt-vault-id on 'edit'. VaultLib.decrypt_and_get_vault_id() was change to return the vault secret used to decrypt (in addition to vault_id and the plaintext). VaultEditor.edit_file() will now use 'vault_secret_used' as returned from decrypt_and_get_vault_id() so that an edited file always gets reencrypted with the same secret, regardless of any vault id configuration or cli options. Fixes #35834 (cherry picked from commit 6e737c8)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
ffe0dde introduce a
change on 'ansible-vault edit' that tried to check
for --encrypt-vault-id in that mode. But '--encrypt-vault-id'
is not intended for 'edit' since the 'edit' should always
reuse the vault secret that was used to decrypt the text.
Change cli to not check for --encrypt-vault-id on 'edit'.
VaultLib.decrypt_and_get_vault_id() was change to return
the vault secret used to decrypt (in addition to vault_id
and the plaintext).
VaultEditor.edit_file() will now use 'vault_secret_used'
as returned from decrypt_and_get_vault_id() so that
an edited file always gets reencrypted with the same
secret, regardless of any vault id configuration or
cli options.
Fixes #35834
ISSUE TYPE
COMPONENT NAME
lib/ansible/cli/vault.py
lib/ansible/parsing/vault/init.py
ANSIBLE VERSION
ADDITIONAL INFORMATION