mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-24 03:11:24 -07:00
e396d5d508
Make !vault-encrypted create a AnsibleVaultUnicode
yaml object that can be used as a regular string object.
This allows a playbook to include a encrypted vault
blob for the value of a yaml variable. A 'secret_password'
variable can have it's value encrypted instead of having
to vault encrypt an entire vars file.
Add __ENCRYPTED__ to the vault yaml types so
template.Template can treat it similar
to __UNSAFE__ flags.
vault.VaultLib api changes:
- Split VaultLib.encrypt to encrypt and encrypt_bytestring
- VaultLib.encrypt() previously accepted the plaintext data
as either a byte string or a unicode string.
Doing the right thing based on the input type would fail
on py3 if given a arg of type 'bytes'. To simplify the
API, vaultlib.encrypt() now assumes input plaintext is a
py2 unicode or py3 str. It will encode to utf-8 then call
the new encrypt_bytestring(). The new methods are less
ambiguous.
- moved VaultLib.is_encrypted logic to vault module scope
and split to is_encrypted() and is_encrypted_file().
Add a test/unit/mock/yaml_helper.py
It has some helpers for testing parsing/yaml
Integration tests added as roles test_vault and test_vault_embedded
52 lines
1.9 KiB
Python
52 lines
1.9 KiB
Python
# (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.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/>.
|
|
|
|
# Make coding more python3-ish
|
|
from __future__ import (absolute_import, division, print_function)
|
|
__metaclass__ = type
|
|
|
|
try:
|
|
from _yaml import CParser, CEmitter
|
|
HAVE_PYYAML_C = True
|
|
except ImportError:
|
|
HAVE_PYYAML_C = False
|
|
|
|
from yaml.resolver import Resolver
|
|
|
|
from ansible.parsing.yaml.constructor import AnsibleConstructor
|
|
|
|
if HAVE_PYYAML_C:
|
|
|
|
class AnsibleLoader(CParser, AnsibleConstructor, Resolver):
|
|
def __init__(self, stream, file_name=None, vault_password=None):
|
|
CParser.__init__(self, stream)
|
|
AnsibleConstructor.__init__(self, file_name=file_name, vault_password=vault_password)
|
|
Resolver.__init__(self)
|
|
else:
|
|
from yaml.composer import Composer
|
|
from yaml.reader import Reader
|
|
from yaml.scanner import Scanner
|
|
from yaml.parser import Parser
|
|
|
|
class AnsibleLoader(Reader, Scanner, Parser, Composer, AnsibleConstructor, Resolver):
|
|
def __init__(self, stream, file_name=None, vault_password=None):
|
|
Reader.__init__(self, stream)
|
|
Scanner.__init__(self)
|
|
Parser.__init__(self)
|
|
Composer.__init__(self)
|
|
AnsibleConstructor.__init__(self, file_name=file_name, vault_password=vault_password)
|
|
Resolver.__init__(self)
|