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