/mandos/release

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