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