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