/mandos/trunk

To get this branch, use:
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.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
38
#include <sys/types.h>		/* ssize_t, struct dirent, pid_t, 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,
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
40
				   getenv(), free() */
41
#include <dirent.h>		/* scandir(), alphasort() */
13 by Björn Påhlsson
Added following support:
42
#include <stdio.h>		/* fprintf(), stderr, getline(),
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
43
				   stdin, feof(), fputc()
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
44
				*/
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
45
#include <errno.h>		/* errno, EBADF, ENOTTY, EINVAL,
46
				   EFAULT, EFBIG, EIO, ENOSPC, EINTR
47
				*/
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
48
#include <error.h>		/* error() */
13 by Björn Påhlsson
Added following support:
49
#include <iso646.h>		/* or, not */
50
#include <stdbool.h>		/* bool, false, true */
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
51
#include <inttypes.h>		/* strtoumax() */
52
#include <sys/stat.h> 		/* struct stat, lstat() */
53
#include <string.h> 		/* strlen, rindex, memcmp */
24.1.26 by Björn Påhlsson
tally count of used symbols
54
#include <argp.h>		/* struct argp_option, struct
55
				   argp_state, struct argp,
56
				   argp_parse(), error_t,
57
				   ARGP_KEY_ARG, ARGP_KEY_END,
58
				   ARGP_ERR_UNKNOWN */
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
59
#include <sysexits.h>		/* EX_SOFTWARE, EX_OSERR,
60
				   EX_UNAVAILABLE, EX_IOERR, EX_OK */
