mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
pass: Use pass executable path from _get_pass_exec()
This commit is contained in:
parent
4813a9f533
commit
b327996cf5
2 changed files with 4 additions and 2 deletions
|
@ -1,3 +1,4 @@
|
|||
Pass executable path from _get_path_exec() is used when calling the program.
|
||||
The $HOME env is no longer modified globally.
|
||||
Only trailing newlines are stripped from the fetched secret.
|
||||
Pass process arguments are handled in a secure way.
|
||||
|
|
|
@ -75,13 +75,15 @@ def _fetch_secret(pass_path):
|
|||
Fetch secret from pass based on pass_path. If there is
|
||||
any error, return back the original pass_path value
|
||||
"""
|
||||
pass_exec = _get_pass_exec()
|
||||
|
||||
# Make a backup in case we want to return the original value without stripped whitespaces
|
||||
original_pass_path = pass_path
|
||||
|
||||
# Remove whitespaces from the pass_path
|
||||
pass_path = pass_path.strip()
|
||||
|
||||
cmd = ["pass", "show", pass_path]
|
||||
cmd = [pass_exec, "show", pass_path]
|
||||
log.debug("Fetching secret: %s", " ".join(cmd))
|
||||
|
||||
# Make sure environment variable HOME is set, since Pass looks for the
|
||||
|
@ -119,5 +121,4 @@ def render(pass_info, saltenv="base", sls="", argline="", **kwargs):
|
|||
"""
|
||||
Fetch secret from pass based on pass_path
|
||||
"""
|
||||
_get_pass_exec()
|
||||
return _decrypt_object(pass_info)
|
||||
|
|
Loading…
Add table
Reference in a new issue