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

: (revision 24.1.93)

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