/mandos/trunk : contents of plugin-runner.c at revision 131

: (revision 131)

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

21 by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and	1	/* -- coding: utf-8 -- */
	2	/*
	3	* Mandos plugin runner - Run Mandos plugins
	4	*
28 by Teddy Hogeborn * server.conf: New file.	5	* Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
21 by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and	6	*
	7	* This program is free software: you can redistribute it and/or
	8	* modify it under the terms of the GNU General Public License as
	9	* published by the Free Software Foundation, either version 3 of the
	10	* License, or (at your option) any later version.
	11	*
	12	* This program is distributed in the hope that it will be useful, but
	13	* WITHOUT ANY WARRANTY; without even the implied warranty of
	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	15	* General Public License for more details.
	16	*
	17	* You should have received a copy of the GNU General Public License
	18	* along with this program. If not, see
	19	* <http://www.gnu.org/licenses/>.
	20	*
28 by Teddy Hogeborn * server.conf: New file.	21	* Contact the authors at <mandos@fukt.bsnet.se>.
21 by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and	22	*/
	23
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	24	#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
	25	asprintf() */
24.1.26 by Björn Påhlsson tally count of used symbols	26	#include <stddef.h> /* size_t, NULL */
	27	#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
	28	EXIT_SUCCESS, realloc() */
	29	#include <stdbool.h> /* bool, true, false */
	30	#include <stdio.h> /* perror, popen(), fileno(),
	31	fprintf(), stderr, STDOUT_FILENO */
	32	#include <sys/types.h> /* DIR, opendir(), stat(), struct
	33	stat, waitpid(), WIFEXITED(),
	34	WEXITSTATUS(), wait(), pid_t,
	35	uid_t, gid_t, getuid(), getgid(),
	36	dirfd() */
	37	#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
	38	FD_SET(), FD_ISSET(), FD_CLR */
	39	#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
	40	WEXITSTATUS() */
	41	#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	42	#include <iso646.h> /* and, or, not */
	43	#include <dirent.h> /* DIR, struct dirent, opendir(),
24.1.26 by Björn Påhlsson tally count of used symbols	44	readdir(), closedir(), dirfd() */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	45	#include <unistd.h> /* struct stat, stat(), S_ISREG(),
24.1.26 by Björn Påhlsson tally count of used symbols	46	fcntl(), setuid(), setgid(),
	47	F_GETFD, F_SETFD, FD_CLOEXEC,
	48	access(), pipe(), fork(), close()
	49	dup2, STDOUT_FILENO, _exit(),
	50	execv(), write(), read(),
	51	close() */
	52	#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
	53	FD_CLOEXEC */
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	54	#include <string.h> /* strsep, strlen(), asprintf() */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	55	#include <errno.h> /* errno */
24.1.26 by Björn Påhlsson tally count of used symbols	56	#include <argp.h> /* struct argp_option, struct
	57	argp_state, struct argp,
	58	argp_parse(), ARGP_ERR_UNKNOWN,
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	59	ARGP_KEY_END, ARGP_KEY_ARG,
	60	error_t */
24.1.26 by Björn Påhlsson tally count of used symbols	61	#include <signal.h> /* struct sigaction, sigemptyset(),
	62	sigaddset(), sigaction(),
	63	sigprocmask(), SIG_BLOCK, SIGCHLD,
	64	SIG_UNBLOCK, kill() */
	65	#include <errno.h> /* errno, EBADF */
13 by Björn Påhlsson Added following support:	66
37 by Teddy Hogeborn Non-tested commit for merge purposes.	67	#define BUFFER_SIZE 256
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	68
	69	#define PDIR "/lib/mandos/plugins.d"
	70	#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
37 by Teddy Hogeborn Non-tested commit for merge purposes.	71
74 by Teddy Hogeborn * Makefile (PREFIX, CONFDIR): New.	72	const char *argp_program_version = "plugin-runner 1.0";
24.1.35 by Björn Påhlsson version 1.0	73	const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
24.1.35 by Björn Påhlsson version 1.0	74
13 by Björn Påhlsson Added following support:	75	struct process;
	76
	77	typedef struct process{
	78	pid_t pid;
	79	int fd;
	80	char *buffer;
21 by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and	81	size_t buffer_size;
	82	size_t buffer_length;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	83	bool eof;
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	84	volatile bool completed;
	85	volatile int status;
13 by Björn Påhlsson Added following support:	86	struct process *next;
	87	} process;
	88
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	89	typedef struct plugin{
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	90	char name; / can be NULL or any plugin name */
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	91	char **argv;
	92	int argc;
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	93	char **environ;
	94	int envc;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	95	bool disabled;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	96	struct plugin *next;
	97	} plugin;
	98
