/mandos/release

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