13 by Björn Påhlsson
Added following support:
61
294 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
62
volatile sig_atomic_t quit_now = 0;
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
63
int signal_received;
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
64
bool debug = false;
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
65
const char *argp_program_version = "password-prompt " VERSION;
24.1.17 by Björn Påhlsson
passprompt
66
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
13 by Björn Påhlsson
Added following support:
67
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
68
/* Needed for conflic resolution */
69
const char plymouthd_path[] = "/sbin/plymouth";
70
71
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
72
static void termination_handler(int signum){
73
  if(quit_now){
74
    return;
75
  }
294 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
76
  quit_now = 1;
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
77
  signal_received = signum;
13 by Björn Påhlsson
Added following support:
78
}
79
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
80
bool conflict_detection(void){
81
82
  /* plymouth conflicts with password-promt since both want to control the
83
     associated terminal. Password-prompt exit since plymouth perferms the same
84
     functionallity.
85
   */
86
  int is_plymouth(const struct dirent *proc_entry){
87
    int ret;
88
    {
89
      uintmax_t maxvalue;
90
      char *tmp;
91
      errno = 0;
92
      maxvalue = strtoumax(proc_entry->d_name, &tmp, 10);
93
      
94
      if(errno != 0 or *tmp != '\0'
95
	 or maxvalue != (uintmax_t)((pid_t)maxvalue)){
96
	return 0;
97
      }
98
    }
99
    char exe_target[sizeof(plymouthd_path)];
100
    char *exe_link;
101
    ret = asprintf(&exe_link, "/proc/%s/exe", proc_entry->d_name);
102
    if(ret == -1){
103
      error(0, errno, "asprintf");
104
      return 0;
105
    }
106
  
107
    struct stat exe_stat;
108
    ret = lstat(exe_link, &exe_stat);
109
    if(ret == -1){
110
      free(exe_link);
111
      if(errno != ENOENT){
112
	error(0, errno, "lstat");
113
      }
114
      return 0;
115
    }
116
  
117
    if(not S_ISLNK(exe_stat.st_mode)
118
       or exe_stat.st_uid != 0
119
       or exe_stat.st_gid != 0){
120
      free(exe_link);
121
      return 0;
122
    }
123
  
124
    ssize_t sret = readlink(exe_link, exe_target, sizeof(exe_target));
125
    free(exe_link);
126
    if((sret != (ssize_t)sizeof(plymouthd_path)-1) or
127
       (memcmp(plymouthd_path, exe_target,
128
	       sizeof(plymouthd_path)-1) != 0)){
129
      return 0;
130
    }
131
    return 1;
132
  }
133
134
  struct dirent **direntries;
135
  int ret;
136
  ret = scandir("/proc", &direntries, is_plymouth, alphasort);
137
  if (ret == -1){
138
    error(1, errno, "scandir");
139
  }
140
  if (ret < 0){
141
    return 1;
142
  } else {
143
    return 0;
144
  }
145
}
146
147
13 by Björn Påhlsson
Added following support:
148
int main(int argc, char **argv){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
149
  ssize_t sret;
150
  int ret;
13 by Björn Påhlsson
Added following support:
151
  size_t n;
152
  struct termios t_new, t_old;
153
  char *buffer = NULL;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
154
  char *prefix = NULL;
13 by Björn Påhlsson
Added following support:
155
  int status = EXIT_SUCCESS;
156
  struct sigaction old_action,
157
    new_action = { .sa_handler = termination_handler,
158
		   .sa_flags = 0 };
24.1.17 by Björn Påhlsson
passprompt
159
  {
160
    struct argp_option options[] = {
161
      { .name = "prefix", .key = 'p',
162
	.arg = "PREFIX", .flags = 0,
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
163
	.doc = "Prefix shown before the prompt", .group = 2 },
24.1.17 by Björn Påhlsson
passprompt
164
      { .name = "debug", .key = 128,
165
	.doc = "Debug mode", .group = 3 },
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
166
      /*
167
       * These reproduce what we would get without ARGP_NO_HELP
168
       */
169
      { .name = "help", .key = '?',
170
	.doc = "Give this help list", .group = -1 },
171
      { .name = "usage", .key = -3,
172
	.doc = "Give a short usage message", .group = -1 },
173
      { .name = "version", .key = 'V',
174
	.doc = "Print program version", .group = -1 },
24.1.17 by Björn Påhlsson
passprompt
175
      { .name = NULL }
176
    };
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
177
    
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
178
    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
179
      errno = 0;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
180
      switch (key){
24.1.17 by Björn Påhlsson
passprompt
181
      case 'p':
182
	prefix = arg;
183
	break;
184
      case 128:
185
	debug = true;
186
	break;
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
187
	/*
188
	 * These reproduce what we would get without ARGP_NO_HELP
189
	 */
190
      case '?':			/* --help */
191
	argp_state_help(state, state->out_stream,
192
			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
193
			& ~(unsigned int)ARGP_HELP_EXIT_OK);
194
      case -3:			/* --usage */
195
	argp_state_help(state, state->out_stream,
196
			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
197
      case 'V':			/* --version */
198
	fprintf(state->out_stream, "%s\n", argp_program_version);
199
	exit(argp_err_exit_status);
24.1.17 by Björn Påhlsson
passprompt
200
	break;
201
      default:
202
	return ARGP_ERR_UNKNOWN;
203
      }
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
204
      return errno;
24.1.17 by Björn Påhlsson
passprompt
205
    }
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
206
    
24.1.17 by Björn Påhlsson
passprompt
207
    struct argp argp = { .options = options, .parser = parse_opt,
208
			 .args_doc = "",
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
209
			 .doc = "Mandos password-prompt -- Read and"
210
			 " output a password" };
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
211
    ret = argp_parse(&argp, argc, argv,
212
		     ARGP_IN_ORDER | ARGP_NO_HELP, NULL, NULL);
213
    switch(ret){
214
    case 0:
215
      break;
216
    case ENOMEM:
217
    default:
218
      errno = ret;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
219
      error(0, errno, "argp_parse");
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
220
      return EX_OSERR;
221
    case EINVAL:
222
      return EX_USAGE;
24.1.26 by Björn Påhlsson
tally count of used symbols
223
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
224
  }
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
225
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
226
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
227
    fprintf(stderr, "Starting %s\n", argv[0]);
228
  }
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
229
230
  if (conflict_detection()){
231
    if(debug){
232
      fprintf(stderr, "Stopping %s because of conflict", argv[0]);
233
    }
234
    return EXIT_FAILURE;
235
  }
236
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
237
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
238
    fprintf(stderr, "Storing current terminal attributes\n");
239
  }
