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