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

: (revision 248)

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	*
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(),
	41	WEXITSTATUS() */
	42	#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	43	#include <iso646.h> /* and, or, not */
	44	#include <dirent.h> /* DIR, struct dirent, opendir(),
24.1.26 by Björn Påhlsson tally count of used symbols	45	readdir(), closedir(), dirfd() */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	46	#include <unistd.h> /* struct stat, stat(), S_ISREG(),
24.1.26 by Björn Påhlsson tally count of used symbols	47	fcntl(), setuid(), setgid(),
	48	F_GETFD, F_SETFD, FD_CLOEXEC,
	49	access(), pipe(), fork(), close()
205 by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client,	50	dup2(), STDOUT_FILENO, _exit(),
24.1.26 by Björn Påhlsson tally count of used symbols	51	execv(), write(), read(),
	52	close() */
	53	#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
	54	FD_CLOEXEC */
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	55	#include <string.h> /* strsep, strlen(), asprintf() */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	56	#include <errno.h> /* errno */
24.1.26 by Björn Påhlsson tally count of used symbols	57	#include <argp.h> /* struct argp_option, struct
	58	argp_state, struct argp,
	59	argp_parse(), ARGP_ERR_UNKNOWN,
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	60	ARGP_KEY_END, ARGP_KEY_ARG,
	61	error_t */
24.1.26 by Björn Påhlsson tally count of used symbols	62	#include <signal.h> /* struct sigaction, sigemptyset(),
	63	sigaddset(), sigaction(),
	64	sigprocmask(), SIG_BLOCK, SIGCHLD,
	65	SIG_UNBLOCK, kill() */
	66	#include <errno.h> /* errno, EBADF */
13 by Björn Påhlsson Added following support:	67
37 by Teddy Hogeborn Non-tested commit for merge purposes.	68	#define BUFFER_SIZE 256
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	69
	70	#define PDIR "/lib/mandos/plugins.d"
	71	#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
37 by Teddy Hogeborn Non-tested commit for merge purposes.	72
217 by Teddy Hogeborn * .bzrignore: Added "man" directory (created by "make install-html").	73	const char *argp_program_version = "plugin-runner " VERSION;
24.1.35 by Björn Påhlsson version 1.0	74	const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
24.1.35 by Björn Påhlsson version 1.0	75
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	76	typedef struct plugin{
	77	char name; / can be NULL or any plugin name */
	78	char **argv;
	79	int argc;
	80	char **environ;
	81	int envc;
	82	bool disabled;
	83
	84	/* Variables used for running processes*/
13 by Björn Påhlsson Added following support:	85	pid_t pid;
	86	int fd;
	87	char *buffer;
21 by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and	88	size_t buffer_size;
	89	size_t buffer_length;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	90	bool eof;
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	91	volatile bool completed;
	92	volatile int status;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	93	struct plugin *next;
	94	} plugin;
	95
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	96	static plugin *plugin_list = NULL;
	97
24.1.90 by Björn Påhlsson fixed two bugs:	98	/* Gets an existing plugin based on name,
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	99	or if none is found, creates a new one */
	100	static plugin getplugin(char name){
	101	/* Check for exiting plugin with that name */
	102	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	103	if ((p->name == name)
	104	or (p->name and name and (strcmp(p->name, name) == 0))){
	105	return p;
	106	}
	107	}
	108	/* Create a new plugin */
	109	plugin *new_plugin = malloc(sizeof(plugin));
	110	if (new_plugin == NULL){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	111	return NULL;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	112	}
24.1.62 by Björn Påhlsson merge + small bugfix	113	char *copy_name = NULL;
	114	if(name != NULL){
	115	copy_name = strdup(name);
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	116	if(copy_name == NULL){
	117	return NULL;
	118	}
24.1.54 by Björn Påhlsson plugin-runner	119	}
24.1.90 by Björn Påhlsson fixed two bugs:	120
24.1.54 by Björn Påhlsson plugin-runner	121	*new_plugin = (plugin) { .name = copy_name,
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	122	.argc = 1,
	123	.disabled = false,
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	124	.next = plugin_list };
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	125
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	126	new_plugin->argv = malloc(sizeof(char ) 2);
	127	if (new_plugin->argv == NULL){
24.1.62 by Björn Påhlsson merge + small bugfix	128	free(copy_name);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	129	free(new_plugin);
	130	return NULL;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	131	}
