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