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