/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
 * 
505.1.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
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
469.1.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,
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(),
485 by Teddy Hogeborn
Merge from Björn.
44
				   stdin, feof(), fputc(), vfprintf(),
45
				   vasprintf() */
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() */
469.1.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() */
485 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 */
391 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 */
237.5.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
294 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
66
volatile sig_atomic_t quit_now = 0;
356 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;
505.1.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
469 by Teddy Hogeborn
* plugins.d/password-prompt.c (conflict_detection): Check for both
72
/* Needed for conflict resolution */
73
const char plymouth_name[] = "plymouthd";
237.5.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 */
485 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){
485 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
356 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
  }
294 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
102
  quit_now = 1;
356 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
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
106
bool conflict_detection(void){
107
237.5.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.
237.5.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;
237.5.2 by Björn Påhlsson
fixed bug with conflict detection between plymouthd and password-prompt
114
    int cl_fd;
237.5.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
    }
237.5.2 by Björn Påhlsson
fixed bug with conflict detection between plymouthd and password-prompt
126
    
127
    char *cmdline_filename;
469.1.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);
237.5.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
    }
237.5.2 by Björn Påhlsson
fixed bug with conflict detection between plymouthd and password-prompt
134
    
469.1.1 by teddy at bsnet
* plugins.d/password-prompt.c: Some white space fixes. Break some
135
    /* Open /proc/<pid>/cmdline */
237.5.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){
478 by Teddy Hogeborn
* plugins.d/password-prompt.c (conflict_detection): Don't print error
139
      if(errno != ENOENT){
140
	error(0, errno, "open");
141
      }
237.5.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;
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
182
      }
237.5.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
    
471 by Teddy Hogeborn
* plugins.d/password-prompt.c (conflict_detection): Check for both
195
    if(strcmp(cmdline_base, plymouth_name) != 0){
469.1.1 by teddy at bsnet
* plugins.d/password-prompt.c: Some white space fixes. Break some
196
      if(debug){
471 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);
469.1.1 by teddy at bsnet
* plugins.d/password-prompt.c: Some white space fixes. Break some
199
      }
237.5.2 by Björn Påhlsson
fixed bug with conflict detection between plymouthd and password-prompt
200
      free(cmdline);
201
      return 0;
202
    }
471 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
    }
237.5.2 by Björn Påhlsson
fixed bug with conflict detection between plymouthd and password-prompt
207
    free(cmdline);
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
208
    return 1;
209
  }
469.1.1 by teddy at bsnet
* plugins.d/password-prompt.c: Some white space fixes. Break some
210
  
24.1.176 by Björn Påhlsson
free dirents in password-prompt
211
  struct dirent **direntries = NULL;
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
212
  int ret;
213
  ret = scandir("/proc", &direntries, is_plymouth, alphasort);
214
  if (ret == -1){
215
    error(1, errno, "scandir");
216
  }
237.4.16 by Teddy Hogeborn
* Makefile (version): Changed to "1.3.1".
217
  free(direntries);
467 by Teddy Hogeborn
Merge fix for password-prompt/plymouth conflict from Björn.
218
  return ret > 0;
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
219
}
220
221
13 by Björn Påhlsson
Added following support:
222
int main(int argc, char **argv){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
223
  ssize_t sret;
224
  int ret;
13 by Björn Påhlsson
Added following support:
225
  size_t n;
226
  struct termios t_new, t_old;
227
  char *buffer = NULL;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
228
  char *prefix = NULL;
13 by Björn Påhlsson
Added following support:
229
  int status = EXIT_SUCCESS;
230
  struct sigaction old_action,
231
    new_action = { .sa_handler = termination_handler,
232
		   .sa_flags = 0 };
24.1.17 by Björn Påhlsson
passprompt
233
  {
234
    struct argp_option options[] = {
235
      { .name = "prefix", .key = 'p',
236
	.arg = "PREFIX", .flags = 0,
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
237
	.doc = "Prefix shown before the prompt", .group = 2 },
24.1.17 by Björn Påhlsson
passprompt
238
      { .name = "debug", .key = 128,
239
	.doc = "Debug mode", .group = 3 },
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
240
      /*
241
       * These reproduce what we would get without ARGP_NO_HELP
242
       */
243
      { .name = "help", .key = '?',
244
	.doc = "Give this help list", .group = -1 },
245
      { .name = "usage", .key = -3,
246
	.doc = "Give a short usage message", .group = -1 },
247
      { .name = "version", .key = 'V',
248
	.doc = "Print program version", .group = -1 },
24.1.17 by Björn Påhlsson
passprompt
249
      { .name = NULL }
250
    };
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
251
    
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
252
    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
253
      errno = 0;
293 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
254
      switch (key){
24.1.17 by Björn Påhlsson
passprompt
255
      case 'p':
256
	prefix = arg;
257
	break;
258
      case 128:
259
	debug = true;
260
	break;
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
261
	/*
262
	 * These reproduce what we would get without ARGP_NO_HELP
263
	 */
264
      case '?':			/* --help */
265
	argp_state_help(state, state->out_stream,
266
			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
267
			& ~(unsigned int)ARGP_HELP_EXIT_OK);
268
      case -3:			/* --usage */
269
	argp_state_help(state, state->out_stream,
270
			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
271
      case 'V':			/* --version */
272
	fprintf(state->out_stream, "%s\n", argp_program_version);
273
	exit(argp_err_exit_status);
24.1.17 by Björn Påhlsson
passprompt
274
	break;
275
      default:
276
	return ARGP_ERR_UNKNOWN;
277
      }
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
278
      return errno;
24.1.17 by Björn Påhlsson
passprompt
279
    }
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
280
    
24.1.17 by Björn Påhlsson
passprompt
281
    struct argp argp = { .options = options, .parser = parse_opt,
282
			 .args_doc = "",
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
283
			 .doc = "Mandos password-prompt -- Read and"
284
			 " output a password" };
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
285
    ret = argp_parse(&argp, argc, argv,
286
		     ARGP_IN_ORDER | ARGP_NO_HELP, NULL, NULL);
287
    switch(ret){
288
    case 0:
289
      break;
290
    case ENOMEM:
291
    default:
292
      errno = ret;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
293
      error(0, errno, "argp_parse");
394 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
294
      return EX_OSERR;
295
    case EINVAL:
296
      return EX_USAGE;
24.1.26 by Björn Påhlsson
tally count of used symbols
297
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
298
  }
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
299
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
300
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
301
    fprintf(stderr, "Starting %s\n", argv[0]);
302
  }
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
303
304
  if (conflict_detection()){
305
    if(debug){
469.1.1 by teddy at bsnet
* plugins.d/password-prompt.c: Some white space fixes. Break some
306
      fprintf(stderr, "Stopping %s because of conflict\n", argv[0]);
237.5.1 by Björn Påhlsson
password-prompt: added conflic handling with plymouth daemon.
307
    }
308
    return EXIT_FAILURE;
309
  }
310
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
311
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
312
    fprintf(stderr, "Storing current terminal attributes\n");
313
  }
