shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-02-03 17:47:40 +03:00
Code Issues Projects Releases Wiki Activity

lib/gpg: Only show gpg-connect-agent stderr on failures

Browse Source 
When listing GPG keys, the temporary GPG homedir will be constructed by
simply copying the remote's trusted keys to the pubring.gpg file. In
that case, no GPG operations spawning gpg-agent will be run. When
gpg-connect-agent is run to cleanup the homedir, it will helpfully print
on stderr that it's starting gpg-agent like so:

gpg-connect-agent: no running gpg-agent - starting '/usr/bin/gpg-agent'
gpg-connect-agent: waiting for the agent to come up ... (5s)
gpg-connect-agent: connection to agent established

Send gpg-connect-agent's stderr to a pipe and only send it to the
application's stderr if an error was encountered.

Fixes: #1907

Closes: #1908
Approved by: cgwalters
This commit is contained in:
Dan Nicholson 2019-08-15 22:24:54 -06:00 committed by Atomic Bot
parent d42f970ed3
commit 522d31b2d4
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libotutil/ot-gpg-utils.c
View File

@ -25,6 +25,7 @@
#include <stdlib.h>
#include <gio/gunixoutputstream.h>
#include "libglnx.h"
/* Like glnx_throw_errno_prefix, but takes @gpg_error */
@ -445,19 +446,27 @@ ot_gpgme_kill_agent (const char *homedir)
/* Run gpg-connect-agent killagent /bye */
g_autoptr(GError) local_error = NULL;
g_autoptr(GSubprocess) proc = g_subprocess_new(G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
&local_error,
"gpg-connect-agent",
"--homedir",
homedir,
"killagent",
"/bye",
NULL);
GSubprocessFlags flags = G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE;
g_autoptr(GSubprocess) proc = g_subprocess_new (flags,
&local_error,
"gpg-connect-agent",
"--homedir",
homedir,
"killagent",
"/bye",
NULL);
if (proc == NULL) {
g_debug ("Spawning gpg-connect-agent failed: %s", local_error->message);
return;
}
if (!g_subprocess_wait_check (proc, NULL, &local_error)) {
/* Dump out stderr on failures */
GInputStream *stderr_in = g_subprocess_get_stderr_pipe (proc);
g_autoptr(GOutputStream) stderr_out =
G_OUTPUT_STREAM (g_unix_output_stream_new (STDERR_FILENO, FALSE));
g_output_stream_splice (stderr_out, stderr_in, G_OUTPUT_STREAM_SPLICE_NONE,
NULL, NULL);
g_debug ("Killing GPG agent with gpg-connect-agent failed: %s",
local_error->message);
return;