/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
24.1.90 by Björn Påhlsson
fixed two bugs:
99
/* Gets an existing plugin based on name,
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
100
   or if none is found, creates a new one */
101
static plugin *getplugin(char *name){
102
  /* Check for exiting plugin with that name */
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.90 by Björn Påhlsson
fixed two bugs:
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++){
24.1.90 by Björn Påhlsson
fixed two bugs:
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){
24.1.90 by Björn Påhlsson
fixed two bugs:
193
	char *new = realloc(*e, strlen(def) + 1);
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
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
    }
24.1.90 by Björn Påhlsson
fixed two bugs:
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
  for(size_t written = 0; written < length; written += (size_t)ret){
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
259
    ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
260
				   length - written));
261
    if(ret < 0){
262
      return false;
263
    }
264
  }
265
  return true;
266
}
267
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
268
/* Removes and free a plugin from the plugin list */
269
static void free_plugin(plugin *plugin_node){
270
  
271
  for(char **arg = plugin_node->argv; *arg != NULL; arg++){
272
    free(*arg);
273
  }
274
  free(plugin_node->argv);
275
  for(char **env = plugin_node->environ; *env != NULL; env++){
276
    free(*env);
277
  }
278
  free(plugin_node->environ);
279
  free(plugin_node->buffer);
280
281
  /* Removes the plugin from the singly-linked list */
282
  if(plugin_node == plugin_list){
283
    /* First one - simple */
284
    plugin_list = plugin_list->next;
285
  } else {
286
    /* Second one or later */
287
    for(plugin *p = plugin_list; p != NULL; p = p->next){
288
      if(p->next == plugin_node){
289
	p->next = plugin_node->next;
290
	break;
291
      }
292
    }
293
  }
294
  
295
  free(plugin_node);
296
}
297
298
static void free_plugin_list(void){
299
  while(plugin_list != NULL){
300
    free_plugin(plugin_list);
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
301
  }
24.1.54 by Björn Påhlsson
plugin-runner
302
}
303
13 by Björn Påhlsson
Added following support:
304
int main(int argc, char *argv[]){
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
305
  char *plugindir = NULL;
306
  char *argfile = NULL;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
307
  FILE *conffp;
24.1.5 by Björn Påhlsson
plugbasedclient:
308
  size_t d_name_len;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
309
  DIR *dir = NULL;
13 by Björn Påhlsson
Added following support:
310
  struct dirent *dirst;
311
  struct stat st;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
312
  fd_set rfds_all;
13 by Björn Påhlsson
Added following support:
313
  int ret, maxfd = 0;
24.1.6 by Björn Påhlsson
plugbasedclient
314
  uid_t uid = 65534;
315
  gid_t gid = 65534;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
316
  bool debug = false;
317
  int exitstatus = EXIT_SUCCESS;
24.1.7 by Björn Påhlsson
merge
318
  struct sigaction old_sigchld_action;
319
  struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
320
				      .sa_flags = SA_NOCLDSTOP };
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
321
  char **custom_argv = NULL;
322
  int custom_argc = 0;
323
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
324
  /* Establish a signal handler */
325
  sigemptyset(&sigchld_action.sa_mask);
326
  ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
24.1.54 by Björn Påhlsson
plugin-runner
327
  if(ret == -1){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
328
    perror("sigaddset");
24.1.54 by Björn Påhlsson
plugin-runner
329
    exitstatus = EXIT_FAILURE;
330
    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
331
  }
332
  ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
24.1.54 by Björn Påhlsson
plugin-runner
333
  if(ret == -1){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
334
    perror("sigaction");
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
335
    exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
336
    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
337
  }
338
  
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
339
  /* The options we understand. */
