/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
 *
923 by Teddy Hogeborn
Update copyright year to 2018
5
 * Copyright © 2008-2018 Teddy Hogeborn
6
 * Copyright © 2008-2018 Björn Påhlsson
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
7
 * 
907 by Teddy Hogeborn
Alter copyright notices slightly. Actual license is unchanged!
8
 * This file is part of Mandos.
9
 * 
10
 * Mandos is free software: you can redistribute it and/or modify it
11
 * under the terms of the GNU General Public License as published by
12
 * the Free Software Foundation, either version 3 of the License, or
13
 * (at your option) any later version.
14
 * 
15
 * Mandos is distributed in the hope that it will be useful, but
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
16
 * WITHOUT ANY WARRANTY; without even the implied warranty of
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
18
 * General Public License for more details.
19
 * 
20
 * You should have received a copy of the GNU General Public License
907 by Teddy Hogeborn
Alter copyright notices slightly. Actual license is unchanged!
21
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
22
 * 
505.1.2 by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout.
23
 * Contact the authors at <mandos@recompile.se>.
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
24
 */
25
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
26
#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY(), getline(),
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
27
				   O_CLOEXEC, pipe2() */
24.1.26 by Björn Påhlsson
tally count of used symbols
28
#include <stddef.h>		/* size_t, NULL */
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
29
#include <stdlib.h>		/* malloc(), exit(), EXIT_SUCCESS,
30
				   realloc() */
24.1.26 by Björn Påhlsson
tally count of used symbols
31
#include <stdbool.h>		/* bool, true, false */
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
32
#include <stdio.h>		/* fileno(), fprintf(),
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
33
				   stderr, STDOUT_FILENO, fclose() */
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
34
#include <sys/types.h>	        /* fstat(), struct stat, waitpid(),
35
				   WIFEXITED(), WEXITSTATUS(), wait(),
36
				   pid_t, uid_t, gid_t, getuid(),
37
				   getgid() */
24.1.26 by Björn Påhlsson
tally count of used symbols
38
#include <sys/select.h>		/* fd_set, select(), FD_ZERO(),
39
				   FD_SET(), FD_ISSET(), FD_CLR */
40
#include <sys/wait.h>		/* wait(), waitpid(), WIFEXITED(),
834 by Teddy Hogeborn
Client: Remove dead code in plugin-runner
41
				   WEXITSTATUS(), WTERMSIG() */
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
  
1097 by Teddy Hogeborn
plugin-runner: Fix minor memory leak
316
  for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
317
    free(*arg);
318
  }
1097 by Teddy Hogeborn
plugin-runner: Fix minor memory leak
319
  free(plugin_node->name);
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
320
  free(plugin_node->argv);
321
  for(char **env = plugin_node->environ; *env != NULL; env++){
322
    free(*env);
323
  }
324
  free(plugin_node->environ);
325
  free(plugin_node->buffer);
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
326
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
327
  /* Removes the plugin from the singly-linked list */
328
  if(plugin_node == plugin_list){
329
    /* First one - simple */
330
    plugin_list = plugin_list->next;
331
  } else {
332
    /* Second one or later */
333
    for(plugin *p = plugin_list; p != NULL; p = p->next){
334
      if(p->next == plugin_node){
335
	p->next = plugin_node->next;
336
	break;
337
      }
338
    }
339
  }
340
  
341
  free(plugin_node);
342
}
343
344
static void free_plugin_list(void){
345
  while(plugin_list != NULL){
346
    free_plugin(plugin_list);
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
347
  }
24.1.54 by Björn Påhlsson
plugin-runner
348
}
349
13 by Björn Påhlsson
Added following support:
350
int main(int argc, char *argv[]){
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
351
  char *plugindir = NULL;
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
352
  char *pluginhelperdir = NULL;
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
353
  char *argfile = NULL;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
354
  FILE *conffp;
705 by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases.
355
  struct dirent **direntries = NULL;
13 by Björn Påhlsson
Added following support:
356
  struct stat st;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
357
  fd_set rfds_all;
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
358
  int ret, maxfd = 0;
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
359
  ssize_t sret;
24.1.6 by Björn Påhlsson
plugbasedclient
360
  uid_t uid = 65534;
361
  gid_t gid = 65534;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
362
  bool debug = false;
363
  int exitstatus = EXIT_SUCCESS;
24.1.7 by Björn Påhlsson
merge
364
  struct sigaction old_sigchld_action;
365
  struct sigaction sigchld_action = { .sa_handler = handle_sigchld,
366
				      .sa_flags = SA_NOCLDSTOP };
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
367
  char **custom_argv = NULL;
368
  int custom_argc = 0;
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
369
  int dir_fd = -1;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
370
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
371
  /* Establish a signal handler */
372
  sigemptyset(&sigchld_action.sa_mask);
373
  ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
24.1.54 by Björn Påhlsson
plugin-runner
374
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
375
    error(0, errno, "sigaddset");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
376
    exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
377
    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
378
  }
379
  ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
24.1.54 by Björn Påhlsson
plugin-runner
380
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
381
    error(0, errno, "sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
382
    exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
383
    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
384
  }
385
  
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
386
  /* The options we understand. */