24.1.54 by Björn Påhlsson plugin-runner	132	new_plugin->argv[0] = copy_name;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	133	new_plugin->argv[1] = NULL;
135 by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment	134
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	135	new_plugin->environ = malloc(sizeof(char *));
	136	if(new_plugin->environ == NULL){
24.1.62 by Björn Påhlsson merge + small bugfix	137	free(copy_name);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	138	free(new_plugin->argv);
	139	free(new_plugin);
	140	return NULL;
	141	}
	142	new_plugin->environ[0] = NULL;
135 by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment	143
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	144	/* Append the new plugin to the list */
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	145	plugin_list = new_plugin;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	146	return new_plugin;
	147	}
	148
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	149	/* Helper function for add_argument and add_environment */
	150	static bool add_to_char_array(const char new, char **array,
	151	int *len){
	152	/* Resize the pointed-to array to hold one more pointer */
	153	array = realloc(array, sizeof(char *)
	154	* (size_t) ((*len) + 2));
	155	/* Malloc check */
	156	if(*array == NULL){
	157	return false;
	158	}
	159	/* Make a copy of the new string */
	160	char *copy = strdup(new);
	161	if(copy == NULL){
	162	return false;
	163	}
	164	/* Insert the copy */
	165	(array)[len] = copy;
	166	(*len)++;
	167	/* Add a new terminating NULL pointer to the last element */
	168	(array)[len] = NULL;
	169	return true;
	170	}
	171
	172	/* Add to a plugin's argument vector */
	173	static bool add_argument(plugin p, const char arg){
	174	if(p == NULL){
	175	return false;
	176	}
	177	return add_to_char_array(arg, &(p->argv), &(p->argc));
	178	}
	179
	180	/* Add to a plugin's environment */
