ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

session-helper: Disable p11-kit for older broken versions

Browse Source 
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
This commit is contained in:
Alexander Larsson 2018-06-13 11:51:58 +02:00 committed by Atomic Bot
parent ab87617ac1
commit 11d9b5b0b6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
session-helper/flatpak-session-helper.c
View File

@ -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