jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpg: use pinentry UI for initialization and agent

Browse Source
This commit is contained in:
Roman Zeyde
2018-03-07 13:19:02 +02:00
parent 64064b5ecc
commit 17ea941add
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libagent/gpg/__init__.py
View File

@@ -158,7 +158,9 @@ default-key \"{1}\"
f.write("""# Hardware-based GPG agent emulator f.write("""# Hardware-based GPG agent emulator
log-file {0}/gpg-agent.log log-file {0}/gpg-agent.log
verbosity 2 verbosity 2
""".format(homedir)) pin_entry_binary {1}
passphrase_entry_binary {2}
""".format(homedir, args.pin_entry_binary, args.passphrase_entry_binary))
# Prepare a helper script for setting up the new identity # Prepare a helper script for setting up the new identity
with open(os.path.join(homedir, 'env'), 'w') as f: with open(os.path.join(homedir, 'env'), 'w') as f:
@@ -223,6 +225,7 @@ def run_agent(device_type):
env = {'GNUPGHOME': args.homedir} env = {'GNUPGHOME': args.homedir}
sock_path = keyring.get_agent_sock_path(env=env) sock_path = keyring.get_agent_sock_path(env=env)
pubkey_bytes = keyring.export_public_keys(env=env) pubkey_bytes = keyring.export_public_keys(env=env)
device_type.ui = device.ui.UI.from_config_dict(config)
handler = agent.Handler(device=device_type(), pubkey_bytes=pubkey_bytes) handler = agent.Handler(device=device_type(), pubkey_bytes=pubkey_bytes)
with server.unix_domain_socket_server(sock_path) as sock: with server.unix_domain_socket_server(sock_path) as sock:
for conn in agent.yield_connections(sock): for conn in agent.yield_connections(sock):
@@ -259,6 +262,12 @@ def main(device_type):
p.add_argument('-t', '--time', type=int, default=int(time.time())) p.add_argument('-t', '--time', type=int, default=int(time.time()))
p.add_argument('-v', '--verbose', default=0, action='count') p.add_argument('-v', '--verbose', default=0, action='count')
p.add_argument('-s', '--subkey', default=False, action='store_true') p.add_argument('-s', '--subkey', default=False, action='store_true')
p.add_argument('--pin-entry-binary', type=str, default='pinentry',
help='Path to PIN entry UI helper.')
p.add_argument('--passphrase-entry-binary', type=str, default='pinentry',
help='Path to passphrase entry UI helper.')
p.set_defaults(func=run_init) p.set_defaults(func=run_init)
p = subparsers.add_parser('unlock', help='unlock the hardware device') p = subparsers.add_parser('unlock', help='unlock the hardware device')
@@ -266,4 +275,6 @@ def main(device_type):
p.set_defaults(func=run_unlock) p.set_defaults(func=run_unlock)
args = parser.parse_args() args = parser.parse_args()
device_type.ui = device.ui.UI.from_config_dict(vars(args))
return args.func(device_type=device_type, args=args) return args.func(device_type=device_type, args=args)

8
libagent/gpg/agent.py
View File

@@ -77,19 +77,23 @@ class AgentStop(Exception):
"""Raised to close the agent.""" """Raised to close the agent."""
# pylint: disable=too-many-instance-attributes
class Handler(object): class Handler(object):
"""GPG agent requests' handler.""" """GPG agent requests' handler."""
# pylint: disable=too-many-instance-attributes def _get_options(self):
return self.options
def __init__(self, device, pubkey_bytes): def __init__(self, device, pubkey_bytes):
"""C-tor.""" """C-tor."""
self.reset()
device.ui.options_getter = self._get_options
self.client = client.Client(device=device) self.client = client.Client(device=device)
# Cache public keys from GnuPG # Cache public keys from GnuPG
self.pubkey_bytes = pubkey_bytes self.pubkey_bytes = pubkey_bytes
# "Clone" existing GPG version # "Clone" existing GPG version
self.version = keyring.gpg_version() self.version = keyring.gpg_version()
self.reset()
self.handlers = { self.handlers = {
b'RESET': lambda *_: self.reset(), b'RESET': lambda *_: self.reset(),
b'OPTION': lambda _, args: self.handle_option(*args), b'OPTION': lambda _, args: self.handle_option(*args),