/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1
/*  -*- coding: utf-8 -*- */
2
/*
3
 * Mandos plugin runner - Run Mandos plugins
4
 *
246 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,
308 by Teddy Hogeborn
* plugin-runner.c: Comment change.
65
				   SIG_UNBLOCK, kill(), sig_atomic_t
66
				*/
24.1.26 by Björn Påhlsson
tally count of used symbols
67
#include <errno.h>		/* errno, EBADF */
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
68
#include <inttypes.h>		/* intmax_t, PRIdMAX, strtoimax() */
13 by Björn Påhlsson
Added following support:
69
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
70
#define BUFFER_SIZE 256
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
71
72
#define PDIR "/lib/mandos/plugins.d"
73
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
74
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
75
const char *argp_program_version = "plugin-runner " VERSION;
24.1.35 by Björn Påhlsson
version 1.0
76
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
77
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
78
typedef struct plugin{
79
  char *name;			/* can be NULL or any plugin name */
80
  char **argv;
81
  int argc;
82
  char **environ;
83
  int envc;
84
  bool disabled;
85
86
  /* Variables used for running processes*/
13 by Björn Påhlsson
Added following support:
87
  pid_t pid;
88
  int fd;
89
  char *buffer;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
90
  size_t buffer_size;
91
  size_t buffer_length;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
92
  bool eof;
296 by Teddy Hogeborn
* plugin-runner.c (struct plugin.completed): Changed type to "volatile
93
  volatile sig_atomic_t completed;
297 by Teddy Hogeborn
* plugin-runner.c (struct plugin.status): Changed type to "int".
94
  int status;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
95
  struct plugin *next;
96
} plugin;
97
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
98
static plugin *plugin_list = NULL;
99
24.1.90 by Björn Påhlsson
fixed two bugs:
100
/* Gets an existing plugin based on name,
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
101
   or if none is found, creates a new one */