13 by Björn Påhlsson
Added following support:
314
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
315
  if(tcgetattr(STDIN_FILENO, &t_old) != 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
316
    int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
317
    error(0, errno, "tcgetattr");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
318
    switch(e){
319
    case EBADF:
320
    case ENOTTY:
321
      return EX_UNAVAILABLE;
322
    default:
323
      return EX_OSERR;
324
    }
13 by Björn Påhlsson
Added following support:
325
  }
326
  
327
  sigemptyset(&new_action.sa_mask);
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
328
  ret = sigaddset(&new_action.sa_mask, SIGINT);
329
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
330
    error(0, errno, "sigaddset");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
331
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
332
  }
333
  ret = sigaddset(&new_action.sa_mask, SIGHUP);
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, "sigaddset");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
336
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
337
  }
338
  ret = sigaddset(&new_action.sa_mask, SIGTERM);
339
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
340
    error(0, errno, "sigaddset");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
341
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
342
  }
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
343
  /* Need to check if the handler is SIG_IGN before handling:
344
     | [[info:libc:Initial Signal Actions]] |
345
     | [[info:libc:Basic Signal Handling]]  |
346
  */
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
347
  ret = sigaction(SIGINT, NULL, &old_action);
348
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
349
    error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
350
    return EX_OSERR;
357 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
351
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
352
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
353
    ret = sigaction(SIGINT, &new_action, NULL);
354
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
355
      error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
356
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
357
    }
358
  }
359
  ret = sigaction(SIGHUP, NULL, &old_action);
360
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
361
    error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
362
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
363
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
364
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
365
    ret = sigaction(SIGHUP, &new_action, NULL);
366
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
367
      error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
368
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
369
    }
370
  }
371
  ret = sigaction(SIGTERM, NULL, &old_action);
372
  if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
373
    error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
374
    return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
375
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
376
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
377
    ret = sigaction(SIGTERM, &new_action, NULL);
378
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
379
      error(0, errno, "sigaction");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
380
      return EX_OSERR;
24.1.26 by Björn Påhlsson
tally count of used symbols
381
    }
382
  }
383
  
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
384
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
385
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
386
    fprintf(stderr, "Removing echo flag from terminal attributes\n");
387
  }
13 by Björn Påhlsson
Added following support:
388
  
389
  t_new = t_old;
377 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): Fix "-Wconversion" warning.
390
  t_new.c_lflag &= ~(tcflag_t)ECHO;
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
391
  if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
392
    int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
393
    error(0, errno, "tcsetattr-echo");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
394
    switch(e){
395
    case EBADF:
396
    case ENOTTY:
397
      return EX_UNAVAILABLE;
398
    case EINVAL:
399
    default:
400
      return EX_OSERR;
401
    }
13 by Björn Påhlsson
Added following support:
402
  }
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
403
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
404
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
405
    fprintf(stderr, "Waiting for input from stdin \n");
406
  }
