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