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