From 9359b36c6f51f799dc859a2b3adfa5688ac9cf4b Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Tue, 13 Sep 2022 23:29:43 -0400 Subject: [PATCH] added windows gpg exe path, added gpg command --- bitwardenBackup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bitwardenBackup.py b/bitwardenBackup.py index 6ae99ed..a67689b 100644 --- a/bitwardenBackup.py +++ b/bitwardenBackup.py @@ -30,6 +30,7 @@ datetime_string = datetime.datetime.now().strftime("%Y%m%d-%H%M%S") if os_detected == "Windows": bitwarden_cli_executable = os.path.join(script_directory, "lib", "Bitwarden CLI", "bw.exe") + gpg_executable = os.path.join(script_directory, "lib", "gpg", "bin", "gpg.exe") elif os_detected == "Linux": bitwarden_cli_executable = os.path.join(script_directory, "lib", "Bitwarden CLI", "bw_linux") elif os_detected == "macOS": @@ -494,12 +495,14 @@ if __name__ == "__main__": logger.info("Zipping everything together...") zip_filename = os.path.join(exports_directory, "Bitwarden Backup {} {}".format(email, datetime_string)) shutil.make_archive(zip_filename, format="zip", root_dir=working_directory) - + + 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).stderr).decode()) + logger.info("Securely deleting files") secure_delete.secure_delete(working_directory) - #secure_delete.secure_delete(zip_filename) + secure_delete.secure_delete(zip_filename + ".zip") logger.info("Removing working directory") - shutil.rmtree(working_directory) + #shutil.rmtree(working_directory) else: logger.error("Unable to unlock vault, please check vault password")