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