136 by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment	181	static bool add_environment(plugin p, const char def, bool replace){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	182	if(p == NULL){
	183	return false;
	184	}
135 by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment	185	/* namelen = length of name of environment variable */
	186	size_t namelen = (size_t)(strchrnul(def, '=') - def);
	187	/* Search for this environment variable */
	188	for(char *e = p->environ; e != NULL; e++){
24.1.90 by Björn Påhlsson fixed two bugs:	189	if(strncmp(*e, def, namelen + 1) == 0){
136 by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment	190	/* It already exists */
	191	if(replace){
24.1.90 by Björn Påhlsson fixed two bugs:	192	char new = realloc(e, strlen(def) + 1);
136 by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment	193	if(new == NULL){
	194	return false;
	195	}
	196	*e = new;
	197	strcpy(*e, def);
	198	}
135 by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment	199	return true;
	200	}
	201	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	202	return add_to_char_array(def, &(p->environ), &(p->envc));
	203	}
	204
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	205	/*
	206	* Based on the example in the GNU LibC manual chapter 13.13 "File
	207	* Descriptor Flags".
	208	* *Note File Descriptor Flags:(libc)Descriptor Flags.
	209	*/
187 by Teddy Hogeborn * debian/mandos-client.README.Debian: Document "eth0" default and how	210	static int set_cloexec_flag(int fd){
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	211	int ret = fcntl(fd, F_GETFD, 0);
	212	/* If reading the flags failed, return error indication now. */
	213	if(ret < 0){
	214	return ret;
	215	}
	216	/* Store modified flag word in the descriptor. */
	217	return fcntl(fd, F_SETFD, ret \| FD_CLOEXEC);
	218	}
	219
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	220
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	221	/* Mark processes as completed when they exit, and save their exit
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	222	status. */
187 by Teddy Hogeborn * debian/mandos-client.README.Debian: Document "eth0" default and how	223	static 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	224	while(true){
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	225	plugin *proc = plugin_list;
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	226	int status;
	227	pid_t pid = waitpid(-1, &status, WNOHANG);
	228	if(pid == 0){
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	229	/* Only still running child processes */
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	230	break;
	231	}
	232	if(pid == -1){
	233	if (errno != ECHILD){
	234	perror("waitpid");
	235	}
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	236	/* No child processes */
	237	break;
24.1.65 by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children	238	}
24.1.90 by Björn Påhlsson fixed two bugs:	239
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	240	/* 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	241	while(proc != NULL and proc->pid != pid){
	242	proc = proc->next;
	243	}
	244	if(proc == NULL){
	245	/* Process not found in process list */
	246	continue;
	247	}
	248	proc->status = status;
	249	proc->completed = true;
	250	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	251	}
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	252
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	253	/* Prints out a password to stdout */
187 by Teddy Hogeborn * debian/mandos-client.README.Debian: Document "eth0" default and how	254	static bool print_out_password(const char *buffer, size_t length){
64 by Teddy Hogeborn * mandos-client.c (print_out_password): Strip trailing '\n'.	255	ssize_t ret;
	256	for(size_t written = 0; written < length; written += (size_t)ret){
24.1.42 by Björn Påhlsson Added fallback to mandos-client	257	ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
	258	length - written));
	259	if(ret < 0){
	260	return false;
	261	}
	262	}
	263	return true;
	264	}
	265
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	266	/* Removes and free a plugin from the plugin list */
	267	static void free_plugin(plugin *plugin_node){
	268
	269	for(char *arg = plugin_node->argv; arg != NULL; arg++){
	270	free(*arg);
	271	}
	272	free(plugin_node->argv);
	273	for(char *env = plugin_node->environ; env != NULL; env++){
	274	free(*env);
	275	}
	276	free(plugin_node->environ);
	277	free(plugin_node->buffer);
	278
	279	/* Removes the plugin from the singly-linked list */
	280	if(plugin_node == plugin_list){
	281	/* First one - simple */
	282	plugin_list = plugin_list->next;
	283	} else {
	284	/* Second one or later */
	285	for(plugin *p = plugin_list; p != NULL; p = p->next){
	286	if(p->next == plugin_node){
	287	p->next = plugin_node->next;
	288	break;
	289	}
	290	}
	291	}
	292
	293	free(plugin_node);
	294	}
	295
	296	static void free_plugin_list(void){
	297	while(plugin_list != NULL){
	298	free_plugin(plugin_list);
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	299	}
24.1.54 by Björn Påhlsson plugin-runner	300	}
24.1.54 by Björn Påhlsson plugin-runner	301
13 by Björn Påhlsson Added following support:	302	int main(int argc, char *argv[]){
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	303	char *plugindir = NULL;
	304	char *argfile = NULL;
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	305	FILE *conffp;
24.1.5 by Björn Påhlsson plugbasedclient:	306	size_t d_name_len;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	307	DIR *dir = NULL;
13 by Björn Påhlsson Added following support:	308	struct dirent *dirst;
13 by Björn Påhlsson Added following support:	309	struct stat st;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	310	fd_set rfds_all;
13 by Björn Påhlsson Added following support:	311	int ret, maxfd = 0;
24.1.6 by Björn Påhlsson plugbasedclient	312	uid_t uid = 65534;
24.1.6 by Björn Påhlsson plugbasedclient	313	gid_t gid = 65534;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	314	bool debug = false;
	315	int exitstatus = EXIT_SUCCESS;
24.1.7 by Björn Påhlsson merge	316	struct sigaction old_sigchld_action;
	317	struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
	318	.sa_flags = SA_NOCLDSTOP };
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	319	char **custom_argv = NULL;
	320	int custom_argc = 0;
	321
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	322	/* Establish a signal handler */
	323	sigemptyset(&sigchld_action.sa_mask);
	324	ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
24.1.54 by Björn Påhlsson plugin-runner	325	if(ret == -1){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	326	perror("sigaddset");
24.1.54 by Björn Påhlsson plugin-runner	327	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	328	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	329	}
	330	ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