340
  struct argp_option options[] = {
341
    { .name = "global-options", .key = 'g',
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
342
      .arg = "OPTION[,OPTION[,...]]",
343
      .doc = "Options passed to all plugins" },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
344
    { .name = "global-env", .key = 'G',
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
345
      .arg = "VAR=value",
346
      .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
347
    { .name = "options-for", .key = 'o',
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
348
      .arg = "PLUGIN:OPTION[,OPTION[,...]]",
349
      .doc = "Options passed only to specified plugin" },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
350
    { .name = "env-for", .key = 'E',
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
351
      .arg = "PLUGIN:ENV=value",
352
      .doc = "Environment variable passed to specified plugin" },
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
353
    { .name = "disable", .key = 'd',
354
      .arg = "PLUGIN",
355
      .doc = "Disable a specific plugin", .group = 1 },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
356
    { .name = "enable", .key = 'e',
357
      .arg = "PLUGIN",
358
      .doc = "Enable 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) {
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
378
    switch (key) {
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
379
    case 'g': 			/* --global-options */
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
380
      if (arg != NULL){
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
381
	char *p;
382
	while((p = strsep(&arg, ",")) != NULL){
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
383
	  if(p[0] == '\0'){
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
384
	    continue;
385
	  }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
386
	  if(not add_argument(getplugin(NULL), p)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
387
	    perror("add_argument");
388
	    return ARGP_ERR_UNKNOWN;
389
	  }
390
	}
391
      }
392
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
393
    case 'G':			/* --global-env */
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
394
      if(arg == NULL){
395
	break;
396
      }
397
      {
398
	char *envdef = strdup(arg);
399
	if(envdef == NULL){
400
	  break;
401
	}
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
402
	if(not add_environment(getplugin(NULL), envdef, true)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
403
	  perror("add_environment");
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
404
	}
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
405
      }
406
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
407
    case 'o':			/* --options-for */
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
408
      if (arg != NULL){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
409
	char *p_name = strsep(&arg, ":");
24.1.90 by Björn Påhlsson
fixed two bugs:
410
	if(p_name[0] == '\0' or arg == NULL){
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
411
	  break;
412
	}
413
	char *opt = strsep(&arg, ":");
24.1.90 by Björn Påhlsson
fixed two bugs:
414
	if(opt[0] == '\0' or opt == NULL){
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
415
	  break;
416
	}
24.1.90 by Björn Påhlsson
fixed two bugs:
417
	char *p;
418
	while((p = strsep(&opt, ",")) != NULL){
419
	  if(p[0] == '\0'){
420
	    continue;
421
	  }
422
	  if(not add_argument(getplugin(p_name), p)){
423
	    perror("add_argument");
424
	    return ARGP_ERR_UNKNOWN;
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
425
	  }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
426
	}
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
427
      }
428
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
429
    case 'E':			/* --env-for */
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
430
      if(arg == NULL){
431
	break;
432
      }
433
      {
434
	char *envdef = strchr(arg, ':');
435
	if(envdef == NULL){
436
	  break;
437
	}
438
	char *p_name = strndup(arg, (size_t) (envdef-arg));
439
	if(p_name == NULL){
440
	  break;
441
	}
442
	envdef++;
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
443
	if(not add_environment(getplugin(p_name), envdef, true)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
444
	  perror("add_environment");
445
	}
446
      }
447
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
448
    case 'd':			/* --disable */
24.1.5 by Björn Påhlsson
plugbasedclient:
449
      if (arg != NULL){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
450
	plugin *p = getplugin(arg);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
451
	if(p == NULL){
452
	  return ARGP_ERR_UNKNOWN;
453
	}
454
	p->disabled = true;
24.1.5 by Björn Påhlsson
plugbasedclient:
455
      }
456
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
457
    case 'e':			/* --enable */
458
      if (arg != NULL){
459
	plugin *p = getplugin(arg);
460
	if(p == NULL){
461
	  return ARGP_ERR_UNKNOWN;
462
	}
463
	p->disabled = false;
464
      }
465
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
466
    case 128:			/* --plugin-dir */
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
467
      plugindir = strdup(arg);
468
      if(plugindir == NULL){
469
	perror("strdup");
470
      }      
24.1.5 by Björn Påhlsson
plugbasedclient:
471
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
472
    case 129:			/* --config-file */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
473
      /* This is already done by parse_opt_config_file() */
474
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
475
    case 130:			/* --userid */
24.1.6 by Björn Påhlsson
plugbasedclient
476
      uid = (uid_t)strtol(arg, NULL, 10);
477
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
478
    case 131:			/* --groupid */
24.1.6 by Björn Påhlsson
plugbasedclient
479
      gid = (gid_t)strtol(arg, NULL, 10);
480
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
481
    case 132:			/* --debug */
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
482
      debug = true;
483
      break;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
484
    case ARGP_KEY_ARG:
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
485
      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
486
      break;
487
    case ARGP_KEY_END:
488
      break;
489
    default:
490
      return ARGP_ERR_UNKNOWN;
491
    }
492
    return 0;
493
  }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
494
  
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
495
  /* This option parser is the same as parse_opt() above, except it
496
     ignores everything but the --config-file option. */
497
  error_t parse_opt_config_file (int key, char *arg,
498
				 __attribute__((unused))
499
				 struct argp_state *state) {
500
    switch (key) {
501
    case 'g': 			/* --global-options */
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
502
    case 'G':			/* --global-env */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
503
    case 'o':			/* --options-for */
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
504
    case 'E':			/* --env-for */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
505
    case 'd':			/* --disable */
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
506
    case 'e':			/* --enable */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
507
    case 128:			/* --plugin-dir */
508
      break;
509
    case 129:			/* --config-file */
510
      argfile = strdup(arg);
511
      if(argfile == NULL){
512
	perror("strdup");
513
      }
514
      break;      
515
    case 130:			/* --userid */
516
    case 131:			/* --groupid */
517
    case 132:			/* --debug */
518
    case ARGP_KEY_ARG:
519
    case ARGP_KEY_END:
520
      break;
521
    default:
522
      return ARGP_ERR_UNKNOWN;
523
    }
524
    return 0;
525
  }
526
  
527
  struct argp argp = { .options = options,
528
		       .parser = parse_opt_config_file,
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
529
		       .args_doc = "",
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
530
		       .doc = "Mandos plugin runner -- Run plugins" };
531
  
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
532
  /* Parse using the parse_opt_config_file in order to get the custom
533
     config file location, if any. */
534
  ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
535
  if (ret == ARGP_ERR_UNKNOWN){
536
    fprintf(stderr, "Unknown error while parsing arguments\n");
537
    exitstatus = EXIT_FAILURE;
538
    goto fallback;
539
  }
540
  
541
  /* Reset to the normal argument parser */
542
  argp.parser = parse_opt;
543
  
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
544
  /* Open the configfile if available */
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
545
  if (argfile == NULL){
546
    conffp = fopen(AFILE, "r");
547
  } else {
548
    conffp = fopen(argfile, "r");
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
549
  }  
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
550
  if(conffp != NULL){
551
    char *org_line = NULL;
24.1.54 by Björn Påhlsson
plugin-runner
552
    char *p, *arg, *new_arg, *line;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
553
    size_t size = 0;
554
    ssize_t sret;
555
    const char whitespace_delims[] = " \r\t\f\v\n";
556
    const char comment_delim[] = "#";
557
24.1.67 by Björn Påhlsson
transformed a function to a part of main
558
    custom_argc = 1;
559
    custom_argv = malloc(sizeof(char*) * 2);
560
    if(custom_argv == NULL){
561
      perror("malloc");
562
      exitstatus = EXIT_FAILURE;
563
      goto fallback;
564
    }
565
    custom_argv[0] = argv[0];
566
    custom_argv[1] = NULL;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
567
133 by Teddy Hogeborn
* plugin-runner.c: Break a couple of long lines.
568
    /* for each line in the config file, strip whitespace and ignore
569
       commented text */
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
570
    while(true){
571
      sret = getline(&org_line, &size, conffp);
572
      if(sret == -1){
573
	break;
574
      }
575
576
      line = org_line;
577
      arg = strsep(&line, comment_delim);
578
      while((p = strsep(&arg, whitespace_delims)) != NULL){
579
	if(p[0] == '\0'){
580
	  continue;
581
	}
582
	new_arg = strdup(p);
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
583
	if(new_arg == NULL){
584
	  perror("strdup");
585
	  exitstatus = EXIT_FAILURE;
586
	  free(org_line);
587
	  goto fallback;
588
	}
589
	
24.1.67 by Björn Påhlsson
transformed a function to a part of main
590
	custom_argc += 1;
591
	custom_argv = realloc(custom_argv, sizeof(char *)
592
			      * ((unsigned int) custom_argc + 1));
593
	if(custom_argv == NULL){
594
	  perror("realloc");
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
595
	  exitstatus = EXIT_FAILURE;
24.1.67 by Björn Påhlsson
transformed a function to a part of main
596
	  free(org_line);
24.1.54 by Björn Påhlsson
plugin-runner
597
	  goto fallback;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
598
	}
24.1.67 by Björn Påhlsson
transformed a function to a part of main
599
	custom_argv[custom_argc-1] = new_arg;
600
	custom_argv[custom_argc] = NULL;	
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
601
      }
602
    }
603
    free(org_line);
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
604
  } else {
24.1.52 by Björn Påhlsson
merge + minor adjustments
605
    /* Check for harmful errors and go to fallback. Other errors might
606
       not affect opening plugins */
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
607
    if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
608
      perror("fopen");
24.1.8 by Björn Påhlsson
plugbasedclient
609
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
610
      goto fallback;
24.1.8 by Björn Påhlsson
plugbasedclient
611
    }
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
612
  }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
613
  /* If there was any arguments from configuration file,
614
     pass them to parser as command arguments */
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
615
  if(custom_argv != NULL){
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
616
    ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
617
		      0, NULL);
24.1.26 by Björn Påhlsson
tally count of used symbols
618
    if (ret == ARGP_ERR_UNKNOWN){
64 by Teddy Hogeborn
* mandos-client.c (print_out_password): Strip trailing '\n'.
619
      fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.26 by Björn Påhlsson
tally count of used symbols
620
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
621
      goto fallback;
24.1.26 by Björn Påhlsson
tally count of used symbols
622
    }
24.1.8 by Björn Påhlsson
plugbasedclient
623
  }