102
static plugin *getplugin(char *name){
103
  /* Check for exiting plugin with that name */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
104
  for(plugin *p = plugin_list; p != NULL; p = p->next){
105
    if((p->name == name)
106
       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
107
      return p;
108
    }
109
  }
110
  /* Create a new plugin */
111
  plugin *new_plugin = malloc(sizeof(plugin));
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
112
  if(new_plugin == NULL){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
113
    return NULL;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
114
  }
24.1.62 by Björn Påhlsson
merge + small bugfix
115
  char *copy_name = NULL;
116
  if(name != NULL){
117
    copy_name = strdup(name);
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
118
    if(copy_name == NULL){
272 by Teddy Hogeborn
Fix problem found using cppcheck, thanks to George Danchev
119
      free(new_plugin);
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
120
      return NULL;
121
    }
24.1.54 by Björn Påhlsson
plugin-runner
122
  }
24.1.90 by Björn Påhlsson
fixed two bugs:
123
  
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
124
  *new_plugin = (plugin){ .name = copy_name,
125
			  .argc = 1,
126
			  .disabled = false,
127
			  .next = plugin_list };
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
128
  
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
129
  new_plugin->argv = malloc(sizeof(char *) * 2);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
130
  if(new_plugin->argv == NULL){
24.1.62 by Björn Påhlsson
merge + small bugfix
131
    free(copy_name);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
132
    free(new_plugin);
133
    return NULL;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
134
  }
24.1.54 by Björn Påhlsson
plugin-runner
135
  new_plugin->argv[0] = copy_name;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
136
  new_plugin->argv[1] = NULL;
135 by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment
137
  
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
138
  new_plugin->environ = malloc(sizeof(char *));
139
  if(new_plugin->environ == NULL){
24.1.62 by Björn Påhlsson
merge + small bugfix
140
    free(copy_name);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
141
    free(new_plugin->argv);
142
    free(new_plugin);
143
    return NULL;
144
  }
145
  new_plugin->environ[0] = NULL;
135 by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment
146
  
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
147
  /* Append the new plugin to the list */
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
148
  plugin_list = new_plugin;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
149
  return new_plugin;
150
}
151
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
152
/* Helper function for add_argument and add_environment */
153
static bool add_to_char_array(const char *new, char ***array,
154
			      int *len){
155
  /* Resize the pointed-to array to hold one more pointer */
156
  *array = realloc(*array, sizeof(char *)
157
		   * (size_t) ((*len) + 2));
158
  /* Malloc check */
159
  if(*array == NULL){
160
    return false;
161
  }
162
  /* Make a copy of the new string */
163
  char *copy = strdup(new);
164
  if(copy == NULL){
165
    return false;
166
  }
167
  /* Insert the copy */
168
  (*array)[*len] = copy;
169
  (*len)++;
170
  /* Add a new terminating NULL pointer to the last element */
171
  (*array)[*len] = NULL;
172
  return true;
173
}
174
175
/* Add to a plugin's argument vector */
176
static bool add_argument(plugin *p, const char *arg){
177
  if(p == NULL){
178
    return false;
179
  }
180
  return add_to_char_array(arg, &(p->argv), &(p->argc));
181
}
182
183
/* Add to a plugin's environment */
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
184
static bool add_environment(plugin *p, const char *def, bool replace){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
185
  if(p == NULL){
186
    return false;
187
  }
135 by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment
188
  /* namelen = length of name of environment variable */
189
  size_t namelen = (size_t)(strchrnul(def, '=') - def);
190
  /* Search for this environment variable */
191
  for(char **e = p->environ; *e != NULL; e++){
24.1.90 by Björn Påhlsson
fixed two bugs:
192
    if(strncmp(*e, def, namelen + 1) == 0){
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
193
      /* It already exists */
194
      if(replace){
24.1.90 by Björn Påhlsson
fixed two bugs:
195
	char *new = realloc(*e, strlen(def) + 1);
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
196
	if(new == NULL){
197
	  return false;
198
	}
199
	*e = new;
200
	strcpy(*e, def);
201
      }
135 by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment
202
      return true;
203
    }
204
  }
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
205
  return add_to_char_array(def, &(p->environ), &(p->envc));
206
}
207
32 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
208
/*
209
 * Based on the example in the GNU LibC manual chapter 13.13 "File
210
 * Descriptor Flags".
211
 * *Note File Descriptor Flags:(libc)Descriptor Flags.
212
 */
187 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Document "eth0" default and how
213
static int set_cloexec_flag(int fd){
32 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
214
  int ret = fcntl(fd, F_GETFD, 0);
215
  /* If reading the flags failed, return error indication now. */
216
  if(ret < 0){
217
    return ret;
218
  }
219
  /* Store modified flag word in the descriptor. */
220
  return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
221
}
222
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
223
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
224
/* Mark processes as completed when they exit, and save their exit
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
225
   status. */
187 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Document "eth0" default and how
226
static void handle_sigchld(__attribute__((unused)) int sig){
298 by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Bug fix: Save and restore "errno".
227
  int old_errno = errno;
24.1.65 by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children
228
  while(true){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
229
    plugin *proc = plugin_list;
24.1.65 by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children
230
    int status;
231
    pid_t pid = waitpid(-1, &status, WNOHANG);
232
    if(pid == 0){
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
233
      /* Only still running child processes */
24.1.65 by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children
234
      break;
235
    }
236
    if(pid == -1){
295 by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Clarify logic.
237
      if(errno == ECHILD){
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
      }
295 by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Clarify logic.
241
      perror("waitpid");
24.1.65 by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children
242
    }
24.1.90 by Björn Påhlsson
fixed two bugs:
243
    
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
244
    /* 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
245
    while(proc != NULL and proc->pid != pid){
246
      proc = proc->next;
247
    }
248
    if(proc == NULL){
249
      /* Process not found in process list */
250
      continue;
251
    }
252
    proc->status = status;
296 by Teddy Hogeborn
* plugin-runner.c (struct plugin.completed): Changed type to "volatile
253
    proc->completed = 1;
24.1.65 by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children
254
  }
298 by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Bug fix: Save and restore "errno".
255
  errno = old_errno;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