387
  struct argp_option options[] = {
388
    { .name = "global-options", .key = 'g',
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
389
      .arg = "OPTION[,OPTION[,...]]",
390
      .doc = "Options passed to all plugins" },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
391
    { .name = "global-env", .key = 'G',
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
392
      .arg = "VAR=value",
393
      .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
394
    { .name = "options-for", .key = 'o',
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
395
      .arg = "PLUGIN:OPTION[,OPTION[,...]]",
396
      .doc = "Options passed only to specified plugin" },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
397
    { .name = "env-for", .key = 'E',
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
398
      .arg = "PLUGIN:ENV=value",
399
      .doc = "Environment variable passed to specified plugin" },
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
400
    { .name = "disable", .key = 'd',
401
      .arg = "PLUGIN",
402
      .doc = "Disable a specific plugin", .group = 1 },
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
403
    { .name = "enable", .key = 'e',
404
      .arg = "PLUGIN",
405
      .doc = "Enable a specific plugin", .group = 1 },
24.1.5 by Björn Påhlsson
plugbasedclient:
406
    { .name = "plugin-dir", .key = 128,
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
407
      .arg = "DIRECTORY",
408
      .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
409
    { .name = "config-file", .key = 129,
410
      .arg = "FILE",
411
      .doc = "Specify a different configuration file", .group = 2 },
412
    { .name = "userid", .key = 130,
413
      .arg = "ID", .flags = 0,
414
      .doc = "User ID the plugins will run as", .group = 3 },
415
    { .name = "groupid", .key = 131,
416
      .arg = "ID", .flags = 0,
417
      .doc = "Group ID the plugins will run as", .group = 3 },
418
    { .name = "debug", .key = 132,
419
      .doc = "Debug mode", .group = 4 },
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
420
    { .name = "plugin-helper-dir", .key = 133,
421
      .arg = "DIRECTORY",
422
      .doc = "Specify a different plugin helper directory",
423
      .group = 2 },
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
424
    /*
425
     * These reproduce what we would get without ARGP_NO_HELP
426
     */
427
    { .name = "help", .key = '?',
428
      .doc = "Give this help list", .group = -1 },
429
    { .name = "usage", .key = -3,
430
      .doc = "Give a short usage message", .group = -1 },
431
    { .name = "version", .key = 'V',
432
      .doc = "Print program version", .group = -1 },
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
433
    { .name = NULL }
434
  };
435
  
534 by teddy at bsnet
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
436
  __attribute__((nonnull(3)))
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
437
  error_t parse_opt(int key, char *arg, struct argp_state *state){
438
    errno = 0;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
439
    switch(key){
360 by Teddy Hogeborn
* plugin-runner.c (main): Move variables "tmpmax" and "tmp" into
440
      char *tmp;
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
441
      intmax_t tmp_id;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
442
    case 'g': 			/* --global-options */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
443
      {
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
444
	char *plugin_option;
445
	while((plugin_option = strsep(&arg, ",")) != NULL){
446
	  if(not add_argument(getplugin(NULL), plugin_option)){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
447
	    break;
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
448
	  }
449
	}
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
450
	errno = 0;
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
451
      }
452
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
453
    case 'G':			/* --global-env */
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
454
      if(add_environment(getplugin(NULL), arg, true)){
455
	errno = 0;
456
      }
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
457
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
458
    case 'o':			/* --options-for */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
459
      {
460
	char *option_list = strchr(arg, ':');
461
	if(option_list == NULL){
462
	  argp_error(state, "No colon in \"%s\"", arg);
463
	  errno = EINVAL;
464
	  break;
465
	}
466
	*option_list = '\0';
467
	option_list++;
468
	if(arg[0] == '\0'){
469
	  argp_error(state, "Empty plugin name");
470
	  errno = EINVAL;
471
	  break;
472
	}
473
	char *option;
474
	while((option = strsep(&option_list, ",")) != NULL){
475
	  if(not add_argument(getplugin(arg), option)){
476
	    break;
24.1.50 by Björn Påhlsson
changed from using strtok to strsep
477
	  }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
478
	}
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
479
	errno = 0;
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
480
      }
481
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
482
    case 'E':			/* --env-for */
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
483
      {
484
	char *envdef = strchr(arg, ':');
485
	if(envdef == NULL){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
486
	  argp_error(state, "No colon in \"%s\"", arg);
487
	  errno = EINVAL;
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
488
	  break;
489
	}
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
490
	*envdef = '\0';
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
491
	envdef++;
492
	if(arg[0] == '\0'){
493
	  argp_error(state, "Empty plugin name");
494
	  errno = EINVAL;
495
	  break;
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
496
	}
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
497
	if(add_environment(getplugin(arg), envdef, true)){
498
	  errno = 0;
499
	}
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
500
      }
501
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
502
    case 'd':			/* --disable */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
503
      {
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
504
	plugin *p = getplugin(arg);
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
505
	if(p != NULL){
506
	  p->disabled = true;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
507
	  errno = 0;
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
508
	}
24.1.5 by Björn Påhlsson
plugbasedclient:
509
      }
510
      break;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
511
    case 'e':			/* --enable */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
512
      {
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
513
	plugin *p = getplugin(arg);
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
514
	if(p != NULL){
515
	  p->disabled = false;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
516
	  errno = 0;
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
517
	}
518
      }
519
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
520
    case 128:			/* --plugin-dir */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
521
      free(plugindir);
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
522
      plugindir = strdup(arg);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
523
      if(plugindir != NULL){
524
	errno = 0;
525
      }
24.1.5 by Björn Påhlsson
plugbasedclient:
526
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
527
    case 129:			/* --config-file */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
528
      /* This is already done by parse_opt_config_file() */
529
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
530
    case 130:			/* --userid */
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
531
      tmp_id = strtoimax(arg, &tmp, 10);
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
532
      if(errno != 0 or tmp == arg or *tmp != '\0'
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
533
	 or tmp_id != (uid_t)tmp_id){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
534
	argp_error(state, "Bad user ID number: \"%s\", using %"
535
		   PRIdMAX, arg, (intmax_t)uid);
536
	break;
264 by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the
537
      }
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
538
      uid = (uid_t)tmp_id;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
539
      errno = 0;
24.1.6 by Björn Påhlsson
plugbasedclient
540
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
541
    case 131:			/* --groupid */
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
542
      tmp_id = strtoimax(arg, &tmp, 10);
311 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
543
      if(errno != 0 or tmp == arg or *tmp != '\0'
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
544
	 or tmp_id != (gid_t)tmp_id){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
545
	argp_error(state, "Bad group ID number: \"%s\", using %"
546
		   PRIdMAX, arg, (intmax_t)gid);
547
	break;
264 by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the
548
      }
536 by Björn Påhlsson
renamed some foomax values to what they actually represent
549
      gid = (gid_t)tmp_id;
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
550
      errno = 0;
24.1.6 by Björn Påhlsson
plugbasedclient
551
      break;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
552
    case 132:			/* --debug */
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
553
      debug = true;
554
      break;
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
555
    case 133:			/* --plugin-helper-dir */
556
      free(pluginhelperdir);
557
      pluginhelperdir = strdup(arg);
558
      if(pluginhelperdir != NULL){
559
	errno = 0;
560
      }
561
      break;
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
562
      /*
563
       * These reproduce what we would get without ARGP_NO_HELP
564
       */
565
    case '?':			/* --help */
566
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
567
      argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
975 by Teddy Hogeborn
Fix warnings from -Wimplicit-fallthrough
568
      __builtin_unreachable();
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
569
    case -3:			/* --usage */
570
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
571
      argp_state_help(state, state->out_stream,
572
		      ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
975 by Teddy Hogeborn
Fix warnings from -Wimplicit-fallthrough
573
      __builtin_unreachable();
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
574
    case 'V':			/* --version */
575
      fprintf(state->out_stream, "%s\n", argp_program_version);
576
      exit(EXIT_SUCCESS);
577
      break;
264 by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the
578
/*
579
 * When adding more options before this line, remember to also add a
580
 * "case" to the "parse_opt_config_file" function below.
581
 */
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
582
    case ARGP_KEY_ARG:
178 by Teddy Hogeborn
* initramfs-tools-script: Fix permissions of "/tmp" in initrd.
583
      /* Cryptsetup always passes an argument, which is an empty
584
	 string if "none" was specified in /etc/crypttab.  So if
585
	 argument was empty, we ignore it silently. */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
586
      if(arg[0] == '\0'){
587
	break;
178 by Teddy Hogeborn
* initramfs-tools-script: Fix permissions of "/tmp" in initrd.
588
      }
1108 by Teddy Hogeborn
plugin-runner.c: Switch to attribute to mark switch fallthrough
589
      __attribute__((fallthrough));
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
590
    default:
591
      return ARGP_ERR_UNKNOWN;
592
    }
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
593
    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
594
  }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
595
  
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
596
  /* This option parser is the same as parse_opt() above, except it
597
     ignores everything but the --config-file option. */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
598
  error_t parse_opt_config_file(int key, char *arg,
599
				__attribute__((unused))
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
600
				struct argp_state *state){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
601
    errno = 0;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
602
    switch(key){
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
603
    case 'g': 			/* --global-options */
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
604
    case 'G':			/* --global-env */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
605
    case 'o':			/* --options-for */
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
606
    case 'E':			/* --env-for */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
607
    case 'd':			/* --disable */
138 by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G",
608
    case 'e':			/* --enable */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
609
    case 128:			/* --plugin-dir */
610
      break;
611
    case 129:			/* --config-file */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
612
      free(argfile);
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
613
      argfile = strdup(arg);
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
614
      if(argfile != NULL){
615
	errno = 0;
616
      }
355 by Teddy Hogeborn
* mandos: White-space fixes only.
617
      break;
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
618
    case 130:			/* --userid */
619
    case 131:			/* --groupid */
620
    case 132:			/* --debug */
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
621
    case 133:			/* --plugin-helper-dir */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
622
    case '?':			/* --help */
623
    case -3:			/* --usage */
624
    case 'V':			/* --version */
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
625
    case ARGP_KEY_ARG:
626
      break;
627
    default:
628
      return ARGP_ERR_UNKNOWN;
629
    }
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
630
    return errno;
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
631
  }
632
  
633
  struct argp argp = { .options = options,
634
		       .parser = parse_opt_config_file,
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
635
		       .args_doc = "",
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
636
		       .doc = "Mandos plugin runner -- Run plugins" };
637
  
265 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix; do not accept a "d" character after
638
  /* 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".
639
     config file location, if any. */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
640
  ret = argp_parse(&argp, argc, argv,
641
		   ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
642
		   NULL, NULL);
643
  switch(ret){
644
  case 0:
645
    break;
646
  case ENOMEM:
647
  default:
648
    errno = ret;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
649
    error(0, errno, "argp_parse");
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
650
    exitstatus = EX_OSERR;
651
    goto fallback;
652
  case EINVAL:
653
    exitstatus = EX_USAGE;
137 by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file".
654
    goto fallback;
655
  }
656
  
657
  /* Reset to the normal argument parser */
658
  argp.parser = parse_opt;
659
  
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
660
  /* Open the configfile if available */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
661
  if(argfile == NULL){
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
662
    conffp = fopen(AFILE, "r");
663
  } else {
664
    conffp = fopen(argfile, "r");
355 by Teddy Hogeborn
* mandos: White-space fixes only.
665
  }
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
666
  if(conffp != NULL){
667
    char *org_line = NULL;
24.1.54 by Björn Påhlsson
plugin-runner
668
    char *p, *arg, *new_arg, *line;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
669
    size_t size = 0;
670
    const char whitespace_delims[] = " \r\t\f\v\n";
671
    const char comment_delim[] = "#";
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
672
    
24.1.67 by Björn Påhlsson
transformed a function to a part of main
673
    custom_argc = 1;
674
    custom_argv = malloc(sizeof(char*) * 2);
675
    if(custom_argv == NULL){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
676
      error(0, errno, "malloc");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
677
      exitstatus = EX_OSERR;
24.1.67 by Björn Påhlsson
transformed a function to a part of main
678
      goto fallback;
679
    }
680
    custom_argv[0] = argv[0];
681
    custom_argv[1] = NULL;
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
682
    
133 by Teddy Hogeborn
* plugin-runner.c: Break a couple of long lines.
683
    /* for each line in the config file, strip whitespace and ignore
684
       commented text */
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
685
    while(true){
686
      sret = getline(&org_line, &size, conffp);
687
      if(sret == -1){
688
	break;
689
      }
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
690
      
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
691
      line = org_line;
692
      arg = strsep(&line, comment_delim);
693
      while((p = strsep(&arg, whitespace_delims)) != NULL){
694
	if(p[0] == '\0'){
695
	  continue;
696
	}
697
	new_arg = strdup(p);
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
698
	if(new_arg == NULL){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
699
	  error(0, errno, "strdup");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
700
	  exitstatus = EX_OSERR;
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
701
	  free(org_line);
702
	  goto fallback;
703
	}
704
	
24.1.67 by Björn Påhlsson
transformed a function to a part of main
705
	custom_argc += 1;
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
706
	{
707
	  char **new_argv = realloc(custom_argv, sizeof(char *)
797 by Teddy Hogeborn
plugin-runner.c: Use size_t to realloc() for custom plugin args.
708
				    * ((size_t)custom_argc + 1));
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
709
	  if(new_argv == NULL){
710
	    error(0, errno, "realloc");
711
	    exitstatus = EX_OSERR;
712
	    free(new_arg);
713
	    free(org_line);
714
	    goto fallback;
715
	  } else {
716
	    custom_argv = new_argv;
717
	  }
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
718
	}
24.1.67 by Björn Påhlsson
transformed a function to a part of main
719
	custom_argv[custom_argc-1] = new_arg;
355 by Teddy Hogeborn
* mandos: White-space fixes only.
720
	custom_argv[custom_argc] = NULL;
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
721
      }
722
    }
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
723
    do {
359 by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file.
724
      ret = fclose(conffp);
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
725
    } while(ret == EOF and errno == EINTR);
359 by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file.
726
    if(ret == EOF){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
727
      error(0, errno, "fclose");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
728
      exitstatus = EX_IOERR;
359 by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file.
729
      goto fallback;
730
    }
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
731
    free(org_line);
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
732
  } else {
24.1.52 by Björn Påhlsson
merge + minor adjustments
733
    /* Check for harmful errors and go to fallback. Other errors might
734
       not affect opening plugins */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
735
    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
736
      error(0, errno, "fopen");
402 by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet",
737
      exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
738
      goto fallback;
24.1.8 by Björn Påhlsson
plugbasedclient
739
    }
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
740
  }
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
741
  /* If there were any arguments from the configuration file, pass
742
     them to parser as command line arguments */
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
743
  if(custom_argv != NULL){
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
744
    ret = argp_parse(&argp, custom_argc, custom_argv,
745
		     ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
746
		     NULL, NULL);
747
    switch(ret){
748
    case 0:
749
      break;
750
    case ENOMEM:
751
    default:
752
      errno = ret;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
753
      error(0, errno, "argp_parse");
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
754
      exitstatus = EX_OSERR;
755
      goto fallback;
756
    case EINVAL:
757
      exitstatus = EX_CONFIG;
24.1.54 by Björn Påhlsson
plugin-runner
758
      goto fallback;
24.1.26 by Björn Påhlsson
tally count of used symbols
759
    }
24.1.8 by Björn Påhlsson
plugbasedclient
760
  }
761
  
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
762
  /* Parse actual command line arguments, to let them override the
763
     config file */
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
764
  ret = argp_parse(&argp, argc, argv,
765
		   ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
766
		   NULL, NULL);
767
  switch(ret){
768
  case 0:
769
    break;
770
  case ENOMEM:
771
  default:
772
    errno = ret;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
773
    error(0, errno, "argp_parse");
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
774
    exitstatus = EX_OSERR;
775
    goto fallback;
776
  case EINVAL:
777
    exitstatus = EX_USAGE;
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
778
    goto fallback;
779
  }
780
  
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
781
  {
782
    char *pluginhelperenv;
783
    bool bret = true;
784
    ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
785
		   pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
786
    if(ret != -1){
787
      bret = add_environment(getplugin(NULL), pluginhelperenv, true);
788
    }
789
    if(ret == -1 or not bret){
790
      error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
791
	    " environment variable to \"%s\" for all plugins\n",
792
	    pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
793
    }
794
    if(ret != -1){
795
      free(pluginhelperenv);
796
    }
797
  }
798
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
799
  if(debug){
890 by Teddy Hogeborn
Add spaces around all '=' signs in all C code.
800
    for(plugin *p = plugin_list; p != NULL; p = p->next){
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
801
      fprintf(stderr, "Plugin: %s has %d arguments\n",
32 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
802
	      p->name ? p->name : "Global", p->argc - 1);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
803
      for(char **a = p->argv; *a != NULL; a++){
804
	fprintf(stderr, "\tArg: %s\n", *a);
805
      }
268 by Teddy Hogeborn
Fixes for sscanf usage:
806
      fprintf(stderr, "...and %d environment variables\n", p->envc);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
807
      for(char **a = p->environ; *a != NULL; a++){
808
	fprintf(stderr, "\t%s\n", *a);
809
      }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
810
    }
811
  }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
812
  
505.3.11 by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option.
813
  if(getuid() == 0){
487 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
814
    /* Work around Debian bug #633582:
868 by Teddy Hogeborn
Change all http:// URLs to https:// wherever possible.
815
       <https://bugs.debian.org/633582> */
487 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
816
    int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
817
    if(plugindir_fd == -1){
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
818
      if(errno != ENOENT){
819
	error(0, errno, "open(\"" PDIR "\")");
820
      }
487 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
821
    } else {
822
      ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
823
      if(ret == -1){
824
	error(0, errno, "fstat");
825
      } else {
826
	if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
827
	  ret = fchown(plugindir_fd, uid, gid);
828
	  if(ret == -1){
829
	    error(0, errno, "fchown");
830
	  }
831
	}
832
      }
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
833
      close(plugindir_fd);
487 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
834
    }
835
  }
836
  
837
  /* Lower permissions */
620 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix; do not ignore return value of
838
  ret = setgid(gid);
299 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: Do setgid before setuid.
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, "setgid");
299 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: Do setgid before setuid.
841
  }
