mirror of https://github.com/ansible/ansible.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29bdd0b326
If an embedded vaulted variable ('!vault' in yaml)
had an invalid format, it would eventually cause
an error for seemingly unrelated reasons.
"Invalid" meaning not valid hexlify (extra chars,
non-hex chars, etc).
For ex, if a host_vars file had invalid vault format
variables, on py2, it would cause an error like:
'ansible.vars.hostvars.HostVars object' has no
attribute u'broken.example.com'
Depending on where the invalid vault is, it could
also cause "VARIABLE IS NOT DEFINED!". The behavior
can also change if ansible-playbook is py2 or py3.
Root cause is errors from binascii.unhexlify() not
being handled consistently.
Fix is to add a AnsibleVaultFormatError exception and
raise it on any unhexlify() errors and to handle it
properly elsewhere.
Add a _unhexlify() that try/excepts around a binascii.unhexlify()
and raises an AnsibleVaultFormatError on invalid vault data.
This is so the same exception type is always raised for this
case. Previous it was different between py2 and py3.
binascii.unhexlify() raises a binascii.Error if the hexlified
blobs in a vault data blob are invalid.
On py2, binascii.Error is a subclass of Exception.
On py3, binascii.Error is a subclass of TypeError
When decrypting content of vault encrypted variables,
if a binascii.Error is raised it propagates up to
playbook.base.Base.post_validate(). post_validate()
handles exceptions for TypeErrors but not for
base Exception subclasses (like py2 binascii.Error).
* Add a display.warning on vault format errors
* Unit tests for _unhexlify, parse_vaulttext*
* Add intg test cases for invalid vault formats
Fixes #28038
(cherry picked from commit
|
8 years ago | |
|---|---|---|
| .. | ||
| group_vars | 8 years ago | |
| host_vars | 10 years ago | |
| roles | 8 years ago | |
| targets | 8 years ago | |
| vars | 9 years ago | |
| Makefile | 8 years ago | |
| amazon.yml | 9 years ago | |
| asa.yaml | 9 years ago | |
| azure.yml | ||
| cleanup_azure.py | 9 years ago | |
| cleanup_ec2.py | 9 years ago | |
| cleanup_gce.py | 9 years ago | |
| cleanup_rax.py | 9 years ago | |
| cloud-config-aws.yml.template | 9 years ago | |
| cloud-config-azure.yml.template | 9 years ago | |
| cloud-config-cs.ini.template | 9 years ago | |
| cloudflare.yml | 9 years ago | |
| cloudscale.yml | 9 years ago | |
| cnos.yaml | 9 years ago | |
| connection-buildah.yaml | 9 years ago | |
| consul.yml | 9 years ago | |
| consul_inventory.yml | ||
| consul_running.py | 11 years ago | |
| credentials.template | 9 years ago | |
| dellos6.yaml | 9 years ago | |
| dellos9.yaml | 9 years ago | |
| dellos10.yaml | 9 years ago | |
| eos.yaml | 9 years ago | |
| exoscale.yml | 10 years ago | |
| galaxy_playbook.yml | ||
| galaxy_playbook_git.yml | 10 years ago | |
| galaxy_roles.yml | 9 years ago | |
| galaxy_rolesfile | 10 years ago | |
| gce.yml | 9 years ago | |
| gce_credentials.py | 9 years ago | |
| integration.cfg | 8 years ago | |
| integration_config.yml | 9 years ago | |
| inventory | 8 years ago | |
| inventory.network | 9 years ago | |
| inventory.networking.template | 9 years ago | |
| inventory.remote.template | 10 years ago | |
| inventory.winrm.template | 9 years ago | |
| inventory.yaml | 9 years ago | |
| ios.yaml | 8 years ago | |
| iosxr.yaml | 9 years ago | |
| jenkins.yml | 9 years ago | |
| junos.yaml | 9 years ago | |
| netscaler.yaml | 9 years ago | |
| network-all.yaml | 9 years ago | |
| network-integration.cfg | 8 years ago | |
| nuage.yaml | 9 years ago | |
| nxos.yaml | 8 years ago | |
| ops.yaml | 9 years ago | |
| ovs.yaml | 9 years ago | |
| platform_agnostic.yaml | 9 years ago | |
| rackspace.yml | ||
| setup_gce.py | 9 years ago | |
| target-prefixes.network | 9 years ago | |
| vyos.yaml | 9 years ago | |
| windows-integration.cfg | 8 years ago | |