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 48
- compare with another revision
- download diff
- download tarball
- view history from revision 48
- Committer: Teddy Hogeborn
- Date: 2008-08-07 22:30:45 UTC
- Revision ID: teddy@fukt.bsnet.se-20080807223045-58y7vw4bcqlmesv5
* network-protocol.txt: Flip table.
added
removed
mandos-client.c
23
23
24
24
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */
25
25
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() */
26
#include <stdio.h> /* popen(), fileno(), fprintf(),
27
stderr, STDOUT_FILENO */
42
28
#include <iso646.h> /* and, or, not */
29
#include <sys/types.h> /* DIR, opendir(), stat(),
30
struct stat, waitpid(),
31
WIFEXITED(), WEXITSTATUS(),
32
wait() */
33
#include <sys/wait.h> /* wait() */
43
34
#include <dirent.h> /* DIR, struct dirent, opendir(),
44
readdir(), closedir(), dirfd() */
35
readdir(), closedir() */
36
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
45
37
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
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 */
54
#include <string.h> /* strtok, strlen(), strcpy(),
55
strcat() */
38
fcntl() */
39
#include <fcntl.h> /* fcntl() */
40
#include <stddef.h> /* NULL */
41
#include <stdlib.h> /* EXIT_FAILURE */
42
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
43
FD_SET(), FD_ISSET() */
44
#include <string.h> /* strlen(), strcpy(), strcat() */
45
#include <stdbool.h> /* true */
46
#include <sys/wait.h> /* waitpid(), WIFEXITED(),
47
WEXITSTATUS() */
56
48
#include <errno.h> /* errno */
57
#include <argp.h> /* struct argp_option, struct
58
argp_state, struct argp,
59
argp_parse(), ARGP_ERR_UNKNOWN,
60
ARGP_KEY_END, ARGP_KEY_ARG, error_t */
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 */
49
#include <argp.h> /* struct argp_option,
50
struct argp_state, struct argp,
51
argp_parse() */
66
52
67
53
#define BUFFER_SIZE 256
68
54
69
const char *argp_program_version = "mandos-client 1.0";
70
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
71
72
55
struct process;
73
56
74
57
typedef struct process{
147
130
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
148
131
}
149
132
133
const char *argp_program_version = "plugbasedclient 0.9";
134
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
135
150
136
process *process_list = NULL;
151
137
152
138
/* Mark a process as completed when it exits, and save its exit
155
141
process *proc = process_list;
156
142
int status;
157
143
pid_t pid = wait(&status);
158
if(pid == -1){
159
perror("wait");
160
return;
161
}
162
144
while(proc != NULL and proc->pid != pid){
163
145
proc = proc->next;
164
146
}
170
152
proc->completed = true;
171
153
}
172
154
173
bool print_out_password(const char *buffer, size_t length){
174
ssize_t ret;
175
if(length>0 and buffer[length-1] == '\n'){
176
length--;
177
}
178
for(size_t written = 0; written < length; written += (size_t)ret){
179
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written,
180
length - written));
181
if(ret < 0){
182
return false;
183
}
184
}
185
return true;
186
}
187
188
155
int main(int argc, char *argv[]){
189
156
const char *plugindir = "/conf/conf.d/mandos/plugins.d";
190
157
size_t d_name_len;
202
169
.sa_flags = SA_NOCLDSTOP };
203
170
char *plus_options = NULL;
204
171
char **plus_argv = NULL;
205
206
errno = 0;
207
172
208
173
/* Establish a signal handler */
209
174
sigemptyset(&sigchld_action.sa_mask);
307
272
.args_doc = "[+PLUS_SEPARATED_OPTIONS]",
308
273
.doc = "Mandos plugin runner -- Run plugins" };
309
274
310
ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
311
if (ret == ARGP_ERR_UNKNOWN){
312
fprintf(stderr, "Unknown error while parsing arguments\n");
313
exitstatus = EXIT_FAILURE;
314
goto end;
315
}
275
argp_parse (&argp, argc, argv, 0, 0, &plugin_list);
316
276
317
277
if(plus_options){
318
278
/* This is a mangled argument in the form of
336
296
plus_argv = realloc(plus_argv, sizeof(char *)
337
297
* ((unsigned int) new_argc + 1));
338
298
if(plus_argv == NULL){
339
perror("realloc");
299
perror("malloc");
340
300
exitstatus = EXIT_FAILURE;
341
301
goto end;
342
302
}
344
304
plus_argv[new_argc] = NULL;
345
305
arg = strtok(NULL, delims); /* Get next argument */
346
306
}
347
ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
348
if (ret == ARGP_ERR_UNKNOWN){
349
fprintf(stderr, "Unknown error while parsing arguments\n");
350
exitstatus = EXIT_FAILURE;
351
goto end;
352
}
307
argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list);
353
308
}
354
309
355
310
if(debug){
399
354
400
355
// All directory entries have been processed
401
356
if(dirst == NULL){
402
if (errno == EBADF){
403
perror("readdir");
404
exitstatus = EXIT_FAILURE;
405
goto end;
406
}
407
357
break;
408
358
}
409
359
464
414
strcat(filename, "/"); /* Spurious warning */
465
415
strcat(filename, dirst->d_name); /* Spurious warning */
466
416
467
ret = stat(filename, &st);
468
if (ret == -1){
469
perror("stat");
470
exitstatus = EXIT_FAILURE;
471
goto end;
472
}
417
stat(filename, &st);
473
418
474
419
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
475
420
if(debug){
535
480
perror("sigprocmask");
536
481
_exit(EXIT_FAILURE);
537
482
}
538
539
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
540
if(ret == -1){
541
perror("dup2");
542
_exit(EXIT_FAILURE);
543
}
483
dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
544
484
545
485
if(dirfd(dir) < 0){
546
486
/* If dir has no file descriptor, we could not set FD_CLOEXEC
598
538
599
539
closedir(dir);
600
540
dir = NULL;
601
541
602
542
if (process_list == NULL){
603
fprintf(stderr, "No plugin processes started. Incorrect plugin"
604
" directory?\n");
605
process_list = NULL;
543
fprintf(stderr, "No plugin processes started, exiting\n");
544
exitstatus = EXIT_FAILURE;
545
goto end;
606
546
}
607
547
while(process_list){
608
548
fd_set rfds = rfds_all;
623
563
/* Bad exit by plugin */
624
564
if(debug){
625
565
if(WIFEXITED(proc->status)){
626
fprintf(stderr, "Plugin %u exited with status %d\n",
627
(unsigned int) (proc->pid),
628
WEXITSTATUS(proc->status));
566
fprintf(stderr, "Plugin %d exited with status %d\n",
567
proc->pid, WEXITSTATUS(proc->status));
629
568
} else if(WIFSIGNALED(proc->status)) {
630
fprintf(stderr, "Plugin %u killed by signal %d\n",
631
(unsigned int) (proc->pid),
632
WTERMSIG(proc->status));
569
fprintf(stderr, "Plugin %d killed by signal %d\n",
570
proc->pid, WTERMSIG(proc->status));
633
571
} else if(WCOREDUMP(proc->status)){
634
fprintf(stderr, "Plugin %d dumped core\n",
635
(unsigned int) (proc->pid));
572
fprintf(stderr, "Plugin %d dumped core\n", proc->pid);
636
573
}
637
574
}
638
575
/* Remove the plugin */
671
608
break;
672
609
}
673
610
/* This process exited nicely, so print its buffer */
674
675
bool bret = print_out_password(proc->buffer, proc->buffer_length);
676
if(not bret){
677
perror("print_out_password");
678
exitstatus = EXIT_FAILURE;
611
for(size_t written = 0; written < proc->buffer_length;
612
written += (size_t)ret){
613
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO,
614
proc->buffer + written,
615
proc->buffer_length
616
- written));
617
if(ret < 0){
618
perror("write");
619
exitstatus = EXIT_FAILURE;
620
goto end;
621
}
679
622
}
680
623
goto end;
681
624
}
710
653
}
711
654
}
712
655
}
713
714
656
if(process_list == NULL){
657
fprintf(stderr, "All plugin processes failed, exiting\n");
658
exitstatus = EXIT_FAILURE;
659
}
660
715
661
end:
716
717
if(process_list == NULL or exitstatus != EXIT_SUCCESS){
718
/* Fallback if all plugins failed or an error occured */
719
bool bret;
720
fprintf(stderr, "Going to fallback mode using getpass(3)\n");
721
char *passwordbuffer = getpass("Password: ");
722
bret = print_out_password(passwordbuffer, strlen(passwordbuffer));
723
if(not bret){
724
perror("print_out_password");
725
exitstatus = EXIT_FAILURE;
726
goto end;
727
}
728
}
729
730
662
/* Restore old signal handler */
731
663
sigaction(SIGCHLD, &old_sigchld_action, NULL);
732
664
747
679
for(process *next; process_list != NULL; process_list = next){
748
680
next = process_list->next;
749
681
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");
754
}
682
kill(process_list->pid, SIGTERM);
755
683
free(process_list->buffer);
756
684
free(process_list);
757
685
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0