24.1.54 by Björn Påhlsson plugin-runner	331	if(ret == -1){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	332	perror("sigaction");
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	333	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	334	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	335	}
	336
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	337	/* The options we understand. */
	338	struct argp_option options[] = {
	339	{ .name = "global-options", .key = 'g',
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	340	.arg = "OPTION[,OPTION[,...]]",
	341	.doc = "Options passed to all plugins" },
138 by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G",	342	{ .name = "global-env", .key = 'G',
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	343	.arg = "VAR=value",
	344	.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	345	{ .name = "options-for", .key = 'o',
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	346	.arg = "PLUGIN:OPTION[,OPTION[,...]]",
	347	.doc = "Options passed only to specified plugin" },
138 by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G",	348	{ .name = "env-for", .key = 'E',
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	349	.arg = "PLUGIN:ENV=value",
	350	.doc = "Environment variable passed to specified plugin" },
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	351	{ .name = "disable", .key = 'd',
	352	.arg = "PLUGIN",
	353	.doc = "Disable a specific plugin", .group = 1 },
138 by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G",	354	{ .name = "enable", .key = 'e',
	355	.arg = "PLUGIN",
	356	.doc = "Enable a specific plugin", .group = 1 },
24.1.5 by Björn Påhlsson plugbasedclient:	357	{ .name = "plugin-dir", .key = 128,
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	358	.arg = "DIRECTORY",
	359	.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	360	{ .name = "config-file", .key = 129,
	361	.arg = "FILE",
	362	.doc = "Specify a different configuration file", .group = 2 },
	363	{ .name = "userid", .key = 130,
	364	.arg = "ID", .flags = 0,
	365	.doc = "User ID the plugins will run as", .group = 3 },
	366	{ .name = "groupid", .key = 131,
	367	.arg = "ID", .flags = 0,
	368	.doc = "Group ID the plugins will run as", .group = 3 },
	369	{ .name = "debug", .key = 132,
	370	.doc = "Debug mode", .group = 4 },
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	371	{ .name = NULL }
	372	};
	373
