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 | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 27 | #include <termios.h> /* struct termios, tcsetattr(), | 
| 13
by Björn Påhlsson Added following support: | 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() */ | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 53 | #include <sys/stat.h> /* struct stat, lstat(), open() */ | 
| 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"; | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 72 | |
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 73 | static void termination_handler(int signum){ | 
| 74 | if(quit_now){ | |
| 75 | return; | |
| 76 | } | |
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 77 | quit_now = 1; | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 78 | signal_received = signum; | 
| 13
by Björn Påhlsson Added following support: | 79 | }
 | 
| 80 | ||
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 81 | bool conflict_detection(void){ | 
| 82 | ||
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 83 | /* plymouth conflicts with password-prompt since both want to read | 
| 84 |      from the terminal.  Password-prompt will exit if it detects
 | |
| 85 |      plymouth since plymouth performs the same functionality.
 | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 86 |    */
 | 
| 87 | int is_plymouth(const struct dirent *proc_entry){ | |
| 88 | int ret; | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 89 | int cl_fd; | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 90 | { | 
| 91 | uintmax_t maxvalue; | |
| 92 | char *tmp; | |
| 93 | errno = 0; | |
| 94 | maxvalue = strtoumax(proc_entry->d_name, &tmp, 10); | |
| 95 |       
 | |
| 96 | if(errno != 0 or *tmp != '\0' | |
| 97 | or maxvalue != (uintmax_t)((pid_t)maxvalue)){ | |
| 98 | return 0; | |
| 99 | } | |
| 100 | } | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 101 |     
 | 
| 102 | char *cmdline_filename; | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 103 | ret = asprintf(&cmdline_filename, "/proc/%s/cmdline", | 
| 104 | proc_entry->d_name); | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 105 | if(ret == -1){ | 
| 106 | error(0, errno, "asprintf"); | |
| 107 | return 0; | |
| 108 | } | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 109 |     
 | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 110 | /* Open /proc/<pid>/cmdline */ | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 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; | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 155 | } | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 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 |     
 | |
| 471
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 168 | if(strcmp(cmdline_base, plymouth_name) != 0){ | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 169 | if(debug){ | 
| 471
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 170 | fprintf(stderr, "\"%s\" is not \"%s\"\n", cmdline_base, | 
| 171 | plymouth_name); | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 172 | } | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 173 | free(cmdline); | 
| 174 | return 0; | |
| 175 | } | |
| 471
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 176 | if(debug){ | 
| 177 | fprintf(stderr, "\"%s\" equals \"%s\"\n", cmdline_base, | |
| 178 | plymouth_name); | |
| 179 | } | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 180 | free(cmdline); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 181 | return 1; | 
| 182 | } | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 183 |   
 | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 184 | struct dirent **direntries; | 
| 185 | int ret; | |
| 186 | ret = scandir("/proc", &direntries, is_plymouth, alphasort); | |
| 187 | if (ret == -1){ | |
| 188 | error(1, errno, "scandir"); | |
| 189 | } | |
| 467
by Teddy Hogeborn Merge fix for password-prompt/plymouth conflict from Björn. | 190 | return ret > 0; | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 191 | }
 | 
