diff options
| author | Alexander Larsson <alexl@redhat.com> | 2018-06-13 11:51:58 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-13 10:08:56 +0000 |
| commit | 11d9b5b0b6483c18cfaa44296314da1a87934433 (patch) | |
| tree | 50a15d9c2acbff0438856a39dc35631438ffe604 /session-helper | |
| parent | ab87617ac176baff43779a4f3e809b19f5854488 (diff) | |
| download | flatpak-11d9b5b0b6483c18cfaa44296314da1a87934433.tar.gz | |
session-helper: Disable p11-kit for older broken versions
p11-kit server version < 0.23.10 doesn't properly daemonize which
causes g_spawn_sync() to hang forever waiting for the pipe to
close.
We work around this by passing --sh, which is only available in the
working version, and fill fail the old ones.
https://github.com/flatpak/flatpak/issues/1768
Closes: #1782
Approved by: alexlarsson
Diffstat (limited to 'session-helper')
| -rw-r--r-- | session-helper/flatpak-session-helper.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c index 5c1b12d0..c659c3ad 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c @@ -620,6 +620,11 @@ start_p11_kit_server (const char *flatpak_dir) char *p11_argv[] = { "p11-kit", "server", + /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support + * this flag. This is good, because those earlier versions did not properly daemonize and caused + * the spawn_sync to hang forever, waiting for the pipe to close. + */ + "--sh", "-n", socket_path, "--provider", "p11-kit-trust.so", "pkcs11:model=p11-kit-trust?write-protected=yes", @@ -629,7 +634,7 @@ start_p11_kit_server (const char *flatpak_dir) g_debug ("starting p11-kit server"); if (!g_spawn_sync (NULL, - p11_argv, NULL, G_SPAWN_SEARCH_PATH, + p11_argv, NULL, G_SPAWN_SEARCH_PATH|G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &p11_kit_stdout, NULL, &exit_status, &local_error)) @@ -665,7 +670,13 @@ start_p11_kit_server (const char *flatpak_dir) } } - p11_kit_server_socket_path = g_steal_pointer (&socket_path); + if (p11_kit_server_pid != 0) + { + g_debug ("Using p11-kit socket path %s, pid %d", socket_path, p11_kit_server_pid); + p11_kit_server_socket_path = g_steal_pointer (&socket_path); + } + else + g_debug ("Not using p11-kit due to older version"); } int |