24.1.6 by Björn Påhlsson
plugbasedclient
842
  ret = setuid(uid);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
843
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
844
    error(0, errno, "setuid");
24.1.6 by Björn Påhlsson
plugbasedclient
845
  }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
846
  
384 by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when
847
  /* Open plugin directory with close_on_exec flag */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
848
  {
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
849
    dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
850
#ifdef O_CLOEXEC
851
		  O_CLOEXEC
852
#else  /* not O_CLOEXEC */
853
		  0
854
#endif	/* not O_CLOEXEC */
855
		  );
384 by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when
856
    if(dir_fd == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
857
      error(0, errno, "Could not open plugin dir");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
858
      exitstatus = EX_UNAVAILABLE;
384 by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when
859
      goto fallback;
860
    }
861
    
862
#ifndef O_CLOEXEC
863
  /* Set the FD_CLOEXEC flag on the directory */
864
    ret = set_cloexec_flag(dir_fd);
865
    if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
866
      error(0, errno, "set_cloexec_flag");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
867
      exitstatus = EX_OSERR;
384 by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when
868
      goto fallback;
869
    }
870
#endif	/* O_CLOEXEC */
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
871
  }
872
  
873
  int good_name(const struct dirent * const dirent){
874
    const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
875
				      "*.dpkg-old", "*.dpkg-bak",
876
				      "*.dpkg-divert", NULL };
