/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.9 by Teddy Hogeborn
* README: Update copyright year; add "2009".
5
 * Copyright © 2008,2009 Teddy Hogeborn
6
 * Copyright © 2008,2009 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
 * 
22
 * Contact the authors at <https://www.fukt.bsnet.se/~belorn/> and
23
 * <https://www.fukt.bsnet.se/~teddy/>.
24
 */
25
13 by Björn Påhlsson
Added following support:
26
#define _GNU_SOURCE		/* getline() */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
27
13 by Björn Påhlsson
Added following support:
28
#include <termios.h> 		/* struct termios, tcsetattr(),
29
				   TCSAFLUSH, tcgetattr(), ECHO */
30
#include <unistd.h>		/* struct termios, tcsetattr(),
31
				   STDIN_FILENO, TCSAFLUSH,
32
				   tcgetattr(), ECHO */
33
#include <signal.h>		/* sig_atomic_t, raise(), struct
34
				   sigaction, sigemptyset(),
35
				   sigaction(), sigaddset(), SIGINT,
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
36
				   SIGQUIT, SIGHUP, SIGTERM,
37
				   raise() */
24.1.26 by Björn Påhlsson
tally count of used symbols
38
#include <stddef.h>		/* NULL, size_t, ssize_t */
13 by Björn Påhlsson
Added following support:
39
#include <sys/types.h>		/* ssize_t */
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
40
#include <stdlib.h>		/* EXIT_SUCCESS, EXIT_FAILURE,
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
41
				   getopt_long, getenv() */
13 by Björn Påhlsson
Added following support:
42
#include <stdio.h>		/* fprintf(), stderr, getline(),
43
				   stdin, feof(), perror(), fputc(),
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
44
				   stdout, getopt_long */
13 by Björn Påhlsson
Added following support:
45
#include <errno.h>		/* errno, EINVAL */
46
#include <iso646.h>		/* or, not */
47
#include <stdbool.h>		/* bool, false, true */
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
48
#include <string.h> 		/* strlen, rindex, strncmp, strcmp */
24.1.26 by Björn Påhlsson
tally count of used symbols
49
#include <argp.h>		/* struct argp_option, struct
50
				   argp_state, struct argp,
51
				   argp_parse(), error_t,
52
				   ARGP_KEY_ARG, ARGP_KEY_END,
53
				   ARGP_ERR_UNKNOWN */
