To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 280
- compare with another revision
- download diff
- download tarball
- view history from revision 280
- Committer: Teddy Hogeborn
- Date: 2010-10-11 17:32:23 UTC
- mfrom: (237.7.6 mandos-local)
- Revision ID: teddy@fukt.bsnet.se-20101011173223-tgrfs9i3dweqt0kn
Merge from trunk.
- 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-2010 Teddy Hogeborn
6
* Copyright © 2008-2010 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
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@recompile.se>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
79
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
80
80
81
81
const char *argp_program_version = "plugin-runner " VERSION;
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
82
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
83
84
84
typedef struct plugin{
85
85
char *name; /* can be NULL or any plugin name */
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){
778
/* Work around Debian bug #633582:
779
<http://bugs.debian.org/633582> */
780
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
if(plugindir_fd == -1){
782
error(0, errno, "open");
783
} else {
784
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
785
if(ret == -1){
786
error(0, errno, "fstat");
787
} else {
788
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
789
ret = fchown(plugindir_fd, uid, gid);
790
if(ret == -1){
791
error(0, errno, "fchown");
792
}
793
}
794
}
795
TEMP_FAILURE_RETRY(close(plugindir_fd));
796
}
797
}
798
799
/* Lower permissions */
800
ret = setgid(gid);
745
/* Strip permissions down to nobody */
746
setgid(gid);
801
747
if(ret == -1){
802
748
error(0, errno, "setgid");
803
749
}
876
822
{
877
823
bool bad_name = false;
878
824
879
const char * const bad_prefixes[] = { ".", "#", NULL };
825
const char const *bad_prefixes[] = { ".", "#", NULL };
880
826
881
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
827
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
882
828
".dpkg-old",
883
829
".dpkg-bak",
884
830
".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
831
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
894
832
size_t pre_len = strlen(*pre);
895
833
if((d_name_len >= pre_len)
896
834
and strncmp((dirst->d_name), *pre, pre_len) == 0){
905
843
if(bad_name){
906
844
continue;
907
845
}
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
846
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
917
847
size_t suf_len = strlen(*suf);
918
848
if((d_name_len >= suf_len)
919
849
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
1113
1043
goto fallback;
1114
1044
}
1115
1045
1116
#if defined (__GNUC__) and defined (__GLIBC__)
1117
#if not __GLIBC_PREREQ(2, 16)
1118
#pragma GCC diagnostic push
1119
#pragma GCC diagnostic ignored "-Wsign-conversion"
1120
#endif
1121
#endif
1122
1046
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1123
-Wconversion in GNU libc
1124
before 2.16 */
1125
#if defined (__GNUC__) and defined (__GLIBC__)
1126
#if not __GLIBC_PREREQ(2, 16)
1127
#pragma GCC diagnostic pop
1128
#endif
1129
#endif
1047
-Wconversion */
1130
1048
1131
1049
if(maxfd < new_plugin->fd){
1132
1050
maxfd = new_plugin->fd;
1186
1104
}
1187
1105
1188
1106
/* Remove the plugin */
1189
#if defined (__GNUC__) and defined (__GLIBC__)
1190
#if not __GLIBC_PREREQ(2, 16)
1191
#pragma GCC diagnostic push
1192
#pragma GCC diagnostic ignored "-Wsign-conversion"
1193
#endif
1194
#endif
1195
1107
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1196
-Wconversion in GNU libc
1197
before 2.16 */
1198
#if defined (__GNUC__) and defined (__GLIBC__)
1199
#if not __GLIBC_PREREQ(2, 16)
1200
#pragma GCC diagnostic pop
1201
#endif
1202
#endif
1108
-Wconversion */
1203
1109
1204
1110
/* Block signal while modifying process_list */
1205
1111
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1245
1151
}
1246
1152
1247
1153
/* This process has not completed. Does it have any output? */
1248
#if defined (__GNUC__) and defined (__GLIBC__)
1249
#if not __GLIBC_PREREQ(2, 16)
1250
#pragma GCC diagnostic push
1251
#pragma GCC diagnostic ignored "-Wsign-conversion"
1252
#endif
1253
#endif
1254
1154
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1255
1155
warning from
1256
-Wconversion
1257
in GNU libc
1258
before
1259
2.16 */
1260
#if defined (__GNUC__) and defined (__GLIBC__)
1261
#if not __GLIBC_PREREQ(2, 16)
1262
#pragma GCC diagnostic pop
1263
#endif
1264
#endif
1156
-Wconversion */
1265
1157
/* This process had nothing to say at this time */
1266
1158
proc = proc->next;
1267
1159
continue;
1268
1160
}
1269
1161
/* Before reading, make the process' data buffer large enough */
1270
1162
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1271
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1272
+ (size_t) BUFFER_SIZE);
1273
if(new_buffer == NULL){
1163
proc->buffer = realloc(proc->buffer, proc->buffer_size
1164
+ (size_t) BUFFER_SIZE);
1165
if(proc->buffer == NULL){
1274
1166
error(0, errno, "malloc");
1275
1167
exitstatus = EX_OSERR;
1276
1168
goto fallback;
1277
1169
}
1278
proc->buffer = new_buffer;
1279
1170
proc->buffer_size += BUFFER_SIZE;
1280
1171
}
1281
1172
/* Read from the process */
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0