877
#ifdef __GNUC__
878
#pragma GCC diagnostic push
879
#pragma GCC diagnostic ignored "-Wcast-qual"
880
#endif
881
    for(const char **pat = (const char **)patterns;
882
	*pat != NULL; pat++){
883
#ifdef __GNUC__
884
#pragma GCC diagnostic pop
885
#endif
886
      if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
887
	 != FNM_NOMATCH){
888
	if(debug){
889
	    fprintf(stderr, "Ignoring plugin dir entry \"%s\""
890
		    " matching pattern %s\n", dirent->d_name, *pat);
891
	}
892
	return 0;
893
      }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
894
    }
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
895
    return 1;
896
  }
897
  
898
  int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
899
			     alphasort);
900
  if(numplugins == -1){
901
    error(0, errno, "Could not scan plugin dir");
705 by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases.
902
    direntries = NULL;
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
903
    exitstatus = EX_OSERR;
904
    goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
905
  }
24.1.1 by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they
906
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
907
  FD_ZERO(&rfds_all);
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
908
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
909
  /* Read and execute any executable in the plugin directory*/
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
910
  for(int i = 0; i < numplugins; i++){
911
    
912
    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.
913
    if(plugin_fd == -1){
914
      error(0, errno, "Could not open plugin");
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
915
      free(direntries[i]);
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
916
      continue;
169 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: use built-in default value if
917
    }
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
918
    ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
919
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
920
      error(0, errno, "stat");
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
921
      close(plugin_fd);
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
922
      free(direntries[i]);
24.1.46 by Björn Påhlsson
mandos-client
923
      continue;
24.1.26 by Björn Påhlsson
tally count of used symbols
924
    }
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
925
    
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
926
    /* Ignore non-executable files */
