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