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