bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 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 |  * 
 | 
| 246
by Teddy Hogeborn * README: Update copyright year; add "2009". | 5 |  * Copyright © 2008,2009 Teddy Hogeborn
 | 
| 6 |  * Copyright © 2008,2009 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 |  * 
 | |
| 22 |  * Contact the authors at <https://www.fukt.bsnet.se/~belorn/> and
 | |
| 23 |  * <https://www.fukt.bsnet.se/~teddy/>.
 | |
| 24 |  */
 | |
| 25 | ||
| 13
by Björn Påhlsson Added following support: | 26 | #define _GNU_SOURCE /* getline() */ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 27 | |
| 13
by Björn Påhlsson Added following support: | 28 | #include <termios.h> /* struct termios, tcsetattr(), | 
| 29 | TCSAFLUSH, tcgetattr(), ECHO */ | |
| 30 | #include <unistd.h> /* struct termios, tcsetattr(), | |
| 31 | STDIN_FILENO, TCSAFLUSH, | |
| 32 | tcgetattr(), ECHO */ | |
| 33 | #include <signal.h> /* sig_atomic_t, raise(), struct | |
| 34 | sigaction, sigemptyset(), | |
| 35 | sigaction(), sigaddset(), SIGINT, | |
| 36 | SIGQUIT, SIGHUP, SIGTERM */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 37 | #include <stddef.h> /* NULL, size_t, ssize_t */ | 
| 13
by Björn Påhlsson Added following support: | 38 | #include <sys/types.h> /* ssize_t */ | 
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 39 | #include <stdlib.h> /* EXIT_SUCCESS, EXIT_FAILURE, | 
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 40 | getopt_long, getenv() */ | 
| 13
by Björn Påhlsson Added following support: | 41 | #include <stdio.h> /* fprintf(), stderr, getline(), | 
| 42 | stdin, feof(), perror(), fputc(), | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 43 | stdout, getopt_long */ | 
| 13
by Björn Påhlsson Added following support: | 44 | #include <errno.h> /* errno, EINVAL */ | 
| 45 | #include <iso646.h> /* or, not */ | |
| 46 | #include <stdbool.h> /* bool, false, true */ | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 47 | #include <string.h> /* strlen, rindex, strncmp, strcmp */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 48 | #include <argp.h> /* struct argp_option, struct | 
| 49 | argp_state, struct argp, | |
| 50 | argp_parse(), error_t, | |
| 51 | ARGP_KEY_ARG, ARGP_KEY_END, | |
| 52 | ARGP_ERR_UNKNOWN */ | |
| 13
by Björn Påhlsson Added following support: | 53 | |
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 54 | volatile sig_atomic_t quit_now = 0; | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 55 | bool debug = false; | 
| 217
by Teddy Hogeborn * .bzrignore: Added "man" directory (created by "make install-html"). | 56 | const char *argp_program_version = "password-prompt " VERSION; | 
| 24.1.17
by Björn Påhlsson passprompt | 57 | const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>"; | 
| 13
by Björn Påhlsson Added following support: | 58 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 59 | static void termination_handler(__attribute__((unused))int signum){ | 
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 60 | quit_now = 1; | 
| 13
by Björn Påhlsson Added following support: | 61 | }
 | 