256
}
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
257
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
258
/* Prints out a password to stdout */
187 by Teddy Hogeborn
* debian/mandos-client.README.Debian: Document "eth0" default and how
259
static bool print_out_password(const char *buffer, size_t length){
64 by Teddy Hogeborn
* mandos-client.c (print_out_password): Strip trailing '\n'.
260
  ssize_t ret;
261
  for(size_t written = 0; written < length; written += (size_t)ret){
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
262
    ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
263
				   length - written));
264
    if(ret < 0){
265
      return false;
266
    }
267
  }
268
  return true;
269
}
270
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
271
/* Removes and free a plugin from the plugin list */
272
static void free_plugin(plugin *plugin_node){
273
  
274
  for(char **arg = plugin_node->argv; *arg != NULL; arg++){
275
    free(*arg);
276
  }
277
  free(plugin_node->argv);
278
  for(char **env = plugin_node->environ; *env != NULL; env++){
279
    free(*env);
280
  }
281
  free(plugin_node->environ);
282
  free(plugin_node->buffer);
283
284
  /* Removes the plugin from the singly-linked list */
285
  if(plugin_node == plugin_list){
286
    /* First one - simple */
287
    plugin_list = plugin_list->next;
288
  } else {
289
    /* Second one or later */
290
    for(plugin *p = plugin_list; p != NULL; p = p->next){
291
      if(p->next == plugin_node){
292
	p->next = plugin_node->next;
293
	break;
294
      }
295
    }
296
  }
297
  
298
  free(plugin_node);
299
}
300
301
static void free_plugin_list(void){
302
  while(plugin_list != NULL){
303
    free_plugin(plugin_list);
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
304
  }
24.1.54 by Björn Påhlsson
plugin-runner
305
}
306
13 by Björn Påhlsson
Added following support:
307
int main(int argc, char *argv[]){
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
308
  char *plugindir = NULL;
309
  char *argfile = NULL;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
310
  FILE *conffp;
24.1.5 by Björn Påhlsson
plugbasedclient:
311
  size_t d_name_len;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
312
  DIR *dir = NULL;
13 by Björn Påhlsson
Added following support:
313
  struct dirent *dirst;
314
  struct stat st;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
315
  fd_set rfds_all;
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
316
  int ret, maxfd = 0;
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
317
  ssize_t sret;
268 by Teddy Hogeborn
Fixes for sscanf usage:
318
  intmax_t tmpmax;
24.1.6 by Björn Påhlsson
plugbasedclient
319
  uid_t uid = 65534;
320
  gid_t gid = 65534;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
321
  bool debug = false;
322
  int exitstatus = EXIT_SUCCESS;
24.1.7 by Björn Påhlsson
merge
323
  struct sigaction old_sigchld_action;
324
  struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
325
				      .sa_flags = SA_NOCLDSTOP };
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
326
  char **custom_argv = NULL;
327
  int custom_argc = 0;
328
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
329
  /* Establish a signal handler */
330
  sigemptyset(&sigchld_action.sa_mask);
331
  ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
24.1.54 by Björn Påhlsson
plugin-runner
332
  if(ret == -1){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
333
    perror("sigaddset");
24.1.54 by Björn Påhlsson
plugin-runner
334
    exitstatus = EXIT_FAILURE;
335
    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
336
  }
337
  ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
24.1.54 by Björn Påhlsson
plugin-runner
338
  if(ret == -1){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
339
    perror("sigaction");
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
340
    exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
341
    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
342
  }
343
  
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
344
  /* The options we understand. */
