mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Addresses #6188 Add --vault-password-file option to the ansible-vault command
This commit is contained in:
parent
1e33c96083
commit
7acd2f3a2d
1 changed files with 34 additions and 7 deletions
|
@ -52,9 +52,10 @@ def build_option_parser(action):
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
# options for all actions
|
# options for all actions
|
||||||
#parser.add_option('-p', '--password', help="encryption key")
|
|
||||||
#parser.add_option('-c', '--cipher', dest='cipher', default="AES", help="cipher to use")
|
#parser.add_option('-c', '--cipher', dest='cipher', default="AES", help="cipher to use")
|
||||||
parser.add_option('-d', '--debug', dest='debug', action="store_true", help="debug")
|
parser.add_option('--debug', dest='debug', action="store_true", help="debug")
|
||||||
|
parser.add_option('--vault-password-file', dest='password_file',
|
||||||
|
help="vault password file")
|
||||||
|
|
||||||
# options specific to actions
|
# options specific to actions
|
||||||
if action == "create":
|
if action == "create":
|
||||||
|
@ -100,11 +101,21 @@ def get_opt(options, k, defval=""):
|
||||||
# Command functions
|
# Command functions
|
||||||
#-------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
def _read_password(filename):
|
||||||
|
f = open(filename, "rb")
|
||||||
|
data = f.read()
|
||||||
|
f.close
|
||||||
|
return data
|
||||||
|
|
||||||
def execute_create(args, options, parser):
|
def execute_create(args, options, parser):
|
||||||
|
|
||||||
if len(args) > 1:
|
if len(args) > 1:
|
||||||
raise errors.AnsibleError("'create' does not accept more than one filename")
|
raise errors.AnsibleError("'create' does not accept more than one filename")
|
||||||
|
|
||||||
|
if not options.password_file:
|
||||||
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
|
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
|
||||||
|
else:
|
||||||
|
password = _read_password(options.password_file)
|
||||||
|
|
||||||
cipher = 'AES'
|
cipher = 'AES'
|
||||||
if hasattr(options, 'cipher'):
|
if hasattr(options, 'cipher'):
|
||||||
|
@ -115,7 +126,10 @@ def execute_create(args, options, parser):
|
||||||
|
|
||||||
def execute_decrypt(args, options, parser):
|
def execute_decrypt(args, options, parser):
|
||||||
|
|
||||||
|
if not options.password_file:
|
||||||
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
|
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
|
||||||
|
else:
|
||||||
|
password = _read_password(options.password_file)
|
||||||
|
|
||||||
cipher = 'AES'
|
cipher = 'AES'
|
||||||
if hasattr(options, 'cipher'):
|
if hasattr(options, 'cipher'):
|
||||||
|
@ -132,7 +146,10 @@ def execute_edit(args, options, parser):
|
||||||
if len(args) > 1:
|
if len(args) > 1:
|
||||||
raise errors.AnsibleError("create does not accept more than one filename")
|
raise errors.AnsibleError("create does not accept more than one filename")
|
||||||
|
|
||||||
|
if not options.password_file:
|
||||||
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
|
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
|
||||||
|
else:
|
||||||
|
password = _read_password(options.password_file)
|
||||||
|
|
||||||
cipher = None
|
cipher = None
|
||||||
|
|
||||||
|
@ -144,7 +161,11 @@ def execute_encrypt(args, options, parser):
|
||||||
|
|
||||||
if len(args) > 1:
|
if len(args) > 1:
|
||||||
raise errors.AnsibleError("'create' does not accept more than one filename")
|
raise errors.AnsibleError("'create' does not accept more than one filename")
|
||||||
|
|
||||||
|
if not options.password_file:
|
||||||
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
|
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
|
||||||
|
else:
|
||||||
|
password = _read_password(options.password_file)
|
||||||
|
|
||||||
cipher = 'AES'
|
cipher = 'AES'
|
||||||
if hasattr(options, 'cipher'):
|
if hasattr(options, 'cipher'):
|
||||||
|
@ -158,7 +179,13 @@ def execute_encrypt(args, options, parser):
|
||||||
|
|
||||||
def execute_rekey(args, options, parser):
|
def execute_rekey(args, options, parser):
|
||||||
|
|
||||||
password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, ask_new_vault_pass=True, confirm_new=True)
|
if not options.password_file:
|
||||||
|
password, __ = utils.ask_vault_passwords(ask_vault_pass=True)
|
||||||
|
else:
|
||||||
|
password = _read_password(options.password_file)
|
||||||
|
|
||||||
|
__, new_password = utils.ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=True, confirm_new=True)
|
||||||
|
|
||||||
cipher = None
|
cipher = None
|
||||||
for f in args:
|
for f in args:
|
||||||
this_editor = VaultEditor(cipher, password, f)
|
this_editor = VaultEditor(cipher, password, f)
|
||||||
|
|
Loading…
Reference in a new issue