37 by Teddy Hogeborn Non-tested commit for merge purposes.	99	static plugin getplugin(char name, plugin **plugin_list){
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	100	for (plugin p = plugin_list; p != NULL; p = p->next){
	101	if ((p->name == name)
	102	or (p->name and name and (strcmp(p->name, name) == 0))){
	103	return p;
	104	}
	105	}
	106	/* Create a new plugin */
	107	plugin *new_plugin = malloc(sizeof(plugin));
	108	if (new_plugin == NULL){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	109	return NULL;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	110	}
24.1.62 by Björn Påhlsson merge + small bugfix	111	char *copy_name = NULL;
	112	if(name != NULL){
	113	copy_name = strdup(name);
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	114	if(copy_name == NULL){
	115	return NULL;
	116	}
24.1.54 by Björn Påhlsson plugin-runner	117	}
	118
	119	*new_plugin = (plugin) { .name = copy_name,
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	120	.argc = 1,
	121	.envc = 0,
	122	.disabled = false,
	123	.next = *plugin_list };
	124
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	125	new_plugin->argv = malloc(sizeof(char ) 2);
	126	if (new_plugin->argv == NULL){
24.1.62 by Björn Påhlsson merge + small bugfix	127	free(copy_name);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	128	free(new_plugin);
	129	return NULL;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	130	}
24.1.54 by Björn Påhlsson plugin-runner	131	new_plugin->argv[0] = copy_name;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	132	new_plugin->argv[1] = NULL;
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	133
	134	new_plugin->environ = malloc(sizeof(char *));
	135	if(new_plugin->environ == NULL){
24.1.62 by Björn Påhlsson merge + small bugfix	136	free(copy_name);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	137	free(new_plugin->argv);
	138	free(new_plugin);
	139	return NULL;
	140	}
	141	new_plugin->environ[0] = NULL;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	142	/* Append the new plugin to the list */
	143	*plugin_list = new_plugin;
	144	return new_plugin;
	145	}
	146
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	147	/* Helper function for add_argument and add_environment */
	148	static bool add_to_char_array(const char new, char **array,
	149	int *len){
	150	/* Resize the pointed-to array to hold one more pointer */
	151	array = realloc(array, sizeof(char *)
	152	* (size_t) ((*len) + 2));
	153	/* Malloc check */
	154	if(*array == NULL){
	155	return false;
	156	}
	157	/* Make a copy of the new string */
	158	char *copy = strdup(new);
	159	if(copy == NULL){
	160	return false;
	161	}
	162	/* Insert the copy */
	163	(array)[len] = copy;
	164	(*len)++;
	165	/* Add a new terminating NULL pointer to the last element */
	166	(array)[len] = NULL;
	167	return true;
	168	}
	169
	170	/* Add to a plugin's argument vector */
	171	static bool add_argument(plugin p, const char arg){
	172	if(p == NULL){
	173	return false;
	174	}
	175	return add_to_char_array(arg, &(p->argv), &(p->argc));
	176	}
	177
	178	/* Add to a plugin's environment */
	179	static bool add_environment(plugin p, const char def){
	180	if(p == NULL){
	181	return false;
	182	}
	183	return add_to_char_array(def, &(p->environ), &(p->envc));
	184	}
	185
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	186
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	187	/*
	188	* Based on the example in the GNU LibC manual chapter 13.13 "File
	189	* Descriptor Flags".
	190	* *Note File Descriptor Flags:(libc)Descriptor Flags.
	191	*/
37 by Teddy Hogeborn Non-tested commit for merge purposes.	192	static int set_cloexec_flag(int fd)
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	193	{
	194	int ret = fcntl(fd, F_GETFD, 0);
	195	/* If reading the flags failed, return error indication now. */
	196	if(ret < 0){
	197	return ret;
	198	}
	199	/* Store modified flag word in the descriptor. */
	200	return fcntl(fd, F_SETFD, ret \| FD_CLOEXEC);
	201	}
	202
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	203	process *process_list = NULL;
	204
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	205	/* Mark processes as completed when they exit, and save their exit
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	206	status. */
	207	void handle_sigchld(__attribute__((unused)) int sig){
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	208	while(true){
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	209	process *proc = process_list;
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	210	int status;
	211	pid_t pid = waitpid(-1, &status, WNOHANG);
	212	if(pid == 0){
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	213	/* Only still running child processes */
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	214	break;
	215	}
	216	if(pid == -1){
	217	if (errno != ECHILD){
	218	perror("waitpid");
	219	}
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	220	/* No child processes */
	221	break;
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	222	}
	223
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	224	/* A child exited, find it in process_list */
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	225	while(proc != NULL and proc->pid != pid){
	226	proc = proc->next;
	227	}
	228	if(proc == NULL){
	229	/* Process not found in process list */
	230	continue;
	231	}
	232	proc->status = status;
	233	proc->completed = true;
	234	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	235	}
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	236
24.1.42 by Björn Påhlsson Added fallback to mandos-client	237	bool print_out_password(const char *buffer, size_t length){
64 by Teddy Hogeborn * mandos-client.c (print_out_password): Strip trailing '\n'.	238	ssize_t ret;
	239	if(length>0 and buffer[length-1] == '\n'){
	240	length--;
	241	}
	242	for(size_t written = 0; written < length; written += (size_t)ret){
24.1.42 by Björn Påhlsson Added fallback to mandos-client	243	ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
	244	length - written));
	245	if(ret < 0){
	246	return false;
	247	}
	248	}
	249	return true;
	250	}
	251
