/mandos/release

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