624
  
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
625
  /* Parse actual command line arguments, to let them override the
626
     config file */
627
  ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
628
  if (ret == ARGP_ERR_UNKNOWN){
629
    fprintf(stderr, "Unknown error while parsing arguments\n");
630
    exitstatus = EXIT_FAILURE;
631
    goto fallback;
632
  }
633
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
634
  if(debug){
635
    for(plugin *p = plugin_list; p != NULL; p=p->next){
636
      fprintf(stderr, "Plugin: %s has %d arguments\n",
32 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
637
	      p->name ? p->name : "Global", p->argc - 1);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
638
      for(char **a = p->argv; *a != NULL; a++){
639
	fprintf(stderr, "\tArg: %s\n", *a);
640
      }
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
641
      fprintf(stderr, "...and %u environment variables\n", p->envc);
642
      for(char **a = p->environ; *a != NULL; a++){
643
	fprintf(stderr, "\t%s\n", *a);
644
      }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
645
    }
646
  }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
647
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
648
  /* Strip permissions down to nobody */
24.1.6 by Björn Påhlsson
plugbasedclient
649
  ret = setuid(uid);
650
  if (ret == -1){
651
    perror("setuid");
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
652
  }  
24.1.6 by Björn Påhlsson
plugbasedclient
653
  setgid(gid);