133 by Teddy Hogeborn * plugin-runner.c: Break a couple of long lines.	374	error_t parse_opt (int key, char *arg, __attribute__((unused))
	375	struct argp_state *state) {
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	376	switch (key) {
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	377	case 'g': /* --global-options */
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	378	if (arg != NULL){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	379	char *p;
	380	while((p = strsep(&arg, ",")) != NULL){
24.1.51 by Björn Påhlsson Added configuration files support for mandos-client	381	if(p[0] == '\0'){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	382	continue;
	383	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	384	if(not add_argument(getplugin(NULL), p)){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	385	perror("add_argument");
	386	return ARGP_ERR_UNKNOWN;
	387	}
	388	}
	389	}
	390	break;
138 by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G",	391	case 'G': /* --global-env */
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	392	if(arg == NULL){
	393	break;
	394	}
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	395	if(not add_environment(getplugin(NULL), arg, true)){
	396	perror("add_environment");
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	397	}
	398	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	399	case 'o': /* --options-for */
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	400	if (arg != NULL){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	401	char *p_name = strsep(&arg, ":");
24.1.90 by Björn Påhlsson fixed two bugs:	402	if(p_name[0] == '\0' or arg == NULL){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	403	break;
	404	}
	405	char *opt = strsep(&arg, ":");
24.1.90 by Björn Påhlsson fixed two bugs:	406	if(opt[0] == '\0' or opt == NULL){
24.1.50 by Björn Påhlsson changed from using strtok to strsep	407	break;
	408	}
24.1.90 by Björn Påhlsson fixed two bugs:	409	char *p;
	410	while((p = strsep(&opt, ",")) != NULL){
	411	if(p[0] == '\0'){
	412	continue;
	413	}
	414	if(not add_argument(getplugin(p_name), p)){
	415	perror("add_argument");
	416	return ARGP_ERR_UNKNOWN;
24.1.50 by Björn Påhlsson changed from using strtok to strsep	417	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	418	}
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	419	}
	420	break;
138 by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G",	421	case 'E': /* --env-for */
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	422	if(arg == NULL){
	423	break;
	424	}
	425	{
	426	char *envdef = strchr(arg, ':');
	427	if(envdef == NULL){
	428	break;
	429	}
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	430	*envdef = '\0';
	431	if(not add_environment(getplugin(arg), envdef+1, true)){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	432	perror("add_environment");
	433	}
	434	}
	435	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	436	case 'd': /* --disable */
24.1.5 by Björn Påhlsson plugbasedclient:	437	if (arg != NULL){
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	438	plugin *p = getplugin(arg);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	439	if(p == NULL){
	440	return ARGP_ERR_UNKNOWN;
	441	}
	442	p->disabled = true;
24.1.5 by Björn Påhlsson plugbasedclient:	443	}
24.1.5 by Björn Påhlsson plugbasedclient:	444	break;
138 by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G",	445	case 'e': /* --enable */
	446	if (arg != NULL){
	447	plugin *p = getplugin(arg);
	448	if(p == NULL){
	449	return ARGP_ERR_UNKNOWN;
	450	}
	451	p->disabled = false;
	452	}
	453	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	454	case 128: /* --plugin-dir */
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	455	free(plugindir);
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	456	plugindir = strdup(arg);
	457	if(plugindir == NULL){
	458	perror("strdup");
	459	}
24.1.5 by Björn Påhlsson plugbasedclient:	460	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	461	case 129: /* --config-file */
137 by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file".	462	/* This is already done by parse_opt_config_file() */
	463	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	464	case 130: /* --userid */
24.1.6 by Björn Påhlsson plugbasedclient	465	uid = (uid_t)strtol(arg, NULL, 10);
24.1.6 by Björn Påhlsson plugbasedclient	466	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	467	case 131: /* --groupid */
24.1.6 by Björn Påhlsson plugbasedclient	468	gid = (gid_t)strtol(arg, NULL, 10);
24.1.6 by Björn Påhlsson plugbasedclient	469	break;
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	470	case 132: /* --debug */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	471	debug = true;
	472	break;
24.1.1 by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they	473	case ARGP_KEY_ARG:
178 by Teddy Hogeborn * initramfs-tools-script: Fix permissions of "/tmp" in initrd.	474	/* Cryptsetup always passes an argument, which is an empty
	475	string if "none" was specified in /etc/crypttab. So if
	476	argument was empty, we ignore it silently. */
	477	if(arg[0] != '\0'){
	478	fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
	479	}
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",
236 by Teddy Hogeborn * initramfs-tools-hook: Also ignore plugins named "*.dpkg-bak".	704	".dpkg-bak",
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	705	".dpkg-divert", NULL };
	706	for(const char *pre = bad_prefixes; pre != NULL; pre++){
	707	size_t pre_len = strlen(*pre);
	708	if((d_name_len >= pre_len)
	709	and strncmp((dirst->d_name), *pre, pre_len) == 0){
	710	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	711	fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	712	" with bad prefix %s\n", dirst->d_name, *pre);
	713	}
	714	bad_name = true;
	715	break;
	716	}
	717	}
	718	if(bad_name){
	719	continue;
	720	}
	721	for(const char *suf = bad_suffixes; suf != NULL; suf++){
	722	size_t suf_len = strlen(*suf);
	723	if((d_name_len >= suf_len)
	724	and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
	725	== 0)){
	726	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	727	fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	728	" with bad suffix %s\n", dirst->d_name, *suf);
	729	}
	730	bad_name = true;
	731	break;
	732	}
	733	}
	734
	735	if(bad_name){
	736	continue;
	737	}
13 by Björn Påhlsson Added following support:	738	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	739
	740	char *filename;
