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