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

added no encryption warning message and message that zip is being encrypted. moved file delete to end of loop

Browse Source
This commit is contained in:
John Gaunt
2022-12-30 15:54:05 -05:00
parent 3fec27ac48
commit ce40b1ed5d
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bitwardenBackup.py
View File

@@ -527,13 +527,21 @@ if __name__ == "__main__":
else: else:
logger.debug("Item has no attachments") logger.debug("Item has no attachments")
logger.info("Done downloading attachments") logger.info("Done downloading attachments")
logger.info("Zipping everything together...") logger.info("Zipping everything together...")
zip_filename = os.path.join(exports_directory, "Bitwarden Backup {} {}".format(email, datetime_string)) zip_filename = os.path.join(exports_directory, "Bitwarden Backup {} {}".format(email, datetime_string))
shutil.make_archive(zip_filename, format="zip", root_dir=working_directory) shutil.make_archive(zip_filename, format="zip", root_dir=working_directory)
if not opts.no_encrypt: if not opts.no_encrypt:
logger.info("Encrypting zip file...")
logger.debug((subprocess.run([gpg_executable, '--no-options', '--batch', '--passphrase', vault_password, '--symmetric', '--cipher-algo', 'AES256', '--digest-algo', 'SHA512', '--compression-algo', 'Uncompressed', '--output', zip_filename + '.zip.gpg', zip_filename + '.zip'], capture_output=True).stdout).decode()) logger.debug((subprocess.run([gpg_executable, '--no-options', '--batch', '--passphrase', vault_password, '--symmetric', '--cipher-algo', 'AES256', '--digest-algo', 'SHA512', '--compression-algo', 'Uncompressed', '--output', zip_filename + '.zip.gpg', zip_filename + '.zip'], capture_output=True).stdout).decode())
else:
logger.warning("You passed in --no-encryption option, not encrypting zip file")
else:
logger.error((bitwarden_unlock_output.stderr).decode())
else:
logger.error("Unable to login to account, please check API credentials")
#logger.error((bitwarden_login_output.stderr).decode())
logger.info("Securely deleting files") logger.info("Securely deleting files")
if os_detected == "Windows": if os_detected == "Windows":
@@ -547,12 +555,6 @@ if __name__ == "__main__":
if not opts.no_encrypt: if not opts.no_encrypt:
logger.debug((subprocess.run(['srm', '-r', '-z', '-v', zip_filename + '.zip'], capture_output=True).stdout).decode()) logger.debug((subprocess.run(['srm', '-r', '-z', '-v', zip_filename + '.zip'], capture_output=True).stdout).decode())
else:
logger.error((bitwarden_unlock_output.stderr).decode())
else:
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']
del os.environ['BW_CLIENTSECRET'] del os.environ['BW_CLIENTSECRET']