/mandos/release

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