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