345
  struct argp_option options[] = {
346
    { .name = "global-options", .key = 'g',
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
347
      .arg = "OPTION[,OPTION[,...]]",
348
      .doc = "Options passed to all plugins" },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
349
    { .name = "global-env", .key = 'G',
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
350
      .arg = "VAR=value",
351
      .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
352
    { .name = "options-for", .key = 'o',
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
353
      .arg = "PLUGIN:OPTION[,OPTION[,...]]",
354
      .doc = "Options passed only to specified plugin" },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
355
    { .name = "env-for", .key = 'E',
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
356
      .arg = "PLUGIN:ENV=value",
357
      .doc = "Environment variable passed to specified plugin" },
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
358
    { .name = "disable", .key = 'd',
359
      .arg = "PLUGIN",
360
      .doc = "Disable a specific plugin", .group = 1 },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
361
    { .name = "enable", .key = 'e',
362
      .arg = "PLUGIN",
363
      .doc = "Enable a specific plugin", .group = 1 },
24.1.5 by Björn Påhlsson
plugbasedclient:
364
    { .name = "plugin-dir", .key = 128,
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
365
      .arg = "DIRECTORY",
366
      .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
367
    { .name = "config-file", .key = 129,
368
      .arg = "FILE",
369
      .doc = "Specify a different configuration file", .group = 2 },
370
    { .name = "userid", .key = 130,
371
      .arg = "ID", .flags = 0,
372
      .doc = "User ID the plugins will run as", .group = 3 },
373
    { .name = "groupid", .key = 131,
374
      .arg = "ID", .flags = 0,
375
      .doc = "Group ID the plugins will run as", .group = 3 },
376
    { .name = "debug", .key = 132,
377
      .doc = "Debug mode", .group = 4 },
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
378
    { .name = NULL }
379
  };
380
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
381
  error_t parse_opt(int key, char *arg, __attribute__((unused))
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
382
		    struct argp_state *state){
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
383
    char *tmp;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
384
    switch(key){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
385
    case 'g': 			/* --global-options */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
386
      if(arg != NULL){
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
387
	char *plugin_option;
388
	while((plugin_option = strsep(&arg, ",")) != NULL){
389
	  if(plugin_option[0] == '\0'){
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
390
	    continue;
391
	  }
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
392
	  if(not add_argument(getplugin(NULL), plugin_option)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
393
	    perror("add_argument");
394
	    return ARGP_ERR_UNKNOWN;
395
	  }
396
	}
397
      }
398
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
399
    case 'G':			/* --global-env */
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
400
      if(arg == NULL){
401
	break;
402
      }
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
403
      if(not add_environment(getplugin(NULL), arg, true)){
404
	perror("add_environment");
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
405
      }
406
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
407
    case 'o':			/* --options-for */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
408
      if(arg != NULL){
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
409
	char *plugin_name = strsep(&arg, ":");
410
	if(plugin_name[0] == '\0'){
411
	  break;
412
	}
413
	char *plugin_option;
414
	while((plugin_option = strsep(&arg, ",")) != NULL){
415
	  if(not add_argument(getplugin(plugin_name), plugin_option)){
24.1.90 by Björn Påhlsson
fixed two bugs:
416
	    perror("add_argument");
417
	    return ARGP_ERR_UNKNOWN;
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
418
	  }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
419
	}
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
420
      }
421
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
422
    case 'E':			/* --env-for */
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
423
      if(arg == NULL){
424
	break;
425
      }
426
      {
427
	char *envdef = strchr(arg, ':');
428
	if(envdef == NULL){
429
	  break;
430
	}
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
431
	*envdef = '\0';
432
	if(not add_environment(getplugin(arg), envdef+1, true)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
433
	  perror("add_environment");
434
	}
435
      }
436
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
437
    case 'd':			/* --disable */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
438
      if(arg != NULL){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
439
	plugin *p = getplugin(arg);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
440
	if(p == NULL){
441
	  return ARGP_ERR_UNKNOWN;
442
	}
443
	p->disabled = true;
24.1.5 by Björn Påhlsson
plugbasedclient:
444
      }
445
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
446
    case 'e':			/* --enable */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
447
      if(arg != NULL){
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
448
	plugin *p = getplugin(arg);
449
	if(p == NULL){
450
	  return ARGP_ERR_UNKNOWN;
451
	}
452
	p->disabled = false;
453
      }
454
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
455
    case 128:			/* --plugin-dir */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
456
      free(plugindir);
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
457
      plugindir = strdup(arg);
458
      if(plugindir == NULL){
459
	perror("strdup");
460
      }      
24.1.5 by Björn Påhlsson
plugbasedclient:
461
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
462
    case 129:			/* --config-file */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
463
      /* This is already done by parse_opt_config_file() */
464
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
465
    case 130:			/* --userid */
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
466
      errno = 0;
467
      tmpmax = strtoimax(arg, &tmp, 10);
468
      if(errno != 0 or tmp == arg or *tmp != '\0'
469
	 or tmpmax != (uid_t)tmpmax){
268 by Teddy Hogeborn
Fixes for sscanf usage:
470
	fprintf(stderr, "Bad user ID number: \"%s\", using %"
471
		PRIdMAX "\n", arg, (intmax_t)uid);
472
      } else {
473
	uid = (uid_t)tmpmax;
264 by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the
474
      }
24.1.6 by Björn Påhlsson
plugbasedclient
475
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
476
    case 131:			/* --groupid */
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
477
      errno = 0;
478
      tmpmax = strtoimax(arg, &tmp, 10);
479
      if(errno != 0 or tmp == arg or *tmp != '\0'
480
	 or tmpmax != (gid_t)tmpmax){
268 by Teddy Hogeborn
Fixes for sscanf usage:
481
	fprintf(stderr, "Bad group ID number: \"%s\", using %"
482
		PRIdMAX "\n", arg, (intmax_t)gid);
483
      } else {
484
	gid = (gid_t)tmpmax;
264 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;
264 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. */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
512
  error_t parse_opt_config_file(int key, char *arg,
513
				__attribute__((unused))
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
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
  
265 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. */
266 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 */
266 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 */
266 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){
266 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 */
266 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
      }
268 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 */
299 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: Do setgid before setuid.
664
  setgid(gid);
665
  if(ret == -1){
666
    perror("setgid");
667
  }
24.1.6 by Björn Påhlsson
plugbasedclient
668
  ret = setuid(uid);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
669
  if(ret == -1){
24.1.6 by Björn Påhlsson
plugbasedclient
670
    perror("setuid");
671
  }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
672
  
266 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){
266 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);
266 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 */
266 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);
266 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 */
266 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);
266 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");
266 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 */
266 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
    
266 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;
24.1.132 by Björn Påhlsson
Fixed a bug in fallback handling
936
  free_plugin(getplugin(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);
266 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? */
297 by Teddy Hogeborn
* plugin-runner.c (struct plugin.status): Changed type to "int".
962
      if(proc->completed and proc->eof){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "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)){
301 by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins.
970
	      fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
971
		      " status %d\n", proc->name,
972
		      (intmax_t) (proc->pid),
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
973
		      WEXITSTATUS(proc->status));
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
974
	    } else if(WIFSIGNALED(proc->status)){
301 by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins.
975
	      fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
976
		      " signal %d\n", proc->name,
977
		      (intmax_t) (proc->pid),
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
978
		      WTERMSIG(proc->status));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
979
	    } else if(WCOREDUMP(proc->status)){
301 by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins.
980
	      fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
981
		      " core\n", proc->name, (intmax_t) (proc->pid));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
982
	    }