13 by Björn Påhlsson
Added following support:
240
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
241
  if(tcgetattr(STDIN_FILENO, &t_old) != 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
242
    int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
243
    error(0, errno, "tcgetattr");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
244
    switch(e){
245
    case EBADF:
246
    case ENOTTY:
247
      return EX_UNAVAILABLE;
248
    default:
249
      return EX_OSERR;
250
    }
13 by Björn Påhlsson
Added following support:
251
  }
252
  
253
  sigemptyset(&new_action.sa_mask);
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
254
  ret = sigaddset(&new_action.sa_mask, SIGINT);
255
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
256
    error(0, errno, "sigaddset");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
257
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
258
  }
259
  ret = sigaddset(&new_action.sa_mask, SIGHUP);
260
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
261
    error(0, errno, "sigaddset");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
262
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
263
  }
264
  ret = sigaddset(&new_action.sa_mask, SIGTERM);
265
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
266
    error(0, errno, "sigaddset");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
267
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
268
  }
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
269
  /* Need to check if the handler is SIG_IGN before handling:
270
     | [[info:libc:Initial Signal Actions]] |
271
     | [[info:libc:Basic Signal Handling]]  |
272
  */
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
273
  ret = sigaction(SIGINT, NULL, &old_action);
274
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
275
    error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
276
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
277
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
278
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
279
    ret = sigaction(SIGINT, &new_action, NULL);
280
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
281
      error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
282
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
283
    }
284
  }
285
  ret = sigaction(SIGHUP, NULL, &old_action);
286
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
287
    error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
288
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
289
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
290
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
291
    ret = sigaction(SIGHUP, &new_action, NULL);
292
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
293
      error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
294
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
295
    }
296
  }
297
  ret = sigaction(SIGTERM, NULL, &old_action);
298
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
299
    error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
300
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
301
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
302
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
303
    ret = sigaction(SIGTERM, &new_action, NULL);
304
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
305
      error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
306
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
307
    }
308
  }
309
  
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
310
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
311
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
312
    fprintf(stderr, "Removing echo flag from terminal attributes\n");
313
  }
13 by Björn Påhlsson
Added following support:
314
  
315
  t_new = t_old;
377 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): Fix "-Wconversion" warning.
316
  t_new.c_lflag &= ~(tcflag_t)ECHO;
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
317
  if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
318
    int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
319
    error(0, errno, "tcsetattr-echo");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
320
    switch(e){
321
    case EBADF:
322
    case ENOTTY:
323
      return EX_UNAVAILABLE;
324
    case EINVAL:
325
    default:
326
      return EX_OSERR;
327
    }
13 by Björn Påhlsson
Added following support:
328
  }
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
329
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
330
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
331
    fprintf(stderr, "Waiting for input from stdin \n");
332
  }