654
  if (ret == -1){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
655
    perror("setgid");
24.1.6 by Björn Påhlsson
plugbasedclient
656
  }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
657
  
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
658
  if (plugindir == NULL){
659
    dir = opendir(PDIR);
660
  } else {
661
    dir = opendir(plugindir);
662
  }
24.1.6 by Björn Påhlsson
plugbasedclient
663
  
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
664
  if(dir == NULL){
665
    perror("Could not open plugin dir");
666
    exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
667
    goto fallback;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
668
  }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
669
  
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
670
  /* Set the FD_CLOEXEC flag on the directory, if possible */
671
  {
672
    int dir_fd = dirfd(dir);
673
    if(dir_fd >= 0){
674
      ret = set_cloexec_flag(dir_fd);
675
      if(ret < 0){
676
	perror("set_cloexec_flag");
677
	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
678
	goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
679
      }
680
    }
681
  }
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
682
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
683
  FD_ZERO(&rfds_all);
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
684
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
685
  /* Read and execute any executable in the plugin directory*/
13 by Björn Påhlsson
Added following support:
686
  while(true){
687
    dirst = readdir(dir);
688
    
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
689
    /* All directory entries have been processed */
13 by Björn Påhlsson
Added following support:
690
    if(dirst == NULL){
24.1.26 by Björn Påhlsson
tally count of used symbols
691
      if (errno == EBADF){
692
	perror("readdir");
693
	exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
694
	goto fallback;
24.1.26 by Björn Påhlsson
tally count of used symbols
695
      }
13 by Björn Påhlsson
Added following support:
696
      break;
697
    }
698
    
699
    d_name_len = strlen(dirst->d_name);
700
    
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
701
    /* Ignore dotfiles, backup files and other junk */
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
702
    {
703
      bool bad_name = false;
704
      
705
      const char const *bad_prefixes[] = { ".", "#", NULL };
706
      
707
      const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
708
					   ".dpkg-old",
709
					   ".dpkg-divert", NULL };
710
      for(const char **pre = bad_prefixes; *pre != NULL; pre++){
711
	size_t pre_len = strlen(*pre);
712
	if((d_name_len >= pre_len)
713
	   and strncmp((dirst->d_name), *pre, pre_len) == 0){
714
	  if(debug){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
715
	    fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
716
		    " with bad prefix %s\n", dirst->d_name, *pre);
717
	  }
718
	  bad_name = true;
719
	  break;
720
	}
721
      }
