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

: (revision 137)

To get this branch, use:

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

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