24.1.54 by Björn Påhlsson plugin-runner	252	static void free_plugin_list(plugin *plugin_list){
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	253	for(plugin *next; plugin_list != NULL; plugin_list = next){
24.1.54 by Björn Påhlsson plugin-runner	254	next = plugin_list->next;
	255	for(char *arg = plugin_list->argv; arg != NULL; arg++){
	256	free(*arg);
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	257	}
24.1.54 by Björn Påhlsson plugin-runner	258	free(plugin_list->argv);
	259	for(char *env = plugin_list->environ; env != NULL; env++){
	260	free(*env);
	261	}
	262	free(plugin_list->environ);
	263	free(plugin_list);
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	264	}
24.1.54 by Björn Påhlsson plugin-runner	265	}
24.1.54 by Björn Påhlsson plugin-runner	266
13 by Björn Påhlsson Added following support:	267	int main(int argc, char *argv[]){
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	268	char *plugindir = NULL;
	269	char *argfile = NULL;
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	270	FILE *conffp;
24.1.5 by Björn Påhlsson plugbasedclient:	271	size_t d_name_len;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	272	DIR *dir = NULL;
13 by Björn Påhlsson Added following support:	273	struct dirent *dirst;
13 by Björn Påhlsson Added following support:	274	struct stat st;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	275	fd_set rfds_all;
13 by Björn Påhlsson Added following support:	276	int ret, maxfd = 0;
24.1.6 by Björn Påhlsson plugbasedclient	277	uid_t uid = 65534;
24.1.6 by Björn Påhlsson plugbasedclient	278	gid_t gid = 65534;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	279	bool debug = false;
	280	int exitstatus = EXIT_SUCCESS;
24.1.7 by Björn Påhlsson merge	281	struct sigaction old_sigchld_action;
	282	struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
	283	.sa_flags = SA_NOCLDSTOP };
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	284	char **custom_argv = NULL;
	285	int custom_argc = 0;
	286
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	287	/* Establish a signal handler */
	288	sigemptyset(&sigchld_action.sa_mask);
	289	ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
24.1.54 by Björn Påhlsson plugin-runner	290	if(ret == -1){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	291	perror("sigaddset");
24.1.54 by Björn Påhlsson plugin-runner	292	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	293	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	294	}
	295	ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
