jgaunt/bitwardenbackup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed to get some error codes when things don't work

Browse Source
This commit is contained in:
John Gaunt
2022-09-14 19:30:24 -04:00
parent 75562c141f
commit 1e4ed58fe6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitwardenBackup.py
View File

@@ -438,13 +438,14 @@ if __name__ == "__main__":
# login to Bitwarden # login to Bitwarden
logger.info("Trying to login to Bitwarden as {}".format(email)) logger.info("Trying to login to Bitwarden as {}".format(email))
bitwarden_login = subprocess.run([bitwarden_cli_executable, 'login', '--apikey', '--raw'], capture_output=True) bitwarden_login_output = subprocess.run([bitwarden_cli_executable, 'login', '--apikey', '--raw'], capture_output=True)
logger.debug("Bitwarden login output: {}".format(bitwarden_login)) logger.debug((bitwarden_login_output.stdout).decode())
bitwarden_status = json.loads(((subprocess.run([bitwarden_cli_executable, 'status'], capture_output=True)).stdout).decode()) bitwarden_status = json.loads(((subprocess.run([bitwarden_cli_executable, 'status'], capture_output=True)).stdout).decode())
logger.debug("Bitwarden Status: {}".format(bitwarden_status)) logger.debug("Bitwarden Status: {}".format(bitwarden_status))
if bitwarden_status['status'] == "locked": if bitwarden_status['status'] == "locked":
logger.info("Successfully Logged in") logger.info("Successfully Logged in")
bitwarden_session_key = (subprocess.run([bitwarden_cli_executable, 'unlock', vault_password, '--raw', '--nointeraction'], capture_output=True).stdout).decode() bitwarden_unlock_output = subprocess.run([bitwarden_cli_executable, 'unlock', vault_password, '--raw', '--nointeraction'], capture_output=True)
bitwarden_session_key = (bitwarden_unlock_output.stdout).decode()
if bitwarden_session_key: if bitwarden_session_key:
# logger.debug("Session key: {}".format(bitwarden_session_key)) # logger.debug("Session key: {}".format(bitwarden_session_key))
logger.info("Successfully unlocked vault") logger.info("Successfully unlocked vault")
@@ -502,9 +503,10 @@ if __name__ == "__main__":
logger.debug((subprocess.run(['shred', '-v', '-u', '-n', '5', zip_filename + '.zip'], capture_output=True).stdout).decode()) logger.debug((subprocess.run(['shred', '-v', '-u', '-n', '5', zip_filename + '.zip'], capture_output=True).stdout).decode())
else: else:
logger.error("Unable to unlock vault, please check vault password") logger.error((bitwarden_unlock_output.stderr).decode())
else: else:
logger.error("Unable to login to account, please check API credentials") logger.error("Unable to login to account, please check API credentials")
#logger.error((bitwarden_login_output.stderr).decode())
del vault_password del vault_password
del os.environ['BW_CLIENTID'] del os.environ['BW_CLIENTID']