upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-21 22:29:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use prepared env for calling BORG_PASSCOMMAND, fixes #3050

Browse source 
(cherry picked from commit 2f7d7bdbb8)
This commit is contained in:
Thomas Waldmann 2017-09-23 20:04:47 +02:00
parent 55702777bb
commit d5d2d6419f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
borg/key.py
View file

@ -19,6 +19,7 @@ from .crypto import AES, bytes_to_long, long_to_bytes, bytes_to_int, num_aes_blo
from .crypto import hkdf_hmac_sha512
from .compress import Compressor, CNONE
from .helpers import get_limited_unpacker
from .helpers import prepare_subprocess_env
PREFIX = b'\0' * 8
@ -327,8 +328,10 @@ class Passphrase(str):
def env_passcommand(cls, default=None):
passcommand = os.environ.get('BORG_PASSCOMMAND', None)
if passcommand is not None:
# passcommand is a system command (not inside pyinstaller env)
env = prepare_subprocess_env(system=True)
try:
passphrase = subprocess.check_output(shlex.split(passcommand), universal_newlines=True)
passphrase = subprocess.check_output(shlex.split(passcommand), universal_newlines=True, env=env)
except (subprocess.CalledProcessError, FileNotFoundError) as e:
raise PasscommandFailure(e)
return cls(passphrase.rstrip('\n'))