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

Reformat with Black

Browse source
This commit is contained in:
Scott Wallace 2022-05-02 13:08:57 +01:00
parent bc2d23fc55
commit b378de4163
Signed by: scott
GPG key ID: AA742FDC5AFE2A72
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bw_add_sshkeys.py
View file

@ -135,16 +135,19 @@ def folder_items(session: str, folder_id: str) -> List[Dict[str, Any]]:
return data return data
def add_ssh_keys(session: str, items: List[Dict[str, Any]], keyname: str, pwkeyname: str) -> None: def add_ssh_keys(
session: str,
items: List[Dict[str, Any]],
keyname: str,
pwkeyname: str,
) -> None:
""" """
Function to attempt to get keys from a vault item Function to attempt to get keys from a vault item
""" """
for item in items: for item in items:
try: try:
private_key_file = [ private_key_file = [
k['value'] k['value'] for k in item['fields'] if k['name'] == keyname
for k in item['fields']
if k['name'] == keyname
][0] ][0]
except IndexError: except IndexError:
logging.warning('No "%s" field found for item %s', keyname, item['name']) logging.warning('No "%s" field found for item %s', keyname, item['name'])
@ -159,9 +162,7 @@ def add_ssh_keys(session: str, items: List[Dict[str, Any]], keyname: str, pwkeyn
private_key_pw = None private_key_pw = None
try: try:
private_key_pw = [ private_key_pw = [
k['value'] k['value'] for k in item['fields'] if k['name'] == pwkeyname
for k in item['fields']
if k['name'] == pwkeyname
][0] ][0]
logging.debug('Passphrase declared') logging.debug('Passphrase declared')
except IndexError: except IndexError:
@ -218,7 +219,11 @@ def ssh_add(session: str, item_id: str, key_id: str, key_pw: Optional[str]) -> N
ssh_key = proc_attachment.stdout ssh_key = proc_attachment.stdout
if key_pw: if key_pw:
envdict = dict(os.environ, SSH_ASKPASS=os.path.realpath(__file__), SSH_KEY_PASSPHRASE=key_pw) envdict = dict(
os.environ,
SSH_ASKPASS=os.path.realpath(__file__),
SSH_KEY_PASSPHRASE=key_pw,
)
else: else:
envdict = dict(os.environ, SSH_ASKPASS_REQUIRE="never") envdict = dict(os.environ, SSH_ASKPASS_REQUIRE="never")
@ -263,7 +268,7 @@ if __name__ == '__main__':
'-p', '-p',
'--passphrasefield', '--passphrasefield',
default='passphrase', default='passphrase',
help='custom field name where key passphrase is stored' help='custom field name where key passphrase is stored',
) )
return parser.parse_args() return parser.parse_args()
@ -297,7 +302,7 @@ if __name__ == '__main__':
add_ssh_keys(session, items, args.customfield, args.passphrasefield) add_ssh_keys(session, items, args.customfield, args.passphrasefield)
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
if error.stderr: if error.stderr:
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'):