scott/bitwarden-ssh-agent
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #28 from ymage/handle_already_set_variable

Browse source 
Fix for already set SSH_ASKPASS env var
This commit is contained in:
Joao Jacome 2022-08-22 12:25:20 +01:00 committed by GitHub
parent 4908899986 e186367d5d
commit f4d7dd2bf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bw_add_sshkeys.py
View file

@ -226,7 +226,7 @@ def ssh_add(session: str, item_id: str, key_id: str, key_pw: Optional[str]) -> N
) )
else: else:
envdict = dict(os.environ, SSH_ASKPASS_REQUIRE="never") envdict = dict(os.environ, SSH_ASKPASS_REQUIRE="never")
logging.debug("Running ssh-add") logging.debug("Running ssh-add")
# CAVEAT: `ssh-add` provides no useful output, even with maximum verbosity # CAVEAT: `ssh-add` provides no useful output, even with maximum verbosity
subprocess.run( subprocess.run(
@ -236,7 +236,7 @@ def ssh_add(session: str, item_id: str, key_id: str, key_pw: Optional[str]) -> N
env=envdict, env=envdict,
universal_newlines=True, universal_newlines=True,
check=True, check=True,
) )
if __name__ == '__main__': if __name__ == '__main__':
@ -305,7 +305,7 @@ if __name__ == '__main__':
logging.error('"%s" error: %s', error.cmd[0], error.stderr) logging.error('"%s" error: %s', error.cmd[0], error.stderr)
logging.debug('Error running %s', error.cmd) logging.debug('Error running %s', error.cmd)
if os.environ.get('SSH_ASKPASS'): if os.environ.get('SSH_ASKPASS') and os.environ.get('SSH_ASKPASS') == os.path.realpath(__file__):
print(os.environ.get('SSH_KEY_PASSPHRASE')) print(os.environ.get('SSH_KEY_PASSPHRASE'))
else: else:
main() main()