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