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