362 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
927
    if(not S_ISREG(st.st_mode)
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
928
       or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
929
					X_OK, 0)) != 0)){
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
930
      if(debug){
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
931
	fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
932
		" with bad type or mode\n",
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
933
		plugindir != NULL ? plugindir : PDIR,
934
		direntries[i]->d_name);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
935
      }
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
936
      close(plugin_fd);
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
937
      free(direntries[i]);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
938
      continue;
939
    }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
940
    
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
941
    plugin *p = getplugin(direntries[i]->d_name);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
942
    if(p == NULL){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
943
      error(0, errno, "getplugin");
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
944
      close(plugin_fd);
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
945
      free(direntries[i]);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
946
      continue;
947
    }
948
    if(p->disabled){
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
949
      if(debug){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
950
	fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
951
		direntries[i]->d_name);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
952
      }
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
953
      close(plugin_fd);
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
954
      free(direntries[i]);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
955
      continue;
956
    }
32 by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
957
    {
958
      /* 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
959
      plugin *g = getplugin(NULL);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
960
      if(g != NULL){
961
	for(char **a = g->argv + 1; *a != NULL; a++){
962
	  if(not add_argument(p, *a)){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
963
	    error(0, errno, "add_argument");
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
964
	  }
965
	}
966
	/* Add global environment variables */
967
	for(char **e = g->environ; *e != NULL; e++){
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
968
	  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
969
	    error(0, errno, "add_environment");
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
970
	  }
971
	}
