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