| 62 | ||
| 63 | int main(int argc, char **argv){ | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 64 | ssize_t ret; | 
| 13
by Björn Påhlsson Added following support: | 65 | size_t n; | 
| 66 | struct termios t_new, t_old; | |
| 67 | char *buffer = NULL; | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 68 | char *prefix = NULL; | 
| 13
by Björn Påhlsson Added following support: | 69 | int status = EXIT_SUCCESS; | 
| 70 | struct sigaction old_action, | |
| 71 | new_action = { .sa_handler = termination_handler, | |
| 72 | .sa_flags = 0 }; | |
| 24.1.17
by Björn Påhlsson passprompt | 73 | { | 
| 74 | struct argp_option options[] = { | |
| 75 | { .name = "prefix", .key = 'p', | |
| 76 | .arg = "PREFIX", .flags = 0, | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 77 | .doc = "Prefix shown before the prompt", .group = 2 }, | 
| 24.1.17
by Björn Påhlsson passprompt | 78 | { .name = "debug", .key = 128, | 
| 79 | .doc = "Debug mode", .group = 3 }, | |
| 80 | { .name = NULL } | |
| 81 | }; | |
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 82 |     
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 83 | error_t parse_opt (int key, char *arg, struct argp_state *state){ | 
| 84 | switch (key){ | |
| 24.1.17
by Björn Påhlsson passprompt | 85 | case 'p': | 
| 86 | prefix = arg; | |
| 87 | break; | |
| 88 | case 128: | |
| 89 | debug = true; | |
| 90 | break; | |
| 91 | case ARGP_KEY_ARG: | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 92 | argp_usage(state); | 
| 24.1.17
by Björn Påhlsson passprompt | 93 | break; | 
| 94 | case ARGP_KEY_END: | |
| 95 | break; | |
| 96 | default: | |
| 97 | return ARGP_ERR_UNKNOWN; | |
| 98 | } | |
| 99 | return 0; | |
| 100 | } | |
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 101 |     
 | 
| 24.1.17
by Björn Påhlsson passprompt | 102 | struct argp argp = { .options = options, .parser = parse_opt, | 
| 103 | .args_doc = "", | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 104 | .doc = "Mandos password-prompt -- Read and" | 
| 105 | " output a password" }; | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 106 | ret = argp_parse(&argp, argc, argv, 0, 0, NULL); | 
| 107 | if(ret == ARGP_ERR_UNKNOWN){ | |
| 24.1.44
by Björn Påhlsson Fixed unkown -> unknown | 108 | fprintf(stderr, "Unknown error while parsing arguments\n"); | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 109 | return EXIT_FAILURE; | 
| 110 | } | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 111 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 112 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 113 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 114 | fprintf(stderr, "Starting %s\n", argv[0]); | 
| 115 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 116 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 117 | fprintf(stderr, "Storing current terminal attributes\n"); | 
| 118 | } | |
| 13
by Björn Påhlsson Added following support: | 119 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 120 | if(tcgetattr(STDIN_FILENO, &t_old) != 0){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 121 | perror("tcgetattr"); | 
| 13
by Björn Påhlsson Added following support: | 122 | return EXIT_FAILURE; | 
| 123 | } | |
| 124 |   
 | |
| 125 | sigemptyset(&new_action.sa_mask); | |
| 126 | sigaddset(&new_action.sa_mask, SIGINT); | |
| 127 | sigaddset(&new_action.sa_mask, SIGHUP); | |
| 128 | sigaddset(&new_action.sa_mask, SIGTERM); | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 129 | ret = sigaction(SIGINT, NULL, &old_action); | 
| 130 | if(ret == -1){ | |
| 131 | perror("sigaction"); | |
| 132 | return EXIT_FAILURE; | |
| 133 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 134 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 135 | ret = sigaction(SIGINT, &new_action, NULL); | 
| 136 | if(ret == -1){ | |
| 137 | perror("sigaction"); | |
| 138 | return EXIT_FAILURE; | |
| 139 | } | |
| 140 | } | |
| 141 | ret = sigaction(SIGHUP, NULL, &old_action); | |
| 142 | if(ret == -1){ | |
| 143 | perror("sigaction"); | |
| 144 | return EXIT_FAILURE; | |
| 145 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 146 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 147 | ret = sigaction(SIGHUP, &new_action, NULL); | 
| 148 | if(ret == -1){ | |
| 149 | perror("sigaction"); | |
| 150 | return EXIT_FAILURE; | |
| 151 | } | |
| 152 | } | |
| 153 | ret = sigaction(SIGTERM, NULL, &old_action); | |
| 154 | if(ret == -1){ | |
| 155 | perror("sigaction"); | |
| 156 | return EXIT_FAILURE; | |
| 157 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 158 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 159 | ret = sigaction(SIGTERM, &new_action, NULL); | 
| 160 | if(ret == -1){ | |
| 161 | perror("sigaction"); | |
| 162 | return EXIT_FAILURE; | |
| 163 | } | |
| 164 | } | |
| 165 |   
 | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 166 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 167 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 168 | fprintf(stderr, "Removing echo flag from terminal attributes\n"); | 
| 169 | } | |
| 13
by Björn Påhlsson Added following support: | 170 |   
 | 
