Skip to content

Use pipe to pass password to borg #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
steelman wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use pipe to pass password to borg #1004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/vorta/borg/borg_thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,21 @@ def __init__(self, cmd, params, parent=None):

password = params.get('password')
if password is not None:
env['BORG_PASSPHRASE'] = password
pass_pipe_r, pass_pipe_w = os.pipe()
logger.debug("Passphrase pipe reading fd: {}, writing fd: {}".format(pass_pipe_r, pass_pipe_w))
os.set_inheritable(pass_pipe_r, True)
with os.fdopen(pass_pipe_w, "w") as p:
p.write(password)
env['BORG_PASSPHRASE_FD'] = "{}".format(pass_pipe_r)
else:
pass_pipe_r = None
env['BORG_PASSPHRASE'] = '9999999' # Set dummy password to avoid prompt.

if env.get('BORG_PASSCOMMAND', False):
env.pop('BORG_PASSPHRASE', None) # Unset passphrase
# Close the passphrase pipe
os.close(pass_pipe_r)
pass_pipe_r = None
env.pop('BORG_PASSPHRASE_FD', None)

ssh_key = params.get('ssh_key')
if ssh_key is not None:
Expand All @@ -91,6 +100,7 @@ def __init__(self, cmd, params, parent=None):
self.cwd = params.get('cwd', None)
self.params = params
self.process = None
self.pass_pipe_r = pass_pipe_r

@classmethod
def is_running(cls):
Expand Down Expand Up @@ -196,7 +206,11 @@ def run(self):
logger.info('Running command %s', ' '.join(self.cmd))

p = Popen(self.cmd, stdout=PIPE, stderr=PIPE, bufsize=1, universal_newlines=True,
env=self.env, cwd=self.cwd, start_new_session=True)
env=self.env, cwd=self.cwd, start_new_session=True,
close_fds=self.pass_pipe_r is None)

if self.pass_pipe_r is not None:
os.close(self.pass_pipe_r)

self.process = p

Expand Down