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