983
	  }
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
	  /* Remove the plugin */
986
	  FD_CLR(proc->fd, &rfds_all);
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
987
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
988
	  /* Block signal while modifying process_list */
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
989
	  ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
990
	  if(ret < 0){
991
	    perror("sigprocmask");
992
	    exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
993
	    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
994
	  }
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
995
	  
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
996
	  plugin *next_plugin = proc->next;
997
	  free_plugin(proc);
998
	  proc = next_plugin;
999
	  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1000
	  /* We are done modifying process list, so unblock signal */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1001
	  ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
			    NULL);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1003
	  if(ret < 0){
1004
	    perror("sigprocmask");
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1005
	    exitstatus = EXIT_FAILURE;
1006
	    goto fallback;
1007
	  }
1008
	  
1009
	  if(plugin_list == NULL){
1010
	    break;
1011
	  }
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1012
	  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1013
	  continue;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1014
	}
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1015
	
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1016
	/* This process exited nicely, so print its buffer */
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1017
	
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
1018
	bool bret = print_out_password(proc->buffer,
1019
				       proc->buffer_length);
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1020
	if(not bret){
1021
	  perror("print_out_password");
1022
	  exitstatus = EXIT_FAILURE;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1023
	}
24.1.54 by Björn Påhlsson
plugin-runner
1024
	goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1025
      }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1026
      
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1027
      /* This process has not completed.  Does it have any output? */
