/mandos/trunk

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