/mandos/release

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