722
      if(bad_name){
723
	continue;
724
      }
725
      for(const char **suf = bad_suffixes; *suf != NULL; suf++){
726
	size_t suf_len = strlen(*suf);
727
	if((d_name_len >= suf_len)
728
	   and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
729
		== 0)){
730
	  if(debug){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
731
	    fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
732
		    " with bad suffix %s\n", dirst->d_name, *suf);
733
	  }
734
	  bad_name = true;
735
	  break;
736
	}
737
      }
738
      
739
      if(bad_name){
740
	continue;
741
      }
13 by Björn Påhlsson
Added following support:
742
    }
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
743
744
    char *filename;
745
    ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
746
    if(ret < 0){
747
      perror("asprintf");
24.1.46 by Björn Påhlsson
mandos-client
748
      continue;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
749
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
750
    
24.1.26 by Björn Påhlsson
tally count of used symbols
751
    ret = stat(filename, &st);
752
    if (ret == -1){
753
      perror("stat");
24.1.46 by Björn Påhlsson
mandos-client
754
      free(filename);
755
      continue;
24.1.26 by Björn Påhlsson
tally count of used symbols
756
    }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
757
758
    /* Ignore non-executable files */
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
759
    if (not S_ISREG(st.st_mode)	or (access(filename, X_OK) != 0)){
760
      if(debug){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
761
	fprintf(stderr, "Ignoring plugin dir entry \"%s\""
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
762
		" with bad type or mode\n", filename);
763
      }
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
      continue;
766
    }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
767
    
768
    plugin *p = getplugin(dirst->d_name);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
769
    if(p == NULL){
770
      perror("getplugin");
771
      free(filename);
772
      continue;
773
    }
774
    if(p->disabled){
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
775
      if(debug){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
776
	fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
777
		dirst->d_name);
778
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
779
      free(filename);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
780
      continue;
781
    }
32 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
782
    {
783
      /* 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
784
      plugin *g = getplugin(NULL);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
785
      if(g != NULL){
786
	for(char **a = g->argv + 1; *a != NULL; a++){
787
	  if(not add_argument(p, *a)){
788
	    perror("add_argument");
789
	  }
790
	}
791
	/* Add global environment variables */
792
	for(char **e = g->environ; *e != NULL; e++){
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
793
	  if(not add_environment(p, *e, false)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
794
	    perror("add_environment");
795
	  }
796
	}
797
      }
798
    }
