|
|
|
# (c) 2017, Adrian Likins <alikins@redhat.com>
|
|
|
|
#
|
|
|
|
# This file is part of Ansible
|
|
|
|
#
|
|
|
|
# Ansible is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# Ansible is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
import unittest
|
|
|
|
from unittest.mock import patch, MagicMock
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
|
|
|
|
from units.mock.loader import DictDataLoader
|
|
|
|
|
|
|
|
from ansible.release import __version__
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
from ansible.parsing import vault
|
|
|
|
from ansible import cli
|
|
|
|
|
|
|
|
|
|
|
|
class TestCliVersion(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_version_info(self):
|
|
|
|
version_info = cli.CLI.version_info()
|
|
|
|
self.assertEqual(version_info['string'], __version__)
|
|
|
|
|
|
|
|
def test_version_info_gitinfo(self):
|
|
|
|
version_info = cli.CLI.version_info(gitinfo=True)
|
|
|
|
self.assertIn('python version', version_info['string'])
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
|
|
|
|
|
|
|
|
class TestCliBuildVaultIds(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
self.tty_patcher = patch('ansible.cli.sys.stdin.isatty', return_value=True)
|
|
|
|
self.mock_isatty = self.tty_patcher.start()
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
self.tty_patcher.stop()
|
|
|
|
|
|
|
|
def test(self):
|
|
|
|
res = cli.CLI.build_vault_ids(['foo@bar'])
|
|
|
|
self.assertEqual(res, ['foo@bar'])
|
|
|
|
|
|
|
|
def test_no_vault_id_no_auto_prompt(self):
|
|
|
|
# simulate 'ansible-playbook site.yml' with out --ask-vault-pass, should not prompt
|
|
|
|
res = cli.CLI.build_vault_ids([], auto_prompt=False)
|
|
|
|
self.assertEqual(res, [])
|
|
|
|
|
|
|
|
def test_no_vault_ids_auto_prompt(self):
|
|
|
|
# create_new_password=False
|
|
|
|
# simulate 'ansible-vault edit encrypted.yml'
|
|
|
|
res = cli.CLI.build_vault_ids([], auto_prompt=True)
|
|
|
|
self.assertEqual(res, ['default@prompt_ask_vault_pass'])
|
|
|
|
|
|
|
|
def test_no_vault_ids_auto_prompt_ask_vault_pass(self):
|
|
|
|
# create_new_password=False
|
|
|
|
# simulate 'ansible-vault edit --ask-vault-pass encrypted.yml'
|
|
|
|
res = cli.CLI.build_vault_ids([], auto_prompt=True, ask_vault_pass=True)
|
|
|
|
self.assertEqual(res, ['default@prompt_ask_vault_pass'])
|
|
|
|
|
|
|
|
def test_no_vault_id_ask_vault_pass(self):
|
|
|
|
res = cli.CLI.build_vault_ids([], ask_vault_pass=True)
|
|
|
|
self.assertEqual(res, ['default@prompt_ask_vault_pass'])
|
|
|
|
|
|
|
|
def test_no_vault_ids_password_files(self):
|
|
|
|
res = cli.CLI.build_vault_ids([], vault_password_files=['some-password-file'])
|
|
|
|
self.assertEqual(res, ['default@some-password-file'])
|
|
|
|
|
|
|
|
def test_everything(self):
|
|
|
|
res = cli.CLI.build_vault_ids(['blip@prompt', 'baz@prompt_ask_vault_pass',
|
|
|
|
'some-password-file', 'qux@another-password-file'],
|
|
|
|
vault_password_files=['yet-another-password-file',
|
|
|
|
'one-more-password-file'],
|
|
|
|
ask_vault_pass=True,
|
|
|
|
auto_prompt=False)
|
|
|
|
|
|
|
|
self.assertEqual(set(res), set(['blip@prompt', 'baz@prompt_ask_vault_pass',
|
|
|
|
'default@prompt_ask_vault_pass',
|
|
|
|
'some-password-file', 'qux@another-password-file',
|
|
|
|
'default@yet-another-password-file',
|
|
|
|
'default@one-more-password-file']))
|
|
|
|
|
|
|
|
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
class TestCliSetupVaultSecrets(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
|
|
self.fake_loader = DictDataLoader({})
|
|
|
|
self.tty_patcher = patch('ansible.cli.sys.stdin.isatty', return_value=True)
|
|
|
|
self.mock_isatty = self.tty_patcher.start()
|
|
|
|
|
|
|
|
self.display_v_patcher = patch('ansible.cli.display.verbosity', return_value=6)
|
|
|
|
self.mock_display_v = self.display_v_patcher.start()
|
|
|
|
cli.display.verbosity = 5
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
self.tty_patcher.stop()
|
|
|
|
self.display_v_patcher.stop()
|
|
|
|
cli.display.verbosity = 0
|
|
|
|
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
def test(self):
|
|
|
|
res = cli.CLI.setup_vault_secrets(None, None, auto_prompt=False)
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
|
|
|
|
@patch('ansible.cli.get_file_vault_secret')
|
|
|
|
def test_password_file(self, mock_file_secret):
|
|
|
|
filename = '/dev/null/secret'
|
|
|
|
mock_file_secret.return_value = MagicMock(bytes=b'file1_password',
|
|
|
|
vault_id='file1',
|
|
|
|
filename=filename)
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
vault_ids=['secret1@%s' % filename, 'secret2'],
|
|
|
|
vault_password_files=[filename])
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
matches = vault.match_secrets(res, ['secret1'])
|
|
|
|
self.assertIn('secret1', [x[0] for x in matches])
|
|
|
|
match = matches[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'file1_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='prompt1')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
vault_ids=['prompt1@prompt'],
|
|
|
|
ask_vault_pass=True,
|
|
|
|
auto_prompt=False)
|
Support multiple vault passwords (#22756)
Fixes #13243
** Add --vault-id to name/identify multiple vault passwords
Use --vault-id to indicate id and path/type
--vault-id=prompt # prompt for default vault id password
--vault-id=myorg@prompt # prompt for a vault_id named 'myorg'
--vault-id=a_password_file # load ./a_password_file for default id
--vault-id=myorg@a_password_file # load file for 'myorg' vault id
vault_id's are created implicitly for existing --vault-password-file
and --ask-vault-pass options.
Vault ids are just for UX purposes and bookkeeping. Only the vault
payload and the password bytestring is needed to decrypt a
vault blob.
Replace passing password around everywhere with
a VaultSecrets object.
If we specify a vault_id, mention that in password prompts
Specifying multiple -vault-password-files will
now try each until one works
** Rev vault format in a backwards compatible way
The 1.2 vault format adds the vault_id to the header line
of the vault text. This is backwards compatible with older
versions of ansible. Old versions will just ignore it and
treat it as the default (and only) vault id.
Note: only 2.4+ supports multiple vault passwords, so while
earlier ansible versions can read the vault-1.2 format, it
does not make them magically support multiple vault passwords.
use 1.1 format for 'default' vault_id
Vaulted items that need to include a vault_id will be
written in 1.2 format.
If we set a new DEFAULT_VAULT_IDENTITY, then the default will
use version 1.2
vault will only use a vault_id if one is specified. So if none
is specified and C.DEFAULT_VAULT_IDENTITY is 'default'
we use the old format.
** Changes/refactors needed to implement multiple vault passwords
raise exceptions on decrypt fail, check vault id early
split out parsing the vault plaintext envelope (with the
sha/original plaintext) to _split_plaintext_envelope()
some cli fixups for specifying multiple paths in
the unfrack_paths optparse callback
fix py3 dict.keys() 'dict_keys object is not indexable' error
pluralize cli.options.vault_password_file -> vault_password_files
pluralize cli.options.new_vault_password_file -> new_vault_password_files
pluralize cli.options.vault_id -> cli.options.vault_ids
** Add a config option (vault_id_match) to force vault id matching.
With 'vault_id_match=True' and an ansible
vault that provides a vault_id, then decryption will require
that a matching vault_id is required. (via
--vault-id=my_vault_id@password_file, for ex).
In other words, if the config option is true, then only
the vault secrets with matching vault ids are candidates for
decrypting a vault. If option is false (the default), then
all of the provided vault secrets will be selected.
If a user doesn't want all vault secrets to be tried to
decrypt any vault content, they can enable this option.
Note: The vault id used for the match is not encrypted or
cryptographically signed. It is just a label/id/nickname used
for referencing a specific vault secret.
7 years ago
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
matches = vault.match_secrets(res, ['prompt1'])
|
|
|
|
self.assertIn('prompt1', [x[0] for x in matches])
|
|
|
|
match = matches[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'prompt1_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_no_tty(self, mock_prompt_secret):
|
|
|
|
self.mock_isatty.return_value = False
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='prompt1',
|
|
|
|
name='bytes_should_be_prompt1_password',
|
|
|
|
spec=vault.PromptVaultSecret)
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['prompt1@prompt'],
|
|
|
|
ask_vault_pass=True,
|
|
|
|
auto_prompt=False)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
self.assertEqual(len(res), 2)
|
|
|
|
matches = vault.match_secrets(res, ['prompt1'])
|
|
|
|
self.assertIn('prompt1', [x[0] for x in matches])
|
|
|
|
self.assertEqual(len(matches), 1)
|
|
|
|
|
|
|
|
@patch('ansible.cli.get_file_vault_secret')
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_no_tty_and_password_file(self, mock_prompt_secret, mock_file_secret):
|
|
|
|
self.mock_isatty.return_value = False
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='prompt1')
|
|
|
|
filename = '/dev/null/secret'
|
|
|
|
mock_file_secret.return_value = MagicMock(bytes=b'file1_password',
|
|
|
|
vault_id='file1',
|
|
|
|
filename=filename)
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['prompt1@prompt', 'file1@/dev/null/secret'],
|
|
|
|
ask_vault_pass=True)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
matches = vault.match_secrets(res, ['file1'])
|
|
|
|
self.assertIn('file1', [x[0] for x in matches])
|
|
|
|
self.assertNotIn('prompt1', [x[0] for x in matches])
|
|
|
|
match = matches[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'file1_password')
|
|
|
|
|
|
|
|
def _assert_ids(self, vault_id_names, res, password=b'prompt1_password'):
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
len_ids = len(vault_id_names)
|
|
|
|
matches = vault.match_secrets(res, vault_id_names)
|
|
|
|
self.assertEqual(len(res), len_ids, 'len(res):%s does not match len_ids:%s' % (len(res), len_ids))
|
|
|
|
self.assertEqual(len(matches), len_ids)
|
|
|
|
for index, prompt in enumerate(vault_id_names):
|
|
|
|
self.assertIn(prompt, [x[0] for x in matches])
|
|
|
|
# simple mock, same password/prompt for each mock_prompt_secret
|
|
|
|
self.assertEqual(matches[index][1].bytes, password)
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_multiple_prompts(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='prompt1')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['prompt1@prompt',
|
|
|
|
'prompt2@prompt'],
|
|
|
|
ask_vault_pass=False)
|
|
|
|
|
|
|
|
vault_id_names = ['prompt1', 'prompt2']
|
|
|
|
self._assert_ids(vault_id_names, res)
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_multiple_prompts_and_ask_vault_pass(self, mock_prompt_secret):
|
|
|
|
self.mock_isatty.return_value = False
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='prompt1')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['prompt1@prompt',
|
|
|
|
'prompt2@prompt',
|
|
|
|
'prompt3@prompt_ask_vault_pass'],
|
|
|
|
ask_vault_pass=True)
|
|
|
|
|
|
|
|
# We provide some vault-ids and secrets, so auto_prompt shouldn't get triggered,
|
|
|
|
# so there is
|
|
|
|
vault_id_names = ['prompt1', 'prompt2', 'prompt3', 'default']
|
|
|
|
self._assert_ids(vault_id_names, res)
|
|
|
|
|
|
|
|
@patch('ansible.cli.C')
|
|
|
|
@patch('ansible.cli.get_file_vault_secret')
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_default_file_vault(self, mock_prompt_secret,
|
|
|
|
mock_file_secret,
|
|
|
|
mock_config):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='default')
|
|
|
|
mock_file_secret.return_value = MagicMock(bytes=b'file1_password',
|
|
|
|
vault_id='default')
|
|
|
|
mock_config.DEFAULT_VAULT_PASSWORD_FILE = '/dev/null/faux/vault_password_file'
|
|
|
|
mock_config.DEFAULT_VAULT_IDENTITY = 'default'
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=[],
|
|
|
|
create_new_password=False,
|
|
|
|
ask_vault_pass=False)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
matches = vault.match_secrets(res, ['default'])
|
|
|
|
# --vault-password-file/DEFAULT_VAULT_PASSWORD_FILE is higher precendce than prompts
|
|
|
|
# if the same vault-id ('default') regardless of cli order since it didn't matter in 2.3
|
|
|
|
|
|
|
|
self.assertEqual(matches[0][1].bytes, b'file1_password')
|
|
|
|
self.assertEqual(len(matches), 1)
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=[],
|
|
|
|
create_new_password=False,
|
|
|
|
ask_vault_pass=True,
|
|
|
|
auto_prompt=True)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
matches = vault.match_secrets(res, ['default'])
|
|
|
|
self.assertEqual(matches[0][1].bytes, b'file1_password')
|
|
|
|
self.assertEqual(matches[1][1].bytes, b'prompt1_password')
|
|
|
|
self.assertEqual(len(matches), 2)
|
|
|
|
|
|
|
|
@patch('ansible.cli.get_file_vault_secret')
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_default_file_vault_identity_list(self, mock_prompt_secret,
|
|
|
|
mock_file_secret):
|
|
|
|
default_vault_ids = ['some_prompt@prompt',
|
|
|
|
'some_file@/dev/null/secret']
|
|
|
|
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'some_prompt_password',
|
|
|
|
vault_id='some_prompt')
|
|
|
|
|
|
|
|
filename = '/dev/null/secret'
|
|
|
|
mock_file_secret.return_value = MagicMock(bytes=b'some_file_password',
|
|
|
|
vault_id='some_file',
|
|
|
|
filename=filename)
|
|
|
|
|
|
|
|
vault_ids = default_vault_ids
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=vault_ids,
|
|
|
|
create_new_password=False,
|
|
|
|
ask_vault_pass=True)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
matches = vault.match_secrets(res, ['some_file'])
|
|
|
|
# --vault-password-file/DEFAULT_VAULT_PASSWORD_FILE is higher precendce than prompts
|
|
|
|
# if the same vault-id ('default') regardless of cli order since it didn't matter in 2.3
|
|
|
|
self.assertEqual(matches[0][1].bytes, b'some_file_password')
|
|
|
|
matches = vault.match_secrets(res, ['some_prompt'])
|
|
|
|
self.assertEqual(matches[0][1].bytes, b'some_prompt_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_just_ask_vault_pass(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='default')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=[],
|
|
|
|
create_new_password=False,
|
|
|
|
ask_vault_pass=True)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
match = vault.match_secrets(res, ['default'])[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'prompt1_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_new_password_ask_vault_pass(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='default')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=[],
|
|
|
|
create_new_password=True,
|
|
|
|
ask_vault_pass=True)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
match = vault.match_secrets(res, ['default'])[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'prompt1_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_new_password_vault_id_prompt(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='some_vault_id')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['some_vault_id@prompt'],
|
|
|
|
create_new_password=True,
|
|
|
|
ask_vault_pass=False)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
match = vault.match_secrets(res, ['some_vault_id'])[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'prompt1_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_new_password_vault_id_prompt_ask_vault_pass(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='default')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['some_vault_id@prompt_ask_vault_pass'],
|
|
|
|
create_new_password=True,
|
|
|
|
ask_vault_pass=False)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
match = vault.match_secrets(res, ['some_vault_id'])[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'prompt1_password')
|
|
|
|
|
|
|
|
@patch('ansible.cli.PromptVaultSecret')
|
|
|
|
def test_prompt_new_password_vault_id_prompt_ask_vault_pass_ask_vault_pass(self, mock_prompt_secret):
|
|
|
|
mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
|
|
|
|
vault_id='default')
|
|
|
|
|
|
|
|
res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
|
|
|
|
vault_ids=['some_vault_id@prompt_ask_vault_pass'],
|
|
|
|
create_new_password=True,
|
|
|
|
ask_vault_pass=True)
|
|
|
|
|
|
|
|
self.assertIsInstance(res, list)
|
|
|
|
match = vault.match_secrets(res, ['some_vault_id'])[0][1]
|
|
|
|
self.assertEqual(match.bytes, b'prompt1_password')
|