To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 505.1.17
- compare with another revision
- download diff
- download tarball
- view history from revision 505.1.17
- Committer: Teddy Hogeborn
- Date: 2011-10-14 18:35:55 UTC
- mto: (505.2.5 mandos-client-network-hooks)
- mto: This revision was merged to the branch mainline in revision 517.
- Revision ID: teddy@recompile.se-20111014183555-ytijba30et3kpkx2
* mandos (Client.checked_ok): Bug fix: Handle disabled client.
- files removed:
- debian/mandos-client.examples
- network-hooks.d
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2013 Teddy Hogeborn
6
* Copyright © 2008-2013 Björn Påhlsson
5
* Copyright © 2008-2011 Teddy Hogeborn
6
* Copyright © 2008-2011 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
49
49
F_GETFD, F_SETFD, FD_CLOEXEC,
50
50
access(), pipe(), fork(), close()
51
51
dup2(), STDOUT_FILENO, _exit(),
52
execve(), write(), read(),
52
execv(), write(), read(),
53
53
close() */
54
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
55
FD_CLOEXEC */
105
105
106
106
/* Gets an existing plugin based on name,
107
107
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
109
108
static plugin *getplugin(char *name){
110
109
/* Check for existing plugin with that name */
111
110
for(plugin *p = plugin_list; p != NULL; p = p->next){
172
171
}
173
172
174
173
/* Helper function for add_argument and add_environment */
175
__attribute__((nonnull, warn_unused_result))
176
174
static bool add_to_char_array(const char *new, char ***array,
177
175
int *len){
178
176
/* Resize the pointed-to array to hold one more pointer */
179
char **new_array = NULL;
180
177
do {
181
new_array = realloc(*array, sizeof(char *)
182
* (size_t) ((*len) + 2));
183
} while(new_array == NULL and errno == EINTR);
178
*array = realloc(*array, sizeof(char *)
179
* (size_t) ((*len) + 2));
180
} while(*array == NULL and errno == EINTR);
184
181
/* Malloc check */
185
if(new_array == NULL){
182
if(*array == NULL){
186
183
return false;
187
184
}
188
*array = new_array;
189
185
/* Make a copy of the new string */
190
186
char *copy;
191
187
do {
203
199
}
204
200
205
201
/* Add to a plugin's argument vector */
206
__attribute__((nonnull(2), warn_unused_result))
207
202
static bool add_argument(plugin *p, const char *arg){
208
203
if(p == NULL){
209
204
return false;
212
207
}
213
208
214
209
/* Add to a plugin's environment */
215
__attribute__((nonnull(2), warn_unused_result))
216
210
static bool add_environment(plugin *p, const char *def, bool replace){
217
211
if(p == NULL){
218
212
return false;
220
214
/* namelen = length of name of environment variable */
221
215
size_t namelen = (size_t)(strchrnul(def, '=') - def);
222
216
/* Search for this environment variable */
223
for(char **envdef = p->environ; *envdef != NULL; envdef++){
224
if(strncmp(*envdef, def, namelen + 1) == 0){
217
for(char **e = p->environ; *e != NULL; e++){
218
if(strncmp(*e, def, namelen + 1) == 0){
225
219
/* It already exists */
226
220
if(replace){
227
char *new_envdef;
221
char *new;
228
222
do {
229
new_envdef = realloc(*envdef, strlen(def) + 1);
230
} while(new_envdef == NULL and errno == EINTR);
231
if(new_envdef == NULL){
223
new = realloc(*e, strlen(def) + 1);
224
} while(new == NULL and errno == EINTR);
225
if(new == NULL){
232
226
return false;
233
227
}
234
*envdef = new_envdef;
235
strcpy(*envdef, def);
228
*e = new;
229
strcpy(*e, def);
236
230
}
237
231
return true;
238
232
}
245
239
* Descriptor Flags".
246
240
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
247
241
*/
248
__attribute__((warn_unused_result))
249
242
static int set_cloexec_flag(int fd){
250
243
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
251
244
/* If reading the flags failed, return error indication now. */
293
286
}
294
287
295
288
/* Prints out a password to stdout */
296
__attribute__((nonnull, warn_unused_result))
297
289
static bool print_out_password(const char *buffer, size_t length){
298
290
ssize_t ret;
299
291
for(size_t written = 0; written < length; written += (size_t)ret){
307
299
}
308
300
309
301
/* Removes and free a plugin from the plugin list */
310
__attribute__((nonnull))
311
302
static void free_plugin(plugin *plugin_node){
312
303
313
304
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
425
416
{ .name = NULL }
426
417
};
427
418
428
__attribute__((nonnull(3)))
429
419
error_t parse_opt(int key, char *arg, struct argp_state *state){
430
420
errno = 0;
431
421
switch(key){
432
422
char *tmp;
433
intmax_t tmp_id;
423
intmax_t tmpmax;
434
424
case 'g': /* --global-options */
435
425
{
436
426
char *plugin_option;
439
429
break;
440
430
}
441
431
}
442
errno = 0;
443
432
}
444
433
break;
445
434
case 'G': /* --global-env */
446
if(add_environment(getplugin(NULL), arg, true)){
447
errno = 0;
448
}
435
add_environment(getplugin(NULL), arg, true);
449
436
break;
450
437
case 'o': /* --options-for */
451
438
{
468
455
break;
469
456
}
470
457
}
471
errno = 0;
472
458
}
473
459
break;
474
460
case 'E': /* --env-for */
486
472
errno = EINVAL;
487
473
break;
488
474
}
489
if(add_environment(getplugin(arg), envdef, true)){
490
errno = 0;
491
}
475
add_environment(getplugin(arg), envdef, true);
492
476
}
493
477
break;
494
478
case 'd': /* --disable */
496
480
plugin *p = getplugin(arg);
497
481
if(p != NULL){
498
482
p->disabled = true;
499
errno = 0;
500
483
}
501
484
}
502
485
break;
505
488
plugin *p = getplugin(arg);
506
489
if(p != NULL){
507
490
p->disabled = false;
508
errno = 0;
509
491
}
510
492
}
511
493
break;
512
494
case 128: /* --plugin-dir */
513
495
free(plugindir);
514
496
plugindir = strdup(arg);
515
if(plugindir != NULL){
516
errno = 0;
517
}
518
497
break;
519
498
case 129: /* --config-file */
520
499
/* This is already done by parse_opt_config_file() */
521
500
break;
522
501
case 130: /* --userid */
523
tmp_id = strtoimax(arg, &tmp, 10);
502
tmpmax = strtoimax(arg, &tmp, 10);
524
503
if(errno != 0 or tmp == arg or *tmp != '\0'
525
or tmp_id != (uid_t)tmp_id){
504
or tmpmax != (uid_t)tmpmax){
526
505
argp_error(state, "Bad user ID number: \"%s\", using %"
527
506
PRIdMAX, arg, (intmax_t)uid);
528
507
break;
529
508
}
530
uid = (uid_t)tmp_id;
531
errno = 0;
509
uid = (uid_t)tmpmax;
532
510
break;
533
511
case 131: /* --groupid */
534
tmp_id = strtoimax(arg, &tmp, 10);
512
tmpmax = strtoimax(arg, &tmp, 10);
535
513
if(errno != 0 or tmp == arg or *tmp != '\0'
536
or tmp_id != (gid_t)tmp_id){
514
or tmpmax != (gid_t)tmpmax){
537
515
argp_error(state, "Bad group ID number: \"%s\", using %"
538
516
PRIdMAX, arg, (intmax_t)gid);
539
517
break;
540
518
}
541
gid = (gid_t)tmp_id;
542
errno = 0;
519
gid = (gid_t)tmpmax;
543
520
break;
544
521
case 132: /* --debug */
545
522
debug = true;
593
570
case 129: /* --config-file */
594
571
free(argfile);
595
572
argfile = strdup(arg);
596
if(argfile != NULL){
597
errno = 0;
598
}
599
573
break;
600
574
case 130: /* --userid */
601
575
case 131: /* --groupid */
684
658
}
685
659
686
660
custom_argc += 1;
687
{
688
char **new_argv = realloc(custom_argv, sizeof(char *)
689
* ((unsigned int)
690
custom_argc + 1));
691
if(new_argv == NULL){
692
error(0, errno, "realloc");
693
exitstatus = EX_OSERR;
694
free(new_arg);
695
free(org_line);
696
goto fallback;
697
} else {
698
custom_argv = new_argv;
699
}
661
custom_argv = realloc(custom_argv, sizeof(char *)
662
* ((unsigned int) custom_argc + 1));
663
if(custom_argv == NULL){
664
error(0, errno, "realloc");
665
exitstatus = EX_OSERR;
666
free(org_line);
667
goto fallback;
700
668
}
701
669
custom_argv[custom_argc-1] = new_arg;
702
670
custom_argv[custom_argc] = NULL;
774
742
}
775
743
}
776
744
777
if(getuid() == 0){
745
{
778
746
/* Work around Debian bug #633582:
779
747
<http://bugs.debian.org/633582> */
780
748
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
749
if(plugindir_fd == -1){
782
error(0, errno, "open(\"" PDIR "\")");
750
error(0, errno, "open");
783
751
} else {
784
752
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
785
753
if(ret == -1){
797
765
}
798
766
799
767
/* Lower permissions */
800
ret = setgid(gid);
768
setgid(gid);
801
769
if(ret == -1){
802
770
error(0, errno, "setgid");
803
771
}
876
844
{
877
845
bool bad_name = false;
878
846
879
const char * const bad_prefixes[] = { ".", "#", NULL };
847
const char const *bad_prefixes[] = { ".", "#", NULL };
880
848
881
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
849
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
882
850
".dpkg-old",
883
851
".dpkg-bak",
884
852
".dpkg-divert", NULL };
885
#ifdef __GNUC__
886
#pragma GCC diagnostic push
887
#pragma GCC diagnostic ignored "-Wcast-qual"
888
#endif
889
for(const char **pre = (const char **)bad_prefixes;
890
*pre != NULL; pre++){
891
#ifdef __GNUC__
892
#pragma GCC diagnostic pop
893
#endif
853
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
894
854
size_t pre_len = strlen(*pre);
895
855
if((d_name_len >= pre_len)
896
856
and strncmp((dirst->d_name), *pre, pre_len) == 0){
905
865
if(bad_name){
906
866
continue;
907
867
}
908
#ifdef __GNUC__
909
#pragma GCC diagnostic push
910
#pragma GCC diagnostic ignored "-Wcast-qual"
911
#endif
912
for(const char **suf = (const char **)bad_suffixes;
913
*suf != NULL; suf++){
914
#ifdef __GNUC__
915
#pragma GCC diagnostic pop
916
#endif
868
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
917
869
size_t suf_len = strlen(*suf);
918
870
if((d_name_len >= suf_len)
919
871
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
1069
1021
above and must now close it manually here. */
1070
1022
closedir(dir);
1071
1023
}
1072
if(execve(filename, p->argv,
1073
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1074
error(0, errno, "execve for %s", filename);
1075
_exit(EX_OSERR);
1024
if(p->environ[0] == NULL){
1025
if(execv(filename, p->argv) < 0){
1026
error(0, errno, "execv for %s", filename);
1027
_exit(EX_OSERR);
1028
}
1029
} else {
1030
if(execve(filename, p->argv, p->environ) < 0){
1031
error(0, errno, "execve for %s", filename);
1032
_exit(EX_OSERR);
1033
}
1076
1034
}
1077
1035
/* no return */
1078
1036
}
1107
1065
goto fallback;
1108
1066
}
1109
1067
1110
#if defined (__GNUC__) and defined (__GLIBC__)
1111
#if not __GLIBC_PREREQ(2, 16)
1112
#pragma GCC diagnostic push
1113
#pragma GCC diagnostic ignored "-Wsign-conversion"
1114
#endif
1115
#endif
1116
1068
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1117
-Wconversion in GNU libc
1118
before 2.16 */
1119
#if defined (__GNUC__) and defined (__GLIBC__)
1120
#if not __GLIBC_PREREQ(2, 16)
1121
#pragma GCC diagnostic pop
1122
#endif
1123
#endif
1069
-Wconversion */
1124
1070
1125
1071
if(maxfd < new_plugin->fd){
1126
1072
maxfd = new_plugin->fd;
1180
1126
}
1181
1127
1182
1128
/* Remove the plugin */
1183
#if defined (__GNUC__) and defined (__GLIBC__)
1184
#if not __GLIBC_PREREQ(2, 16)
1185
#pragma GCC diagnostic push
1186
#pragma GCC diagnostic ignored "-Wsign-conversion"
1187
#endif
1188
#endif
1189
1129
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1190
-Wconversion in GNU libc
1191
before 2.16 */
1192
#if defined (__GNUC__) and defined (__GLIBC__)
1193
#if not __GLIBC_PREREQ(2, 16)
1194
#pragma GCC diagnostic pop
1195
#endif
1196
#endif
1130
-Wconversion */
1197
1131
1198
1132
/* Block signal while modifying process_list */
1199
1133
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1239
1173
}
1240
1174
1241
1175
/* This process has not completed. Does it have any output? */
1242
#if defined (__GNUC__) and defined (__GLIBC__)
1243
#if not __GLIBC_PREREQ(2, 16)
1244
#pragma GCC diagnostic push
1245
#pragma GCC diagnostic ignored "-Wsign-conversion"
1246
#endif
1247
#endif
1248
1176
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1249
1177
warning from
1250
-Wconversion
1251
in GNU libc
1252
before
1253
2.16 */
1254
#if defined (__GNUC__) and defined (__GLIBC__)
1255
#if not __GLIBC_PREREQ(2, 16)
1256
#pragma GCC diagnostic pop
1257
#endif
1258
#endif
1178
-Wconversion */
1259
1179
/* This process had nothing to say at this time */
1260
1180
proc = proc->next;
1261
1181
continue;
1262
1182
}
1263
1183
/* Before reading, make the process' data buffer large enough */
1264
1184
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1265
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1266
+ (size_t) BUFFER_SIZE);
1267
if(new_buffer == NULL){
1185
proc->buffer = realloc(proc->buffer, proc->buffer_size
1186
+ (size_t) BUFFER_SIZE);
1187
if(proc->buffer == NULL){
1268
1188
error(0, errno, "malloc");
1269
1189
exitstatus = EX_OSERR;
1270
1190
goto fallback;
1271
1191
}
1272
proc->buffer = new_buffer;
1273
1192
proc->buffer_size += BUFFER_SIZE;
1274
1193
}
1275
1194
/* Read from the process */
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0