799
    /* If this plugin has any environment variables, we will call
800
       using execve and need to duplicate the environment from this
801
       process, too. */
802
    if(p->environ[0] != NULL){
803
      for(char **e = environ; *e != NULL; e++){
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
804
	if(not add_environment(p, *e, false)){
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
805
	  perror("add_environment");
806
	}
807
      }
808
    }
809
    
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
810
    int pipefd[2];
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
811
    ret = pipe(pipefd);
812
    if (ret == -1){
813
      perror("pipe");
814
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
815
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
816
    }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
817
    /* Ask OS to automatic close the pipe on exec */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
818
    ret = set_cloexec_flag(pipefd[0]);
819
    if(ret < 0){
820
      perror("set_cloexec_flag");
821
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
822
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
823
    }
824
    ret = set_cloexec_flag(pipefd[1]);
825
    if(ret < 0){
826
      perror("set_cloexec_flag");
827
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
828
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
829
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
830
    /* Block SIGCHLD until process is safely in process list */
831
    ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
832
    if(ret < 0){
833
      perror("sigprocmask");
834
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
835
      goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
836
    }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
837
    /* Starting a new process to be watched */
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
838
    pid_t pid = fork();
24.1.46 by Björn Påhlsson
mandos-client
839
    if(pid == -1){
840
      perror("fork");
841
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
842
      goto fallback;
24.1.46 by Björn Påhlsson
mandos-client
843
    }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
844
    if(pid == 0){
845
      /* this is the child process */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
846
      ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
847
      if(ret < 0){
848
	perror("sigaction");
849
	_exit(EXIT_FAILURE);
850
      }
851
      ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
852
      if(ret < 0){
853
	perror("sigprocmask");
854
	_exit(EXIT_FAILURE);
855
      }
24.1.26 by Björn Påhlsson
tally count of used symbols
856
857
      ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
858
      if(ret == -1){
859
	perror("dup2");
860
	_exit(EXIT_FAILURE);
861
      }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
862
      
863
      if(dirfd(dir) < 0){
864
	/* If dir has no file descriptor, we could not set FD_CLOEXEC
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
865
	   above and must now close it manually here. */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
866
	closedir(dir);
33 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (main): Close the pipe fd after dup2:ing
867
      }
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
868
      if(p->environ[0] == NULL){
869
	if(execv(filename, p->argv) < 0){
870
	  perror("execv");
871
	  _exit(EXIT_FAILURE);
872
	}
873
      } else {
874
	if(execve(filename, p->argv, p->environ) < 0){
875
	  perror("execve");
876
	  _exit(EXIT_FAILURE);
877
	}
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
878
      }
879
      /* no return */
880
    }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
881
    /* Parent process */
882
    close(pipefd[1]);		/* Close unused write end of pipe */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
883
    free(filename);
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
884
    plugin *new_plugin = getplugin(dirst->d_name);
885
    if (new_plugin == NULL){
886
      perror("getplugin");
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
887
      ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
888
      if(ret < 0){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
889
        perror("sigprocmask");
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
890
      }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
891
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
892
      goto fallback;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
893
    }
894
    
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
895
    new_plugin->pid = pid;
896
    new_plugin->fd = pipefd[0];
897
    
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
898
    /* Unblock SIGCHLD so signal handler can be run if this process
899
       has already completed */
900
    ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
901
    if(ret < 0){
902
      perror("sigprocmask");
903
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
904
      goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
905
    }
906
    
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
907
    FD_SET(new_plugin->fd, &rfds_all);
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
908
    
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
909
    if (maxfd < new_plugin->fd){
910
      maxfd = new_plugin->fd;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
911
    }
912
    
13 by Björn Påhlsson
Added following support:
913
  }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