| 171 | t_new = t_old; | |
| 172 | t_new.c_lflag &= ~ECHO; | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 173 | if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){ | 
| 13
by Björn Påhlsson Added following support: | 174 | perror("tcsetattr-echo"); | 
| 175 | return EXIT_FAILURE; | |
| 176 | } | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 177 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 178 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 179 | fprintf(stderr, "Waiting for input from stdin \n"); | 
| 180 | } | |
| 13
by Björn Påhlsson Added following support: | 181 | while(true){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 182 | if(quit_now){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 183 | if(debug){ | 
| 184 | fprintf(stderr, "Interrupted by signal, exiting.\n"); | |
| 185 | } | |
| 13
by Björn Påhlsson Added following support: | 186 | status = EXIT_FAILURE; | 
| 187 | break; | |
| 188 | } | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 189 | |
| 190 | if(prefix){ | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 191 | fprintf(stderr, "%s ", prefix); | 
| 192 | } | |
| 193 | { | |
| 194 | const char *cryptsource = getenv("cryptsource"); | |
| 195 | const char *crypttarget = getenv("crypttarget"); | |
| 196 | const char *const prompt | |
| 24.1.124
by Björn Påhlsson Added lower kernel loglevel to reduce clutter on system console. | 197 | = "Enter passphrase to unlock the disk"; | 
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 198 | if(cryptsource == NULL){ | 
| 199 | if(crypttarget == NULL){ | |
| 200 | fprintf(stderr, "%s: ", prompt); | |
| 201 | } else { | |
| 202 | fprintf(stderr, "%s (%s): ", prompt, crypttarget); | |
| 203 | } | |
| 204 | } else { | |
| 205 | if(crypttarget == NULL){ | |
| 206 | fprintf(stderr, "%s %s: ", prompt, cryptsource); | |
| 207 | } else { | |
| 208 | fprintf(stderr, "%s %s (%s): ", prompt, cryptsource, | |
| 209 | crypttarget); | |
| 210 | } | |
| 211 | } | |
| 212 | } | |
| 13
by Björn Påhlsson Added following support: | 213 | ret = getline(&buffer, &n, stdin); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 214 | if(ret > 0){ | 
| 13
by Björn Påhlsson Added following support: | 215 | status = EXIT_SUCCESS; | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 216 | /* Make n = data size instead of allocated buffer size */ | 
| 217 | n = (size_t)ret; | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 218 | /* Strip final newline */ | 
| 219 | if(n>0 and buffer[n-1] == '\n'){ | |
| 220 | buffer[n-1] = '\0'; /* not strictly necessary */ | |
| 221 | n--; | |
| 222 | } | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 223 | size_t written = 0; | 
| 224 | while(written < n){ | |
| 225 | ret = write(STDOUT_FILENO, buffer + written, n - written); | |
| 226 | if(ret < 0){ | |
| 227 | perror("write"); | |
| 228 | status = EXIT_FAILURE; | |
| 229 | break; | |
| 230 | } | |
| 231 | written += (size_t)ret; | |
| 232 | } | |
| 13
by Björn Påhlsson Added following support: | 233 | break; | 
| 234 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 235 | if(ret < 0){ | 
| 236 | if(errno != EINTR and not feof(stdin)){ | |
| 13
by Björn Påhlsson Added following support: | 237 | perror("getline"); | 
| 238 | status = EXIT_FAILURE; | |
| 239 | break; | |
| 240 | } | |
| 241 | } | |
| 41
by Teddy Hogeborn Merge. | 242 | /* if(ret == 0), then the only sensible thing to do is to retry to | 
| 243 |        read from stdin */
 | |
| 13
by Björn Påhlsson Added following support: | 244 | fputc('\n', stderr); | 
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 245 | if(debug and quit_now == 0){ | 
| 246 | /* 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 | 247 | 	 will print that later, so no need to show this too. */
 | 
| 248 | fprintf(stderr, "getline() returned 0, retrying.\n"); | |
| 249 | } | |
| 13
by Björn Påhlsson Added following support: | 250 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 251 |   
 | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 252 | free(buffer); | 
| 41
by Teddy Hogeborn Merge. | 253 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 254 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 255 | fprintf(stderr, "Restoring terminal attributes\n"); | 
| 256 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 257 | if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){ | 
| 13
by Björn Påhlsson Added following support: | 258 | perror("tcsetattr+echo"); | 
| 259 | } | |
| 41
by Teddy Hogeborn Merge. | 260 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 261 | if(debug){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 262 | fprintf(stderr, "%s is exiting with status %d\n", argv[0], | 
| 263 | status); | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 264 | } | 
| 167
by Teddy Hogeborn * plugins.d/password-prompt.c (main): If successful, output an extra | 265 | if(status == EXIT_SUCCESS){ | 
| 266 | fputc('\n', stderr); | |
| 267 | } | |
| 13
by Björn Påhlsson Added following support: | 268 |   
 | 
| 269 | return status; | |
| 270 | }
 |