972
      }
973
    }
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
974
    /* If this plugin has any environment variables, we need to
975
       duplicate the environment from this process, too. */
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
976
    if(p->environ[0] != NULL){
977
      for(char **e = environ; *e != NULL; e++){
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
978
	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
979
	  error(0, errno, "add_environment");
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
980
	}
981
      }
982
    }
983
    
98 by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free
984
    int pipefd[2];
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
985
#ifndef O_CLOEXEC
367 by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header.
986
    ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
987
#else  /* O_CLOEXEC */
988
    ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
989
#endif	/* O_CLOEXEC */
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
990
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
991
      error(0, errno, "pipe");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
992
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
993
      free(direntries[i]);
24.1.54 by Björn Påhlsson
plugin-runner
994
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
995
    }
702 by Teddy Hogeborn
In plugin-runner, protect against a larger FD_SETSIZE than fd_set.
996
    if(pipefd[0] >= FD_SETSIZE){
997
      fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
998
	      FD_SETSIZE);
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
999
      close(pipefd[0]);
1000
      close(pipefd[1]);
702 by Teddy Hogeborn
In plugin-runner, protect against a larger FD_SETSIZE than fd_set.
1001
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1002
      free(direntries[i]);
702 by Teddy Hogeborn
In plugin-runner, protect against a larger FD_SETSIZE than fd_set.
1003
      goto fallback;
1004
    }
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
1005
#ifndef O_CLOEXEC
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1006
    /* Ask OS to automatic close the pipe on exec */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1007
    ret = set_cloexec_flag(pipefd[0]);
1008
    if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1009
      error(0, errno, "set_cloexec_flag");
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
1010
      close(pipefd[0]);
1011
      close(pipefd[1]);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1012
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1013
      free(direntries[i]);
24.1.54 by Björn Påhlsson
plugin-runner
1014
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1015
    }
1016
    ret = set_cloexec_flag(pipefd[1]);
1017
    if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1018
      error(0, errno, "set_cloexec_flag");
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
1019
      close(pipefd[0]);
1020
      close(pipefd[1]);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1021
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1022
      free(direntries[i]);
24.1.54 by Björn Påhlsson
plugin-runner
1023
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1024
    }
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
1025
#endif	/* not O_CLOEXEC */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1026
    /* Block SIGCHLD until process is safely in process list */
367 by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header.
1027
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1028
					      &sigchld_action.sa_mask,
1029
					      NULL));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1030
    if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1031
      error(0, errno, "sigprocmask");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1032
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1033
      free(direntries[i]);
24.1.54 by Björn Påhlsson
plugin-runner
1034
      goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1035
    }
136 by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment
1036
    /* Starting a new process to be watched */
362 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
1037
    pid_t pid;
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
1038
    do {
362 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
1039
      pid = fork();
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
1040
    } while(pid == -1 and errno == EINTR);
24.1.46 by Björn Påhlsson
mandos-client
1041
    if(pid == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1042
      error(0, errno, "fork");
701 by Teddy Hogeborn
plugin-runner: Restore resources correctly if fork() fails.
1043
      TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1044
				     &sigchld_action.sa_mask, NULL));
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
1045
      close(pipefd[0]);
1046
      close(pipefd[1]);
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1047
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1048
      free(direntries[i]);
24.1.54 by Björn Påhlsson
plugin-runner
1049
      goto fallback;
24.1.46 by Björn Påhlsson
mandos-client
1050
    }
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1051
    if(pid == 0){
1052
      /* this is the child process */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1053
      ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1054
      if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1055
	error(0, errno, "sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1056
	_exit(EX_OSERR);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1057
      }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1058
      ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1059
      if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1060
	error(0, errno, "sigprocmask");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1061
	_exit(EX_OSERR);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1062
      }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1063
      
24.1.26 by Björn Påhlsson
tally count of used symbols
1064
      ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1065
      if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1066
	error(0, errno, "dup2");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1067
	_exit(EX_OSERR);
24.1.26 by Björn Påhlsson
tally count of used symbols
1068
      }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1069
      
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
1070
      if(fexecve(plugin_fd, p->argv,
674 by Teddy Hogeborn
Improve error message when working around Debian bug #633582.
1071
		(p->environ[0] != NULL) ? p->environ : environ) < 0){
675 by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning.
1072
	error(0, errno, "fexecve for %s/%s",
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
1073
	      plugindir != NULL ? plugindir : PDIR,
1074
	      direntries[i]->d_name);
674 by Teddy Hogeborn
Improve error message when working around Debian bug #633582.
1075
	_exit(EX_OSERR);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1076
      }
