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