/mandos/trunk

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