1077
      /* no return */
1078
    }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1079
    /* Parent process */
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
1080
    close(pipefd[1]);		/* Close unused write end of pipe */
1081
    close(plugin_fd);
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
1082
    plugin *new_plugin = getplugin(direntries[i]->d_name);
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1083
    if(new_plugin == NULL){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1084
      error(0, errno, "getplugin");
367 by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header.
1085
      ret = (int)(TEMP_FAILURE_RETRY
1086
		  (sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1087
			       NULL)));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1088
      if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1089
        error(0, errno, "sigprocmask");
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1090
      }
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1091
      exitstatus = EX_OSERR;
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1092
      free(direntries[i]);
24.1.54 by Björn Påhlsson
plugin-runner
1093
      goto fallback;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1094
    }
716 by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks.
1095
    free(direntries[i]);
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1096
    
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1097
    new_plugin->pid = pid;
1098
    new_plugin->fd = pipefd[0];
952 by Teddy Hogeborn
plugin-runner: More debug output
1099
1100
    if(debug){
1101
      fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1102
	      new_plugin->name, (intmax_t) (new_plugin->pid));
1103
    }
1104
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1105
    /* Unblock SIGCHLD so signal handler can be run if this process
1106
       has already completed */
367 by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header.
1107
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1108
					      &sigchld_action.sa_mask,
1109
					      NULL));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1110
    if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1111
      error(0, errno, "sigprocmask");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1112
      exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
1113
      goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1114
    }
1115
    
810 by Teddy Hogeborn
Depend on the GNU C Library 2.16 or later
1116
    FD_SET(new_plugin->fd, &rfds_all);
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1117
    
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1118
    if(maxfd < new_plugin->fd){
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1119
      maxfd = new_plugin->fd;
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1120
    }
13 by Björn Påhlsson
Added following support:
1121
  }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1122
  
705 by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases.
1123
  free(direntries);
1124
  direntries = NULL;
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
1125
  close(dir_fd);
705 by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases.
1126
  dir_fd = -1;
24.1.132 by Björn Påhlsson
Fixed a bug in fallback handling
1127
  free_plugin(getplugin(NULL));
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1128
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1129
  for(plugin *p = plugin_list; p != NULL; p = p->next){
1130
    if(p->pid != 0){
1131
      break;
1132
    }
1133
    if(p->next == NULL){
1134
      fprintf(stderr, "No plugin processes started. Incorrect plugin"
1135
	      " directory?\n");
1136
      free_plugin_list();
1137
    }
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1138
  }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1139
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1140
  /* Main loop while running plugins exist */
1141
  while(plugin_list){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1142
    fd_set rfds = rfds_all;
1143
    int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
362 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
1144
    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
1145
      error(0, errno, "select");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1146
      exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
1147
      goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1148
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1149
    /* OK, now either a process completed, or something can be read
1150
       from one of them */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1151
    for(plugin *proc = plugin_list; proc != NULL;){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1152
      /* Is this process completely done? */
297 by Teddy Hogeborn
* plugin-runner.c (struct plugin.status): Changed type to "int".
1153
      if(proc->completed and proc->eof){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1154
	/* Only accept the plugin output if it exited cleanly */
1155
	if(not WIFEXITED(proc->status)
1156
	   or WEXITSTATUS(proc->status) != 0){
1157
	  /* Bad exit by plugin */
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1158
	  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1159
	  if(debug){
1160
	    if(WIFEXITED(proc->status)){
301 by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins.
1161
	      fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1162
		      " status %d\n", proc->name,
1163
		      (intmax_t) (proc->pid),
60 by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing.
1164
		      WEXITSTATUS(proc->status));
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1165
	    } else if(WIFSIGNALED(proc->status)){
301 by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins.
1166
	      fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
1167
		      " signal %d: %s\n", proc->name,
301 by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins.
1168
		      (intmax_t) (proc->pid),
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
1169
		      WTERMSIG(proc->status),
1170
		      strsignal(WTERMSIG(proc->status)));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1171
	    }
1172
	  }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1173
	  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1174
	  /* Remove the plugin */
810 by Teddy Hogeborn
Depend on the GNU C Library 2.16 or later
1175
	  FD_CLR(proc->fd, &rfds_all);
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1176
	  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1177
	  /* Block signal while modifying process_list */
367 by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header.
1178
	  ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1179
					(SIG_BLOCK,
1180
					 &sigchld_action.sa_mask,
1181
					 NULL));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1182
	  if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1183
	    error(0, errno, "sigprocmask");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1184
	    exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
1185
	    goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1186
	  }
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1187
	  
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1188
	  plugin *next_plugin = proc->next;
1189
	  free_plugin(proc);
1190
	  proc = next_plugin;
1191
	  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1192
	  /* We are done modifying process list, so unblock signal */
367 by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header.
1193
	  ret = (int)(TEMP_FAILURE_RETRY
1194
		      (sigprocmask(SIG_UNBLOCK,
1195
				   &sigchld_action.sa_mask, NULL)));
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1196
	  if(ret < 0){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1197
	    error(0, errno, "sigprocmask");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1198
	    exitstatus = EX_OSERR;
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1199
	    goto fallback;
1200
	  }
1201
	  