914
  
13 by Björn Påhlsson
Added following support:
915
  closedir(dir);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
916
  dir = NULL;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
917
918
  for(plugin *p = plugin_list; p != NULL; p = p->next){
919
    if(p->pid != 0){
920
      break;
921
    }
922
    if(p->next == NULL){
923
      fprintf(stderr, "No plugin processes started. Incorrect plugin"
924
	      " directory?\n");
925
      free_plugin_list();
926
    }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
927
  }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
928
929
  /* Main loop while running plugins exist */
930
  while(plugin_list){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
931
    fd_set rfds = rfds_all;
932
    int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
933
    if (select_ret == -1){
934
      perror("select");
935
      exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
936
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
937
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
938
    /* OK, now either a process completed, or something can be read
939
       from one of them */
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
940
    for(plugin *proc = plugin_list; proc != NULL; proc = proc->next){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
941
      /* Is this process completely done? */
942
      if(proc->eof and proc->completed){
943
	/* Only accept the plugin output if it exited cleanly */
944
	if(not WIFEXITED(proc->status)
945
	   or WEXITSTATUS(proc->status) != 0){
946
	  /* Bad exit by plugin */
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
947
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
948
	  if(debug){
949
	    if(WIFEXITED(proc->status)){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
950
	      fprintf(stderr, "Plugin %u exited with status %d\n",
951
		      (unsigned int) (proc->pid),
952
		      WEXITSTATUS(proc->status));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
953
	    } else if(WIFSIGNALED(proc->status)) {
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
954
	      fprintf(stderr, "Plugin %u killed by signal %d\n",
955
		      (unsigned int) (proc->pid),
956
		      WTERMSIG(proc->status));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
957
	    } else if(WCOREDUMP(proc->status)){
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
958
	      fprintf(stderr, "Plugin %d dumped core\n",
959
		      (unsigned int) (proc->pid));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
960
	    }
961
	  }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
962
	  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
963
	  /* Remove the plugin */
964
	  FD_CLR(proc->fd, &rfds_all);
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
965
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
966
	  /* Block signal while modifying process_list */
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
967
	  ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
968
	  if(ret < 0){
969
	    perror("sigprocmask");
970
	    exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
971
	    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
972
	  }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
973
	  free_plugin(proc);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
974
	  /* We are done modifying process list, so unblock signal */
975
	  ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
976
			     NULL);
977
	  if(ret < 0){
978
	    perror("sigprocmask");
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
979
	    exitstatus = EXIT_FAILURE;
980
	    goto fallback;
981
	  }
982
	  
983
	  if(plugin_list == NULL){
984
	    break;
985
	  }
986
	  continue;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
987
	}
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
988
	
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
989
	/* This process exited nicely, so print its buffer */
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
990
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
991
	bool bret = print_out_password(proc->buffer,
992
				       proc->buffer_length);
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
993
	if(not bret){
994
	  perror("print_out_password");
995
	  exitstatus = EXIT_FAILURE;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
996
	}
24.1.54 by Björn Påhlsson
plugin-runner
997
	goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
998
      }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
999
      
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1000
      /* This process has not completed.  Does it have any output? */
1001
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1002
	/* This process had nothing to say at this time */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1003
	continue;
1004
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1005
      /* Before reading, make the process' data buffer large enough */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1006
      if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1007
	proc->buffer = realloc(proc->buffer, proc->buffer_size
1008
			       + (size_t) BUFFER_SIZE);
1009
	if (proc->buffer == NULL){
1010
	  perror("malloc");
1011
	  exitstatus = EXIT_FAILURE;
24.1.54 by Björn Påhlsson
plugin-runner
1012
	  goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1013
	}
1014
	proc->buffer_size += BUFFER_SIZE;
1015
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1016
      /* Read from the process */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1017
      ret = read(proc->fd, proc->buffer + proc->buffer_length,
1018
		 BUFFER_SIZE);
1019
      if(ret < 0){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1020
	/* Read error from this process; ignore the error */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1021
	continue;
1022
      }
1023
      if(ret == 0){
1024
	/* got EOF */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1025
	proc->eof = true;
1026
      } else {
1027
	proc->buffer_length += (size_t) ret;
13 by Björn Påhlsson
Added following support:
1028
      }
1029
    }
1030
  }