1028
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1029
	/* This process had nothing to say at this time */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1030
	proc = proc->next;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1031
	continue;
1032
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1033
      /* Before reading, make the process' data buffer large enough */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1034
      if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1035
	proc->buffer = realloc(proc->buffer, proc->buffer_size
1036
			       + (size_t) BUFFER_SIZE);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1037
	if(proc->buffer == NULL){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1038
	  perror("malloc");
1039
	  exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
1040
	  goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1041
	}
1042
	proc->buffer_size += BUFFER_SIZE;
1043
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1044
      /* Read from the process */
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
1045
      sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
		  BUFFER_SIZE);
1047
      if(sret < 0){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1048
	/* Read error from this process; ignore the error */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1049
	proc = proc->next;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1050
	continue;
1051
      }
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
1052
      if(sret == 0){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1053
	/* got EOF */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1054
	proc->eof = true;
1055
      } else {
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
1056
	proc->buffer_length += (size_t) sret;
13 by Björn Påhlsson
Added following support:
1057
      }
1058
    }
1059
  }
24.1.45 by Björn Påhlsson
Fixed fallback on error in mandos-client
1060
1061
24.1.54 by Björn Påhlsson
plugin-runner
1062
 fallback:
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1063
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1064
  if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
1065
    /* Fallback if all plugins failed, none are found or an error
1066
       occured */
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1067
    bool bret;
1068
    fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1069
    char *passwordbuffer = getpass("Password: ");
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
1070
    size_t len = strlen(passwordbuffer);
1071
    /* Strip trailing newline */
1072
    if(len > 0 and passwordbuffer[len-1] == '\n'){
1073
      passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1074
      len--;
1075
    }
1076
    bret = print_out_password(passwordbuffer, len);
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1077
    if(not bret){
1078
      perror("print_out_password");
1079
      exitstatus = EXIT_FAILURE;
1080
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1081
  }
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1082
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1083
  /* Restore old signal handler */
24.1.54 by Björn Påhlsson
plugin-runner
1084
  ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1085
  if(ret == -1){
1086
    perror("sigaction");
1087
    exitstatus = EXIT_FAILURE;
1088
  }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1089
  
24.1.54 by Björn Påhlsson
plugin-runner
1090
  if(custom_argv != NULL){
24.1.67 by Björn Påhlsson
transformed a function to a part of main
1091
    for(char **arg = custom_argv+1; *arg != NULL; arg++){
24.1.54 by Björn Påhlsson
plugin-runner
1092
      free(*arg);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
1093
    }
24.1.54 by Björn Påhlsson
plugin-runner
1094
    free(custom_argv);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1095
  }
1096
  
1097
  if(dir != NULL){
1098
    closedir(dir);
1099
  }
1100
  
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1101
  /* Kill the processes */
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1102
  for(plugin *p = plugin_list; p != NULL; p = p->next){
1103
    if(p->pid != 0){
1104
      close(p->fd);
1105
      ret = kill(p->pid, SIGTERM);
1106
      if(ret == -1 and errno != ESRCH){
1107
	/* Set-uid proccesses might not get closed */
1108
	perror("kill");
1109
      }
24.1.26 by Björn Påhlsson
tally count of used symbols
1110
    }
13 by Björn Påhlsson
Added following support:
1111
  }
1112
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1113
  /* Wait for any remaining child processes to terminate */
1114
  do{
1115
    ret = wait(NULL);
1116
  } while(ret >= 0);
1117
  if(errno != ECHILD){
1118
    perror("wait");
1119
  }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1120
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1121
  free_plugin_list();
1122
  
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
1123
  free(plugindir);
1124
  free(argfile);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1125
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1126
  return exitstatus;
13 by Björn Påhlsson
Added following support:
1127
}