2009-10-13 19:17:24 +00:00
|
|
|
|
/* runner.c - Run and watch the backend engines
|
|
|
|
|
* Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-11-05 12:02:19 +01:00
|
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2009-10-13 19:17:24 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <assert.h>
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#include <npth.h>
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
#include "g13.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
|
#include "../common/i18n.h"
|
2009-10-13 19:17:24 +00:00
|
|
|
|
#include "keyblob.h"
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
#include "runner.h"
|
2009-10-15 17:20:41 +00:00
|
|
|
|
#include "mountinfo.h"
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
/* The runner object. */
|
|
|
|
|
struct runner_s
|
|
|
|
|
{
|
2009-10-15 17:20:41 +00:00
|
|
|
|
char *name; /* The name of this runner. */
|
|
|
|
|
unsigned int identifier; /* The runner identifier. */
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
int spawned; /* True if runner_spawn has been called. */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_t thread; /* The TID of the runner thread. */
|
2009-10-14 17:06:10 +00:00
|
|
|
|
runner_t next_running; /* Builds a list of all running threads. */
|
|
|
|
|
int canceled; /* Set if a cancel has already been send once. */
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
int cancel_flag; /* If set the thread should terminate itself. */
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* We use a reference counter to know when it is safe to remove the
|
2010-06-07 13:33:02 +00:00
|
|
|
|
object. Lacking an explicit ref function this counter will take
|
2009-10-13 19:17:24 +00:00
|
|
|
|
only these two values:
|
|
|
|
|
|
|
|
|
|
1 = Thread not running or only the thread is still running.
|
|
|
|
|
2 = Thread is running and someone is holding a reference. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
int refcount;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
2024-07-23 13:53:20 +02:00
|
|
|
|
gpgrt_process_t proc; /* Process of the backend's process (the engine). */
|
2009-10-13 19:17:24 +00:00
|
|
|
|
int in_fd; /* File descriptors to read from the engine. */
|
|
|
|
|
int out_fd; /* File descriptors to write to the engine. */
|
|
|
|
|
engine_handler_fnc_t handler; /* The handler functions. */
|
|
|
|
|
engine_handler_cleanup_fnc_t handler_cleanup;
|
|
|
|
|
void *handler_data; /* Private data of HANDLER and HANDLER_CLEANUP. */
|
|
|
|
|
|
|
|
|
|
/* Instead of IN_FD we use an estream. Note that the runner thread
|
|
|
|
|
may close the stream and set status_fp to NULL at any time. Thus
|
|
|
|
|
it won't be a good idea to use it while the runner thread is
|
|
|
|
|
running. */
|
|
|
|
|
estream_t status_fp;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* The head of the list of all running threads. */
|
|
|
|
|
static runner_t running_threads;
|
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Write NBYTES of BUF to file descriptor FD. */
|
|
|
|
|
static int
|
|
|
|
|
writen (int fd, const void *buf, size_t nbytes)
|
|
|
|
|
{
|
|
|
|
|
size_t nleft = nbytes;
|
|
|
|
|
int nwritten;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
while (nleft > 0)
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
nwritten = npth_write (fd, buf, nleft);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
if (nwritten < 0)
|
|
|
|
|
{
|
|
|
|
|
if (errno == EINTR)
|
|
|
|
|
nwritten = 0;
|
|
|
|
|
else
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
nleft -= nwritten;
|
|
|
|
|
buf = (const char*)buf + nwritten;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
check_already_spawned (runner_t runner, const char *funcname)
|
|
|
|
|
{
|
|
|
|
|
if (runner->spawned)
|
|
|
|
|
{
|
|
|
|
|
log_error ("BUG: runner already spawned - ignoring call to %s\n",
|
|
|
|
|
funcname);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the number of active threads. */
|
|
|
|
|
unsigned int
|
|
|
|
|
runner_get_threads (void)
|
|
|
|
|
{
|
2009-10-14 17:06:10 +00:00
|
|
|
|
unsigned int n = 0;
|
|
|
|
|
runner_t r;
|
|
|
|
|
|
|
|
|
|
for (r = running_threads; r; r = r->next_running)
|
|
|
|
|
n++;
|
|
|
|
|
return n;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The public release function. */
|
|
|
|
|
void
|
|
|
|
|
runner_release (runner_t runner)
|
|
|
|
|
{
|
2009-10-15 17:20:41 +00:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
if (!runner)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (!--runner->refcount)
|
|
|
|
|
return;
|
|
|
|
|
|
2009-10-15 17:20:41 +00:00
|
|
|
|
err = mountinfo_del_mount (NULL, NULL, runner->identifier);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("failed to remove mount with rid %u from mtab: %s\n",
|
|
|
|
|
runner->identifier, gpg_strerror (err));
|
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
es_fclose (runner->status_fp);
|
|
|
|
|
if (runner->in_fd != -1)
|
|
|
|
|
close (runner->in_fd);
|
|
|
|
|
if (runner->out_fd != -1)
|
|
|
|
|
close (runner->out_fd);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* Fixme: close the process. */
|
|
|
|
|
|
|
|
|
|
/* Tell the engine to release its data. */
|
|
|
|
|
if (runner->handler_cleanup)
|
|
|
|
|
runner->handler_cleanup (runner->handler_data);
|
|
|
|
|
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
if (runner->proc)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
{
|
|
|
|
|
/* The process has not been cleaned up - do it now. */
|
2024-07-23 13:53:20 +02:00
|
|
|
|
gpgrt_process_terminate (runner->proc);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* (Actually we should use the program name and not the
|
|
|
|
|
arbitrary NAME of the runner object. However it does not
|
|
|
|
|
matter because that information is only used for
|
|
|
|
|
diagnostics.) */
|
2024-07-23 13:53:20 +02:00
|
|
|
|
gpgrt_process_wait (runner->proc, 1);
|
|
|
|
|
gpgrt_process_release (runner->proc);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xfree (runner->name);
|
|
|
|
|
xfree (runner);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a new runner context. On success a new runner object is
|
|
|
|
|
stored at R_RUNNER. On failure NULL is stored at this address and
|
|
|
|
|
an error code returned. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
gpg_error_t
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner_new (runner_t *r_runner, const char *name)
|
|
|
|
|
{
|
2009-10-15 17:20:41 +00:00
|
|
|
|
static unsigned int namecounter; /* Global name counter. */
|
|
|
|
|
char *namebuffer;
|
|
|
|
|
runner_t runner, r;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
*r_runner = NULL;
|
|
|
|
|
|
|
|
|
|
runner = xtrycalloc (1, sizeof *runner);
|
|
|
|
|
if (!runner)
|
|
|
|
|
return gpg_error_from_syserror ();
|
2009-10-15 17:20:41 +00:00
|
|
|
|
|
|
|
|
|
/* Bump up the namecounter. In case we ever had an overflow we
|
|
|
|
|
check that this number is currently not in use. The algorithm is
|
|
|
|
|
a bit lame but should be sufficient because such an wrap is not
|
|
|
|
|
very likely: Assuming that we do a mount 10 times a second, then
|
|
|
|
|
we would overwrap on a 32 bit system after 13 years. */
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
namecounter++;
|
|
|
|
|
for (r = running_threads; r; r = r->next_running)
|
|
|
|
|
if (r->identifier == namecounter)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
while (r);
|
|
|
|
|
|
|
|
|
|
runner->identifier = namecounter;
|
|
|
|
|
runner->name = namebuffer = xtryasprintf ("%s-%d", name, namecounter);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
if (!runner->name)
|
|
|
|
|
{
|
|
|
|
|
xfree (runner);
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
runner->refcount = 1;
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
runner->proc = NULL;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner->in_fd = -1;
|
|
|
|
|
runner->out_fd = -1;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
*r_runner = runner;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-15 17:20:41 +00:00
|
|
|
|
/* Return the identifier of RUNNER. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
unsigned int
|
2009-10-15 17:20:41 +00:00
|
|
|
|
runner_get_rid (runner_t runner)
|
|
|
|
|
{
|
|
|
|
|
return runner->identifier;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Find a runner by its rid. Returns the runner object. The caller
|
|
|
|
|
must release the runner object. */
|
|
|
|
|
runner_t
|
|
|
|
|
runner_find_by_rid (unsigned int rid)
|
|
|
|
|
{
|
|
|
|
|
runner_t r;
|
|
|
|
|
|
|
|
|
|
for (r = running_threads; r; r = r->next_running)
|
|
|
|
|
if (r->identifier == rid)
|
|
|
|
|
{
|
|
|
|
|
r->refcount++;
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* A runner usually maintains two file descriptors to control the
|
2009-10-13 19:17:24 +00:00
|
|
|
|
backend engine. This function is used to set these file
|
|
|
|
|
descriptors. The function takes ownership of these file
|
|
|
|
|
descriptors. IN_FD will be used to read from engine and OUT_FD to
|
|
|
|
|
send data to the engine. */
|
|
|
|
|
void
|
|
|
|
|
runner_set_fds (runner_t runner, int in_fd, int out_fd)
|
|
|
|
|
{
|
|
|
|
|
if (check_already_spawned (runner, "runner_set_fds"))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (runner->in_fd != -1)
|
|
|
|
|
close (runner->in_fd);
|
|
|
|
|
if (runner->out_fd != -1)
|
|
|
|
|
close (runner->out_fd);
|
|
|
|
|
runner->in_fd = in_fd;
|
|
|
|
|
runner->out_fd = out_fd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
/* Set the PROC of the backend engine. After this call the engine is
|
2009-10-13 19:17:24 +00:00
|
|
|
|
owned by the runner object. */
|
|
|
|
|
void
|
2024-07-23 13:53:20 +02:00
|
|
|
|
runner_set_proc (runner_t runner, gpgrt_process_t proc)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
{
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
if (check_already_spawned (runner, "runner_set_proc"))
|
2009-10-13 19:17:24 +00:00
|
|
|
|
return;
|
|
|
|
|
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
runner->proc = proc;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2018-10-24 15:56:18 -04:00
|
|
|
|
/* Register the engine handler functions HANDLER and HANDLER_CLEANUP
|
2009-10-13 19:17:24 +00:00
|
|
|
|
and its private HANDLER_DATA with RUNNER. */
|
|
|
|
|
void
|
|
|
|
|
runner_set_handler (runner_t runner,
|
2011-02-04 12:57:53 +01:00
|
|
|
|
engine_handler_fnc_t handler,
|
|
|
|
|
engine_handler_cleanup_fnc_t handler_cleanup,
|
2009-10-13 19:17:24 +00:00
|
|
|
|
void *handler_data)
|
|
|
|
|
{
|
|
|
|
|
if (check_already_spawned (runner, "runner_set_handler"))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
runner->handler = handler;
|
|
|
|
|
runner->handler_cleanup = handler_cleanup;
|
|
|
|
|
runner->handler_data = handler_data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The thread spawned by runner_spawn. */
|
|
|
|
|
static void *
|
|
|
|
|
runner_thread (void *arg)
|
|
|
|
|
{
|
|
|
|
|
runner_t runner = arg;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
gpg_error_t err = 0;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
log_debug ("starting runner thread\n");
|
|
|
|
|
/* If a status_fp is available, the thread's main task is to read
|
|
|
|
|
from that stream and invoke the backend's handler function. This
|
|
|
|
|
is done on a line by line base and the line length is limited to
|
|
|
|
|
a reasonable value (about 1000 characters). Other work will
|
|
|
|
|
continue either due to an EOF of the stream or by demand of the
|
|
|
|
|
engine. */
|
|
|
|
|
if (runner->status_fp)
|
|
|
|
|
{
|
|
|
|
|
int c, cont_line;
|
|
|
|
|
unsigned int pos;
|
|
|
|
|
char buffer[1024];
|
|
|
|
|
estream_t fp = runner->status_fp;
|
|
|
|
|
|
|
|
|
|
pos = 0;
|
|
|
|
|
cont_line = 0;
|
|
|
|
|
while (!err && !runner->cancel_flag && (c=es_getc (fp)) != EOF)
|
|
|
|
|
{
|
|
|
|
|
buffer[pos++] = c;
|
|
|
|
|
if (pos >= sizeof buffer - 5 || c == '\n')
|
|
|
|
|
{
|
|
|
|
|
buffer[pos - (c == '\n')] = 0;
|
|
|
|
|
if (opt.verbose)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
log_info ("%s%s: %s\n",
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner->name, cont_line? "(cont)":"", buffer);
|
|
|
|
|
/* We handle only complete lines and ignore any stuff we
|
|
|
|
|
possibly had to truncate. That is - at least for the
|
|
|
|
|
encfs engine - not an issue because our changes to
|
|
|
|
|
the tool make sure that only relatively short prompt
|
|
|
|
|
lines are of interest. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (!cont_line && runner->handler)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
err = runner->handler (runner->handler_data,
|
|
|
|
|
runner, buffer);
|
|
|
|
|
pos = 0;
|
|
|
|
|
cont_line = (c != '\n');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!err && runner->cancel_flag)
|
|
|
|
|
log_debug ("runner thread noticed cancel flag\n");
|
|
|
|
|
else
|
|
|
|
|
log_debug ("runner thread saw EOF\n");
|
|
|
|
|
if (pos)
|
|
|
|
|
{
|
|
|
|
|
buffer[pos] = 0;
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("%s%s: %s\n",
|
|
|
|
|
runner->name, cont_line? "(cont)":"", buffer);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (!cont_line && !err && runner->handler)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
err = runner->handler (runner->handler_data,
|
|
|
|
|
runner, buffer);
|
|
|
|
|
}
|
|
|
|
|
if (!err && es_ferror (fp))
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("error reading from %s: %s\n",
|
|
|
|
|
runner->name, gpg_strerror (err));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
runner->status_fp = NULL;
|
|
|
|
|
es_fclose (fp);
|
|
|
|
|
log_debug ("runner thread closed status fp\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now wait for the process to finish. */
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
if (!err && runner->proc)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
{
|
|
|
|
|
int exitcode;
|
|
|
|
|
|
|
|
|
|
log_debug ("runner thread waiting ...\n");
|
2024-07-23 13:53:20 +02:00
|
|
|
|
err = gpgrt_process_wait (runner->proc, 1);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
if (!err)
|
2024-07-23 13:53:20 +02:00
|
|
|
|
gpgrt_process_ctl (runner->proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
|
|
|
|
|
gpgrt_process_release (runner->proc);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
runner->proc = NULL;
|
|
|
|
|
if (exitcode)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("running '%s' failed (exitcode=%d): %s\n",
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner->name, exitcode, gpg_strerror (err));
|
|
|
|
|
log_debug ("runner thread waiting finished\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get rid of the runner object (note: it is refcounted). */
|
|
|
|
|
log_debug ("runner thread releasing runner ...\n");
|
2009-10-14 17:06:10 +00:00
|
|
|
|
{
|
|
|
|
|
runner_t r, rprev;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
for (r = running_threads, rprev = NULL; r; rprev = r, r = r->next_running)
|
|
|
|
|
if (r == runner)
|
|
|
|
|
{
|
|
|
|
|
if (!rprev)
|
|
|
|
|
running_threads = r->next_running;
|
|
|
|
|
else
|
|
|
|
|
rprev->next_running = r->next_running;
|
|
|
|
|
r->next_running = NULL;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner_release (runner);
|
|
|
|
|
log_debug ("runner thread runner released\n");
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Spawn a new thread to let RUNNER work as a coprocess. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
runner_spawn (runner_t runner)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_attr_t tattr;
|
|
|
|
|
npth_t thread;
|
|
|
|
|
int ret;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
if (check_already_spawned (runner, "runner_spawn"))
|
|
|
|
|
return gpg_error (GPG_ERR_BUG);
|
|
|
|
|
|
|
|
|
|
/* In case we have an input fd, open it as an estream so that the
|
|
|
|
|
Pth scheduling will work. The stdio functions don't work with
|
|
|
|
|
Pth because they don't call the pth counterparts of read and
|
|
|
|
|
write unless linker tricks are used. */
|
|
|
|
|
if (runner->in_fd != -1)
|
|
|
|
|
{
|
|
|
|
|
estream_t fp;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
fp = es_fdopen (runner->in_fd, "r");
|
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("can't fdopen pipe for reading: %s\n", gpg_strerror (err));
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
runner->status_fp = fp;
|
|
|
|
|
runner->in_fd = -1; /* Now owned by status_fp. */
|
|
|
|
|
}
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_attr_init (&tattr);
|
|
|
|
|
npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
ret = npth_create (&thread, &tattr, runner_thread, runner);
|
|
|
|
|
if (ret)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
err = gpg_error_from_errno (ret);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
log_error ("error spawning runner thread: %s\n", gpg_strerror (err));
|
|
|
|
|
return err;
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_setname_np (thread, runner->name);
|
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* The scheduler has not yet kicked in, thus we can safely set the
|
|
|
|
|
spawned flag and the tid. */
|
|
|
|
|
runner->spawned = 1;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
runner->thread = thread;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
runner->next_running = running_threads;
|
|
|
|
|
running_threads = runner;
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_attr_destroy (&tattr);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
|
|
|
|
/* The runner thread is now runnable. */
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Cancel a running thread. */
|
|
|
|
|
void
|
|
|
|
|
runner_cancel (runner_t runner)
|
|
|
|
|
{
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* Warning: runner_cancel_all has knowledge of this code. */
|
2009-10-13 19:17:24 +00:00
|
|
|
|
if (runner->spawned)
|
|
|
|
|
{
|
2009-10-14 17:06:10 +00:00
|
|
|
|
runner->canceled = 1; /* Mark that we canceled this one already. */
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* FIXME: This does only work if the thread emits status lines. We
|
2015-09-14 18:49:32 +02:00
|
|
|
|
need to change the thread to wait on an event. */
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner->cancel_flag = 1;
|
|
|
|
|
/* For now we use the brutal way and kill the process. */
|
2024-07-23 13:53:20 +02:00
|
|
|
|
gpgrt_process_terminate (runner->proc);
|
2009-10-13 19:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* Cancel all runner threads. */
|
|
|
|
|
void
|
|
|
|
|
runner_cancel_all (void)
|
|
|
|
|
{
|
|
|
|
|
runner_t r;
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
do
|
2009-10-14 17:06:10 +00:00
|
|
|
|
{
|
|
|
|
|
for (r = running_threads; r; r = r->next_running)
|
|
|
|
|
if (r->spawned && !r->canceled)
|
|
|
|
|
{
|
|
|
|
|
runner_cancel (r);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (r);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* Send a line of data down to the engine. This line may not contain
|
|
|
|
|
a binary Nul or a LF character. This function is used by the
|
|
|
|
|
engine's handler. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
gpg_error_t
|
2009-10-13 19:17:24 +00:00
|
|
|
|
runner_send_line (runner_t runner, const void *data, size_t datalen)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
|
|
|
|
|
if (!runner->spawned)
|
|
|
|
|
{
|
|
|
|
|
log_error ("BUG: runner for %s not spawned\n", runner->name);
|
|
|
|
|
err = gpg_error (GPG_ERR_INTERNAL);
|
|
|
|
|
}
|
|
|
|
|
else if (runner->out_fd == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error ("no output file descriptor for runner %s\n", runner->name);
|
|
|
|
|
err = gpg_error (GPG_ERR_EBADF);
|
|
|
|
|
}
|
|
|
|
|
else if (data && datalen)
|
|
|
|
|
{
|
|
|
|
|
if (memchr (data, '\n', datalen))
|
|
|
|
|
{
|
|
|
|
|
log_error ("LF detected in response data\n");
|
|
|
|
|
err = gpg_error (GPG_ERR_BUG);
|
|
|
|
|
}
|
|
|
|
|
else if (memchr (data, 0, datalen))
|
|
|
|
|
{
|
|
|
|
|
log_error ("Nul detected in response data\n");
|
|
|
|
|
err = gpg_error (GPG_ERR_BUG);
|
|
|
|
|
}
|
|
|
|
|
else if (writen (runner->out_fd, data, datalen))
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
|
if (writen (runner->out_fd, "\n", 1))
|
|
|
|
|
err = gpg_error_from_syserror ();
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
return err;
|
|
|
|
|
}
|