13 by Björn Påhlsson
Added following support:
407
  while(true){
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
408
    if(quit_now){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
409
      if(debug){
410
	fprintf(stderr, "Interrupted by signal, exiting.\n");
411
      }
13 by Björn Påhlsson
Added following support:
412
      status = EXIT_FAILURE;
413
      break;
414
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
415
416
    if(prefix){
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
417
      fprintf(stderr, "%s ", prefix);
418
    }
419
    {
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
420
      const char *cryptsource = getenv("CRYPTTAB_SOURCE");
421
      const char *crypttarget = getenv("CRYPTTAB_NAME");
422
      /* Before cryptsetup 1.1.0~rc2 */
423
      if(cryptsource == NULL){
424
	cryptsource = getenv("cryptsource");
425
      }
426
      if(crypttarget == NULL){
427
	crypttarget = getenv("crypttarget");
428
      }
429
      const char *const prompt1 = "Unlocking the disk";
430
      const char *const prompt2 = "Enter passphrase";
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
431
      if(cryptsource == NULL){
432
	if(crypttarget == NULL){
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
433
	  fprintf(stderr, "%s to unlock the disk: ", prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
434
	} else {
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
435
	  fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget,
436
		  prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
437
	}
438
      } else {
439
	if(crypttarget == NULL){
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
440
	  fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource,
441
		  prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
442
	} else {
397 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use environment variables and prompt
443
	  fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource,
444
		  crypttarget, prompt2);
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
445
	}
446
      }
447
    }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
448
    sret = getline(&buffer, &n, stdin);
449
    if(sret > 0){
13 by Björn Påhlsson
Added following support:
450
      status = EXIT_SUCCESS;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
451
      /* 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
452
      n = (size_t)sret;
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
453
      /* Strip final newline */
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
454
      if(n > 0 and buffer[n-1] == '\n'){
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
455
	buffer[n-1] = '\0';	/* not strictly necessary */
456
	n--;
457
      }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
458
      size_t written = 0;
459
      while(written < n){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
460
	sret = write(STDOUT_FILENO, buffer + written, n - written);
461
	if(sret < 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
462
	  int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
463
	  error(0, errno, "write");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
464
	  switch(e){
465
	  case EBADF:
466
	  case EFAULT:
467
	  case EINVAL:
468
	  case EFBIG:
469
	  case EIO:
470
	  case ENOSPC:
471
	  default:
472
	    status = EX_IOERR;
473
	    break;
474
	  case EINTR:
475
	    status = EXIT_FAILURE;
476
	    break;
477
	  }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
478
	  break;
479
	}
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
480
	written += (size_t)sret;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
481
      }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
482
      sret = close(STDOUT_FILENO);
483
      if(sret == -1){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
484
	int e = errno;
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
485
	error(0, errno, "close");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
486
	switch(e){
487
	case EBADF:
488
	  status = EX_OSFILE;
489
	  break;
490
	case EIO:
491
	default:
492
	  status = EX_IOERR;
493
	  break;
494
	}
495
      }
13 by Björn Påhlsson
Added following support:
496
      break;
497
    }
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
498
    if(sret < 0){
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
499
      int e = errno;
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
500
      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
501
	error(0, errno, "getline");
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
502
	switch(e){
503
	case EBADF:
504
	  status = EX_UNAVAILABLE;
505
	case EIO:
506
	case EINVAL:
507
	default:
508
	  status = EX_IOERR;
509
	  break;
510
	}
13 by Björn Påhlsson
Added following support:
511
	break;
512
      }
513
    }
469.1.1 by teddy at bsnet
* plugins.d/password-prompt.c: Some white space fixes. Break some
514
    /* if(sret == 0), then the only sensible thing to do is to retry
515
       to read from stdin */
13 by Björn Påhlsson
Added following support:
516
    fputc('\n', stderr);
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
517
    if(debug and not quit_now){
294 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
518
      /* 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
519
	 will print that later, so no need to show this too. */
520
      fprintf(stderr, "getline() returned 0, retrying.\n");
521
    }
13 by Björn Påhlsson
Added following support:
522
  }
257 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
523
  
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
524
  free(buffer);
41 by Teddy Hogeborn
Merge.
525
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
526
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
527
    fprintf(stderr, "Restoring terminal attributes\n");
528
  }
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
529
  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
530
    error(0, errno, "tcsetattr+echo");
13 by Björn Påhlsson
Added following support:
531
  }
41 by Teddy Hogeborn
Merge.
532
  
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
533
  if(quit_now){
534
    sigemptyset(&old_action.sa_mask);
535
    old_action.sa_handler = SIG_DFL;
536
    ret = sigaction(signal_received, &old_action, NULL);
537
    if(ret == -1){
24.1.155 by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information
538
      error(0, errno, "sigaction");
356 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
539
    }
540
    raise(signal_received);
541
  }
542
  
266 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
543
  if(debug){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
544
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
545
	    status);
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
546
  }
391 by Teddy Hogeborn
* plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do
547
  if(status == EXIT_SUCCESS or status == EX_OK){
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
548
    fputc('\n', stderr);
549
  }
13 by Björn Påhlsson
Added following support:
550
  
551
  return status;
552
}