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

gpg: use correct GNUPGHOME for gpgconf

Browse Source
This commit is contained in:
Roman Zeyde
2017-10-21 18:46:04 +03:00
parent a5929eed62
commit 7ed76fe472
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libagent/gpg/__init__.py
View File

@@ -208,7 +208,7 @@ 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() sock_path = keyring.get_agent_sock_path(env={'GNUPGHOME': args.homedir})
handler = agent.Handler(device=device_type()) handler = agent.Handler(device=device_type())
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):

11
libagent/gpg/keyring.py
View File

@@ -14,17 +14,18 @@ from .. import util
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def get_agent_sock_path(sp=subprocess): def get_agent_sock_path(env=None, sp=subprocess):
"""Parse gpgconf output to find out GPG agent UNIX socket path.""" """Parse gpgconf output to find out GPG agent UNIX socket path."""
lines = sp.check_output(['gpgconf', '--list-dirs']).strip().split(b'\n') output = sp.check_output(['gpgconf', '--list-dirs'], env=env)
lines = output.strip().split(b'\n')
dirs = dict(line.split(b':', 1) for line in lines) dirs = dict(line.split(b':', 1) for line in lines)
log.debug('gpgconf --list-dirs: %s', dirs) log.debug('gpgconf --list-dirs: %s', dirs)
return dirs[b'agent-socket'] return dirs[b'agent-socket']
def connect_to_agent(sp=subprocess): def connect_to_agent(env=None, sp=subprocess):
"""Connect to GPG agent's UNIX socket.""" """Connect to GPG agent's UNIX socket."""
sock_path = get_agent_sock_path(sp=sp) sock_path = get_agent_sock_path(sp=sp, env=env)
sp.check_call(['gpg-connect-agent', '/bye']) # Make sure it's running sp.check_call(['gpg-connect-agent', '/bye']) # Make sure it's running
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sock.connect(sock_path) sock.connect(sock_path)
@@ -231,7 +232,7 @@ def export_public_keys(sp=subprocess):
def create_agent_signer(user_id): def create_agent_signer(user_id):
"""Sign digest with existing GPG keys using gpg-agent tool.""" """Sign digest with existing GPG keys using gpg-agent tool."""
sock = connect_to_agent() sock = connect_to_agent(env=os.environ)
keygrip = get_keygrip(user_id) keygrip = get_keygrip(user_id)
def sign(digest): def sign(digest):