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