24.1.45 by Björn Påhlsson
Fixed fallback on error in mandos-client
1031
1032
24.1.54 by Björn Påhlsson
plugin-runner
1033
 fallback:
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1034
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1035
  if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
1036
    /* Fallback if all plugins failed, none are found or an error
1037
       occured */
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1038
    bool bret;
1039
    fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1040
    char *passwordbuffer = getpass("Password: ");
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
1041
    size_t len = strlen(passwordbuffer);
1042
    /* Strip trailing newline */
1043
    if(len > 0 and passwordbuffer[len-1] == '\n'){
1044
      passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1045
      len--;
1046
    }
1047
    bret = print_out_password(passwordbuffer, len);
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1048
    if(not bret){
1049
      perror("print_out_password");
1050
      exitstatus = EXIT_FAILURE;
1051
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1052
  }
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1053
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1054
  /* Restore old signal handler */
24.1.54 by Björn Påhlsson
plugin-runner
1055
  ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1056
  if(ret == -1){
1057
    perror("sigaction");
1058
    exitstatus = EXIT_FAILURE;
1059
  }
1060
1061
  if(custom_argv != NULL){
24.1.67 by Björn Påhlsson
transformed a function to a part of main
1062
    for(char **arg = custom_argv+1; *arg != NULL; arg++){
24.1.54 by Björn Påhlsson
plugin-runner
1063
      free(*arg);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
1064
    }
24.1.54 by Björn Påhlsson
plugin-runner
1065
    free(custom_argv);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1066
  }
1067
  
1068
  if(dir != NULL){
1069
    closedir(dir);
1070
  }
1071
  
1072
  /* 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
1073
  for(plugin *p = plugin_list; p != NULL; p = p->next){
1074
    if(p->pid != 0){
1075
      close(p->fd);
1076
      ret = kill(p->pid, SIGTERM);
1077
      if(ret == -1 and errno != ESRCH){
1078
	/* Set-uid proccesses might not get closed */
1079
	perror("kill");
1080
      }
24.1.26 by Björn Påhlsson
tally count of used symbols
1081
    }
13 by Björn Påhlsson
Added following support:
1082
  }
1083
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1084
  /* Wait for any remaining child processes to terminate */
1085
  do{
1086
    ret = wait(NULL);
1087
  } while(ret >= 0);
1088
  if(errno != ECHILD){
1089
    perror("wait");
1090
  }
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
1091
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1092
  free_plugin_list();
1093
  
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
1094
  free(plugindir);
1095
  free(argfile);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1096
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1097
  return exitstatus;
13 by Björn Påhlsson
Added following support:
1098
}