13 by Björn Påhlsson
Added following support:
54
237.2.57 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
55
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
56
int signal_received;
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
57
bool debug = false;
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
58
const char *argp_program_version = "password-prompt " VERSION;
24.1.17 by Björn Påhlsson
passprompt
59
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
13 by Björn Påhlsson
Added following support:
60
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
61
static void termination_handler(int signum){
62
  if(quit_now){
63
    return;
64
  }
237.2.57 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
65
  quit_now = 1;
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
66
  signal_received = signum;
13 by Björn Påhlsson
Added following support:
67
}
68
69
int main(int argc, char **argv){
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
70
  ssize_t ret;
13 by Björn Påhlsson
Added following support:
71
  size_t n;
72
  struct termios t_new, t_old;
73
  char *buffer = NULL;
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
74
  char *prefix = NULL;
13 by Björn Påhlsson
Added following support:
75
  int status = EXIT_SUCCESS;
76
  struct sigaction old_action,
77
    new_action = { .sa_handler = termination_handler,
78
		   .sa_flags = 0 };
24.1.17 by Björn Påhlsson
passprompt
79
  {
80
    struct argp_option options[] = {
81
      { .name = "prefix", .key = 'p',
82
	.arg = "PREFIX", .flags = 0,
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
83
	.doc = "Prefix shown before the prompt", .group = 2 },
24.1.17 by Björn Påhlsson
passprompt
84
      { .name = "debug", .key = 128,
85
	.doc = "Debug mode", .group = 3 },
86
      { .name = NULL }
87
    };
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
88
    
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
89
    error_t parse_opt (int key, char *arg, struct argp_state *state){
90
      switch (key){
24.1.17 by Björn Påhlsson
passprompt
91
      case 'p':
92
	prefix = arg;
93
	break;
94
      case 128:
95
	debug = true;
96
	break;
97
      case ARGP_KEY_ARG:
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
98
	argp_usage(state);
24.1.17 by Björn Påhlsson
passprompt
99
	break;
100
      case ARGP_KEY_END:
101
	break;
102
      default:
103
	return ARGP_ERR_UNKNOWN;
104
      }
105
      return 0;
106
    }
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
107
    
24.1.17 by Björn Påhlsson
passprompt
108
    struct argp argp = { .options = options, .parser = parse_opt,
109
			 .args_doc = "",
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
110
			 .doc = "Mandos password-prompt -- Read and"
111
			 " output a password" };
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
112
    ret = argp_parse(&argp, argc, argv, 0, 0, NULL);
113
    if(ret == ARGP_ERR_UNKNOWN){
24.1.44 by Björn Påhlsson
Fixed unkown -> unknown
114
      fprintf(stderr, "Unknown error while parsing arguments\n");
24.1.26 by Björn Påhlsson
tally count of used symbols
115
      return EXIT_FAILURE;
116
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
117
  }
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
118
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
119
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
120
    fprintf(stderr, "Starting %s\n", argv[0]);
121
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
122
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
123
    fprintf(stderr, "Storing current terminal attributes\n");
124
  }
13 by Björn Påhlsson
Added following support:
125
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
126
  if(tcgetattr(STDIN_FILENO, &t_old) != 0){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
127
    perror("tcgetattr");
13 by Björn Påhlsson
Added following support:
128
    return EXIT_FAILURE;
129
  }
130
  
131
  sigemptyset(&new_action.sa_mask);
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
132
  ret = sigaddset(&new_action.sa_mask, SIGINT);
133
  if(ret == -1){
134
    perror("sigaddset");
135
    return EXIT_FAILURE;
136
  }
137
  ret = sigaddset(&new_action.sa_mask, SIGHUP);
138
  if(ret == -1){
139
    perror("sigaddset");
140
    return EXIT_FAILURE;
141
  }
142
  ret = sigaddset(&new_action.sa_mask, SIGTERM);
143
  if(ret == -1){
144
    perror("sigaddset");
24.1.26 by Björn Påhlsson
tally count of used symbols
145
    return EXIT_FAILURE;
146
  }
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
147
  /* Need to check if the handler is SIG_IGN before handling:
148
     | [[info:libc:Initial Signal Actions]] |
149
     | [[info:libc:Basic Signal Handling]]  |
150
  */
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
151
  ret = sigaction(SIGINT, NULL, &old_action);
152
  if(ret == -1){
153
    perror("sigaction");
154
    return EXIT_FAILURE;
155
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
156
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
157
    ret = sigaction(SIGINT, &new_action, NULL);
158
    if(ret == -1){
159
      perror("sigaction");
160
      return EXIT_FAILURE;
161
    }
162
  }
163
  ret = sigaction(SIGHUP, NULL, &old_action);
164
  if(ret == -1){
165
    perror("sigaction");
166
    return EXIT_FAILURE;
167
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
168
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
169
    ret = sigaction(SIGHUP, &new_action, NULL);
170
    if(ret == -1){
171
      perror("sigaction");
172
      return EXIT_FAILURE;
173
    }
174
  }
175
  ret = sigaction(SIGTERM, NULL, &old_action);
176
  if(ret == -1){
177
    perror("sigaction");
178
    return EXIT_FAILURE;
179
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
180
  if(old_action.sa_handler != SIG_IGN){
24.1.26 by Björn Påhlsson
tally count of used symbols
181
    ret = sigaction(SIGTERM, &new_action, NULL);
182
    if(ret == -1){
183
      perror("sigaction");
184
      return EXIT_FAILURE;
185
    }
186
  }
187
  
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
188
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
189
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
190
    fprintf(stderr, "Removing echo flag from terminal attributes\n");
191
  }
13 by Björn Påhlsson
Added following support:
192
  
193
  t_new = t_old;
194
  t_new.c_lflag &= ~ECHO;
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
195
  if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){
13 by Björn Påhlsson
Added following support:
196
    perror("tcsetattr-echo");
197
    return EXIT_FAILURE;
198
  }
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
199
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
200
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
201
    fprintf(stderr, "Waiting for input from stdin \n");
202
  }