13 by Björn Påhlsson
Added following support:
333
  while(true){
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
334
    if(quit_now){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
335
      if(debug){
336
	fprintf(stderr, "Interrupted by signal, exiting.\n");
337
      }
13 by Björn Påhlsson
Added following support:
338
      status = EXIT_FAILURE;
339
      break;
340
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
341
342
    if(prefix){
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
343
      fprintf(stderr, "%s ", prefix);
344
    }
345
    {
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
346
      const char *cryptsource = getenv("CRYPTTAB_SOURCE");
347
      const char *crypttarget = getenv("CRYPTTAB_NAME");
348
      /* Before cryptsetup 1.1.0~rc2 */
349
      if(cryptsource == NULL){
350
	cryptsource = getenv("cryptsource");
351
      }
352
      if(crypttarget == NULL){
353
	crypttarget = getenv("crypttarget");
354
      }
355
      const char *const prompt1 = "Unlocking the disk";
356
      const char *const prompt2 = "Enter passphrase";
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
357
      if(cryptsource == NULL){
358
	if(crypttarget == NULL){
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
359
	  fprintf(stderr, "%s to unlock the disk: ", prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
360
	} else {
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
361
	  fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget,
362
		  prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
363
	}
364
      } else {
365
	if(crypttarget == NULL){
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
366
	  fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource,
367
		  prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
368
	} else {
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
369
	  fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource,
370
		  crypttarget, prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
371
	}
372
      }
373
    }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
374
    sret = getline(&buffer, &n, stdin);
375
    if(sret > 0){
13 by Björn Påhlsson
Added following support:
376
      status = EXIT_SUCCESS;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
377
      /* 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
378
      n = (size_t)sret;
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
379
      /* Strip final newline */
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
380
      if(n > 0 and buffer[n-1] == '\n'){
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
381
	buffer[n-1] = '\0';	/* not strictly necessary */
382
	n--;
383
      }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
384
      size_t written = 0;
385
      while(written < n){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
386
	sret = write(STDOUT_FILENO, buffer + written, n - written);
387
	if(sret < 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
388
	  int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
389
	  error(0, errno, "write");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
390
	  switch(e){
391
	  case EBADF:
392
	  case EFAULT:
393
	  case EINVAL:
394
	  case EFBIG:
395
	  case EIO:
396
	  case ENOSPC:
397
	  default:
398
	    status = EX_IOERR;
399
	    break;
400
	  case EINTR:
401
	    status = EXIT_FAILURE;
402
	    break;
403
	  }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
404
	  break;
405
	}
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
406
	written += (size_t)sret;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
407
      }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
408
      sret = close(STDOUT_FILENO);
409
      if(sret == -1){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
410
	int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
411
	error(0, errno, "close");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
412
	switch(e){
413
	case EBADF:
414
	  status = EX_OSFILE;
415
	  break;
416
	case EIO:
417
	default:
418
	  status = EX_IOERR;
419
	  break;
420
	}
421
      }
13 by Björn Påhlsson
Added following support:
422
      break;
423
    }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
424
    if(sret < 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
425
      int e = errno;
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
426
      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
427
	error(0, errno, "getline");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
428
	switch(e){
429
	case EBADF:
430
	  status = EX_UNAVAILABLE;
431
	case EIO:
432
	case EINVAL:
433
	default:
434
	  status = EX_IOERR;
435
	  break;
436
	}
13 by Björn Påhlsson
Added following support:
437
	break;
438
      }
439
    }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
440
    /* if(sret == 0), then the only sensible thing to do is to retry to
41 by Teddy Hogeborn
Merge.
441
       read from stdin */
13 by Björn Påhlsson
Added following support:
442
    fputc('\n', stderr);
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
443
    if(debug and not quit_now){
294 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
444
      /* 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
445
	 will print that later, so no need to show this too. */
446
      fprintf(stderr, "getline() returned 0, retrying.\n");
447
    }
13 by Björn Påhlsson
Added following support:
448
  }
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
449
  
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
450
  free(buffer);
41 by Teddy Hogeborn
Merge.
451
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
452
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
453
    fprintf(stderr, "Restoring terminal attributes\n");
454
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
455
  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
456
    error(0, errno, "tcsetattr+echo");
13 by Björn Påhlsson
Added following support:
457
  }
41 by Teddy Hogeborn
Merge.
458
  
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
459
  if(quit_now){
460
    sigemptyset(&old_action.sa_mask);
461
    old_action.sa_handler = SIG_DFL;
462
    ret = sigaction(signal_received, &old_action, NULL);
463
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
464
      error(0, errno, "sigaction");
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
465
    }
466
    raise(signal_received);
467
  }
468
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
469
  if(debug){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
470
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
471
	    status);
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
472
  }
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
473
  if(status == EXIT_SUCCESS or status == EX_OK){
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
474
    fputc('\n', stderr);
475
  }
13 by Björn Påhlsson
Added following support:
476
  
477
  return status;
478
}