internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't pass the cipher around so much

Browse Source 
It's unused and unnecessary; VaultLib can decide for itself what cipher
to use when encrypting. There's no need (and no provision) for the user
to override the cipher via options, so there's no need for code to see
if that has been done either.
This commit is contained in:
Abhijit Menon-Sen
2015-08-26 18:20:57 +05:30
parent 017566a2d9
commit f91ad3dabe
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ansible/cli/vault.py
View File

@@ -30,7 +30,6 @@ class VaultCLI(CLI):
""" Vault command line class """
VALID_ACTIONS = ("create", "decrypt", "edit", "encrypt", "rekey", "view")
CIPHER = 'AES256'
def __init__(self, args, display=None):
@@ -91,15 +90,13 @@ class VaultCLI(CLI):
if len(self.args) > 1:
raise AnsibleOptionsError("ansible-vault create can take only one filename argument")
cipher = getattr(self.options, 'cipher', self.CIPHER)
this_editor = VaultEditor(cipher, self.vault_pass, self.args[0])
this_editor = VaultEditor(self.vault_pass, self.args[0])
this_editor.create_file()
def execute_decrypt(self):
cipher = getattr(self.options, 'cipher', self.CIPHER)
for f in self.args:
this_editor = VaultEditor(cipher, self.vault_pass, f)
this_editor = VaultEditor(self.vault_pass, f)
this_editor.decrypt_file()
self.display.display("Decryption successful")
@@ -107,20 +104,19 @@ class VaultCLI(CLI):
def execute_edit(self):
for f in self.args:
this_editor = VaultEditor(None, self.vault_pass, f)
this_editor = VaultEditor(self.vault_pass, f)
this_editor.edit_file()
def execute_view(self):
for f in self.args:
this_editor = VaultEditor(None, self.vault_pass, f)
this_editor = VaultEditor(self.vault_pass, f)
this_editor.view_file()
def execute_encrypt(self):
cipher = getattr(self.options, 'cipher', self.CIPHER)
for f in self.args:
this_editor = VaultEditor(cipher, self.vault_pass, f)
this_editor = VaultEditor(self.vault_pass, f)
this_editor.encrypt_file()
self.display.display("Encryption successful")
@@ -136,7 +132,7 @@ class VaultCLI(CLI):
__, new_password = self.ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=True, confirm_new=True)
for f in self.args:
this_editor = VaultEditor(None, self.vault_pass, f)
this_editor = VaultEditor(self.vault_pass, f)
this_editor.rekey_file(new_password)
self.display.display("Rekey successful")