13 by Björn Påhlsson
Added following support:
203
  while(true){
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
204
    if(quit_now){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
205
      if(debug){
206
	fprintf(stderr, "Interrupted by signal, exiting.\n");
207
      }
13 by Björn Påhlsson
Added following support:
208
      status = EXIT_FAILURE;
209
      break;
210
    }
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
211
212
    if(prefix){
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
213
      fprintf(stderr, "%s ", prefix);
214
    }
215
    {
216
      const char *cryptsource = getenv("cryptsource");
217
      const char *crypttarget = getenv("crypttarget");
218
      const char *const prompt
237.2.118 by Teddy Hogeborn
* mandos: White-space fixes only.
219
	= "Enter passphrase to unlock the disk";
79 by Teddy Hogeborn
* plugins.d/password-request.c (main): Include environment variables
220
      if(cryptsource == NULL){
221
	if(crypttarget == NULL){
222
	  fprintf(stderr, "%s: ", prompt);
223
	} else {
224
	  fprintf(stderr, "%s (%s): ", prompt, crypttarget);
225
	}
226
      } else {
227
	if(crypttarget == NULL){
228
	  fprintf(stderr, "%s %s: ", prompt, cryptsource);
229
	} else {
230
	  fprintf(stderr, "%s %s (%s): ", prompt, cryptsource,
231
		  crypttarget);
232
	}
233
      }
234
    }
13 by Björn Påhlsson
Added following support:
235
    ret = getline(&buffer, &n, stdin);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
236
    if(ret > 0){
13 by Björn Påhlsson
Added following support:
237
      status = EXIT_SUCCESS;
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
238
      /* Make n = data size instead of allocated buffer size */
239
      n = (size_t)ret;
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
240
      /* Strip final newline */
241
      if(n>0 and buffer[n-1] == '\n'){
242
	buffer[n-1] = '\0';	/* not strictly necessary */
243
	n--;
244
      }
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
245
      size_t written = 0;
246
      while(written < n){
247
	ret = write(STDOUT_FILENO, buffer + written, n - written);
248
	if(ret < 0){
249
	  perror("write");
250
	  status = EXIT_FAILURE;
251
	  break;
252
	}
253
	written += (size_t)ret;
254
      }
13 by Björn Påhlsson
Added following support:
255
      break;
256
    }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
257
    if(ret < 0){
258
      if(errno != EINTR and not feof(stdin)){
13 by Björn Påhlsson
Added following support:
259
	perror("getline");
260
	status = EXIT_FAILURE;
261
	break;
262
      }
263
    }
41 by Teddy Hogeborn
Merge.
264
    /* if(ret == 0), then the only sensible thing to do is to retry to
265
       read from stdin */
13 by Björn Påhlsson
Added following support:
266
    fputc('\n', stderr);
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
267
    if(debug and not quit_now){
237.2.57 by Teddy Hogeborn
* plugins.d/password-prompt.c (quit_now): Changed type to "volatile
268
      /* 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
269
	 will print that later, so no need to show this too. */
270
      fprintf(stderr, "getline() returned 0, retrying.\n");
271
    }
13 by Björn Påhlsson
Added following support:
272
  }
237.2.20 by Teddy Hogeborn
Change the default value of the "checker" option command to make the
273
  
24.1.92 by Björn Påhlsson
Several memory leaks detected by valgrind fixed
274
  free(buffer);
41 by Teddy Hogeborn
Merge.
275
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
276
  if(debug){
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
277
    fprintf(stderr, "Restoring terminal attributes\n");
278
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
279
  if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){
13 by Björn Påhlsson
Added following support:
280
    perror("tcsetattr+echo");
281
  }
41 by Teddy Hogeborn
Merge.
282
  
237.2.119 by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show
283
  if(quit_now){
284
    sigemptyset(&old_action.sa_mask);
285
    old_action.sa_handler = SIG_DFL;
286
    ret = sigaction(signal_received, &old_action, NULL);
287
    if(ret == -1){
288
      perror("sigaction");
289
    }
290
    raise(signal_received);
291
  }
292
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
293
  if(debug){
110 by Teddy Hogeborn
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
294
    fprintf(stderr, "%s is exiting with status %d\n", argv[0],
295
	    status);
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
296
  }
167 by Teddy Hogeborn
* plugins.d/password-prompt.c (main): If successful, output an extra
297
  if(status == EXIT_SUCCESS){
298
    fputc('\n', stderr);
299
  }
13 by Björn Påhlsson
Added following support:
300
  
301
  return status;
302
}