24.1.54 by Björn Påhlsson plugin-runner	296	if(ret == -1){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	297	perror("sigaction");
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	298	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	299	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	300	}
	301
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	302	/* The options we understand. */
	303	struct argp_option options[] = {
	304	{ .name = "global-options", .key = 'g',
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	305	.arg = "OPTION[,OPTION[,...]]",
	306	.doc = "Options passed to all plugins" },
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	307	{ .name = "global-envs", .key = 'e',
	308	.arg = "VAR=value",
	309	.doc = "Environment variable passed to all plugins" },
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	310	{ .name = "options-for", .key = 'o',
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	311	.arg = "PLUGIN:OPTION[,OPTION[,...]]",
	312	.doc = "Options passed only to specified plugin" },
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	313	{ .name = "envs-for", .key = 'f',
	314	.arg = "PLUGIN:ENV=value",
	315	.doc = "Environment variable passed to specified plugin" },
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	316	{ .name = "disable", .key = 'd',
	317	.arg = "PLUGIN",
	318	.doc = "Disable a specific plugin", .group = 1 },
24.1.5 by Björn Påhlsson plugbasedclient:	319	{ .name = "plugin-dir", .key = 128,
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	320	.arg = "DIRECTORY",
	321	.doc = "Specify a different plugin directory", .group = 2 },
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	322	{ .name = "config-file", .key = 129,
	323	.arg = "FILE",
	324	.doc = "Specify a different configuration file", .group = 2 },
	325	{ .name = "userid", .key = 130,
	326	.arg = "ID", .flags = 0,
	327	.doc = "User ID the plugins will run as", .group = 3 },
	328	{ .name = "groupid", .key = 131,
	329	.arg = "ID", .flags = 0,
	330	.doc = "Group ID the plugins will run as", .group = 3 },
	331	{ .name = "debug", .key = 132,
	332	.doc = "Debug mode", .group = 4 },
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	333	{ .name = NULL }
	334	};
	335
	336	error_t parse_opt (int key, char arg, struct argp_state state) {
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	337	/* Get the INPUT argument from `argp_parse', which we know is a
	338	pointer to our plugin list pointer. */
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	339	plugin **plugins = state->input;
	340	switch (key) {
	341	case 'g':
	342	if (arg != NULL){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	343	char *p;
	344	while((p = strsep(&arg, ",")) != NULL){
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	345	if(p[0] == '\0'){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	346	continue;
	347	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	348	if(not add_argument(getplugin(NULL, plugins), p)){
	349	perror("add_argument");
	350	return ARGP_ERR_UNKNOWN;
	351	}
	352	}
	353	}
	354	break;
	355	case 'e':
	356	if(arg == NULL){
	357	break;
	358	}
	359	{
	360	char *envdef = strdup(arg);
	361	if(envdef == NULL){
	362	break;
	363	}
	364	if(not add_environment(getplugin(NULL, plugins), envdef)){
	365	perror("add_environment");
24.1.50 by Björn Påhlsson changed from using strtok to strsep	366	}
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	367	}
	368	break;
	369	case 'o':
	370	if (arg != NULL){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	371	char *p_name = strsep(&arg, ":");
	372	if(p_name[0] == '\0'){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	373	break;
	374	}
	375	char *opt = strsep(&arg, ":");
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	376	if(opt[0] == '\0'){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	377	break;
	378	}
	379	if(opt != NULL){
	380	char *p;
	381	while((p = strsep(&opt, ",")) != NULL){
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	382	if(p[0] == '\0'){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	383	continue;
	384	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	385	if(not add_argument(getplugin(p_name, plugins), p)){
	386	perror("add_argument");
	387	return ARGP_ERR_UNKNOWN;
	388	}
24.1.50 by Björn Påhlsson changed from using strtok to strsep	389	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	390	}
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	391	}
	392	break;
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	393	case 'f':
	394	if(arg == NULL){
	395	break;
	396	}
	397	{
	398	char *envdef = strchr(arg, ':');
	399	if(envdef == NULL){
	400	break;
	401	}
	402	char *p_name = strndup(arg, (size_t) (envdef-arg));
	403	if(p_name == NULL){
	404	break;
	405	}
	406	envdef++;
	407	if(not add_environment(getplugin(p_name, plugins), envdef)){
	408	perror("add_environment");
	409	}
	410	}
	411	break;
24.1.5 by Björn Påhlsson plugbasedclient:	412	case 'd':
24.1.5 by Björn Påhlsson plugbasedclient:	413	if (arg != NULL){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	414	plugin *p = getplugin(arg, plugins);
	415	if(p == NULL){
	416	return ARGP_ERR_UNKNOWN;
	417	}
	418	p->disabled = true;
24.1.5 by Björn Påhlsson plugbasedclient:	419	}
	420	break;
	421	case 128:
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	422	plugindir = strdup(arg);
	423	if(plugindir == NULL){
	424	perror("strdup");
	425	}
24.1.5 by Björn Påhlsson plugbasedclient:	426	break;
24.1.6 by Björn Påhlsson plugbasedclient	427	case 129:
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	428	argfile = strdup(arg);
	429	if(argfile == NULL){
	430	perror("strdup");
	431	}
	432	break;
	433	case 130:
24.1.6 by Björn Påhlsson plugbasedclient	434	uid = (uid_t)strtol(arg, NULL, 10);
24.1.6 by Björn Påhlsson plugbasedclient	435	break;
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	436	case 131:
24.1.6 by Björn Påhlsson plugbasedclient	437	gid = (gid_t)strtol(arg, NULL, 10);
24.1.6 by Björn Påhlsson plugbasedclient	438	break;
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	439	case 132:
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	440	debug = true;
	441	break;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	442	case ARGP_KEY_ARG:
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	443	fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	444	break;
	445	case ARGP_KEY_END:
	446	break;
	447	default:
	448	return ARGP_ERR_UNKNOWN;
	449	}
	450	return 0;
	451	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	452
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	453	plugin *plugin_list = NULL;
	454
	455	struct argp argp = { .options = options, .parser = parse_opt,
24.1.8 by Björn Påhlsson plugbasedclient	456	.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	457	.doc = "Mandos plugin runner -- Run plugins" };
	458
24.1.26 by Björn Påhlsson tally count of used symbols	459	ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
24.1.26 by Björn Påhlsson tally count of used symbols	460	if (ret == ARGP_ERR_UNKNOWN){
64 by Teddy Hogeborn * mandos-client.c (print_out_password): Strip trailing '\n'.	461	fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.26 by Björn Påhlsson tally count of used symbols	462	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	463	goto fallback;
24.1.26 by Björn Påhlsson tally count of used symbols	464	}
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	465
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	466	if (argfile == NULL){
	467	conffp = fopen(AFILE, "r");
	468	} else {
	469	conffp = fopen(argfile, "r");
	470	}
	471
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	472	if(conffp != NULL){
	473	char *org_line = NULL;
24.1.54 by Björn Påhlsson plugin-runner	474	char p, arg, new_arg, line;
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	475	size_t size = 0;
	476	ssize_t sret;
	477	const char whitespace_delims[] = " \r\t\f\v\n";
	478	const char comment_delim[] = "#";
	479
24.1.67 by Björn Påhlsson transformed a function to a part of main	480	custom_argc = 1;
	481	custom_argv = malloc(sizeof(char) 2);
	482	if(custom_argv == NULL){
	483	perror("malloc");
	484	exitstatus = EXIT_FAILURE;
	485	goto fallback;
	486	}
	487	custom_argv[0] = argv[0];
	488	custom_argv[1] = NULL;
	489
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	490	while(true){
	491	sret = getline(&org_line, &size, conffp);
	492	if(sret == -1){
	493	break;
	494	}
	495
	496	line = org_line;
	497	arg = strsep(&line, comment_delim);
	498	while((p = strsep(&arg, whitespace_delims)) != NULL){
	499	if(p[0] == '\0'){
	500	continue;
	501	}
	502	new_arg = strdup(p);
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	503	if(new_arg == NULL){
	504	perror("strdup");
	505	exitstatus = EXIT_FAILURE;
	506	free(org_line);
	507	goto fallback;
	508	}
	509
24.1.67 by Björn Påhlsson transformed a function to a part of main	510	custom_argc += 1;
	511	custom_argv = realloc(custom_argv, sizeof(char *)
	512	* ((unsigned int) custom_argc + 1));
	513	if(custom_argv == NULL){
	514	perror("realloc");
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	515	exitstatus = EXIT_FAILURE;
24.1.67 by Björn Påhlsson transformed a function to a part of main	516	free(org_line);
24.1.54 by Björn Påhlsson plugin-runner	517	goto fallback;
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	518	}
24.1.67 by Björn Påhlsson transformed a function to a part of main	519	custom_argv[custom_argc-1] = new_arg;
	520	custom_argv[custom_argc] = NULL;
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	521	}
	522	}
	523	free(org_line);
	524	} else{
24.1.52 by Björn Påhlsson merge + minor adjustments	525	/* Check for harmful errors and go to fallback. Other errors might
24.1.52 by Björn Påhlsson merge + minor adjustments	526	not affect opening plugins */
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	527	if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
	528	perror("fopen");
24.1.8 by Björn Påhlsson plugbasedclient	529	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	530	goto fallback;
24.1.8 by Björn Påhlsson plugbasedclient	531	}
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	532	}
	533
	534	if(custom_argv != NULL){
24.1.66 by Björn Påhlsson Merge.	535	ret = argp_parse (&argp, custom_argc, custom_argv, 0, 0, &plugin_list);
24.1.26 by Björn Påhlsson tally count of used symbols	536	if (ret == ARGP_ERR_UNKNOWN){
64 by Teddy Hogeborn * mandos-client.c (print_out_password): Strip trailing '\n'.	537	fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.26 by Björn Påhlsson tally count of used symbols	538	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	539	goto fallback;
24.1.26 by Björn Påhlsson tally count of used symbols	540	}
24.1.8 by Björn Påhlsson plugbasedclient	541	}
24.1.8 by Björn Påhlsson plugbasedclient	542
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	543	if(debug){
	544	for(plugin *p = plugin_list; p != NULL; p=p->next){
	545	fprintf(stderr, "Plugin: %s has %d arguments\n",
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	546	p->name ? p->name : "Global", p->argc - 1);
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	547	for(char *a = p->argv; a != NULL; a++){
	548	fprintf(stderr, "\tArg: %s\n", *a);
	549	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	550	fprintf(stderr, "...and %u environment variables\n", p->envc);
	551	for(char *a = p->environ; a != NULL; a++){
	552	fprintf(stderr, "\t%s\n", *a);
	553	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	554	}
	555	}
24.1.8 by Björn Påhlsson plugbasedclient	556
24.1.6 by Björn Påhlsson plugbasedclient	557	ret = setuid(uid);
	558	if (ret == -1){
	559	perror("setuid");
	560	}
24.1.7 by Björn Påhlsson merge	561
24.1.6 by Björn Påhlsson plugbasedclient	562	setgid(gid);
24.1.6 by Björn Påhlsson plugbasedclient	563	if (ret == -1){
39 by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.	564	perror("setgid");
24.1.6 by Björn Påhlsson plugbasedclient	565	}
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	566
	567	if (plugindir == NULL){
	568	dir = opendir(PDIR);
	569	} else {
	570	dir = opendir(plugindir);
	571	}
24.1.6 by Björn Påhlsson plugbasedclient	572
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	573	if(dir == NULL){
	574	perror("Could not open plugin dir");
	575	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	576	goto fallback;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	577	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	578
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	579	/* Set the FD_CLOEXEC flag on the directory, if possible */
	580	{
	581	int dir_fd = dirfd(dir);
	582	if(dir_fd >= 0){
	583	ret = set_cloexec_flag(dir_fd);
	584	if(ret < 0){
	585	perror("set_cloexec_flag");
	586	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	587	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	588	}
	589	}
	590	}
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	591
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	592	FD_ZERO(&rfds_all);
13 by Björn Påhlsson Added following support:	593
	594	while(true){
	595	dirst = readdir(dir);
	596
	597	// All directory entries have been processed
	598	if(dirst == NULL){
24.1.26 by Björn Påhlsson tally count of used symbols	599	if (errno == EBADF){
	600	perror("readdir");
	601	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	602	goto fallback;
24.1.26 by Björn Påhlsson tally count of used symbols	603	}
13 by Björn Påhlsson Added following support:	604	break;
	605	}
	606
	607	d_name_len = strlen(dirst->d_name);
	608
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	609	// Ignore dotfiles, backup files and other junk
	610	{
	611	bool bad_name = false;
	612
	613	const char const *bad_prefixes[] = { ".", "#", NULL };
	614
	615	const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
	616	".dpkg-old",
	617	".dpkg-divert", NULL };
	618	for(const char *pre = bad_prefixes; pre != NULL; pre++){
	619	size_t pre_len = strlen(*pre);
	620	if((d_name_len >= pre_len)
	621	and strncmp((dirst->d_name), *pre, pre_len) == 0){
	622	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	623	fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	624	" with bad prefix %s\n", dirst->d_name, *pre);
	625	}
	626	bad_name = true;
	627	break;
	628	}
	629	}
	630
	631	if(bad_name){
	632	continue;
	633	}
	634
	635	for(const char *suf = bad_suffixes; suf != NULL; suf++){
	636	size_t suf_len = strlen(*suf);
	637	if((d_name_len >= suf_len)
	638	and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
	639	== 0)){
	640	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	641	fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	642	" with bad suffix %s\n", dirst->d_name, *suf);
	643	}
	644	bad_name = true;
	645	break;
	646	}
	647	}
	648
	649	if(bad_name){
	650	continue;
	651	}
13 by Björn Påhlsson Added following support:	652	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	653
	654	char *filename;
	655	ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
	656	if(ret < 0){
	657	perror("asprintf");
24.1.46 by Björn Påhlsson mandos-client	658	continue;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	659	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	660
24.1.26 by Björn Påhlsson tally count of used symbols	661	ret = stat(filename, &st);
	662	if (ret == -1){
	663	perror("stat");
24.1.46 by Björn Påhlsson mandos-client	664	free(filename);
24.1.46 by Björn Påhlsson mandos-client	665	continue;
24.1.26 by Björn Påhlsson tally count of used symbols	666	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	667
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	668	if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
	669	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	670	fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	671	" with bad type or mode\n", filename);
	672	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	673	free(filename);
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	674	continue;
	675	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	676	plugin *p = getplugin(dirst->d_name, &plugin_list);
	677	if(p == NULL){
	678	perror("getplugin");
	679	free(filename);
	680	continue;
	681	}
	682	if(p->disabled){
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	683	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	684	fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	685	dirst->d_name);
	686	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	687	free(filename);
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	688	continue;
	689	}
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	690	{
	691	/* Add global arguments to argument list for this plugin */
	692	plugin *g = getplugin(NULL, &plugin_list);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	693	if(g != NULL){
	694	for(char *a = g->argv + 1; a != NULL; a++){
	695	if(not add_argument(p, *a)){
	696	perror("add_argument");
	697	}
	698	}
	699	/* Add global environment variables */
	700	for(char *e = g->environ; e != NULL; e++){
	701	if(not add_environment(p, *e)){
	702	perror("add_environment");
	703	}
	704	}
	705	}
	706	}
	707	/* If this plugin has any environment variables, we will call
	708	using execve and need to duplicate the environment from this
	709	process, too. */
	710	if(p->environ[0] != NULL){
	711	for(char *e = environ; e != NULL; e++){
	712	char copy = strdup(e);
	713	if(copy == NULL){
	714	perror("strdup");
	715	continue;
	716	}
	717	if(not add_environment(p, copy)){
	718	perror("add_environment");
	719	}
	720	}
	721	}
	722
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	723	int pipefd[2];
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	724	ret = pipe(pipefd);
	725	if (ret == -1){
	726	perror("pipe");
	727	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	728	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	729	}
	730	ret = set_cloexec_flag(pipefd[0]);
	731	if(ret < 0){
	732	perror("set_cloexec_flag");
	733	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	734	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	735	}
	736	ret = set_cloexec_flag(pipefd[1]);
	737	if(ret < 0){
	738	perror("set_cloexec_flag");
	739	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	740	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	741	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	742	/* Block SIGCHLD until process is safely in process list */
	743	ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
	744	if(ret < 0){
	745	perror("sigprocmask");
	746	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	747	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	748	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	749	// Starting a new process to be watched
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	750	pid_t pid = fork();
24.1.46 by Björn Påhlsson mandos-client	751	if(pid == -1){
	752	perror("fork");
	753	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	754	goto fallback;
24.1.46 by Björn Påhlsson mandos-client	755	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	756	if(pid == 0){
	757	/* this is the child process */
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	758	ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
	759	if(ret < 0){
	760	perror("sigaction");
	761	_exit(EXIT_FAILURE);
	762	}
	763	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
	764	if(ret < 0){
	765	perror("sigprocmask");
	766	_exit(EXIT_FAILURE);
	767	}
24.1.26 by Björn Påhlsson tally count of used symbols	768
	769	ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
	770	if(ret == -1){
	771	perror("dup2");
	772	_exit(EXIT_FAILURE);
	773	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	774
	775	if(dirfd(dir) < 0){
	776	/* If dir has no file descriptor, we could not set FD_CLOEXEC
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	777	above and must now close it manually here. */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	778	closedir(dir);
33 by Teddy Hogeborn * plugins.d/plugbasedclient.c (main): Close the pipe fd after dup2:ing	779	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	780	if(p->environ[0] == NULL){
	781	if(execv(filename, p->argv) < 0){
	782	perror("execv");
	783	_exit(EXIT_FAILURE);
	784	}
	785	} else {
	786	if(execve(filename, p->argv, p->environ) < 0){
	787	perror("execve");
	788	_exit(EXIT_FAILURE);
	789	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	790	}
	791	/* no return */
	792	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	793	/* parent process */
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	794	free(filename);
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	795	close(pipefd[1]); /* close unused write end of pipe */
	796	process *new_process = malloc(sizeof(process));
	797	if (new_process == NULL){
	798	perror("malloc");
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	799	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
	800	if(ret < 0){
	801	perror("sigprocmask");
	802	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	803	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	804	goto fallback;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	805	}
	806
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	807	*new_process = (struct process){ .pid = pid,
	808	.fd = pipefd[0],
	809	.next = process_list };
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	810	// List handling
	811	process_list = new_process;
	812	/* Unblock SIGCHLD so signal handler can be run if this process
	813	has already completed */
	814	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
	815	if(ret < 0){
	816	perror("sigprocmask");
	817	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	818	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	819	}
	820
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	821	FD_SET(new_process->fd, &rfds_all);
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	822
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	823	if (maxfd < new_process->fd){
	824	maxfd = new_process->fd;
	825	}
	826
13 by Björn Påhlsson Added following support:	827	}
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	828
24.1.54 by Björn Påhlsson plugin-runner	829	free_plugin_list(plugin_list);
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	830	plugin_list = NULL;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	831
13 by Björn Påhlsson Added following support:	832	closedir(dir);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	833	dir = NULL;
24.1.26 by Björn Påhlsson tally count of used symbols	834
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	835	if (process_list == NULL){
24.1.42 by Björn Påhlsson Added fallback to mandos-client	836	fprintf(stderr, "No plugin processes started. Incorrect plugin"
	837	" directory?\n");
	838	process_list = NULL;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	839	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	840	while(process_list){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	841	fd_set rfds = rfds_all;
	842	int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
	843	if (select_ret == -1){
	844	perror("select");
	845	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	846	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	847	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	848	/* OK, now either a process completed, or something can be read
	849	from one of them */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	850	for(process *proc = process_list; proc ; proc = proc->next){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	851	/* Is this process completely done? */
	852	if(proc->eof and proc->completed){
	853	/* Only accept the plugin output if it exited cleanly */
	854	if(not WIFEXITED(proc->status)
	855	or WEXITSTATUS(proc->status) != 0){
	856	/* Bad exit by plugin */
	857	if(debug){
	858	if(WIFEXITED(proc->status)){
60 by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing.	859	fprintf(stderr, "Plugin %u exited with status %d\n",
	860	(unsigned int) (proc->pid),
	861	WEXITSTATUS(proc->status));
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	862	} else if(WIFSIGNALED(proc->status)) {
60 by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing.	863	fprintf(stderr, "Plugin %u killed by signal %d\n",
	864	(unsigned int) (proc->pid),
	865	WTERMSIG(proc->status));
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	866	} else if(WCOREDUMP(proc->status)){
60 by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing.	867	fprintf(stderr, "Plugin %d dumped core\n",
	868	(unsigned int) (proc->pid));
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	869	}
	870	}
	871	/* Remove the plugin */
	872	FD_CLR(proc->fd, &rfds_all);
	873	/* Block signal while modifying process_list */
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	874	ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	875	if(ret < 0){
	876	perror("sigprocmask");
	877	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	878	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	879	}
	880	/* Delete this process entry from the list */
	881	if(process_list == proc){
	882	/* First one - simple */
	883	process_list = proc->next;
	884	} else {
	885	/* Second one or later */
	886	for(process *p = process_list; p != NULL; p = p->next){
	887	if(p->next == proc){
	888	p->next = proc->next;
	889	break;
	890	}
	891	}
	892	}
	893	/* We are done modifying process list, so unblock signal */
	894	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
	895	NULL);
	896	if(ret < 0){
	897	perror("sigprocmask");
	898	}
	899	free(proc->buffer);
	900	free(proc);
	901	/* We deleted this process from the list, so we can't go
	902	proc->next. Therefore, start over from the beginning of
	903	the process list */
	904	break;
	905	}
	906	/* This process exited nicely, so print its buffer */
24.1.42 by Björn Påhlsson Added fallback to mandos-client	907
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	908	bool bret = print_out_password(proc->buffer,
	909	proc->buffer_length);
24.1.42 by Björn Påhlsson Added fallback to mandos-client	910	if(not bret){
	911	perror("print_out_password");
	912	exitstatus = EXIT_FAILURE;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	913	}
24.1.54 by Björn Påhlsson plugin-runner	914	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	915	}
	916	/* This process has not completed. Does it have any output? */
	917	if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
	918	/* This process had nothing to say at this time */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	919	continue;
	920	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	921	/* Before reading, make the process' data buffer large enough */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	922	if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
	923	proc->buffer = realloc(proc->buffer, proc->buffer_size
	924	+ (size_t) BUFFER_SIZE);
	925	if (proc->buffer == NULL){
	926	perror("malloc");
	927	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	928	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	929	}
	930	proc->buffer_size += BUFFER_SIZE;
	931	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	932	/* Read from the process */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	933	ret = read(proc->fd, proc->buffer + proc->buffer_length,
	934	BUFFER_SIZE);
	935	if(ret < 0){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	936	/* Read error from this process; ignore the error */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	937	continue;
	938	}
	939	if(ret == 0){
	940	/* got EOF */
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	941	proc->eof = true;
	942	} else {
	943	proc->buffer_length += (size_t) ret;
13 by Björn Påhlsson Added following support:	944	}
	945	}
	946	}
24.1.45 by Björn Påhlsson Fixed fallback on error in mandos-client	947
	948
24.1.54 by Björn Påhlsson plugin-runner	949	fallback:
24.1.42 by Björn Påhlsson Added fallback to mandos-client	950
24.1.45 by Björn Påhlsson Fixed fallback on error in mandos-client	951	if(process_list == NULL or exitstatus != EXIT_SUCCESS){
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	952	/* Fallback if all plugins failed, none are found or an error
	953	occured */
24.1.42 by Björn Påhlsson Added fallback to mandos-client	954	bool bret;
	955	fprintf(stderr, "Going to fallback mode using getpass(3)\n");
	956	char *passwordbuffer = getpass("Password: ");
	957	bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
	958	if(not bret){
	959	perror("print_out_password");
	960	exitstatus = EXIT_FAILURE;
	961	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	962	}
24.1.42 by Björn Påhlsson Added fallback to mandos-client	963
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	964	/* Restore old signal handler */
24.1.54 by Björn Påhlsson plugin-runner	965	ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
	966	if(ret == -1){
	967	perror("sigaction");
	968	exitstatus = EXIT_FAILURE;
	969	}
	970
	971	if(custom_argv != NULL){
24.1.67 by Björn Påhlsson transformed a function to a part of main	972	for(char *arg = custom_argv+1; arg != NULL; arg++){
24.1.54 by Björn Påhlsson plugin-runner	973	free(*arg);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	974	}
24.1.54 by Björn Påhlsson plugin-runner	975	free(custom_argv);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	976	}
24.1.54 by Björn Påhlsson plugin-runner	977	free_plugin_list(plugin_list);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	978
	979	if(dir != NULL){
	980	closedir(dir);
	981	}
	982
	983	/* Free the process list and kill the processes */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	984	for(process *next; process_list != NULL; process_list = next){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	985	next = process_list->next;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	986	close(process_list->fd);
24.1.26 by Björn Påhlsson tally count of used symbols	987	ret = kill(process_list->pid, SIGTERM);
	988	if(ret == -1 and errno != ESRCH){
	989	/* set-uid proccesses migth not get closed */
	990	perror("kill");
	991	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	992	free(process_list->buffer);
	993	free(process_list);
13 by Björn Påhlsson Added following support:	994	}
13 by Björn Påhlsson Added following support:	995
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	996	/* Wait for any remaining child processes to terminate */
	997	do{
	998	ret = wait(NULL);
	999	} while(ret >= 0);
	1000	if(errno != ECHILD){
	1001	perror("wait");
	1002	}
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	1003
	1004	free(plugindir);
	1005	free(argfile);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1006
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	1007	return exitstatus;
13 by Björn Påhlsson Added following support:	1008	}