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