/mandos/release

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