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