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

: (revision 24.1.145)

To get this branch, use:

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

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