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