| 192 | ||
| 193 | ||
| 13
by Björn Påhlsson Added following support: | 194 | int main(int argc, char **argv){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 195 | ssize_t sret; | 
| 196 | int ret; | |
| 13
by Björn Påhlsson Added following support: | 197 | size_t n; | 
| 198 | struct termios t_new, t_old; | |
| 199 | char *buffer = NULL; | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 200 | char *prefix = NULL; | 
| 13
by Björn Påhlsson Added following support: | 201 | int status = EXIT_SUCCESS; | 
| 202 | struct sigaction old_action, | |
| 203 | new_action = { .sa_handler = termination_handler, | |
| 204 | .sa_flags = 0 }; | |
| 24.1.17
by Björn Påhlsson passprompt | 205 | { | 
| 206 | struct argp_option options[] = { | |
| 207 | { .name = "prefix", .key = 'p', | |
| 208 | .arg = "PREFIX", .flags = 0, | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 209 | .doc = "Prefix shown before the prompt", .group = 2 }, | 
| 24.1.17
by Björn Påhlsson passprompt | 210 | { .name = "debug", .key = 128, | 
| 211 | .doc = "Debug mode", .group = 3 }, | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 212 | /* | 
| 213 |        * These reproduce what we would get without ARGP_NO_HELP
 | |
| 214 |        */
 | |
| 215 | { .name = "help", .key = '?', | |
| 216 | .doc = "Give this help list", .group = -1 }, | |
| 217 | { .name = "usage", .key = -3, | |
| 218 | .doc = "Give a short usage message", .group = -1 }, | |
| 219 | { .name = "version", .key = 'V', | |
| 220 | .doc = "Print program version", .group = -1 }, | |
| 24.1.17
by Björn Påhlsson passprompt | 221 | { .name = NULL } | 
| 222 | }; | |
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 223 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 224 | 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 | 225 | errno = 0; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 226 | switch (key){ | 
| 24.1.17
by Björn Påhlsson passprompt | 227 | case 'p': | 
| 228 | prefix = arg; | |
| 229 | break; | |
| 230 | case 128: | |
| 231 | debug = true; | |
| 232 | break; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 233 | /* | 
| 234 | 	 * These reproduce what we would get without ARGP_NO_HELP
 | |
| 235 | 	 */
 | |
| 236 | case '?': /* --help */ | |
| 237 | argp_state_help(state, state->out_stream, | |
| 238 | (ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR) | |
| 239 | & ~(unsigned int)ARGP_HELP_EXIT_OK); | |
| 240 | case -3: /* --usage */ | |
| 241 | argp_state_help(state, state->out_stream, | |
| 242 | ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR); | |
| 243 | case 'V': /* --version */ | |
| 244 | fprintf(state->out_stream, "%s\n", argp_program_version); | |
| 245 | exit(argp_err_exit_status); | |
| 24.1.17
by Björn Påhlsson passprompt | 246 | break; | 
| 247 | default: | |
| 248 | return ARGP_ERR_UNKNOWN; | |
| 249 | } | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 250 | return errno; | 
| 24.1.17
by Björn Påhlsson passprompt | 251 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 252 |     
 | 
| 24.1.17
by Björn Påhlsson passprompt | 253 | struct argp argp = { .options = options, .parser = parse_opt, | 
| 254 | .args_doc = "", | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 255 | .doc = "Mandos password-prompt -- Read and" | 
| 256 | " output a password" }; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 257 | ret = argp_parse(&argp, argc, argv, | 
| 258 | ARGP_IN_ORDER | ARGP_NO_HELP, NULL, NULL); | |
| 259 | switch(ret){ | |
| 260 | case 0: | |
| 261 | break; | |
| 262 | case ENOMEM: | |
| 263 | default: | |
| 264 | errno = ret; | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 265 | error(0, errno, "argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 266 | return EX_OSERR; | 
| 267 | case EINVAL: | |
| 268 | return EX_USAGE; | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 269 | } | 
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 270 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 271 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 272 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 273 | fprintf(stderr, "Starting %s\n", argv[0]); | 
| 274 | } | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 275 | |
| 276 | if (conflict_detection()){ | |
| 277 | if(debug){ | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 278 | fprintf(stderr, "Stopping %s because of conflict\n", argv[0]); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 279 | } | 
| 280 | return EXIT_FAILURE; | |
| 281 | } | |
| 282 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 283 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 284 | fprintf(stderr, "Storing current terminal attributes\n"); | 
| 285 | } | |
| 13
by Björn Påhlsson Added following support: | 286 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 287 | if(tcgetattr(STDIN_FILENO, &t_old) != 0){ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 288 | int e = errno; | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 289 | error(0, errno, "tcgetattr"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 290 | switch(e){ | 
| 291 | case EBADF: | |
| 292 | case ENOTTY: | |
| 293 | return EX_UNAVAILABLE; | |
| 294 | default: | |
| 295 | return EX_OSERR; | |
| 296 | } | |
| 13
by Björn Påhlsson Added following support: | 297 | } | 
| 298 |   
 | |
| 299 | sigemptyset(&new_action.sa_mask); | |
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 300 | ret = sigaddset(&new_action.sa_mask, SIGINT); | 
| 301 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 302 | error(0, errno, "sigaddset"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 303 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 304 | } | 
| 305 | ret = sigaddset(&new_action.sa_mask, SIGHUP); | |
| 306 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 307 | error(0, errno, "sigaddset"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 308 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 309 | } | 
| 310 | ret = sigaddset(&new_action.sa_mask, SIGTERM); | |
| 311 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 312 | error(0, errno, "sigaddset"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 313 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 314 | } | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 315 | /* Need to check if the handler is SIG_IGN before handling: | 
| 316 |      | [[info:libc:Initial Signal Actions]] |
 | |
| 317 |      | [[info:libc:Basic Signal Handling]]  |
 | |
| 318 |   */
 | |
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 319 | ret = sigaction(SIGINT, NULL, &old_action); | 
| 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; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 323 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 324 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 325 | ret = sigaction(SIGINT, &new_action, NULL); | 
| 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 | } | 
| 330 | } | |
| 331 | ret = sigaction(SIGHUP, NULL, &old_action); | |
| 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 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 336 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 337 | ret = sigaction(SIGHUP, &new_action, NULL); | 
| 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 | } | 
| 342 | } | |
| 343 | ret = sigaction(SIGTERM, NULL, &old_action); | |
| 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 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 348 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 349 | ret = sigaction(SIGTERM, &new_action, NULL); | 
| 350 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 351 | error(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 352 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 353 | } | 
| 354 | } | |
| 355 |   
 | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 356 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 357 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 358 | fprintf(stderr, "Removing echo flag from terminal attributes\n"); | 
