lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-21 05:36:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpg-agent: use correct GNUPGHOME when getting public keys

Browse Source
This commit is contained in:
Roman Zeyde
2017-10-21 20:49:05 +03:00
parent e2625cc521
commit bab46dae5c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libagent/gpg/__init__.py
View File

@@ -208,8 +208,10 @@ def run_agent(device_type):
log.debug('sys.argv: %s', sys.argv) log.debug('sys.argv: %s', sys.argv)
log.debug('os.environ: %s', os.environ) log.debug('os.environ: %s', os.environ)
try: try:
sock_path = keyring.get_agent_sock_path(env={'GNUPGHOME': args.homedir}) env = {'GNUPGHOME': args.homedir}
handler = agent.Handler(device=device_type()) sock_path = keyring.get_agent_sock_path(env=env)
pubkey_bytes = keyring.export_public_keys(env=env)
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):
with contextlib.closing(conn): with contextlib.closing(conn):

4
libagent/gpg/agent.py
View File

@@ -68,7 +68,7 @@ class AgentStop(Exception):
class Handler(object): class Handler(object):
"""GPG agent requests' handler.""" """GPG agent requests' handler."""
def __init__(self, device): def __init__(self, device, pubkey_bytes):
"""C-tor.""" """C-tor."""
self.client = client.Client(device=device) self.client = client.Client(device=device)
# Cache ASSUAN commands' arguments between commands # Cache ASSUAN commands' arguments between commands
@@ -76,7 +76,7 @@ class Handler(object):
self.digest = None self.digest = None
self.algo = None self.algo = None
# Cache public keys from GnuPG # Cache public keys from GnuPG
self.pubkey_bytes = keyring.export_public_keys() self.pubkey_bytes = pubkey_bytes
# "Clone" existing GPG version # "Clone" existing GPG version
self.version = keyring.gpg_version() self.version = keyring.gpg_version()