169 by Teddy Hogeborn * plugin-runner.c (main): Bug fix: use built-in default value if	741	if(plugindir == NULL){
	742	ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
	743	} else {
	744	ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
	745	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	746	if(ret < 0){
	747	perror("asprintf");
24.1.46 by Björn Påhlsson mandos-client	748	continue;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	749	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	750
24.1.26 by Björn Påhlsson tally count of used symbols	751	ret = stat(filename, &st);
	752	if (ret == -1){
	753	perror("stat");
24.1.46 by Björn Påhlsson mandos-client	754	free(filename);
24.1.46 by Björn Påhlsson mandos-client	755	continue;
24.1.26 by Björn Påhlsson tally count of used symbols	756	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	757
	758	/* Ignore non-executable files */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	759	if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 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 type or mode\n", filename);
	763	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	764	free(filename);
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	765	continue;
	766	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	767
	768	plugin *p = getplugin(dirst->d_name);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	769	if(p == NULL){
	770	perror("getplugin");
	771	free(filename);
	772	continue;
	773	}
	774	if(p->disabled){
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	775	if(debug){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	776	fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	777	dirst->d_name);
	778	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	779	free(filename);
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	780	continue;
	781	}
32 by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function.	782	{
	783	/* 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	784	plugin *g = getplugin(NULL);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	785	if(g != NULL){
	786	for(char *a = g->argv + 1; a != NULL; a++){
	787	if(not add_argument(p, *a)){
	788	perror("add_argument");
	789	}
	790	}
	791	/* Add global environment variables */
	792	for(char *e = g->environ; e != NULL; e++){
136 by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment	793	if(not add_environment(p, *e, false)){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	794	perror("add_environment");
	795	}
	796	}
	797	}
	798	}
	799	/* If this plugin has any environment variables, we will call
	800	using execve and need to duplicate the environment from this
	801	process, too. */
	802	if(p->environ[0] != NULL){
	803	for(char *e = environ; e != NULL; e++){
136 by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment	804	if(not add_environment(p, *e, false)){
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	805	perror("add_environment");
	806	}
	807	}
	808	}
	809
98 by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free	810	int pipefd[2];
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	811	ret = pipe(pipefd);
	812	if (ret == -1){
	813	perror("pipe");
	814	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	815	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	816	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	817	/* Ask OS to automatic close the pipe on exec */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	818	ret = set_cloexec_flag(pipefd[0]);
	819	if(ret < 0){
	820	perror("set_cloexec_flag");
	821	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	822	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	823	}
	824	ret = set_cloexec_flag(pipefd[1]);
	825	if(ret < 0){
	826	perror("set_cloexec_flag");
	827	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	828	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	829	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	830	/* Block SIGCHLD until process is safely in process list */
	831	ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
	832	if(ret < 0){
	833	perror("sigprocmask");
	834	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	835	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	836	}
136 by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment	837	/* Starting a new process to be watched */
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	838	pid_t pid = fork();
24.1.46 by Björn Påhlsson mandos-client	839	if(pid == -1){
	840	perror("fork");
	841	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	842	goto fallback;
24.1.46 by Björn Påhlsson mandos-client	843	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	844	if(pid == 0){
	845	/* this is the child process */
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	846	ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
	847	if(ret < 0){
	848	perror("sigaction");
	849	_exit(EXIT_FAILURE);
	850	}
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	851	ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	852	if(ret < 0){
	853	perror("sigprocmask");
	854	_exit(EXIT_FAILURE);
	855	}
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	856
24.1.26 by Björn Påhlsson tally count of used symbols	857	ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
	858	if(ret == -1){
	859	perror("dup2");
	860	_exit(EXIT_FAILURE);
	861	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	862
	863	if(dirfd(dir) < 0){
	864	/* If dir has no file descriptor, we could not set FD_CLOEXEC
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	865	above and must now close it manually here. */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	866	closedir(dir);
33 by Teddy Hogeborn * plugins.d/plugbasedclient.c (main): Close the pipe fd after dup2:ing	867	}
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	868	if(p->environ[0] == NULL){
	869	if(execv(filename, p->argv) < 0){
	870	perror("execv");
	871	_exit(EXIT_FAILURE);
	872	}
	873	} else {
	874	if(execve(filename, p->argv, p->environ) < 0){
	875	perror("execve");
	876	_exit(EXIT_FAILURE);
	877	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	878	}
	879	/* no return */
	880	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	881	/* Parent process */
	882	close(pipefd[1]); /* Close unused write end of pipe */
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	883	free(filename);
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	884	plugin *new_plugin = getplugin(dirst->d_name);
	885	if (new_plugin == NULL){
	886	perror("getplugin");
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	887	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
	888	if(ret < 0){
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	889	perror("sigprocmask");
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	890	}
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	891	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	892	goto fallback;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	893	}
	894
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	895	new_plugin->pid = pid;
	896	new_plugin->fd = pipefd[0];
	897
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	898	/* Unblock SIGCHLD so signal handler can be run if this process
	899	has already completed */
	900	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
	901	if(ret < 0){
	902	perror("sigprocmask");
	903	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	904	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	905	}
	906
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	907	FD_SET(new_plugin->fd, &rfds_all);
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	908
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	909	if (maxfd < new_plugin->fd){
	910	maxfd = new_plugin->fd;
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	911	}
13 by Björn Påhlsson Added following support:	912	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	913
13 by Björn Påhlsson Added following support:	914	closedir(dir);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	915	dir = NULL;
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	916
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	917	for(plugin *p = plugin_list; p != NULL; p = p->next){
	918	if(p->pid != 0){
	919	break;
	920	}
	921	if(p->next == NULL){
	922	fprintf(stderr, "No plugin processes started. Incorrect plugin"
	923	" directory?\n");
	924	free_plugin_list();
	925	}
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	926	}
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	927
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	928	/* Main loop while running plugins exist */
	929	while(plugin_list){
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	930	fd_set rfds = rfds_all;
	931	int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
	932	if (select_ret == -1){
	933	perror("select");
	934	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	935	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	936	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	937	/* OK, now either a process completed, or something can be read
	938	from one of them */
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	939	for(plugin *proc = plugin_list; proc != NULL;){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	940	/* Is this process completely done? */
	941	if(proc->eof and proc->completed){
	942	/* Only accept the plugin output if it exited cleanly */
	943	if(not WIFEXITED(proc->status)
	944	or WEXITSTATUS(proc->status) != 0){
	945	/* Bad exit by plugin */
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	946
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	947	if(debug){
	948	if(WIFEXITED(proc->status)){
60 by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing.	949	fprintf(stderr, "Plugin %u exited with status %d\n",
	950	(unsigned int) (proc->pid),
	951	WEXITSTATUS(proc->status));
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	952	} else if(WIFSIGNALED(proc->status)) {
60 by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing.	953	fprintf(stderr, "Plugin %u killed by signal %d\n",
	954	(unsigned int) (proc->pid),
	955	WTERMSIG(proc->status));
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	956	} else if(WCOREDUMP(proc->status)){
60 by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing.	957	fprintf(stderr, "Plugin %d dumped core\n",
	958	(unsigned int) (proc->pid));
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	959	}
	960	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	961
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	962	/* Remove the plugin */
	963	FD_CLR(proc->fd, &rfds_all);
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	964
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	965	/* Block signal while modifying process_list */
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	966	ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	967	if(ret < 0){
	968	perror("sigprocmask");
	969	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	970	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	971	}
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	972
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	973	plugin *next_plugin = proc->next;
	974	free_plugin(proc);
	975	proc = next_plugin;
	976
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	977	/* We are done modifying process list, so unblock signal */
	978	ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
	979	NULL);
	980	if(ret < 0){
	981	perror("sigprocmask");
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	982	exitstatus = EXIT_FAILURE;
	983	goto fallback;
	984	}
	985
	986	if(plugin_list == NULL){
	987	break;
	988	}
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	989
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	990	continue;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	991	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	992
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	993	/* This process exited nicely, so print its buffer */
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	994
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	995	bool bret = print_out_password(proc->buffer,
	996	proc->buffer_length);
24.1.42 by Björn Påhlsson Added fallback to mandos-client	997	if(not bret){
	998	perror("print_out_password");
	999	exitstatus = EXIT_FAILURE;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1000	}
24.1.54 by Björn Påhlsson plugin-runner	1001	goto fallback;
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1002	}
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	1003
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1004	/* This process has not completed. Does it have any output? */
	1005	if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
	1006	/* This process had nothing to say at this time */
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	1007	proc = proc->next;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	1008	continue;
	1009	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1010	/* Before reading, make the process' data buffer large enough */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	1011	if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
	1012	proc->buffer = realloc(proc->buffer, proc->buffer_size
	1013	+ (size_t) BUFFER_SIZE);
	1014	if (proc->buffer == NULL){
	1015	perror("malloc");
	1016	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson plugin-runner	1017	goto fallback;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	1018	}
	1019	proc->buffer_size += BUFFER_SIZE;
	1020	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1021	/* Read from the process */
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	1022	ret = read(proc->fd, proc->buffer + proc->buffer_length,
	1023	BUFFER_SIZE);
	1024	if(ret < 0){
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1025	/* Read error from this process; ignore the error */
24.1.92 by Björn Påhlsson Several memory leaks detected by valgrind fixed	1026	proc = proc->next;
34 by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set	1027	continue;
	1028	}
	1029	if(ret == 0){
	1030	/* got EOF */
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1031	proc->eof = true;
	1032	} else {
	1033	proc->buffer_length += (size_t) ret;
13 by Björn Påhlsson Added following support:	1034	}
	1035	}
	1036	}
24.1.45 by Björn Påhlsson Fixed fallback on error in mandos-client	1037
	1038
24.1.54 by Björn Påhlsson plugin-runner	1039	fallback:
24.1.42 by Björn Påhlsson Added fallback to mandos-client	1040
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	1041	if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
102 by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile.	1042	/* Fallback if all plugins failed, none are found or an error
	1043	occured */
24.1.42 by Björn Påhlsson Added fallback to mandos-client	1044	bool bret;
	1045	fprintf(stderr, "Going to fallback mode using getpass(3)\n");
	1046	char *passwordbuffer = getpass("Password: ");
168 by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only	1047	size_t len = strlen(passwordbuffer);
	1048	/* Strip trailing newline */
	1049	if(len > 0 and passwordbuffer[len-1] == '\n'){
	1050	passwordbuffer[len-1] = '\0'; /* not strictly necessary */
	1051	len--;
	1052	}
	1053	bret = print_out_password(passwordbuffer, len);
24.1.42 by Björn Påhlsson Added fallback to mandos-client	1054	if(not bret){
	1055	perror("print_out_password");
	1056	exitstatus = EXIT_FAILURE;
	1057	}
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1058	}
24.1.42 by Björn Påhlsson Added fallback to mandos-client	1059
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1060	/* Restore old signal handler */
24.1.54 by Björn Påhlsson plugin-runner	1061	ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
	1062	if(ret == -1){
	1063	perror("sigaction");
	1064	exitstatus = EXIT_FAILURE;
	1065	}
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	1066
24.1.54 by Björn Påhlsson plugin-runner	1067	if(custom_argv != NULL){
24.1.67 by Björn Påhlsson transformed a function to a part of main	1068	for(char *arg = custom_argv+1; arg != NULL; arg++){
24.1.54 by Björn Påhlsson plugin-runner	1069	free(*arg);
78 by Teddy Hogeborn Add feature to specify custom environment variables for plugins.	1070	}
24.1.54 by Björn Påhlsson plugin-runner	1071	free(custom_argv);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1072	}
	1073
	1074	if(dir != NULL){
	1075	closedir(dir);
	1076	}
	1077
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	1078	/* Kill the processes */
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	1079	for(plugin *p = plugin_list; p != NULL; p = p->next){
	1080	if(p->pid != 0){
	1081	close(p->fd);
	1082	ret = kill(p->pid, SIGTERM);
	1083	if(ret == -1 and errno != ESRCH){
	1084	/* Set-uid proccesses might not get closed */
	1085	perror("kill");
	1086	}
24.1.26 by Björn Påhlsson tally count of used symbols	1087	}
13 by Björn Påhlsson Added following support:	1088	}
13 by Björn Påhlsson Added following support:	1089
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1090	/* Wait for any remaining child processes to terminate */
	1091	do{
	1092	ret = wait(NULL);
	1093	} while(ret >= 0);
	1094	if(errno != ECHILD){
	1095	perror("wait");
	1096	}
210 by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to	1097
24.1.76 by Björn Påhlsson Rearranged so plugins and processes is the same thing	1098	free_plugin_list();
	1099
24.1.69 by Björn Påhlsson added configfile as a optional argument to plugin-runner	1100	free(plugindir);
	1101	free(argfile);
35 by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed",	1102
31 by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments.	1103	return exitstatus;
13 by Björn Påhlsson Added following support:	1104	}