| 359 | } | |
| 13
by Björn Påhlsson Added following support: | 360 |   
 | 
| 361 | t_new = t_old; | |
| 377
by Teddy Hogeborn * plugins.d/password-prompt.c (main): Fix "-Wconversion" warning. | 362 | t_new.c_lflag &= ~(tcflag_t)ECHO; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 363 | if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 364 | int e = errno; | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 365 | error(0, errno, "tcsetattr-echo"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 366 | switch(e){ | 
| 367 | case EBADF: | |
| 368 | case ENOTTY: | |
| 369 | return EX_UNAVAILABLE; | |
| 370 | case EINVAL: | |
| 371 | default: | |
| 372 | return EX_OSERR; | |
| 373 | } | |
| 13
by Björn Påhlsson Added following support: | 374 | } | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 375 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 376 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 377 | fprintf(stderr, "Waiting for input from stdin \n"); | 
| 378 | } | |
| 13
by Björn Påhlsson Added following support: | 379 | while(true){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 380 | if(quit_now){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 381 | if(debug){ | 
| 382 | fprintf(stderr, "Interrupted by signal, exiting.\n"); | |
| 383 | } | |
| 13
by Björn Påhlsson Added following support: | 384 | status = EXIT_FAILURE; | 
| 385 | break; | |
| 386 | } | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 387 | |
| 388 | if(prefix){ | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 389 | fprintf(stderr, "%s ", prefix); | 
| 390 | } | |
| 391 | { | |
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 392 | const char *cryptsource = getenv("CRYPTTAB_SOURCE"); | 
| 393 | const char *crypttarget = getenv("CRYPTTAB_NAME"); | |
| 394 | /* Before cryptsetup 1.1.0~rc2 */ | |
| 395 | if(cryptsource == NULL){ | |
| 396 | cryptsource = getenv("cryptsource"); | |
| 397 | } | |
| 398 | if(crypttarget == NULL){ | |
| 399 | crypttarget = getenv("crypttarget"); | |
| 400 | } | |
| 401 | const char *const prompt1 = "Unlocking the disk"; | |
| 402 | const char *const prompt2 = "Enter passphrase"; | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 403 | if(cryptsource == NULL){ | 
| 404 | if(crypttarget == NULL){ | |
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 405 | fprintf(stderr, "%s to unlock the disk: ", prompt2); | 
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 406 | } else { | 
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 407 | fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget, | 
| 408 | prompt2); | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 409 | } | 
| 410 | } else { | |
| 411 | if(crypttarget == NULL){ | |
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 412 | fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource, | 
| 413 | prompt2); | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 414 | } else { | 
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 415 | fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource, | 
| 416 | crypttarget, prompt2); | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 417 | } | 
| 418 | } | |
| 419 | } | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 420 | sret = getline(&buffer, &n, stdin); | 
| 421 | if(sret > 0){ | |
| 13
by Björn Påhlsson Added following support: | 422 | status = EXIT_SUCCESS; | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 423 | /* 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 | 424 | n = (size_t)sret; | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 425 | /* Strip final newline */ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 426 | if(n > 0 and buffer[n-1] == '\n'){ | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 427 | buffer[n-1] = '\0'; /* not strictly necessary */ | 
| 428 | n--; | |
| 429 | } | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 430 | size_t written = 0; | 
| 431 | while(written < n){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 432 | sret = write(STDOUT_FILENO, buffer + written, n - written); | 
| 433 | if(sret < 0){ | |
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 434 | int e = errno; | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 435 | error(0, errno, "write"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 436 | switch(e){ | 
| 437 | case EBADF: | |
| 438 | case EFAULT: | |
| 439 | case EINVAL: | |
| 440 | case EFBIG: | |
| 441 | case EIO: | |
| 442 | case ENOSPC: | |
| 443 | default: | |
| 444 | status = EX_IOERR; | |
| 445 | break; | |
| 446 | case EINTR: | |
| 447 | status = EXIT_FAILURE; | |
| 448 | break; | |
| 449 | } | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 450 | break; | 
| 451 | } | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 452 | written += (size_t)sret; | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 453 | } | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 454 | sret = close(STDOUT_FILENO); | 
| 455 | if(sret == -1){ | |
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 456 | int e = errno; | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 457 | error(0, errno, "close"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 458 | switch(e){ | 
| 459 | case EBADF: | |
| 460 | status = EX_OSFILE; | |
| 461 | break; | |
| 462 | case EIO: | |
| 463 | default: | |
| 464 | status = EX_IOERR; | |
| 465 | break; | |
| 466 | } | |
| 467 | } | |
| 13
by Björn Påhlsson Added following support: | 468 | break; | 
| 469 | } | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 470 | if(sret < 0){ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 471 | int e = errno; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 472 | 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 | 473 | error(0, errno, "getline"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 474 | switch(e){ | 
| 475 | case EBADF: | |
| 476 | status = EX_UNAVAILABLE; | |
| 477 | case EIO: | |
| 478 | case EINVAL: | |
| 479 | default: | |
| 480 | status = EX_IOERR; | |
| 481 | break; | |
| 482 | } | |
| 13
by Björn Påhlsson Added following support: | 483 | break; | 
| 484 | } | |
| 485 | } | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 486 | /* if(sret == 0), then the only sensible thing to do is to retry | 
| 487 |        to read from stdin */
 | |
| 13
by Björn Påhlsson Added following support: | 488 | fputc('\n', stderr); | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 489 | if(debug and not quit_now){ | 
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 490 | /* 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 | 491 | 	 will print that later, so no need to show this too. */
 | 
| 492 | fprintf(stderr, "getline() returned 0, retrying.\n"); | |
| 493 | } | |
| 13
by Björn Påhlsson Added following support: | 494 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 495 |   
 | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 496 | free(buffer); | 
| 41
by Teddy Hogeborn Merge. | 497 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 498 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 499 | fprintf(stderr, "Restoring terminal attributes\n"); | 
| 500 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 501 | 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 | 502 | error(0, errno, "tcsetattr+echo"); | 
| 13
by Björn Påhlsson Added following support: | 503 | } | 
| 41
by Teddy Hogeborn Merge. | 504 |   
 | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 505 | if(quit_now){ | 
| 506 | sigemptyset(&old_action.sa_mask); | |
| 507 | old_action.sa_handler = SIG_DFL; | |
| 508 | ret = sigaction(signal_received, &old_action, NULL); | |
| 509 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 510 | error(0, errno, "sigaction"); | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 511 | } | 
| 512 | raise(signal_received); | |
| 513 | } | |
| 514 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 515 | if(debug){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 516 | fprintf(stderr, "%s is exiting with status %d\n", argv[0], | 
| 517 | status); | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 518 | } | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 519 | if(status == EXIT_SUCCESS or status == EX_OK){ | 
| 167
by Teddy Hogeborn * plugins.d/password-prompt.c (main): If successful, output an extra | 520 | fputc('\n', stderr); | 
| 521 | } | |
| 13
by Björn Påhlsson Added following support: | 522 |   
 | 
| 523 | return status; | |
| 524 | }
 |