diff --git a/lib/ansible/parsing/vault/__init__.py b/lib/ansible/parsing/vault/__init__.py index 1ccc47e775d..0c424e26841 100644 --- a/lib/ansible/parsing/vault/__init__.py +++ b/lib/ansible/parsing/vault/__init__.py @@ -402,6 +402,14 @@ class VaultEditor: # shuffle tmp file into place self.shuffle_files(tmp_path, filename) + def _real_path(self, filename): + # '-' is special to VaultEditor, dont expand it. + if filename == '-': + return filename + + real_path = os.path.realpath(filename) + return real_path + def encrypt_bytes(self, b_plaintext): check_prereqs() @@ -417,7 +425,7 @@ class VaultEditor: # so treat the contents as a byte string. # follow the symlink - filename = os.path.realpath(filename) + filename = self._real_path(filename) b_plaintext = self.read_data(filename) b_ciphertext = self.vault.encrypt(b_plaintext) @@ -428,7 +436,7 @@ class VaultEditor: check_prereqs() # follow the symlink - filename = os.path.realpath(filename) + filename = self._real_path(filename) ciphertext = self.read_data(filename) @@ -455,7 +463,7 @@ class VaultEditor: check_prereqs() # follow the symlink - filename = os.path.realpath(filename) + filename = self._real_path(filename) ciphertext = self.read_data(filename) @@ -487,7 +495,7 @@ class VaultEditor: check_prereqs() # follow the symlink - filename = os.path.realpath(filename) + filename = self._real_path(filename) prev = os.stat(filename) ciphertext = self.read_data(filename) @@ -536,7 +544,8 @@ class VaultEditor: b_file_data = to_bytes(data, errors='strict') if filename == '-': - sys.stdout.write(b_file_data) + file_data = to_text(b_file_data, encoding='utf-8', errors='strict', nonstring='strict') + sys.stdout.write(file_data) else: if os.path.isfile(filename): if shred: diff --git a/test/integration/targets/vault/runme.sh b/test/integration/targets/vault/runme.sh index 7fc14d71964..05603ee747a 100755 --- a/test/integration/targets/vault/runme.sh +++ b/test/integration/targets/vault/runme.sh @@ -9,6 +9,8 @@ trap 'rm -rf "${MYTMPDIR}"' EXIT TEST_FILE="${MYTMPDIR}/test_file" echo "This is a test file" > "${TEST_FILE}" +TEST_FILE_OUTPUT="${MYTMPDIR}/test_file_output" + # encrypt it ansible-vault encrypt "$@" --vault-password-file vault-password "${TEST_FILE}" @@ -28,6 +30,11 @@ ansible-vault view "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" "${TEST_FI ansible-vault decrypt "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" "${TEST_FILE}" +# reading/writing to/from stdin/stdin (See https://github.com/ansible/ansible/issues/23567) +ansible-vault encrypt "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" --output="${TEST_FILE_OUTPUT}" < "${TEST_FILE}" +ansible-vault view "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" - < "${TEST_FILE_OUTPUT}" +ansible-vault decrypt "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" --output=- < "${TEST_FILE_OUTPUT}" + ansible-vault encrypt_string "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" "a test string" ansible-vault encrypt_string "$@" --vault-password-file "${NEW_VAULT_PASSWORD}" --name "blippy" "a test string names blippy" diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index 51b8301a0d7..259761ba358 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -516,3 +516,29 @@ class TestVaultEditor(unittest.TestCase): assert vl.cipher_name == "AES256", "wrong cipher name set after rekey: %s" % vl.cipher_name assert error_hit is False, "error decrypting migrated 1.0 file" assert dec_data.strip() == b"foo", "incorrect decryption of rekeyed/migrated file: %s" % dec_data + + def test_real_path_dash(self): + filename = '-' + ve = vault.VaultEditor('password') + + res = ve._real_path(filename) + self.assertEqual(res, '-') + + def test_real_path_dev_null(self): + filename = '/dev/null' + ve = vault.VaultEditor('password') + + res = ve._real_path(filename) + self.assertEqual(res, '/dev/null') + + def test_real_path_symlink(self): + self._test_dir = self._create_test_dir() + file_path = self._create_file(self._test_dir, 'test_file', content=b'this is a test file') + file_link_path = os.path.join(self._test_dir, 'a_link_to_test_file') + + os.symlink(file_path, file_link_path) + + ve = vault.VaultEditor('password') + + res = ve._real_path(file_link_path) + self.assertEqual(res, file_path)