Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Read GPG passphrase from an environment variable #1856

Merged
merged 2 commits into from Feb 3, 2020
Merged

Read GPG passphrase from an environment variable #1856

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d07d390
Read passphrase from an environment variable
nnarain-cpr Jan 7, 2020
405d716
Accept passphrase from the encryptor's initialize method
nnarain-cpr Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions tools/rosbag/src/rosbag/bag.py
View file
Open in desktop
Expand Up @@ -187,6 +187,8 @@ def __init__(self):
super(_ROSBagAesCbcEncryptor, self).__init__()
# User name of GPG key used for symmetric key encryption
self._gpg_key_user = None
# GPG passphrase
self._gpg_passphrase = None
# Symmetric key for encryption/decryption
self._symmetric_key = None
# Encrypted symmetric key
Expand All @@ -202,6 +204,7 @@ def initialize(self, bag, gpg_key_user):
@raise ROSBagException: if GPG key user has already been set
"""
if bag._mode != 'w':
self._gpg_passphrase = os.getenv('ROSBAG_GPG_PASSPHRASE', None)
mikepurvis marked this conversation as resolved.
Show resolved Hide resolved
return
if self._gpg_key_user == gpg_key_user:
return
Expand Down Expand Up @@ -281,7 +284,7 @@ def read_fields_from_file_header(self, header):
except ROSBagFormatException:
raise ROSBagFormatException('GPG key user is not found in header')
try:
self._symmetric_key = _decrypt_string_gpg(self._encrypted_symmetric_key)
self._symmetric_key = _decrypt_string_gpg(self._encrypted_symmetric_key, self._gpg_passphrase)
except ROSBagFormatException:
raise

Expand Down Expand Up @@ -387,9 +390,9 @@ def _encrypt_string_gpg(key_user, input):
raise ROSBagEncryptException('Failed to encrypt bag: {}. Have you installed a required public key?'.format(enc_data.status))
return str(enc_data)

def _decrypt_string_gpg(input):
def _decrypt_string_gpg(input, passphrase=None):
gpg = gnupg.GPG()
dec_data = gpg.decrypt(input, passphrase='clearpath')
dec_data = gpg.decrypt(input, passphrase=passphrase)
if not dec_data.ok:
raise ROSBagEncryptException('Failed to decrypt bag: {}. Have you installed a required private key?'.format(dec_data.status))
return dec_data.data
Expand Down