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