1202
	  if(plugin_list == NULL){
1203
	    break;
1204
	  }
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1205
	  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1206
	  continue;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1207
	}
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1208
	
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1209
	/* This process exited nicely, so print its buffer */
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1210
	
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
1211
	bool bret = print_out_password(proc->buffer,
1212
				       proc->buffer_length);
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1213
	if(not bret){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1214
	  error(0, errno, "print_out_password");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1215
	  exitstatus = EX_IOERR;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1216
	}
24.1.54 by Björn Påhlsson
plugin-runner
1217
	goto fallback;
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1218
      }
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1219
      
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1220
      /* This process has not completed.  Does it have any output? */
810 by Teddy Hogeborn
Depend on the GNU C Library 2.16 or later
1221
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1222
	/* This process had nothing to say at this time */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1223
	proc = proc->next;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1224
	continue;
1225
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1226
      /* Before reading, make the process' data buffer large enough */
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1227
      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.
1228
	char *new_buffer = realloc(proc->buffer, proc->buffer_size
1229
				   + (size_t) BUFFER_SIZE);
1230
	if(new_buffer == NULL){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1231
	  error(0, errno, "malloc");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1232
	  exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
1233
	  goto fallback;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1234
	}
666 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1235
	proc->buffer = new_buffer;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1236
	proc->buffer_size += BUFFER_SIZE;
1237
      }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1238
      /* Read from the process */
362 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
1239
      sret = TEMP_FAILURE_RETRY(read(proc->fd,
1240
				     proc->buffer
1241
				     + proc->buffer_length,
1242
				     BUFFER_SIZE));
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
1243
      if(sret < 0){
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1244
	/* Read error from this process; ignore the error */
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
1245
	proc = proc->next;
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1246
	continue;
1247
      }
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
1248
      if(sret == 0){
34 by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set
1249
	/* got EOF */
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1250
	proc->eof = true;
1251
      } else {
254 by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop
1252
	proc->buffer_length += (size_t) sret;
13 by Björn Påhlsson
Added following support:
1253
      }
1254
    }
1255
  }
312 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1256
  
1257
  
24.1.54 by Björn Påhlsson
plugin-runner
1258
 fallback:
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1259
  
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1260
  if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1261
			     and exitstatus != EX_OK)){
102 by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile.
1262
    /* Fallback if all plugins failed, none are found or an error
1263
       occured */
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1264
    bool bret;
1265
    fprintf(stderr, "Going to fallback mode using getpass(3)\n");
1266
    char *passwordbuffer = getpass("Password: ");
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
1267
    size_t len = strlen(passwordbuffer);
1268
    /* Strip trailing newline */
1269
    if(len > 0 and passwordbuffer[len-1] == '\n'){
1270
      passwordbuffer[len-1] = '\0'; /* not strictly necessary */
1271
      len--;
1272
    }
1273
    bret = print_out_password(passwordbuffer, len);
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1274
    if(not bret){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1275
      error(0, errno, "print_out_password");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1276
      exitstatus = EX_IOERR;
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1277
    }
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1278
  }
24.1.42 by Björn Påhlsson
Added fallback to mandos-client
1279
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1280
  /* Restore old signal handler */
24.1.54 by Björn Påhlsson
plugin-runner
1281
  ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1282
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1283
    error(0, errno, "sigaction");
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1284
    exitstatus = EX_OSERR;
24.1.54 by Björn Påhlsson
plugin-runner
1285
  }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1286
  
24.1.54 by Björn Påhlsson
plugin-runner
1287
  if(custom_argv != NULL){
24.1.67 by Björn Påhlsson
transformed a function to a part of main
1288
    for(char **arg = custom_argv+1; *arg != NULL; arg++){
24.1.54 by Björn Påhlsson
plugin-runner
1289
      free(*arg);
78 by Teddy Hogeborn
Add feature to specify custom environment variables for plugins.
1290
    }
24.1.54 by Björn Påhlsson
plugin-runner
1291
    free(custom_argv);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1292
  }
1293
  
705 by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases.
1294
  free(direntries);
1295
  
703 by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir().
1296
  if(dir_fd != -1){
774 by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close().
1297
    close(dir_fd);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1298
  }
1299
  
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1300
  /* Kill the processes */
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1301
  for(plugin *p = plugin_list; p != NULL; p = p->next){
1302
    if(p->pid != 0){
1303
      close(p->fd);
1304
      ret = kill(p->pid, SIGTERM);
1305
      if(ret == -1 and errno != ESRCH){
1306
	/* 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
1307
	error(0, errno, "kill");
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1308
      }
24.1.26 by Björn Påhlsson
tally count of used symbols
1309
    }
13 by Björn Påhlsson
Added following support:
1310
  }
1311
  
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1312
  /* Wait for any remaining child processes to terminate */
363 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
1313
  do {
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1314
    ret = wait(NULL);
1315
  } while(ret >= 0);
1316
  if(errno != ECHILD){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
1317
    error(0, errno, "wait");
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1318
  }
210 by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to
1319
  
24.1.76 by Björn Påhlsson
Rearranged so plugins and processes is the same thing
1320
  free_plugin_list();
1321
  
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
1322
  free(plugindir);
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
1323
  free(pluginhelperdir);
24.1.69 by Björn Påhlsson
added configfile as a optional argument to plugin-runner
1324
  free(argfile);
35 by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed",
1325
  
31 by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments.
1326
  return exitstatus;
13 by Björn Påhlsson
Added following support:
1327
}