bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
237.2.122
by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file. |
1 |
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
2 |
/*
|
3 |
* Mandos plugin runner - Run Mandos plugins
|
|
4 |
*
|
|
237.7.227
by Teddy Hogeborn
Update copyright year. |
5 |
* Copyright © 2008-2014 Teddy Hogeborn
|
6 |
* Copyright © 2008-2014 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.11.2
by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout. |
22 |
* Contact the authors at <mandos@recompile.se>.
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
23 |
*/
|
24 |
||
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
25 |
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(), |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
26 |
O_CLOEXEC, pipe2() */
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
27 |
#include <stddef.h> /* size_t, NULL */ |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
28 |
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS, |
29 |
realloc() */ |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
30 |
#include <stdbool.h> /* bool, true, false */ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
31 |
#include <stdio.h> /* fileno(), fprintf(), |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
32 |
stderr, STDOUT_FILENO, fclose() */ |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
33 |
#include <sys/types.h> /* fstat(), struct stat, waitpid(), |
34 |
WIFEXITED(), WEXITSTATUS(), wait(), |
|
35 |
pid_t, uid_t, gid_t, getuid(), |
|
36 |
getgid() */ |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
37 |
#include <sys/select.h> /* fd_set, select(), FD_ZERO(), |
38 |
FD_SET(), FD_ISSET(), FD_CLR */ |
|
39 |
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(), |
|
237.2.119
by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show |
40 |
WEXITSTATUS(), WTERMSIG(), |
41 |
WCOREDUMP() */ |
|
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
42 |
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */ |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
43 |
#include <iso646.h> /* and, or, not */ |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
44 |
#include <dirent.h> /* struct dirent, scandirat() */ |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
45 |
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD, |
46 |
FD_CLOEXEC, write(), STDOUT_FILENO, |
|
47 |
struct stat, fstat(), close(), |
|
48 |
setgid(), setuid(), S_ISREG(), |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
49 |
faccessat() pipe2(), fork(), |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
50 |
_exit(), dup2(), fexecve(), read() |
51 |
*/ |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
52 |
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD, |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
53 |
FD_CLOEXEC, openat(), scandirat(), |
54 |
pipe2() */ |
|
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
55 |
#include <string.h> /* strsep, strlen(), strsignal(), |
56 |
strcmp(), strncmp() */ |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
57 |
#include <errno.h> /* errno */ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
58 |
#include <argp.h> /* struct argp_option, struct |
59 |
argp_state, struct argp, |
|
60 |
argp_parse(), ARGP_ERR_UNKNOWN, |
|
102
by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile. |
61 |
ARGP_KEY_END, ARGP_KEY_ARG, |
62 |
error_t */ |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
63 |
#include <signal.h> /* struct sigaction, sigemptyset(), |
64 |
sigaddset(), sigaction(), |
|
65 |
sigprocmask(), SIG_BLOCK, SIGCHLD, |
|
237.2.71
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
66 |
SIG_UNBLOCK, kill(), sig_atomic_t |
67 |
*/ |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
68 |
#include <errno.h> /* errno, EBADF */ |
237.2.74
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
69 |
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */ |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
70 |
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR, |
71 |
EX_CONFIG, EX_UNAVAILABLE, EX_OK */ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
72 |
#include <errno.h> /* errno */ |
73 |
#include <error.h> /* error() */ |
|
237.7.224
by Teddy Hogeborn
Use fnmatch()in plugin-runner. |
74 |
#include <fnmatch.h> /* fnmatch() */ |
13
by Björn Påhlsson
Added following support: |
75 |
|
37
by Teddy Hogeborn
Non-tested commit for merge purposes. |
76 |
#define BUFFER_SIZE 256
|
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
77 |
|
78 |
#define PDIR "/lib/mandos/plugins.d"
|
|
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
79 |
#define PHDIR "/lib/mandos/plugin-helpers"
|
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
80 |
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
|
37
by Teddy Hogeborn
Non-tested commit for merge purposes. |
81 |
|
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
82 |
const char *argp_program_version = "plugin-runner " VERSION; |
237.11.2
by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout. |
83 |
const char *argp_program_bug_address = "<mandos@recompile.se>"; |
24.1.35
by Björn Påhlsson
version 1.0 |
84 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
85 |
typedef struct plugin{ |
86 |
char *name; /* can be NULL or any plugin name */ |
|
87 |
char **argv; |
|
88 |
int argc; |
|
89 |
char **environ; |
|
90 |
int envc; |
|
91 |
bool disabled; |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
92 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
93 |
/* Variables used for running processes*/ |
13
by Björn Påhlsson
Added following support: |
94 |
pid_t pid; |
95 |
int fd; |
|
96 |
char *buffer; |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
97 |
size_t buffer_size; |
98 |
size_t buffer_length; |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
99 |
bool eof; |
237.2.59
by Teddy Hogeborn
* plugin-runner.c (struct plugin.completed): Changed type to "volatile |
100 |
volatile sig_atomic_t completed; |
237.2.60
by Teddy Hogeborn
* plugin-runner.c (struct plugin.status): Changed type to "int". |
101 |
int status; |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
102 |
struct plugin *next; |
103 |
} plugin; |
|
104 |
||
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
105 |
static plugin *plugin_list = NULL; |
106 |
||
24.1.90
by Björn Påhlsson
fixed two bugs: |
107 |
/* Gets an existing plugin based on name,
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
108 |
or if none is found, creates a new one */
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
109 |
__attribute__((warn_unused_result)) |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
110 |
static plugin *getplugin(char *name){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
111 |
/* Check for existing plugin with that name */ |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
112 |
for(plugin *p = plugin_list; p != NULL; p = p->next){ |
113 |
if((p->name == name) |
|
114 |
or (p->name and name and (strcmp(p->name, name) == 0))){ |
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
115 |
return p; |
116 |
} |
|
117 |
} |
|
118 |
/* Create a new plugin */ |
|
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
119 |
plugin *new_plugin = NULL; |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
120 |
do { |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
121 |
new_plugin = malloc(sizeof(plugin)); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
122 |
} while(new_plugin == NULL and errno == EINTR); |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
123 |
if(new_plugin == NULL){ |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
124 |
return NULL; |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
125 |
} |
24.1.62
by Björn Påhlsson
merge + small bugfix |
126 |
char *copy_name = NULL; |
127 |
if(name != NULL){ |
|
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
128 |
do { |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
129 |
copy_name = strdup(name); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
130 |
} while(copy_name == NULL and errno == EINTR); |
98
by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free |
131 |
if(copy_name == NULL){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
132 |
int e = errno; |
237.2.35
by Teddy Hogeborn
Fix problem found using cppcheck, thanks to George Danchev |
133 |
free(new_plugin); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
134 |
errno = e; |
98
by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free |
135 |
return NULL; |
136 |
} |
|
24.1.54
by Björn Påhlsson
plugin-runner |
137 |
} |
24.1.90
by Björn Påhlsson
fixed two bugs: |
138 |
|
237.2.56
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
139 |
*new_plugin = (plugin){ .name = copy_name, |
140 |
.argc = 1, |
|
141 |
.disabled = false, |
|
142 |
.next = plugin_list }; |
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
143 |
|
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
144 |
do { |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
145 |
new_plugin->argv = malloc(sizeof(char *) * 2); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
146 |
} while(new_plugin->argv == NULL and errno == EINTR); |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
147 |
if(new_plugin->argv == NULL){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
148 |
int e = errno; |
24.1.62
by Björn Påhlsson
merge + small bugfix |
149 |
free(copy_name); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
150 |
free(new_plugin); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
151 |
errno = e; |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
152 |
return NULL; |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
153 |
} |
24.1.54
by Björn Påhlsson
plugin-runner |
154 |
new_plugin->argv[0] = copy_name; |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
155 |
new_plugin->argv[1] = NULL; |
135
by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment |
156 |
|
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
157 |
do { |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
158 |
new_plugin->environ = malloc(sizeof(char *)); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
159 |
} while(new_plugin->environ == NULL and errno == EINTR); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
160 |
if(new_plugin->environ == NULL){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
161 |
int e = errno; |
24.1.62
by Björn Påhlsson
merge + small bugfix |
162 |
free(copy_name); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
163 |
free(new_plugin->argv); |
164 |
free(new_plugin); |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
165 |
errno = e; |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
166 |
return NULL; |
167 |
} |
|
168 |
new_plugin->environ[0] = NULL; |
|
135
by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment |
169 |
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
170 |
/* Append the new plugin to the list */ |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
171 |
plugin_list = new_plugin; |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
172 |
return new_plugin; |
173 |
}
|
|
174 |
||
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
175 |
/* Helper function for add_argument and add_environment */
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
176 |
__attribute__((nonnull, warn_unused_result)) |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
177 |
static bool add_to_char_array(const char *new, char ***array, |
178 |
int *len){ |
|
179 |
/* Resize the pointed-to array to hold one more pointer */ |
|
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
180 |
char **new_array = NULL; |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
181 |
do { |
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
182 |
new_array = realloc(*array, sizeof(char *) |
183 |
* (size_t) ((*len) + 2)); |
|
184 |
} while(new_array == NULL and errno == EINTR); |
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
185 |
/* Malloc check */ |
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
186 |
if(new_array == NULL){ |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
187 |
return false; |
188 |
} |
|
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
189 |
*array = new_array; |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
190 |
/* Make a copy of the new string */ |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
191 |
char *copy; |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
192 |
do { |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
193 |
copy = strdup(new); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
194 |
} while(copy == NULL and errno == EINTR); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
195 |
if(copy == NULL){ |
196 |
return false; |
|
197 |
} |
|
198 |
/* Insert the copy */ |
|
199 |
(*array)[*len] = copy; |
|
200 |
(*len)++; |
|
201 |
/* Add a new terminating NULL pointer to the last element */ |
|
202 |
(*array)[*len] = NULL; |
|
203 |
return true; |
|
204 |
}
|
|
205 |
||
206 |
/* Add to a plugin's argument vector */
|
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
207 |
__attribute__((nonnull(2), warn_unused_result)) |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
208 |
static bool add_argument(plugin *p, const char *arg){ |
209 |
if(p == NULL){ |
|
210 |
return false; |
|
211 |
} |
|
212 |
return add_to_char_array(arg, &(p->argv), &(p->argc)); |
|
213 |
}
|
|
214 |
||
215 |
/* Add to a plugin's environment */
|
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
216 |
__attribute__((nonnull(2), warn_unused_result)) |
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
217 |
static bool add_environment(plugin *p, const char *def, bool replace){ |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
218 |
if(p == NULL){ |
219 |
return false; |
|
220 |
} |
|
135
by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment |
221 |
/* namelen = length of name of environment variable */ |
222 |
size_t namelen = (size_t)(strchrnul(def, '=') - def); |
|
223 |
/* Search for this environment variable */ |
|
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
224 |
for(char **envdef = p->environ; *envdef != NULL; envdef++){ |
225 |
if(strncmp(*envdef, def, namelen + 1) == 0){ |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
226 |
/* It already exists */ |
227 |
if(replace){ |
|
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
228 |
char *new_envdef; |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
229 |
do { |
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
230 |
new_envdef = realloc(*envdef, strlen(def) + 1); |
231 |
} while(new_envdef == NULL and errno == EINTR); |
|
232 |
if(new_envdef == NULL){ |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
233 |
return false; |
234 |
} |
|
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
235 |
*envdef = new_envdef; |
236 |
strcpy(*envdef, def); |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
237 |
} |
135
by Teddy Hogeborn
* plugin-runner.c (add_environment): Never insert existing environment |
238 |
return true; |
239 |
} |
|
240 |
} |
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
241 |
return add_to_char_array(def, &(p->environ), &(p->envc)); |
242 |
}
|
|
243 |
||
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
244 |
#ifndef O_CLOEXEC
|
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
245 |
/*
|
246 |
* Based on the example in the GNU LibC manual chapter 13.13 "File
|
|
247 |
* Descriptor Flags".
|
|
237.2.122
by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file. |
248 |
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
|
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
249 |
*/
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
250 |
__attribute__((warn_unused_result)) |
187
by Teddy Hogeborn
* debian/mandos-client.README.Debian: Document "eth0" default and how |
251 |
static int set_cloexec_flag(int fd){ |
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
252 |
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0)); |
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
253 |
/* If reading the flags failed, return error indication now. */ |
254 |
if(ret < 0){ |
|
255 |
return ret; |
|
256 |
} |
|
257 |
/* Store modified flag word in the descriptor. */ |
|
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
258 |
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, |
259 |
ret | FD_CLOEXEC)); |
|
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
260 |
}
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
261 |
#endif /* not O_CLOEXEC */ |
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
262 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
263 |
|
102
by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile. |
264 |
/* Mark processes as completed when they exit, and save their exit
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
265 |
status. */
|
187
by Teddy Hogeborn
* debian/mandos-client.README.Debian: Document "eth0" default and how |
266 |
static void handle_sigchld(__attribute__((unused)) int sig){ |
237.2.61
by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Bug fix: Save and restore "errno". |
267 |
int old_errno = errno; |
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
268 |
while(true){ |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
269 |
plugin *proc = plugin_list; |
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
270 |
int status; |
271 |
pid_t pid = waitpid(-1, &status, WNOHANG); |
|
272 |
if(pid == 0){ |
|
102
by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile. |
273 |
/* Only still running child processes */ |
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
274 |
break; |
275 |
} |
|
276 |
if(pid == -1){ |
|
237.2.58
by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Clarify logic. |
277 |
if(errno == ECHILD){ |
278 |
/* No child processes */ |
|
279 |
break; |
|
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
280 |
} |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
281 |
error(0, errno, "waitpid"); |
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
282 |
} |
24.1.90
by Björn Påhlsson
fixed two bugs: |
283 |
|
102
by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile. |
284 |
/* A child exited, find it in process_list */ |
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
285 |
while(proc != NULL and proc->pid != pid){ |
286 |
proc = proc->next; |
|
287 |
} |
|
288 |
if(proc == NULL){ |
|
289 |
/* Process not found in process list */ |
|
290 |
continue; |
|
291 |
} |
|
292 |
proc->status = status; |
|
237.2.59
by Teddy Hogeborn
* plugin-runner.c (struct plugin.completed): Changed type to "volatile |
293 |
proc->completed = 1; |
24.1.65
by Björn Påhlsson
* plugin-runner.c (handle_sigchld): Loop until all exited children |
294 |
} |
237.2.61
by Teddy Hogeborn
* plugin-runner.c (handle_sigchld): Bug fix: Save and restore "errno". |
295 |
errno = old_errno; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
296 |
}
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
297 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
298 |
/* Prints out a password to stdout */
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
299 |
__attribute__((nonnull, warn_unused_result)) |
187
by Teddy Hogeborn
* debian/mandos-client.README.Debian: Document "eth0" default and how |
300 |
static bool print_out_password(const char *buffer, size_t length){ |
64
by Teddy Hogeborn
* mandos-client.c (print_out_password): Strip trailing '\n'. |
301 |
ssize_t ret; |
302 |
for(size_t written = 0; written < length; written += (size_t)ret){ |
|
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
303 |
ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written, |
304 |
length - written)); |
|
305 |
if(ret < 0){ |
|
306 |
return false; |
|
307 |
} |
|
308 |
} |
|
309 |
return true; |
|
310 |
}
|
|
311 |
||
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
312 |
/* Removes and free a plugin from the plugin list */
|
237.7.82
by teddy at bsnet
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute. |
313 |
__attribute__((nonnull)) |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
314 |
static void free_plugin(plugin *plugin_node){ |
315 |
|
|
316 |
for(char **arg = plugin_node->argv; *arg != NULL; arg++){ |
|
317 |
free(*arg); |
|
318 |
} |
|
319 |
free(plugin_node->argv); |
|
320 |
for(char **env = plugin_node->environ; *env != NULL; env++){ |
|
321 |
free(*env); |
|
322 |
} |
|
323 |
free(plugin_node->environ); |
|
324 |
free(plugin_node->buffer); |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
325 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
326 |
/* Removes the plugin from the singly-linked list */ |
327 |
if(plugin_node == plugin_list){ |
|
328 |
/* First one - simple */ |
|
329 |
plugin_list = plugin_list->next; |
|
330 |
} else { |
|
331 |
/* Second one or later */ |
|
332 |
for(plugin *p = plugin_list; p != NULL; p = p->next){ |
|
333 |
if(p->next == plugin_node){ |
|
334 |
p->next = plugin_node->next; |
|
335 |
break; |
|
336 |
} |
|
337 |
} |
|
338 |
} |
|
339 |
|
|
340 |
free(plugin_node); |
|
341 |
}
|
|
342 |
||
343 |
static void free_plugin_list(void){ |
|
344 |
while(plugin_list != NULL){ |
|
345 |
free_plugin(plugin_list); |
|
98
by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free |
346 |
} |
24.1.54
by Björn Påhlsson
plugin-runner |
347 |
}
|
348 |
||
13
by Björn Påhlsson
Added following support: |
349 |
int main(int argc, char *argv[]){ |
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
350 |
char *plugindir = NULL; |
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
351 |
char *pluginhelperdir = NULL; |
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
352 |
char *argfile = NULL; |
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
353 |
FILE *conffp; |
237.7.253
by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases. |
354 |
struct dirent **direntries = NULL; |
13
by Björn Påhlsson
Added following support: |
355 |
struct stat st; |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
356 |
fd_set rfds_all; |
237.2.74
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
357 |
int ret, maxfd = 0; |
237.2.17
by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop |
358 |
ssize_t sret; |
24.1.6
by Björn Påhlsson
plugbasedclient |
359 |
uid_t uid = 65534; |
360 |
gid_t gid = 65534; |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
361 |
bool debug = false; |
362 |
int exitstatus = EXIT_SUCCESS; |
|
24.1.7
by Björn Påhlsson
merge |
363 |
struct sigaction old_sigchld_action; |
364 |
struct sigaction sigchld_action = { .sa_handler = handle_sigchld, |
|
365 |
.sa_flags = SA_NOCLDSTOP }; |
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
366 |
char **custom_argv = NULL; |
367 |
int custom_argc = 0; |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
368 |
int dir_fd = -1; |
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
369 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
370 |
/* Establish a signal handler */ |
371 |
sigemptyset(&sigchld_action.sa_mask); |
|
372 |
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD); |
|
24.1.54
by Björn Påhlsson
plugin-runner |
373 |
if(ret == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
374 |
error(0, errno, "sigaddset"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
375 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
376 |
goto fallback; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
377 |
} |
378 |
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action); |
|
24.1.54
by Björn Påhlsson
plugin-runner |
379 |
if(ret == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
380 |
error(0, errno, "sigaction"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
381 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
382 |
goto fallback; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
383 |
} |
384 |
|
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
385 |
/* The options we understand. */ |
386 |
struct argp_option options[] = { |
|
387 |
{ .name = "global-options", .key = 'g', |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
388 |
.arg = "OPTION[,OPTION[,...]]", |
389 |
.doc = "Options passed to all plugins" }, |
|
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
390 |
{ .name = "global-env", .key = 'G', |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
391 |
.arg = "VAR=value", |
392 |
.doc = "Environment variable passed to all plugins" }, |
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
393 |
{ .name = "options-for", .key = 'o', |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
394 |
.arg = "PLUGIN:OPTION[,OPTION[,...]]", |
395 |
.doc = "Options passed only to specified plugin" }, |
|
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
396 |
{ .name = "env-for", .key = 'E', |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
397 |
.arg = "PLUGIN:ENV=value", |
398 |
.doc = "Environment variable passed to specified plugin" }, |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
399 |
{ .name = "disable", .key = 'd', |
400 |
.arg = "PLUGIN", |
|
401 |
.doc = "Disable a specific plugin", .group = 1 }, |
|
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
402 |
{ .name = "enable", .key = 'e', |
403 |
.arg = "PLUGIN", |
|
404 |
.doc = "Enable a specific plugin", .group = 1 }, |
|
24.1.5
by Björn Påhlsson
plugbasedclient: |
405 |
{ .name = "plugin-dir", .key = 128, |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
406 |
.arg = "DIRECTORY", |
407 |
.doc = "Specify a different plugin directory", .group = 2 }, |
|
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
408 |
{ .name = "config-file", .key = 129, |
409 |
.arg = "FILE", |
|
410 |
.doc = "Specify a different configuration file", .group = 2 }, |
|
411 |
{ .name = "userid", .key = 130, |
|
412 |
.arg = "ID", .flags = 0, |
|
413 |
.doc = "User ID the plugins will run as", .group = 3 }, |
|
414 |
{ .name = "groupid", .key = 131, |
|
415 |
.arg = "ID", .flags = 0, |
|
416 |
.doc = "Group ID the plugins will run as", .group = 3 }, |
|
417 |
{ .name = "debug", .key = 132, |
|
418 |
.doc = "Debug mode", .group = 4 }, |
|
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
419 |
{ .name = "plugin-helper-dir", .key = 133, |
420 |
.arg = "DIRECTORY", |
|
421 |
.doc = "Specify a different plugin helper directory", |
|
422 |
.group = 2 }, |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
423 |
/* |
424 |
* These reproduce what we would get without ARGP_NO_HELP
|
|
425 |
*/
|
|
426 |
{ .name = "help", .key = '?', |
|
427 |
.doc = "Give this help list", .group = -1 }, |
|
428 |
{ .name = "usage", .key = -3, |
|
429 |
.doc = "Give a short usage message", .group = -1 }, |
|
430 |
{ .name = "version", .key = 'V', |
|
431 |
.doc = "Print program version", .group = -1 }, |
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
432 |
{ .name = NULL } |
433 |
}; |
|
434 |
|
|
237.7.82
by teddy at bsnet
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute. |
435 |
__attribute__((nonnull(3))) |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
436 |
error_t parse_opt(int key, char *arg, struct argp_state *state){ |
437 |
errno = 0; |
|
237.2.56
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
438 |
switch(key){ |
237.2.123
by Teddy Hogeborn
* plugin-runner.c (main): Move variables "tmpmax" and "tmp" into |
439 |
char *tmp; |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
440 |
intmax_t tmp_id; |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
441 |
case 'g': /* --global-options */ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
442 |
{ |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
443 |
char *plugin_option; |
444 |
while((plugin_option = strsep(&arg, ",")) != NULL){ |
|
445 |
if(not add_argument(getplugin(NULL), plugin_option)){ |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
446 |
break; |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
447 |
} |
448 |
} |
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
449 |
errno = 0; |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
450 |
} |
451 |
break; |
|
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
452 |
case 'G': /* --global-env */ |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
453 |
if(add_environment(getplugin(NULL), arg, true)){ |
454 |
errno = 0; |
|
455 |
} |
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
456 |
break; |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
457 |
case 'o': /* --options-for */ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
458 |
{ |
459 |
char *option_list = strchr(arg, ':'); |
|
460 |
if(option_list == NULL){ |
|
461 |
argp_error(state, "No colon in \"%s\"", arg); |
|
462 |
errno = EINVAL; |
|
463 |
break; |
|
464 |
} |
|
465 |
*option_list = '\0'; |
|
466 |
option_list++; |
|
467 |
if(arg[0] == '\0'){ |
|
468 |
argp_error(state, "Empty plugin name"); |
|
469 |
errno = EINVAL; |
|
470 |
break; |
|
471 |
} |
|
472 |
char *option; |
|
473 |
while((option = strsep(&option_list, ",")) != NULL){ |
|
474 |
if(not add_argument(getplugin(arg), option)){ |
|
475 |
break; |
|
24.1.50
by Björn Påhlsson
changed from using strtok to strsep |
476 |
} |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
477 |
} |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
478 |
errno = 0; |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
479 |
} |
480 |
break; |
|
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
481 |
case 'E': /* --env-for */ |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
482 |
{ |
483 |
char *envdef = strchr(arg, ':'); |
|
484 |
if(envdef == NULL){ |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
485 |
argp_error(state, "No colon in \"%s\"", arg); |
486 |
errno = EINVAL; |
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
487 |
break; |
488 |
} |
|
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
489 |
*envdef = '\0'; |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
490 |
envdef++; |
491 |
if(arg[0] == '\0'){ |
|
492 |
argp_error(state, "Empty plugin name"); |
|
493 |
errno = EINVAL; |
|
494 |
break; |
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
495 |
} |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
496 |
if(add_environment(getplugin(arg), envdef, true)){ |
497 |
errno = 0; |
|
498 |
} |
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
499 |
} |
500 |
break; |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
501 |
case 'd': /* --disable */ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
502 |
{ |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
503 |
plugin *p = getplugin(arg); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
504 |
if(p != NULL){ |
505 |
p->disabled = true; |
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
506 |
errno = 0; |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
507 |
} |
24.1.5
by Björn Påhlsson
plugbasedclient: |
508 |
} |
509 |
break; |
|
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
510 |
case 'e': /* --enable */ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
511 |
{ |
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
512 |
plugin *p = getplugin(arg); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
513 |
if(p != NULL){ |
514 |
p->disabled = false; |
|
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
515 |
errno = 0; |
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
516 |
} |
517 |
} |
|
518 |
break; |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
519 |
case 128: /* --plugin-dir */ |
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
520 |
free(plugindir); |
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
521 |
plugindir = strdup(arg); |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
522 |
if(plugindir != NULL){ |
523 |
errno = 0; |
|
524 |
} |
|
24.1.5
by Björn Påhlsson
plugbasedclient: |
525 |
break; |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
526 |
case 129: /* --config-file */ |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
527 |
/* This is already done by parse_opt_config_file() */ |
528 |
break; |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
529 |
case 130: /* --userid */ |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
530 |
tmp_id = strtoimax(arg, &tmp, 10); |
237.2.74
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
531 |
if(errno != 0 or tmp == arg or *tmp != '\0' |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
532 |
or tmp_id != (uid_t)tmp_id){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
533 |
argp_error(state, "Bad user ID number: \"%s\", using %" |
534 |
PRIdMAX, arg, (intmax_t)uid); |
|
535 |
break; |
|
237.2.27
by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the |
536 |
} |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
537 |
uid = (uid_t)tmp_id; |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
538 |
errno = 0; |
24.1.6
by Björn Påhlsson
plugbasedclient |
539 |
break; |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
540 |
case 131: /* --groupid */ |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
541 |
tmp_id = strtoimax(arg, &tmp, 10); |
237.2.74
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
542 |
if(errno != 0 or tmp == arg or *tmp != '\0' |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
543 |
or tmp_id != (gid_t)tmp_id){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
544 |
argp_error(state, "Bad group ID number: \"%s\", using %" |
545 |
PRIdMAX, arg, (intmax_t)gid); |
|
546 |
break; |
|
237.2.27
by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the |
547 |
} |
237.7.84
by Björn Påhlsson
renamed some foomax values to what they actually represent |
548 |
gid = (gid_t)tmp_id; |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
549 |
errno = 0; |
24.1.6
by Björn Påhlsson
plugbasedclient |
550 |
break; |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
551 |
case 132: /* --debug */ |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
552 |
debug = true; |
553 |
break; |
|
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
554 |
case 133: /* --plugin-helper-dir */ |
555 |
free(pluginhelperdir); |
|
556 |
pluginhelperdir = strdup(arg); |
|
557 |
if(pluginhelperdir != NULL){ |
|
558 |
errno = 0; |
|
559 |
} |
|
560 |
break; |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
561 |
/* |
562 |
* These reproduce what we would get without ARGP_NO_HELP
|
|
563 |
*/
|
|
564 |
case '?': /* --help */ |
|
565 |
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */ |
|
566 |
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP); |
|
567 |
case -3: /* --usage */ |
|
568 |
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */ |
|
569 |
argp_state_help(state, state->out_stream, |
|
570 |
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK); |
|
571 |
case 'V': /* --version */ |
|
572 |
fprintf(state->out_stream, "%s\n", argp_program_version); |
|
573 |
exit(EXIT_SUCCESS); |
|
574 |
break; |
|
237.2.27
by Teddy Hogeborn
* plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the |
575 |
/*
|
576 |
* When adding more options before this line, remember to also add a
|
|
577 |
* "case" to the "parse_opt_config_file" function below.
|
|
578 |
*/
|
|
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
579 |
case ARGP_KEY_ARG: |
178
by Teddy Hogeborn
* initramfs-tools-script: Fix permissions of "/tmp" in initrd. |
580 |
/* Cryptsetup always passes an argument, which is an empty |
581 |
string if "none" was specified in /etc/crypttab. So if
|
|
582 |
argument was empty, we ignore it silently. */
|
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
583 |
if(arg[0] == '\0'){ |
584 |
break; |
|
178
by Teddy Hogeborn
* initramfs-tools-script: Fix permissions of "/tmp" in initrd. |
585 |
} |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
586 |
default: |
587 |
return ARGP_ERR_UNKNOWN; |
|
588 |
} |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
589 |
return errno; /* Set to 0 at start */ |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
590 |
} |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
591 |
|
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
592 |
/* This option parser is the same as parse_opt() above, except it |
593 |
ignores everything but the --config-file option. */
|
|
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
594 |
error_t parse_opt_config_file(int key, char *arg, |
595 |
__attribute__((unused)) |
|
237.2.56
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
596 |
struct argp_state *state){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
597 |
errno = 0; |
237.2.56
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
598 |
switch(key){ |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
599 |
case 'g': /* --global-options */ |
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
600 |
case 'G': /* --global-env */ |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
601 |
case 'o': /* --options-for */ |
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
602 |
case 'E': /* --env-for */ |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
603 |
case 'd': /* --disable */ |
138
by Teddy Hogeborn
* plugin-runner.c: Changed short option for "--global-env" to "-G", |
604 |
case 'e': /* --enable */ |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
605 |
case 128: /* --plugin-dir */ |
606 |
break; |
|
607 |
case 129: /* --config-file */ |
|
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
608 |
free(argfile); |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
609 |
argfile = strdup(arg); |
237.7.220
by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7. |
610 |
if(argfile != NULL){ |
611 |
errno = 0; |
|
612 |
} |
|
237.2.118
by Teddy Hogeborn
* mandos: White-space fixes only. |
613 |
break; |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
614 |
case 130: /* --userid */ |
615 |
case 131: /* --groupid */ |
|
616 |
case 132: /* --debug */ |
|
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
617 |
case 133: /* --plugin-helper-dir */ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
618 |
case '?': /* --help */ |
619 |
case -3: /* --usage */ |
|
620 |
case 'V': /* --version */ |
|
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
621 |
case ARGP_KEY_ARG: |
622 |
break; |
|
623 |
default: |
|
624 |
return ARGP_ERR_UNKNOWN; |
|
625 |
} |
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
626 |
return errno; |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
627 |
} |
628 |
|
|
629 |
struct argp argp = { .options = options, |
|
630 |
.parser = parse_opt_config_file, |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
631 |
.args_doc = "", |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
632 |
.doc = "Mandos plugin runner -- Run plugins" }; |
633 |
|
|
237.2.28
by Teddy Hogeborn
* plugin-runner.c (main): Bug fix; do not accept a "d" character after |
634 |
/* Parse using parse_opt_config_file() in order to get the custom |
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
635 |
config file location, if any. */
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
636 |
ret = argp_parse(&argp, argc, argv, |
637 |
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP, |
|
638 |
NULL, NULL); |
|
639 |
switch(ret){ |
|
640 |
case 0: |
|
641 |
break; |
|
642 |
case ENOMEM: |
|
643 |
default: |
|
644 |
errno = ret; |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
645 |
error(0, errno, "argp_parse"); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
646 |
exitstatus = EX_OSERR; |
647 |
goto fallback; |
|
648 |
case EINVAL: |
|
649 |
exitstatus = EX_USAGE; |
|
137
by Teddy Hogeborn
* plugin-runner.c (main/parse_opt): Removed code for "--config-file". |
650 |
goto fallback; |
651 |
} |
|
652 |
|
|
653 |
/* Reset to the normal argument parser */ |
|
654 |
argp.parser = parse_opt; |
|
655 |
|
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
656 |
/* Open the configfile if available */ |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
657 |
if(argfile == NULL){ |
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
658 |
conffp = fopen(AFILE, "r"); |
659 |
} else { |
|
660 |
conffp = fopen(argfile, "r"); |
|
237.2.118
by Teddy Hogeborn
* mandos: White-space fixes only. |
661 |
} |
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
662 |
if(conffp != NULL){ |
663 |
char *org_line = NULL; |
|
24.1.54
by Björn Påhlsson
plugin-runner |
664 |
char *p, *arg, *new_arg, *line; |
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
665 |
size_t size = 0; |
666 |
const char whitespace_delims[] = " \r\t\f\v\n"; |
|
667 |
const char comment_delim[] = "#"; |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
668 |
|
24.1.67
by Björn Påhlsson
transformed a function to a part of main |
669 |
custom_argc = 1; |
670 |
custom_argv = malloc(sizeof(char*) * 2); |
|
671 |
if(custom_argv == NULL){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
672 |
error(0, errno, "malloc"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
673 |
exitstatus = EX_OSERR; |
24.1.67
by Björn Påhlsson
transformed a function to a part of main |
674 |
goto fallback; |
675 |
} |
|
676 |
custom_argv[0] = argv[0]; |
|
677 |
custom_argv[1] = NULL; |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
678 |
|
133
by Teddy Hogeborn
* plugin-runner.c: Break a couple of long lines. |
679 |
/* for each line in the config file, strip whitespace and ignore |
680 |
commented text */
|
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
681 |
while(true){ |
682 |
sret = getline(&org_line, &size, conffp); |
|
683 |
if(sret == -1){ |
|
684 |
break; |
|
685 |
} |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
686 |
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
687 |
line = org_line; |
688 |
arg = strsep(&line, comment_delim); |
|
689 |
while((p = strsep(&arg, whitespace_delims)) != NULL){ |
|
690 |
if(p[0] == '\0'){ |
|
691 |
continue; |
|
692 |
} |
|
693 |
new_arg = strdup(p); |
|
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
694 |
if(new_arg == NULL){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
695 |
error(0, errno, "strdup"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
696 |
exitstatus = EX_OSERR; |
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
697 |
free(org_line); |
698 |
goto fallback; |
|
699 |
} |
|
700 |
|
|
24.1.67
by Björn Påhlsson
transformed a function to a part of main |
701 |
custom_argc += 1; |
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
702 |
{ |
703 |
char **new_argv = realloc(custom_argv, sizeof(char *) |
|
704 |
* ((unsigned int) |
|
705 |
custom_argc + 1)); |
|
706 |
if(new_argv == NULL){ |
|
707 |
error(0, errno, "realloc"); |
|
708 |
exitstatus = EX_OSERR; |
|
709 |
free(new_arg); |
|
710 |
free(org_line); |
|
711 |
goto fallback; |
|
712 |
} else { |
|
713 |
custom_argv = new_argv; |
|
714 |
} |
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
715 |
} |
24.1.67
by Björn Påhlsson
transformed a function to a part of main |
716 |
custom_argv[custom_argc-1] = new_arg; |
237.2.118
by Teddy Hogeborn
* mandos: White-space fixes only. |
717 |
custom_argv[custom_argc] = NULL; |
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
718 |
} |
719 |
} |
|
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
720 |
do { |
237.2.122
by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file. |
721 |
ret = fclose(conffp); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
722 |
} while(ret == EOF and errno == EINTR); |
237.2.122
by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file. |
723 |
if(ret == EOF){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
724 |
error(0, errno, "fclose"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
725 |
exitstatus = EX_IOERR; |
237.2.122
by Teddy Hogeborn
* plugins-runner.c (main): Bug fix: Close config file. |
726 |
goto fallback; |
727 |
} |
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
728 |
free(org_line); |
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
729 |
} else { |
24.1.52
by Björn Påhlsson
merge + minor adjustments |
730 |
/* Check for harmful errors and go to fallback. Other errors might |
731 |
not affect opening plugins */
|
|
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
732 |
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
733 |
error(0, errno, "fopen"); |
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
734 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
735 |
goto fallback; |
24.1.8
by Björn Påhlsson
plugbasedclient |
736 |
} |
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
737 |
} |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
738 |
/* If there were any arguments from the configuration file, pass |
739 |
them to parser as command line arguments */
|
|
24.1.51
by Björn Påhlsson
Added configuration files support for mandos-client |
740 |
if(custom_argv != NULL){ |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
741 |
ret = argp_parse(&argp, custom_argc, custom_argv, |
742 |
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP, |
|
743 |
NULL, NULL); |
|
744 |
switch(ret){ |
|
745 |
case 0: |
|
746 |
break; |
|
747 |
case ENOMEM: |
|
748 |
default: |
|
749 |
errno = ret; |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
750 |
error(0, errno, "argp_parse"); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
751 |
exitstatus = EX_OSERR; |
752 |
goto fallback; |
|
753 |
case EINVAL: |
|
754 |
exitstatus = EX_CONFIG; |
|
24.1.54
by Björn Påhlsson
plugin-runner |
755 |
goto fallback; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
756 |
} |
24.1.8
by Björn Påhlsson
plugbasedclient |
757 |
} |
758 |
|
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
759 |
/* Parse actual command line arguments, to let them override the |
760 |
config file */
|
|
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
761 |
ret = argp_parse(&argp, argc, argv, |
762 |
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP, |
|
763 |
NULL, NULL); |
|
764 |
switch(ret){ |
|
765 |
case 0: |
|
766 |
break; |
|
767 |
case ENOMEM: |
|
768 |
default: |
|
769 |
errno = ret; |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
770 |
error(0, errno, "argp_parse"); |
237.2.157
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
771 |
exitstatus = EX_OSERR; |
772 |
goto fallback; |
|
773 |
case EINVAL: |
|
774 |
exitstatus = EX_USAGE; |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
775 |
goto fallback; |
776 |
} |
|
777 |
|
|
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
778 |
{ |
779 |
char *pluginhelperenv; |
|
780 |
bool bret = true; |
|
781 |
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s", |
|
782 |
pluginhelperdir != NULL ? pluginhelperdir : PHDIR); |
|
783 |
if(ret != -1){ |
|
784 |
bret = add_environment(getplugin(NULL), pluginhelperenv, true); |
|
785 |
} |
|
786 |
if(ret == -1 or not bret){ |
|
787 |
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR" |
|
788 |
" environment variable to \"%s\" for all plugins\n", |
|
789 |
pluginhelperdir != NULL ? pluginhelperdir : PHDIR); |
|
790 |
} |
|
791 |
if(ret != -1){ |
|
792 |
free(pluginhelperenv); |
|
793 |
} |
|
794 |
} |
|
795 |
|
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
796 |
if(debug){ |
797 |
for(plugin *p = plugin_list; p != NULL; p=p->next){ |
|
798 |
fprintf(stderr, "Plugin: %s has %d arguments\n", |
|
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
799 |
p->name ? p->name : "Global", p->argc - 1); |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
800 |
for(char **a = p->argv; *a != NULL; a++){ |
801 |
fprintf(stderr, "\tArg: %s\n", *a); |
|
802 |
} |
|
237.2.31
by Teddy Hogeborn
Fixes for sscanf usage: |
803 |
fprintf(stderr, "...and %d environment variables\n", p->envc); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
804 |
for(char **a = p->environ; *a != NULL; a++){ |
805 |
fprintf(stderr, "\t%s\n", *a); |
|
806 |
} |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
807 |
} |
808 |
} |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
809 |
|
237.16.11
by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option. |
810 |
if(getuid() == 0){ |
237.7.35
by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed |
811 |
/* Work around Debian bug #633582: |
812 |
<http://bugs.debian.org/633582> */
|
|
813 |
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY); |
|
814 |
if(plugindir_fd == -1){ |
|
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
815 |
if(errno != ENOENT){ |
816 |
error(0, errno, "open(\"" PDIR "\")"); |
|
817 |
} |
|
237.7.35
by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed |
818 |
} else { |
819 |
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st)); |
|
820 |
if(ret == -1){ |
|
821 |
error(0, errno, "fstat"); |
|
822 |
} else { |
|
823 |
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){ |
|
824 |
ret = fchown(plugindir_fd, uid, gid); |
|
825 |
if(ret == -1){ |
|
826 |
error(0, errno, "fchown"); |
|
827 |
} |
|
828 |
} |
|
829 |
} |
|
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
830 |
close(plugindir_fd); |
237.7.35
by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed |
831 |
} |
832 |
} |
|
833 |
|
|
834 |
/* Lower permissions */ |
|
237.7.168
by Teddy Hogeborn
* plugin-runner.c (main): Bug fix; do not ignore return value of |
835 |
ret = setgid(gid); |
237.2.62
by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: Do setgid before setuid. |
836 |
if(ret == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
837 |
error(0, errno, "setgid"); |
237.2.62
by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: Do setgid before setuid. |
838 |
} |
24.1.6
by Björn Påhlsson
plugbasedclient |
839 |
ret = setuid(uid); |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
840 |
if(ret == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
841 |
error(0, errno, "setuid"); |
24.1.6
by Björn Påhlsson
plugbasedclient |
842 |
} |
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
843 |
|
237.2.147
by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when |
844 |
/* Open plugin directory with close_on_exec flag */ |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
845 |
{ |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
846 |
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY | |
847 |
#ifdef O_CLOEXEC
|
|
848 |
O_CLOEXEC |
|
849 |
#else /* not O_CLOEXEC */ |
|
850 |
0 |
|
851 |
#endif /* not O_CLOEXEC */ |
|
852 |
); |
|
237.2.147
by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when |
853 |
if(dir_fd == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
854 |
error(0, errno, "Could not open plugin dir"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
855 |
exitstatus = EX_UNAVAILABLE; |
237.2.147
by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when |
856 |
goto fallback; |
857 |
} |
|
858 |
|
|
859 |
#ifndef O_CLOEXEC
|
|
860 |
/* Set the FD_CLOEXEC flag on the directory */ |
|
861 |
ret = set_cloexec_flag(dir_fd); |
|
862 |
if(ret < 0){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
863 |
error(0, errno, "set_cloexec_flag"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
864 |
exitstatus = EX_OSERR; |
237.2.147
by Teddy Hogeborn
* plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when |
865 |
goto fallback; |
866 |
} |
|
867 |
#endif /* O_CLOEXEC */ |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
868 |
} |
869 |
|
|
870 |
int good_name(const struct dirent * const dirent){ |
|
871 |
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new", |
|
872 |
"*.dpkg-old", "*.dpkg-bak", |
|
873 |
"*.dpkg-divert", NULL }; |
|
874 |
#ifdef __GNUC__
|
|
875 |
#pragma GCC diagnostic push
|
|
876 |
#pragma GCC diagnostic ignored "-Wcast-qual"
|
|
877 |
#endif
|
|
878 |
for(const char **pat = (const char **)patterns; |
|
879 |
*pat != NULL; pat++){ |
|
880 |
#ifdef __GNUC__
|
|
881 |
#pragma GCC diagnostic pop
|
|
882 |
#endif
|
|
883 |
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD) |
|
884 |
!= FNM_NOMATCH){ |
|
885 |
if(debug){ |
|
886 |
fprintf(stderr, "Ignoring plugin dir entry \"%s\"" |
|
887 |
" matching pattern %s\n", dirent->d_name, *pat); |
|
888 |
} |
|
889 |
return 0; |
|
890 |
} |
|
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
891 |
} |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
892 |
return 1; |
893 |
} |
|
894 |
|
|
895 |
#ifdef __GLIBC__
|
|
896 |
#if __GLIBC_PREREQ(2, 15)
|
|
897 |
int numplugins = scandirat(dir_fd, ".", &direntries, good_name, |
|
898 |
alphasort); |
|
899 |
#else /* not __GLIBC_PREREQ(2, 15) */ |
|
900 |
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR, |
|
901 |
&direntries, good_name, alphasort); |
|
902 |
#endif /* not __GLIBC_PREREQ(2, 15) */ |
|
903 |
#else /* not __GLIBC__ */ |
|
904 |
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR, |
|
905 |
&direntries, good_name, alphasort); |
|
906 |
#endif /* not __GLIBC__ */ |
|
907 |
if(numplugins == -1){ |
|
908 |
error(0, errno, "Could not scan plugin dir"); |
|
237.7.253
by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases. |
909 |
direntries = NULL; |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
910 |
exitstatus = EX_OSERR; |
911 |
goto fallback; |
|
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
912 |
} |
24.1.1
by Björn Påhlsson
Added syntax and support for plugbasedclient arguments and how they |
913 |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
914 |
FD_ZERO(&rfds_all); |
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
915 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
916 |
/* Read and execute any executable in the plugin directory*/ |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
917 |
for(int i = 0; i < numplugins; i++){ |
918 |
|
|
919 |
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY); |
|
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
920 |
if(plugin_fd == -1){ |
921 |
error(0, errno, "Could not open plugin"); |
|
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
922 |
free(direntries[i]); |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
923 |
continue; |
169
by Teddy Hogeborn
* plugin-runner.c (main): Bug fix: use built-in default value if |
924 |
} |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
925 |
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st)); |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
926 |
if(ret == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
927 |
error(0, errno, "stat"); |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
928 |
close(plugin_fd); |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
929 |
free(direntries[i]); |
24.1.46
by Björn Påhlsson
mandos-client |
930 |
continue; |
24.1.26
by Björn Påhlsson
tally count of used symbols |
931 |
} |
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
932 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
933 |
/* Ignore non-executable files */ |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
934 |
if(not S_ISREG(st.st_mode) |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
935 |
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name, |
936 |
X_OK, 0)) != 0)){ |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
937 |
if(debug){ |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
938 |
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\"" |
939 |
" with bad type or mode\n", |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
940 |
plugindir != NULL ? plugindir : PDIR, |
941 |
direntries[i]->d_name); |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
942 |
} |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
943 |
close(plugin_fd); |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
944 |
free(direntries[i]); |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
945 |
continue; |
946 |
} |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
947 |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
948 |
plugin *p = getplugin(direntries[i]->d_name); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
949 |
if(p == NULL){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
950 |
error(0, errno, "getplugin"); |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
951 |
close(plugin_fd); |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
952 |
free(direntries[i]); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
953 |
continue; |
954 |
} |
|
955 |
if(p->disabled){ |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
956 |
if(debug){ |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
957 |
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n", |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
958 |
direntries[i]->d_name); |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
959 |
} |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
960 |
close(plugin_fd); |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
961 |
free(direntries[i]); |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
962 |
continue; |
963 |
} |
|
32
by Teddy Hogeborn
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function. |
964 |
{ |
965 |
/* Add global arguments to argument list for this plugin */ |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
966 |
plugin *g = getplugin(NULL); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
967 |
if(g != NULL){ |
968 |
for(char **a = g->argv + 1; *a != NULL; a++){ |
|
969 |
if(not add_argument(p, *a)){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
970 |
error(0, errno, "add_argument"); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
971 |
} |
972 |
} |
|
973 |
/* Add global environment variables */ |
|
974 |
for(char **e = g->environ; *e != NULL; e++){ |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
975 |
if(not add_environment(p, *e, false)){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
976 |
error(0, errno, "add_environment"); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
977 |
} |
978 |
} |
|
979 |
} |
|
980 |
} |
|
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
981 |
/* If this plugin has any environment variables, we need to |
982 |
duplicate the environment from this process, too. */
|
|
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
983 |
if(p->environ[0] != NULL){ |
984 |
for(char **e = environ; *e != NULL; e++){ |
|
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
985 |
if(not add_environment(p, *e, false)){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
986 |
error(0, errno, "add_environment"); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
987 |
} |
988 |
} |
|
989 |
} |
|
990 |
|
|
98
by Teddy Hogeborn
* plugin-runner.c (getplugin): Only copy "name" if not NULL. Free |
991 |
int pipefd[2]; |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
992 |
#ifndef O_CLOEXEC
|
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
993 |
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd)); |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
994 |
#else /* O_CLOEXEC */ |
995 |
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC)); |
|
996 |
#endif /* O_CLOEXEC */ |
|
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
997 |
if(ret == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
998 |
error(0, errno, "pipe"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
999 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1000 |
free(direntries[i]); |
24.1.54
by Björn Påhlsson
plugin-runner |
1001 |
goto fallback; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1002 |
} |
237.7.250
by Teddy Hogeborn
In plugin-runner, protect against a larger FD_SETSIZE than fd_set. |
1003 |
if(pipefd[0] >= FD_SETSIZE){ |
1004 |
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0], |
|
1005 |
FD_SETSIZE); |
|
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1006 |
close(pipefd[0]); |
1007 |
close(pipefd[1]); |
|
237.7.250
by Teddy Hogeborn
In plugin-runner, protect against a larger FD_SETSIZE than fd_set. |
1008 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1009 |
free(direntries[i]); |
237.7.250
by Teddy Hogeborn
In plugin-runner, protect against a larger FD_SETSIZE than fd_set. |
1010 |
goto fallback; |
1011 |
} |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
1012 |
#ifndef O_CLOEXEC
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1013 |
/* Ask OS to automatic close the pipe on exec */ |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1014 |
ret = set_cloexec_flag(pipefd[0]); |
1015 |
if(ret < 0){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1016 |
error(0, errno, "set_cloexec_flag"); |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1017 |
close(pipefd[0]); |
1018 |
close(pipefd[1]); |
|
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1019 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1020 |
free(direntries[i]); |
24.1.54
by Björn Påhlsson
plugin-runner |
1021 |
goto fallback; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1022 |
} |
1023 |
ret = set_cloexec_flag(pipefd[1]); |
|
1024 |
if(ret < 0){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1025 |
error(0, errno, "set_cloexec_flag"); |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1026 |
close(pipefd[0]); |
1027 |
close(pipefd[1]); |
|
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1028 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1029 |
free(direntries[i]); |
24.1.54
by Björn Påhlsson
plugin-runner |
1030 |
goto fallback; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1031 |
} |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
1032 |
#endif /* not O_CLOEXEC */ |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1033 |
/* Block SIGCHLD until process is safely in process list */ |
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
1034 |
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK, |
1035 |
&sigchld_action.sa_mask, |
|
1036 |
NULL)); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1037 |
if(ret < 0){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1038 |
error(0, errno, "sigprocmask"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1039 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1040 |
free(direntries[i]); |
24.1.54
by Björn Påhlsson
plugin-runner |
1041 |
goto fallback; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1042 |
} |
136
by Teddy Hogeborn
* plugin-runner.c (add_environment): Override existing environment |
1043 |
/* Starting a new process to be watched */ |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
1044 |
pid_t pid; |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
1045 |
do { |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
1046 |
pid = fork(); |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
1047 |
} while(pid == -1 and errno == EINTR); |
24.1.46
by Björn Påhlsson
mandos-client |
1048 |
if(pid == -1){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1049 |
error(0, errno, "fork"); |
237.7.249
by Teddy Hogeborn
plugin-runner: Restore resources correctly if fork() fails. |
1050 |
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK, |
1051 |
&sigchld_action.sa_mask, NULL)); |
|
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1052 |
close(pipefd[0]); |
1053 |
close(pipefd[1]); |
|
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1054 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1055 |
free(direntries[i]); |
24.1.54
by Björn Påhlsson
plugin-runner |
1056 |
goto fallback; |
24.1.46
by Björn Påhlsson
mandos-client |
1057 |
} |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
1058 |
if(pid == 0){ |
1059 |
/* this is the child process */ |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1060 |
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL); |
1061 |
if(ret < 0){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1062 |
error(0, errno, "sigaction"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1063 |
_exit(EX_OSERR); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1064 |
} |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1065 |
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1066 |
if(ret < 0){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1067 |
error(0, errno, "sigprocmask"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1068 |
_exit(EX_OSERR); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1069 |
} |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1070 |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
1071 |
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */ |
1072 |
if(ret == -1){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1073 |
error(0, errno, "dup2"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1074 |
_exit(EX_OSERR); |
24.1.26
by Björn Påhlsson
tally count of used symbols |
1075 |
} |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1076 |
|
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
1077 |
if(fexecve(plugin_fd, p->argv, |
237.7.222
by Teddy Hogeborn
Improve error message when working around Debian bug #633582. |
1078 |
(p->environ[0] != NULL) ? p->environ : environ) < 0){ |
237.7.223
by Teddy Hogeborn
Use openat() etc. in plugin-runner. Also one less useless warning. |
1079 |
error(0, errno, "fexecve for %s/%s", |
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
1080 |
plugindir != NULL ? plugindir : PDIR, |
1081 |
direntries[i]->d_name); |
|
237.7.222
by Teddy Hogeborn
Improve error message when working around Debian bug #633582. |
1082 |
_exit(EX_OSERR); |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
1083 |
} |
1084 |
/* no return */ |
|
1085 |
} |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1086 |
/* Parent process */ |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1087 |
close(pipefd[1]); /* Close unused write end of pipe */ |
1088 |
close(plugin_fd); |
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
1089 |
plugin *new_plugin = getplugin(direntries[i]->d_name); |
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
1090 |
if(new_plugin == NULL){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1091 |
error(0, errno, "getplugin"); |
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
1092 |
ret = (int)(TEMP_FAILURE_RETRY |
1093 |
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, |
|
1094 |
NULL))); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1095 |
if(ret < 0){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1096 |
error(0, errno, "sigprocmask"); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1097 |
} |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1098 |
exitstatus = EX_OSERR; |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1099 |
free(direntries[i]); |
24.1.54
by Björn Påhlsson
plugin-runner |
1100 |
goto fallback; |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
1101 |
} |
237.7.264
by Teddy Hogeborn
plugin-runner: Bug Fix: Fix some memory leaks. |
1102 |
free(direntries[i]); |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
1103 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1104 |
new_plugin->pid = pid; |
1105 |
new_plugin->fd = pipefd[0]; |
|
1106 |
|
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1107 |
/* Unblock SIGCHLD so signal handler can be run if this process |
1108 |
has already completed */
|
|
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
1109 |
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK, |
1110 |
&sigchld_action.sa_mask, |
|
1111 |
NULL)); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1112 |
if(ret < 0){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1113 |
error(0, errno, "sigprocmask"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1114 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
1115 |
goto fallback; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1116 |
} |
1117 |
|
|
237.7.194
by Teddy Hogeborn
Suppress spurious warnings when needed. |
1118 |
#if defined (__GNUC__) and defined (__GLIBC__)
|
1119 |
#if not __GLIBC_PREREQ(2, 16)
|
|
1120 |
#pragma GCC diagnostic push
|
|
1121 |
#pragma GCC diagnostic ignored "-Wsign-conversion"
|
|
1122 |
#endif
|
|
1123 |
#endif
|
|
237.2.141
by Teddy Hogeborn
* mandos (MandosServer): Fixed doc string. |
1124 |
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from |
237.7.194
by Teddy Hogeborn
Suppress spurious warnings when needed. |
1125 |
-Wconversion in GNU libc
|
1126 |
before 2.16 */
|
|
1127 |
#if defined (__GNUC__) and defined (__GLIBC__)
|
|
1128 |
#if not __GLIBC_PREREQ(2, 16)
|
|
1129 |
#pragma GCC diagnostic pop
|
|
1130 |
#endif
|
|
1131 |
#endif
|
|
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1132 |
|
237.2.29
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
1133 |
if(maxfd < new_plugin->fd){ |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1134 |
maxfd = new_plugin->fd; |
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
1135 |
} |
13
by Björn Påhlsson
Added following support: |
1136 |
} |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1137 |
|
237.7.253
by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases. |
1138 |
free(direntries); |
1139 |
direntries = NULL; |
|
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1140 |
close(dir_fd); |
237.7.253
by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases. |
1141 |
dir_fd = -1; |
24.1.132
by Björn Påhlsson
Fixed a bug in fallback handling |
1142 |
free_plugin(getplugin(NULL)); |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1143 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1144 |
for(plugin *p = plugin_list; p != NULL; p = p->next){ |
1145 |
if(p->pid != 0){ |
|
1146 |
break; |
|
1147 |
} |
|
1148 |
if(p->next == NULL){ |
|
1149 |
fprintf(stderr, "No plugin processes started. Incorrect plugin" |
|
1150 |
" directory?\n"); |
|
1151 |
free_plugin_list(); |
|
1152 |
} |
|
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1153 |
} |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1154 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1155 |
/* Main loop while running plugins exist */ |
1156 |
while(plugin_list){ |
|
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1157 |
fd_set rfds = rfds_all; |
1158 |
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL); |
|
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
1159 |
if(select_ret == -1 and errno != EINTR){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1160 |
error(0, errno, "select"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1161 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
1162 |
goto fallback; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1163 |
} |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1164 |
/* OK, now either a process completed, or something can be read |
1165 |
from one of them */
|
|
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
1166 |
for(plugin *proc = plugin_list; proc != NULL;){ |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1167 |
/* Is this process completely done? */ |
237.2.60
by Teddy Hogeborn
* plugin-runner.c (struct plugin.status): Changed type to "int". |
1168 |
if(proc->completed and proc->eof){ |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1169 |
/* Only accept the plugin output if it exited cleanly */ |
1170 |
if(not WIFEXITED(proc->status) |
|
1171 |
or WEXITSTATUS(proc->status) != 0){ |
|
1172 |
/* Bad exit by plugin */ |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1173 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1174 |
if(debug){ |
1175 |
if(WIFEXITED(proc->status)){ |
|
237.2.64
by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins. |
1176 |
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with" |
1177 |
" status %d\n", proc->name, |
|
1178 |
(intmax_t) (proc->pid), |
|
60
by Teddy Hogeborn
* mandos-client.c (main): Cast pid_t to unsigned int before printing. |
1179 |
WEXITSTATUS(proc->status)); |
237.2.56
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1180 |
} else if(WIFSIGNALED(proc->status)){ |
237.2.64
by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins. |
1181 |
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by" |
237.2.119
by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show |
1182 |
" signal %d: %s\n", proc->name, |
237.2.64
by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins. |
1183 |
(intmax_t) (proc->pid), |
237.2.119
by Teddy Hogeborn
* plugin-runner.c (main): When a plugin is killed by a signal, show |
1184 |
WTERMSIG(proc->status), |
1185 |
strsignal(WTERMSIG(proc->status))); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1186 |
} else if(WCOREDUMP(proc->status)){ |
237.2.64
by Teddy Hogeborn
* plugin-runner.c (main): If debugging, print name of failed plugins. |
1187 |
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped" |
1188 |
" core\n", proc->name, (intmax_t) (proc->pid)); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1189 |
} |
1190 |
} |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1191 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1192 |
/* Remove the plugin */ |
237.7.194
by Teddy Hogeborn
Suppress spurious warnings when needed. |
1193 |
#if defined (__GNUC__) and defined (__GLIBC__)
|
1194 |
#if not __GLIBC_PREREQ(2, 16)
|
|
1195 |
#pragma GCC diagnostic push
|
|
1196 |
#pragma GCC diagnostic ignored "-Wsign-conversion"
|
|
1197 |
#endif
|
|
1198 |
#endif
|
|
237.2.141
by Teddy Hogeborn
* mandos (MandosServer): Fixed doc string. |
1199 |
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from |
237.7.194
by Teddy Hogeborn
Suppress spurious warnings when needed. |
1200 |
-Wconversion in GNU libc
|
1201 |
before 2.16 */
|
|
1202 |
#if defined (__GNUC__) and defined (__GLIBC__)
|
|
1203 |
#if not __GLIBC_PREREQ(2, 16)
|
|
1204 |
#pragma GCC diagnostic pop
|
|
1205 |
#endif
|
|
1206 |
#endif
|
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1207 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1208 |
/* Block signal while modifying process_list */ |
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
1209 |
ret = (int)TEMP_FAILURE_RETRY(sigprocmask |
1210 |
(SIG_BLOCK, |
|
1211 |
&sigchld_action.sa_mask, |
|
1212 |
NULL)); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1213 |
if(ret < 0){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1214 |
error(0, errno, "sigprocmask"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1215 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
1216 |
goto fallback; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1217 |
} |
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
1218 |
|
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1219 |
plugin *next_plugin = proc->next; |
1220 |
free_plugin(proc); |
|
1221 |
proc = next_plugin; |
|
1222 |
|
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1223 |
/* We are done modifying process list, so unblock signal */ |
237.2.130
by Teddy Hogeborn
* init.d-mandos: Bug fix: Correct the LSB header. |
1224 |
ret = (int)(TEMP_FAILURE_RETRY |
1225 |
(sigprocmask(SIG_UNBLOCK, |
|
1226 |
&sigchld_action.sa_mask, NULL))); |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1227 |
if(ret < 0){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1228 |
error(0, errno, "sigprocmask"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1229 |
exitstatus = EX_OSERR; |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1230 |
goto fallback; |
1231 |
} |
|
1232 |
|
|
1233 |
if(plugin_list == NULL){ |
|
1234 |
break; |
|
1235 |
} |
|
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
1236 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1237 |
continue; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1238 |
} |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1239 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1240 |
/* This process exited nicely, so print its buffer */ |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1241 |
|
102
by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile. |
1242 |
bool bret = print_out_password(proc->buffer, |
1243 |
proc->buffer_length); |
|
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
1244 |
if(not bret){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1245 |
error(0, errno, "print_out_password"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1246 |
exitstatus = EX_IOERR; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1247 |
} |
24.1.54
by Björn Påhlsson
plugin-runner |
1248 |
goto fallback; |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1249 |
} |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1250 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1251 |
/* This process has not completed. Does it have any output? */ |
237.7.194
by Teddy Hogeborn
Suppress spurious warnings when needed. |
1252 |
#if defined (__GNUC__) and defined (__GLIBC__)
|
1253 |
#if not __GLIBC_PREREQ(2, 16)
|
|
1254 |
#pragma GCC diagnostic push
|
|
1255 |
#pragma GCC diagnostic ignored "-Wsign-conversion"
|
|
1256 |
#endif
|
|
1257 |
#endif
|
|
237.2.141
by Teddy Hogeborn
* mandos (MandosServer): Fixed doc string. |
1258 |
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious |
1259 |
warning from
|
|
237.7.194
by Teddy Hogeborn
Suppress spurious warnings when needed. |
1260 |
-Wconversion
|
1261 |
in GNU libc
|
|
1262 |
before
|
|
1263 |
2.16 */
|
|
1264 |
#if defined (__GNUC__) and defined (__GLIBC__)
|
|
1265 |
#if not __GLIBC_PREREQ(2, 16)
|
|
1266 |
#pragma GCC diagnostic pop
|
|
1267 |
#endif
|
|
1268 |
#endif
|
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1269 |
/* This process had nothing to say at this time */ |
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
1270 |
proc = proc->next; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1271 |
continue; |
1272 |
} |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1273 |
/* Before reading, make the process' data buffer large enough */ |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1274 |
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){ |
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
1275 |
char *new_buffer = realloc(proc->buffer, proc->buffer_size |
1276 |
+ (size_t) BUFFER_SIZE); |
|
1277 |
if(new_buffer == NULL){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1278 |
error(0, errno, "malloc"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1279 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
1280 |
goto fallback; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1281 |
} |
237.7.214
by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full. |
1282 |
proc->buffer = new_buffer; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1283 |
proc->buffer_size += BUFFER_SIZE; |
1284 |
} |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1285 |
/* Read from the process */ |
237.2.125
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
1286 |
sret = TEMP_FAILURE_RETRY(read(proc->fd, |
1287 |
proc->buffer |
|
1288 |
+ proc->buffer_length, |
|
1289 |
BUFFER_SIZE)); |
|
237.2.17
by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop |
1290 |
if(sret < 0){ |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1291 |
/* Read error from this process; ignore the error */ |
24.1.92
by Björn Påhlsson
Several memory leaks detected by valgrind fixed |
1292 |
proc = proc->next; |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1293 |
continue; |
1294 |
} |
|
237.2.17
by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop |
1295 |
if(sret == 0){ |
34
by Teddy Hogeborn
* plugbasedclient.c (main): Check if plugin dir could be opened. Set |
1296 |
/* got EOF */ |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1297 |
proc->eof = true; |
1298 |
} else { |
|
237.2.17
by Teddy Hogeborn
Eliminate warning on 64-bit systems, thanks to Frans Pop |
1299 |
proc->buffer_length += (size_t) sret; |
13
by Björn Påhlsson
Added following support: |
1300 |
} |
1301 |
} |
|
1302 |
} |
|
237.2.75
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1303 |
|
1304 |
|
|
24.1.54
by Björn Påhlsson
plugin-runner |
1305 |
fallback: |
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
1306 |
|
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1307 |
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS |
1308 |
and exitstatus != EX_OK)){ |
|
102
by Teddy Hogeborn
* plugin-runner.c (process): Set "completed" and "status" as volatile. |
1309 |
/* Fallback if all plugins failed, none are found or an error |
1310 |
occured */
|
|
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
1311 |
bool bret; |
1312 |
fprintf(stderr, "Going to fallback mode using getpass(3)\n"); |
|
1313 |
char *passwordbuffer = getpass("Password: "); |
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
1314 |
size_t len = strlen(passwordbuffer); |
1315 |
/* Strip trailing newline */ |
|
1316 |
if(len > 0 and passwordbuffer[len-1] == '\n'){ |
|
1317 |
passwordbuffer[len-1] = '\0'; /* not strictly necessary */ |
|
1318 |
len--; |
|
1319 |
} |
|
1320 |
bret = print_out_password(passwordbuffer, len); |
|
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
1321 |
if(not bret){ |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1322 |
error(0, errno, "print_out_password"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1323 |
exitstatus = EX_IOERR; |
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
1324 |
} |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1325 |
} |
24.1.42
by Björn Påhlsson
Added fallback to mandos-client |
1326 |
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1327 |
/* Restore old signal handler */ |
24.1.54
by Björn Påhlsson
plugin-runner |
1328 |
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL); |
1329 |
if(ret == -1){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1330 |
error(0, errno, "sigaction"); |
237.2.162
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1331 |
exitstatus = EX_OSERR; |
24.1.54
by Björn Påhlsson
plugin-runner |
1332 |
} |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1333 |
|
24.1.54
by Björn Påhlsson
plugin-runner |
1334 |
if(custom_argv != NULL){ |
24.1.67
by Björn Påhlsson
transformed a function to a part of main |
1335 |
for(char **arg = custom_argv+1; *arg != NULL; arg++){ |
24.1.54
by Björn Påhlsson
plugin-runner |
1336 |
free(*arg); |
78
by Teddy Hogeborn
Add feature to specify custom environment variables for plugins. |
1337 |
} |
24.1.54
by Björn Påhlsson
plugin-runner |
1338 |
free(custom_argv); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1339 |
} |
1340 |
|
|
237.7.253
by Teddy Hogeborn
plugin-runner: Release memory and close FD's correctly in all cases. |
1341 |
free(direntries); |
1342 |
|
|
237.7.251
by Teddy Hogeborn
In plugin-runner, do scandirat() or scandir() instead of readdir(). |
1343 |
if(dir_fd != -1){ |
237.7.322
by Teddy Hogeborn
Don't use TEMP_FAILURE_RETRY around close(). |
1344 |
close(dir_fd); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1345 |
} |
1346 |
|
|
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1347 |
/* Kill the processes */ |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1348 |
for(plugin *p = plugin_list; p != NULL; p = p->next){ |
1349 |
if(p->pid != 0){ |
|
1350 |
close(p->fd); |
|
1351 |
ret = kill(p->pid, SIGTERM); |
|
1352 |
if(ret == -1 and errno != ESRCH){ |
|
1353 |
/* Set-uid proccesses might not get closed */ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1354 |
error(0, errno, "kill"); |
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1355 |
} |
24.1.26
by Björn Påhlsson
tally count of used symbols |
1356 |
} |
13
by Björn Påhlsson
Added following support: |
1357 |
} |
1358 |
|
|
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1359 |
/* Wait for any remaining child processes to terminate */ |
237.2.126
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
1360 |
do { |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1361 |
ret = wait(NULL); |
1362 |
} while(ret >= 0); |
|
1363 |
if(errno != ECHILD){ |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1364 |
error(0, errno, "wait"); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1365 |
} |
210
by Teddy Hogeborn
* debian/mandos-client.postinst: Change home directory to |
1366 |
|
24.1.76
by Björn Påhlsson
Rearranged so plugins and processes is the same thing |
1367 |
free_plugin_list(); |
1368 |
|
|
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
1369 |
free(plugindir); |
237.25.1
by Teddy Hogeborn
Add a plugin helper directory, available to all plugins. |
1370 |
free(pluginhelperdir); |
24.1.69
by Björn Påhlsson
added configfile as a optional argument to plugin-runner |
1371 |
free(argfile); |
35
by Teddy Hogeborn
* plugbasedclient.c (struct process): New fields "eof", "completed", |
1372 |
|
31
by Teddy Hogeborn
* plugins.d/plugbasedclient.c: Update include file comments. |
1373 |
return exitstatus; |
13
by Björn Påhlsson
Added following support: |
1374 |
}
|