To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugins.d/passprompt.c
- browse files at revision 25
- compare with another revision
- download diff
- download tarball
- view history from revision 25
- Committer: Teddy Hogeborn
- Date: 2008-07-22 06:23:29 UTC
- Revision ID: teddy@fukt.bsnet.se-20080722062329-jaex5y5mslf6sqjx
* mandos-clients.conf ([DEFAULT]): New section.
* plugins.d/mandosclient.c (start_mandos_communication): Only print if
debugging.
Print server
name.
Bug fix: Loop
until suc-
cess.
* server.py (serverName): Set via option, not globally.
(Client.__init__): Removed argument "options". Require "timeout"
and "interval" arguments.
(tcp_handler.handle): Set "priority" from self.server.options.
(main): Removed "--timeout" and "--interval" options. New options
"--priority" and "--servicename". Add defaults for
"timeout" and "interval". Set "serviceName" from options.
Do not pass "options" to "Client()".
* plugins.d/mandosclient.c (start_mandos_communication): Only print if
debugging.
Print server
name.
Bug fix: Loop
until suc-
cess.
* server.py (serverName): Set via option, not globally.
(Client.__init__): Removed argument "options". Require "timeout"
and "interval" arguments.
(tcp_handler.handle): Set "priority" from self.server.options.
(main): Removed "--timeout" and "--interval" options. New options
"--priority" and "--servicename". Add defaults for
"timeout" and "interval". Set "serviceName" from options.
Do not pass "options" to "Client()".
- files added:
- ca.pem
- files removed:
- .bzr-builddeb
- debian
- debian/po
- debian/source
- files renamed:
- clients.conf => mandos-clients.conf
- plugin-runner.c => plugbasedclient.c
- plugins.d/mandos-client.c => plugins.d/mandosclient.c
- plugins.d/password-prompt.c => plugins.d/passprompt.c
- mandos => server.py
- files modified:
- Makefile
added
removed
plugins.d/passprompt.c
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
1
/* -*- coding: utf-8 -*- */
2
2
/*
3
* Password-prompt - Read a password from the terminal and print it
4
*
5
* Copyright © 2008-2010 Teddy Hogeborn
6
* Copyright © 2008-2010 Björn Påhlsson
3
* Passprompt - Read a password from the terminal and print it
4
*
5
* Copyright © 2007-2008 Teddy Hogeborn and 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
19
18
* along with this program. If not, see
20
19
* <http://www.gnu.org/licenses/>.
21
20
*
22
* Contact the authors at <mandos@fukt.bsnet.se>.
21
* Contact the authors at <https://www.fukt.bsnet.se/~belorn/> and
22
* <https://www.fukt.bsnet.se/~teddy/>.
23
23
*/
24
24
25
#define _GNU_SOURCE /* getline(), asprintf() */
25
#define _GNU_SOURCE /* getline() */
26
#define _FORTIFY_SOURCE 2
26
27
27
#include <termios.h> /* struct termios, tcsetattr(),
28
#include <termios.h> /* struct termios, tcsetattr(),
28
29
TCSAFLUSH, tcgetattr(), ECHO */
29
30
#include <unistd.h> /* struct termios, tcsetattr(),
30
31
STDIN_FILENO, TCSAFLUSH,
31
tcgetattr(), ECHO, readlink() */
32
tcgetattr(), ECHO */
32
33
#include <signal.h> /* sig_atomic_t, raise(), struct
33
34
sigaction, sigemptyset(),
34
35
sigaction(), sigaddset(), SIGINT,
35
SIGQUIT, SIGHUP, SIGTERM,
36
raise() */
37
#include <stddef.h> /* NULL, size_t, ssize_t */
38
#include <sys/types.h> /* ssize_t, struct dirent, pid_t,
39
ssize_t, open() */
36
SIGQUIT, SIGHUP, SIGTERM */
37
#include <stddef.h> /* NULL, size_t */
38
#include <sys/types.h> /* ssize_t */
40
39
#include <stdlib.h> /* EXIT_SUCCESS, EXIT_FAILURE,
41
getenv(), free() */
42
#include <dirent.h> /* scandir(), alphasort() */
40
getopt_long */
43
41
#include <stdio.h> /* fprintf(), stderr, getline(),
44
stdin, feof(), fputc(), vfprintf(), vasprintf()
45
*/
46
#include <errno.h> /* errno, EBADF, ENOTTY, EINVAL,
47
EFAULT, EFBIG, EIO, ENOSPC, EINTR
48
*/
49
#include <error.h> /* error() */
42
stdin, feof(), perror(), fputc(),
43
stdout, getopt_long */
44
#include <errno.h> /* errno, EINVAL */
50
45
#include <iso646.h> /* or, not */
51
46
#include <stdbool.h> /* bool, false, true */
52
#include <inttypes.h> /* strtoumax() */
53
#include <sys/stat.h> /* struct stat, lstat(), open() */
54
#include <string.h> /* strlen, rindex, memcmp, strerror() */
55
#include <argp.h> /* struct argp_option, struct
56
argp_state, struct argp,
57
argp_parse(), error_t,
58
ARGP_KEY_ARG, ARGP_KEY_END,
59
ARGP_ERR_UNKNOWN */
60
#include <sysexits.h> /* EX_SOFTWARE, EX_OSERR,
61
EX_UNAVAILABLE, EX_IOERR, EX_OK */
62
#include <fcntl.h> /* open() */
63
#include <stdarg.h> /* va_list, va_start(), ... */
47
#include <string.h> /* strlen, rindex, strncmp, strcmp */
48
#include <getopt.h> /* getopt_long */
64
49
65
volatile sig_atomic_t quit_now = 0;
66
int signal_received;
50
volatile bool quit_now = false;
67
51
bool debug = false;
68
const char *argp_program_version = "password-prompt " VERSION;
69
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
70
71
/* Needed for conflict resolution */
72
const char plymouth_name[] = "plymouthd";
73
74
/* Function to use when printing errors */
75
void error_plus(int status, int errnum, const char *formatstring, ...){
76
va_list ap;
77
char *text;
78
int ret;
79
80
va_start(ap, formatstring);
81
ret = vasprintf(&text, formatstring, ap);
82
if (ret == -1){
83
fprintf(stderr, "Mandos plugin %s: ", program_invocation_short_name);
84
vfprintf(stderr, formatstring, ap);
85
fprintf(stderr, ": ");
86
fprintf(stderr, "%s\n", strerror(errnum));
87
error(status, errno, "vasprintf while printing error");
88
return;
89
}
90
fprintf(stderr, "Mandos plugin ");
91
error(status, errnum, "%s", text);
92
free(text);
93
}
94
95
static void termination_handler(int signum){
96
if(quit_now){
97
return;
98
}
99
quit_now = 1;
100
signal_received = signum;
101
}
102
103
bool conflict_detection(void){
104
105
/* plymouth conflicts with password-prompt since both want to read
106
from the terminal. Password-prompt will exit if it detects
107
plymouth since plymouth performs the same functionality.
108
*/
109
int is_plymouth(const struct dirent *proc_entry){
110
int ret;
111
int cl_fd;
112
{
113
uintmax_t maxvalue;
114
char *tmp;
115
errno = 0;
116
maxvalue = strtoumax(proc_entry->d_name, &tmp, 10);
117
118
if(errno != 0 or *tmp != '\0'
119
or maxvalue != (uintmax_t)((pid_t)maxvalue)){
120
return 0;
121
}
122
}
123
124
char *cmdline_filename;
125
ret = asprintf(&cmdline_filename, "/proc/%s/cmdline",
126
proc_entry->d_name);
127
if(ret == -1){
128
error(0, errno, "asprintf");
129
return 0;
130
}
131
132
/* Open /proc/<pid>/cmdline */
133
cl_fd = open(cmdline_filename, O_RDONLY);
134
free(cmdline_filename);
135
if(cl_fd == -1){
136
if(errno != ENOENT){
137
error(0, errno, "open");
138
}
139
return 0;
140
}
141
142
char *cmdline = NULL;
143
{
144
size_t cmdline_len = 0;
145
size_t cmdline_allocated = 0;
146
char *tmp;
147
const size_t blocksize = 1024;
148
ssize_t sret;
149
do {
150
/* Allocate more space? */
151
if(cmdline_len + blocksize + 1 > cmdline_allocated){
152
tmp = realloc(cmdline, cmdline_allocated + blocksize + 1);
153
if(tmp == NULL){
154
error(0, errno, "realloc");
155
free(cmdline);
156
close(cl_fd);
157
return 0;
158
}
159
cmdline = tmp;
160
cmdline_allocated += blocksize;
161
}
162
163
/* Read data */
164
sret = read(cl_fd, cmdline + cmdline_len,
165
cmdline_allocated - cmdline_len);
166
if(sret == -1){
167
error(0, errno, "read");
168
free(cmdline);
169
close(cl_fd);
170
return 0;
171
}
172
cmdline_len += (size_t)sret;
173
} while(sret != 0);
174
ret = close(cl_fd);
175
if(ret == -1){
176
error(0, errno, "close");
177
free(cmdline);
178
return 0;
179
}
180
cmdline[cmdline_len] = '\0'; /* Make sure it is terminated */
181
}
182
/* we now have cmdline */
183
184
/* get basename */
185
char *cmdline_base = strrchr(cmdline, '/');
186
if(cmdline_base != NULL){
187
cmdline_base += 1; /* skip the slash */
188
} else {
189
cmdline_base = cmdline;
190
}
191
192
if(strcmp(cmdline_base, plymouth_name) != 0){
193
if(debug){
194
fprintf(stderr, "\"%s\" is not \"%s\"\n", cmdline_base,
195
plymouth_name);
196
}
197
free(cmdline);
198
return 0;
199
}
200
if(debug){
201
fprintf(stderr, "\"%s\" equals \"%s\"\n", cmdline_base,
202
plymouth_name);
203
}
204
free(cmdline);
205
return 1;
206
}
207
208
struct dirent **direntries;
209
int ret;
210
ret = scandir("/proc", &direntries, is_plymouth, alphasort);
211
if (ret == -1){
212
error(1, errno, "scandir");
213
}
214
return ret > 0;
215
}
216
52
53
void termination_handler(__attribute__((unused))int signum){
54
quit_now = true;
55
}
217
56
218
57
int main(int argc, char **argv){
219
ssize_t sret;
220
int ret;
58
ssize_t ret;
221
59
size_t n;
222
60
struct termios t_new, t_old;
223
61
char *buffer = NULL;
226
64
struct sigaction old_action,
227
65
new_action = { .sa_handler = termination_handler,
228
66
.sa_flags = 0 };
229
{
230
struct argp_option options[] = {
231
{ .name = "prefix", .key = 'p',
232
.arg = "PREFIX", .flags = 0,
233
.doc = "Prefix shown before the prompt", .group = 2 },
234
{ .name = "debug", .key = 128,
235
.doc = "Debug mode", .group = 3 },
236
/*
237
* These reproduce what we would get without ARGP_NO_HELP
238
*/
239
{ .name = "help", .key = '?',
240
.doc = "Give this help list", .group = -1 },
241
{ .name = "usage", .key = -3,
242
.doc = "Give a short usage message", .group = -1 },
243
{ .name = "version", .key = 'V',
244
.doc = "Print program version", .group = -1 },
245
{ .name = NULL }
246
};
247
248
error_t parse_opt (int key, char *arg, struct argp_state *state){
249
errno = 0;
250
switch (key){
251
case 'p':
252
prefix = arg;
253
break;
254
case 128:
255
debug = true;
256
break;
257
/*
258
* These reproduce what we would get without ARGP_NO_HELP
259
*/
260
case '?': /* --help */
261
argp_state_help(state, state->out_stream,
262
(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
263
& ~(unsigned int)ARGP_HELP_EXIT_OK);
264
case -3: /* --usage */
265
argp_state_help(state, state->out_stream,
266
ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
267
case 'V': /* --version */
268
fprintf(state->out_stream, "%s\n", argp_program_version);
269
exit(argp_err_exit_status);
270
break;
271
default:
272
return ARGP_ERR_UNKNOWN;
273
}
274
return errno;
67
68
while (true){
69
static struct option long_options[] = {
70
{"debug", no_argument, (int *)&debug, 1},
71
{"prefix", required_argument, 0, 'p'},
72
{0, 0, 0, 0} };
73
74
int option_index = 0;
75
ret = getopt_long (argc, argv, "p:", long_options, &option_index);
76
77
if (ret == -1){
78
break;
275
79
}
276
277
struct argp argp = { .options = options, .parser = parse_opt,
278
.args_doc = "",
279
.doc = "Mandos password-prompt -- Read and"
280
" output a password" };
281
ret = argp_parse(&argp, argc, argv,
282
ARGP_IN_ORDER | ARGP_NO_HELP, NULL, NULL);
80
283
81
switch(ret){
284
82
case 0:
285
83
break;
286
case ENOMEM:
84
case 'p':
85
prefix = optarg;
86
break;
287
87
default:
288
errno = ret;
289
error(0, errno, "argp_parse");
290
return EX_OSERR;
291
case EINVAL:
292
return EX_USAGE;
88
fprintf(stderr, "bad arguments\n");
89
exit(EXIT_FAILURE);
293
90
}
294
91
}
295
296
if(debug){
92
93
if (debug){
297
94
fprintf(stderr, "Starting %s\n", argv[0]);
298
95
}
299
300
if (conflict_detection()){
301
if(debug){
302
fprintf(stderr, "Stopping %s because of conflict\n", argv[0]);
303
}
304
return EXIT_FAILURE;
305
}
306
307
if(debug){
96
if (debug){
308
97
fprintf(stderr, "Storing current terminal attributes\n");
309
98
}
310
99
311
if(tcgetattr(STDIN_FILENO, &t_old) != 0){
312
int e = errno;
313
error(0, errno, "tcgetattr");
314
switch(e){
315
case EBADF:
316
case ENOTTY:
317
return EX_UNAVAILABLE;
318
default:
319
return EX_OSERR;
320
}
100
if (tcgetattr(STDIN_FILENO, &t_old) != 0){
101
return EXIT_FAILURE;
321
102
}
322
103
323
104
sigemptyset(&new_action.sa_mask);
324
ret = sigaddset(&new_action.sa_mask, SIGINT);
325
if(ret == -1){
326
error(0, errno, "sigaddset");
327
return EX_OSERR;
328
}
329
ret = sigaddset(&new_action.sa_mask, SIGHUP);
330
if(ret == -1){
331
error(0, errno, "sigaddset");
332
return EX_OSERR;
333
}
334
ret = sigaddset(&new_action.sa_mask, SIGTERM);
335
if(ret == -1){
336
error(0, errno, "sigaddset");
337
return EX_OSERR;
338
}
339
/* Need to check if the handler is SIG_IGN before handling:
340
| [[info:libc:Initial Signal Actions]] |
341
| [[info:libc:Basic Signal Handling]] |
342
*/
343
ret = sigaction(SIGINT, NULL, &old_action);
344
if(ret == -1){
345
error(0, errno, "sigaction");
346
return EX_OSERR;
347
}
348
if(old_action.sa_handler != SIG_IGN){
349
ret = sigaction(SIGINT, &new_action, NULL);
350
if(ret == -1){
351
error(0, errno, "sigaction");
352
return EX_OSERR;
353
}
354
}
355
ret = sigaction(SIGHUP, NULL, &old_action);
356
if(ret == -1){
357
error(0, errno, "sigaction");
358
return EX_OSERR;
359
}
360
if(old_action.sa_handler != SIG_IGN){
361
ret = sigaction(SIGHUP, &new_action, NULL);
362
if(ret == -1){
363
error(0, errno, "sigaction");
364
return EX_OSERR;
365
}
366
}
367
ret = sigaction(SIGTERM, NULL, &old_action);
368
if(ret == -1){
369
error(0, errno, "sigaction");
370
return EX_OSERR;
371
}
372
if(old_action.sa_handler != SIG_IGN){
373
ret = sigaction(SIGTERM, &new_action, NULL);
374
if(ret == -1){
375
error(0, errno, "sigaction");
376
return EX_OSERR;
377
}
378
}
379
380
381
if(debug){
105
sigaddset(&new_action.sa_mask, SIGINT);
106
sigaddset(&new_action.sa_mask, SIGQUIT);
107
sigaddset(&new_action.sa_mask, SIGHUP);
108
sigaddset(&new_action.sa_mask, SIGTERM);
109
sigaction(SIGINT, NULL, &old_action);
110
if (old_action.sa_handler != SIG_IGN)
111
sigaction(SIGINT, &new_action, NULL);
112
sigaction(SIGQUIT, NULL, &old_action);
113
if (old_action.sa_handler != SIG_IGN)
114
sigaction(SIGQUIT, &new_action, NULL);
115
sigaction(SIGHUP, NULL, &old_action);
116
if (old_action.sa_handler != SIG_IGN)
117
sigaction(SIGHUP, &new_action, NULL);
118
sigaction(SIGTERM, NULL, &old_action);
119
if (old_action.sa_handler != SIG_IGN)
120
sigaction(SIGTERM, &new_action, NULL);
121
122
123
if (debug){
382
124
fprintf(stderr, "Removing echo flag from terminal attributes\n");
383
125
}
384
126
385
127
t_new = t_old;
386
t_new.c_lflag &= ~(tcflag_t)ECHO;
387
if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){
388
int e = errno;
389
error(0, errno, "tcsetattr-echo");
390
switch(e){
391
case EBADF:
392
case ENOTTY:
393
return EX_UNAVAILABLE;
394
case EINVAL:
395
default:
396
return EX_OSERR;
397
}
128
t_new.c_lflag &= ~ECHO;
129
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){
130
perror("tcsetattr-echo");
131
return EXIT_FAILURE;
398
132
}
399
400
if(debug){
133
134
if (debug){
401
135
fprintf(stderr, "Waiting for input from stdin \n");
402
136
}
403
137
while(true){
404
if(quit_now){
405
if(debug){
406
fprintf(stderr, "Interrupted by signal, exiting.\n");
407
}
138
if (quit_now){
408
139
status = EXIT_FAILURE;
409
140
break;
410
141
}
411
142
412
143
if(prefix){
413
fprintf(stderr, "%s ", prefix);
414
}
415
{
416
const char *cryptsource = getenv("CRYPTTAB_SOURCE");
417
const char *crypttarget = getenv("CRYPTTAB_NAME");
418
/* Before cryptsetup 1.1.0~rc2 */
419
if(cryptsource == NULL){
420
cryptsource = getenv("cryptsource");
421
}
422
if(crypttarget == NULL){
423
crypttarget = getenv("crypttarget");
424
}
425
const char *const prompt1 = "Unlocking the disk";
426
const char *const prompt2 = "Enter passphrase";
427
if(cryptsource == NULL){
428
if(crypttarget == NULL){
429
fprintf(stderr, "%s to unlock the disk: ", prompt2);
430
} else {
431
fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget,
432
prompt2);
433
}
434
} else {
435
if(crypttarget == NULL){
436
fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource,
437
prompt2);
438
} else {
439
fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource,
440
crypttarget, prompt2);
441
}
442
}
443
}
444
sret = getline(&buffer, &n, stdin);
445
if(sret > 0){
144
fprintf(stderr, "%s Password: ", prefix);
145
} else {
146
fprintf(stderr, "Password: ");
147
}
148
ret = getline(&buffer, &n, stdin);
149
if (ret > 0){
150
fprintf(stdout, "%s", buffer);
446
151
status = EXIT_SUCCESS;
447
/* Make n = data size instead of allocated buffer size */
448
n = (size_t)sret;
449
/* Strip final newline */
450
if(n > 0 and buffer[n-1] == '\n'){
451
buffer[n-1] = '\0'; /* not strictly necessary */
452
n--;
453
}
454
size_t written = 0;
455
while(written < n){
456
sret = write(STDOUT_FILENO, buffer + written, n - written);
457
if(sret < 0){
458
int e = errno;
459
error(0, errno, "write");
460
switch(e){
461
case EBADF:
462
case EFAULT:
463
case EINVAL:
464
case EFBIG:
465
case EIO:
466
case ENOSPC:
467
default:
468
status = EX_IOERR;
469
break;
470
case EINTR:
471
status = EXIT_FAILURE;
472
break;
473
}
474
break;
475
}
476
written += (size_t)sret;
477
}
478
sret = close(STDOUT_FILENO);
479
if(sret == -1){
480
int e = errno;
481
error(0, errno, "close");
482
switch(e){
483
case EBADF:
484
status = EX_OSFILE;
485
break;
486
case EIO:
487
default:
488
status = EX_IOERR;
489
break;
490
}
491
}
492
152
break;
493
153
}
494
if(sret < 0){
495
int e = errno;
496
if(errno != EINTR and not feof(stdin)){
497
error(0, errno, "getline");
498
switch(e){
499
case EBADF:
500
status = EX_UNAVAILABLE;
501
case EIO:
502
case EINVAL:
503
default:
504
status = EX_IOERR;
505
break;
506
}
154
// ret == 0 makes no other sence than to retry to read from stdin
155
if (ret < 0){
156
if (errno != EINTR and not feof(stdin)){
157
perror("getline");
158
status = EXIT_FAILURE;
507
159
break;
508
160
}
509
161
}
510
/* if(sret == 0), then the only sensible thing to do is to retry
511
to read from stdin */
512
162
fputc('\n', stderr);
513
if(debug and not quit_now){
514
/* If quit_now is nonzero, we were interrupted by a signal, and
515
will print that later, so no need to show this too. */
516
fprintf(stderr, "getline() returned 0, retrying.\n");
517
}
518
163
}
519
520
free(buffer);
521
522
if(debug){
164
165
if (debug){
523
166
fprintf(stderr, "Restoring terminal attributes\n");
524
167
}
525
if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){
526
error(0, errno, "tcsetattr+echo");
527
}
528
529
if(quit_now){
530
sigemptyset(&old_action.sa_mask);
531
old_action.sa_handler = SIG_DFL;
532
ret = sigaction(signal_received, &old_action, NULL);
533
if(ret == -1){
534
error(0, errno, "sigaction");
535
}
536
raise(signal_received);
537
}
538
539
if(debug){
540
fprintf(stderr, "%s is exiting with status %d\n", argv[0],
541
status);
542
}
543
if(status == EXIT_SUCCESS or status == EX_OK){
544
fputc('\n', stderr);
168
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){
169
perror("tcsetattr+echo");
170
}
171
172
if (debug){
173
fprintf(stderr, "%s is exiting\n", argv[0]);
545
174
}
546
175
547
176
return status;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0