bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1 |
/* -*- coding: utf-8 -*- */
|
2 |
/*
|
|
261
by Teddy Hogeborn
* plugins.d/askpass-fifo.c: Fix name in header. |
3 |
* Mandos-client - get and decrypt data from a Mandos server
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
4 |
*
|
5 |
* This program is partly derived from an example program for an Avahi
|
|
6 |
* service browser, downloaded from
|
|
7 |
* <http://avahi.org/browser/examples/core-browse-services.c>. This
|
|
8 |
* includes the following functions: "resolve_callback",
|
|
9 |
* "browse_callback", and parts of "main".
|
|
10 |
*
|
|
28
by Teddy Hogeborn
* server.conf: New file. |
11 |
* Everything else is
|
466
by Teddy Hogeborn
Update copyright year to "2011" wherever appropriate. |
12 |
* Copyright © 2008-2011 Teddy Hogeborn
|
13 |
* Copyright © 2008-2011 Björn Påhlsson
|
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
14 |
*
|
15 |
* This program is free software: you can redistribute it and/or
|
|
16 |
* modify it under the terms of the GNU General Public License as
|
|
17 |
* published by the Free Software Foundation, either version 3 of the
|
|
18 |
* License, or (at your option) any later version.
|
|
19 |
*
|
|
20 |
* This program is distributed in the hope that it will be useful, but
|
|
21 |
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
22 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
23 |
* General Public License for more details.
|
|
24 |
*
|
|
25 |
* You should have received a copy of the GNU General Public License
|
|
26 |
* along with this program. If not, see
|
|
27 |
* <http://www.gnu.org/licenses/>.
|
|
28 |
*
|
|
505.1.2
by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout. |
29 |
* Contact the authors at <mandos@recompile.se>.
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
30 |
*/
|
31 |
||
28
by Teddy Hogeborn
* server.conf: New file. |
32 |
/* Needed by GPGME, specifically gpgme_data_seek() */
|
317
by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags. |
33 |
#ifndef _LARGEFILE_SOURCE
|
13
by Björn Påhlsson
Added following support: |
34 |
#define _LARGEFILE_SOURCE
|
317
by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags. |
35 |
#endif
|
36 |
#ifndef _FILE_OFFSET_BITS
|
|
13
by Björn Påhlsson
Added following support: |
37 |
#define _FILE_OFFSET_BITS 64
|
317
by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags. |
38 |
#endif
|
13
by Björn Påhlsson
Added following support: |
39 |
|
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
40 |
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */ |
24.1.10
by Björn Påhlsson
merge commit |
41 |
|
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
42 |
#include <stdio.h> /* fprintf(), stderr, fwrite(), |
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
43 |
stdout, ferror(), remove() */ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
44 |
#include <stdint.h> /* uint16_t, uint32_t */ |
45 |
#include <stddef.h> /* NULL, size_t, ssize_t */ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
46 |
#include <stdlib.h> /* free(), EXIT_SUCCESS, srand(), |
47 |
strtof(), abort() */ |
|
304
by Teddy Hogeborn
Four new interrelated features: |
48 |
#include <stdbool.h> /* bool, false, true */ |
24.1.29
by Björn Påhlsson
Added more header file comments |
49 |
#include <string.h> /* memset(), strcmp(), strlen(), |
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
50 |
strerror(), asprintf(), strcpy() */ |
304
by Teddy Hogeborn
Four new interrelated features: |
51 |
#include <sys/ioctl.h> /* ioctl */ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
52 |
#include <sys/types.h> /* socket(), inet_pton(), sockaddr, |
24.1.29
by Björn Påhlsson
Added more header file comments |
53 |
sockaddr_in6, PF_INET6, |
304
by Teddy Hogeborn
Four new interrelated features: |
54 |
SOCK_STREAM, uid_t, gid_t, open(), |
55 |
opendir(), DIR */ |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
56 |
#include <sys/stat.h> /* open(), S_ISREG */ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
57 |
#include <sys/socket.h> /* socket(), struct sockaddr_in6, |
304
by Teddy Hogeborn
Four new interrelated features: |
58 |
inet_pton(), connect() */ |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
59 |
#include <fcntl.h> /* open() */ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
60 |
#include <dirent.h> /* opendir(), struct dirent, readdir() |
61 |
*/ |
|
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
62 |
#include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t, |
63 |
strtoimax() */ |
|
24.1.29
by Björn Påhlsson
Added more header file comments |
64 |
#include <assert.h> /* assert() */ |
485
by Teddy Hogeborn
Merge from Björn. |
65 |
#include <errno.h> /* perror(), errno, |
66 |
program_invocation_short_name */ |
|
24.1.163
by Björn Påhlsson
mandos-client: Added never ending loop for --connect |
67 |
#include <time.h> /* nanosleep(), time(), sleep() */ |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
68 |
#include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP, |
24.1.26
by Björn Påhlsson
tally count of used symbols |
69 |
SIOCSIFFLAGS, if_indextoname(), |
70 |
if_nametoindex(), IF_NAMESIZE */ |
|
304
by Teddy Hogeborn
Four new interrelated features: |
71 |
#include <netinet/in.h> /* IN6_IS_ADDR_LINKLOCAL, |
72 |
INET_ADDRSTRLEN, INET6_ADDRSTRLEN |
|
73 |
*/ |
|
24.1.29
by Björn Påhlsson
Added more header file comments |
74 |
#include <unistd.h> /* close(), SEEK_SET, off_t, write(), |
365
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). |
75 |
getuid(), getgid(), seteuid(), |
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
76 |
setgid(), pause(), _exit() */ |
484
by Teddy Hogeborn
* Makefile (plugins.d/mandos-client): Bug fix: Put $^ before all |
77 |
#include <arpa/inet.h> /* inet_pton(), htons, inet_ntop() */ |
304
by Teddy Hogeborn
Four new interrelated features: |
78 |
#include <iso646.h> /* not, or, and */ |
24.1.29
by Björn Påhlsson
Added more header file comments |
79 |
#include <argp.h> /* struct argp_option, error_t, struct |
80 |
argp_state, struct argp, |
|
81 |
argp_parse(), ARGP_KEY_ARG, |
|
82 |
ARGP_KEY_END, ARGP_ERR_UNKNOWN */ |
|
307
by Teddy Hogeborn
Merge from Björn: |
83 |
#include <signal.h> /* sigemptyset(), sigaddset(), |
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
84 |
sigaction(), SIGTERM, sig_atomic_t, |
85 |
raise() */ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
86 |
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_UNAVAILABLE, |
87 |
EX_NOHOST, EX_IOERR, EX_PROTOCOL */ |
|
505.3.3
by teddy at bsnet
* plugins.d/mandos-client.c: Prefix all printouts with "Mandos plugin |
88 |
#include <sys/wait.h> /* waitpid(), WIFEXITED(), |
89 |
WEXITSTATUS(), WTERMSIG() */ |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
90 |
#include <grp.h> /* setgroups() */ |
307
by Teddy Hogeborn
Merge from Björn: |
91 |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
92 |
#ifdef __linux__
|
24.1.124
by Björn Påhlsson
Added lower kernel loglevel to reduce clutter on system console. |
93 |
#include <sys/klog.h> /* klogctl() */ |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
94 |
#endif /* __linux__ */ |
24.1.26
by Björn Påhlsson
tally count of used symbols |
95 |
|
96 |
/* Avahi */
|
|
24.1.29
by Björn Påhlsson
Added more header file comments |
97 |
/* All Avahi types, constants and functions
|
98 |
Avahi*, avahi_*,
|
|
99 |
AVAHI_* */
|
|
100 |
#include <avahi-core/core.h> |
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
101 |
#include <avahi-core/lookup.h> |
24.1.29
by Björn Påhlsson
Added more header file comments |
102 |
#include <avahi-core/log.h> |
24.1.26
by Björn Påhlsson
tally count of used symbols |
103 |
#include <avahi-common/simple-watch.h> |
104 |
#include <avahi-common/malloc.h> |
|
105 |
#include <avahi-common/error.h> |
|
106 |
||
107 |
/* GnuTLS */
|
|
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
108 |
#include <gnutls/gnutls.h> /* All GnuTLS types, constants and |
109 |
functions: |
|
24.1.29
by Björn Påhlsson
Added more header file comments |
110 |
gnutls_* |
24.1.26
by Björn Påhlsson
tally count of used symbols |
111 |
init_gnutls_session(), |
24.1.29
by Björn Påhlsson
Added more header file comments |
112 |
GNUTLS_* */ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
113 |
#include <gnutls/openpgp.h> |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
114 |
/* gnutls_certificate_set_openpgp_key_file(), |
115 |
GNUTLS_OPENPGP_FMT_BASE64 */
|
|
24.1.26
by Björn Påhlsson
tally count of used symbols |
116 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
117 |
/* GPGME */
|
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
118 |
#include <gpgme.h> /* All GPGME types, constants and |
119 |
functions: |
|
24.1.29
by Björn Påhlsson
Added more header file comments |
120 |
gpgme_* |
24.1.26
by Björn Påhlsson
tally count of used symbols |
121 |
GPGME_PROTOCOL_OpenPGP, |
24.1.29
by Björn Påhlsson
Added more header file comments |
122 |
GPG_ERR_NO_* */ |
13
by Björn Påhlsson
Added following support: |
123 |
|
124 |
#define BUFFER_SIZE 256
|
|
37
by Teddy Hogeborn
Non-tested commit for merge purposes. |
125 |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
126 |
#define PATHDIR "/conf/conf.d/mandos"
|
127 |
#define SECKEY "seckey.txt"
|
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
128 |
#define PUBKEY "pubkey.txt"
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
129 |
#define HOOKDIR "/lib/mandos/network-hooks.d"
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
130 |
|
15.1.2
by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt |
131 |
bool debug = false; |
43
by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes. |
132 |
static const char mandos_protocol_version[] = "1"; |
217
by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html"). |
133 |
const char *argp_program_version = "mandos-client " VERSION; |
505.1.2
by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout. |
134 |
const char *argp_program_bug_address = "<mandos@recompile.se>"; |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
135 |
static const char sys_class_net[] = "/sys/class/net"; |
136 |
char *connect_to = NULL; |
|
505.3.4
by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the |
137 |
const char *hookdir = HOOKDIR; |
24.1.10
by Björn Påhlsson
merge commit |
138 |
|
485
by Teddy Hogeborn
Merge from Björn. |
139 |
/* Doubly linked list that need to be circularly linked when used */
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
140 |
typedef struct server{ |
141 |
const char *ip; |
|
142 |
uint16_t port; |
|
143 |
AvahiIfIndex if_index; |
|
144 |
int af; |
|
145 |
struct timespec last_seen; |
|
146 |
struct server *next; |
|
147 |
struct server *prev; |
|
148 |
} server; |
|
149 |
||
42
by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to" |
150 |
/* Used for passing in values through the Avahi callback functions */
|
13
by Björn Påhlsson
Added following support: |
151 |
typedef struct { |
24.1.9
by Björn Påhlsson
not working midwork... |
152 |
AvahiSimplePoll *simple_poll; |
153 |
AvahiServer *server; |
|
13
by Björn Påhlsson
Added following support: |
154 |
gnutls_certificate_credentials_t cred; |
24.1.9
by Björn Påhlsson
not working midwork... |
155 |
unsigned int dh_bits; |
24.1.13
by Björn Påhlsson
mandosclient |
156 |
gnutls_dh_params_t dh_params; |
24.1.9
by Björn Påhlsson
not working midwork... |
157 |
const char *priority; |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
158 |
gpgme_ctx_t ctx; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
159 |
server *current_server; |
24.1.9
by Björn Påhlsson
not working midwork... |
160 |
} mandos_context; |
13
by Björn Påhlsson
Added following support: |
161 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
162 |
/* global context so signal handler can reach it*/
|
24.1.135
by Björn Påhlsson
Earlier signal handling |
163 |
mandos_context mc = { .simple_poll = NULL, .server = NULL, |
164 |
.dh_bits = 1024, .priority = "SECURE256" |
|
485
by Teddy Hogeborn
Merge from Björn. |
165 |
":!CTYPE-X.509:+CTYPE-OPENPGP", |
166 |
.current_server = NULL }; |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
167 |
|
371
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and |
168 |
sig_atomic_t quit_now = 0; |
169 |
int signal_received = 0; |
|
170 |
||
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
171 |
/* Function to use when printing errors */
|
172 |
void perror_plus(const char *print_text){ |
|
485
by Teddy Hogeborn
Merge from Björn. |
173 |
fprintf(stderr, "Mandos plugin %s: ", |
174 |
program_invocation_short_name); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
175 |
perror(print_text); |
176 |
}
|
|
177 |
||
505.2.4
by Björn Påhlsson
New convinence error printer: fprintf_plus |
178 |
int fprintf_plus(FILE *stream, const char *format, ...){ |
179 |
va_list ap; |
|
180 |
va_start (ap, format); |
|
181 |
|
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
182 |
TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ", |
183 |
program_invocation_short_name)); |
|
505.2.4
by Björn Påhlsson
New convinence error printer: fprintf_plus |
184 |
return TEMP_FAILURE_RETRY(vfprintf(stream, format, ap)); |
185 |
}
|
|
186 |
||
43
by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes. |
187 |
/*
|
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
188 |
* Make additional room in "buffer" for at least BUFFER_SIZE more
|
189 |
* bytes. "buffer_capacity" is how much is currently allocated,
|
|
190 |
* "buffer_length" is how much is already used.
|
|
43
by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes. |
191 |
*/
|
24.1.132
by Björn Påhlsson
Fixed a bug in fallback handling |
192 |
size_t incbuffer(char **buffer, size_t buffer_length, |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
193 |
size_t buffer_capacity){ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
194 |
if(buffer_length + BUFFER_SIZE > buffer_capacity){ |
24.1.12
by Björn Påhlsson
merge + |
195 |
*buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
196 |
if(buffer == NULL){ |
24.1.10
by Björn Påhlsson
merge commit |
197 |
return 0; |
198 |
} |
|
199 |
buffer_capacity += BUFFER_SIZE; |
|
200 |
} |
|
201 |
return buffer_capacity; |
|
202 |
}
|
|
203 |
||
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
204 |
/* Add server to set of servers to retry periodically */
|
505.1.27
by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers |
205 |
bool add_server(const char *ip, uint16_t port, AvahiIfIndex if_index, |
206 |
int af){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
207 |
int ret; |
208 |
server *new_server = malloc(sizeof(server)); |
|
209 |
if(new_server == NULL){ |
|
210 |
perror_plus("malloc"); |
|
505.1.27
by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers |
211 |
return false; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
212 |
} |
213 |
*new_server = (server){ .ip = strdup(ip), |
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
214 |
.port = port, |
215 |
.if_index = if_index, |
|
216 |
.af = af }; |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
217 |
if(new_server->ip == NULL){ |
218 |
perror_plus("strdup"); |
|
505.1.27
by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers |
219 |
return false; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
220 |
} |
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
221 |
/* Special case of first server */ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
222 |
if (mc.current_server == NULL){ |
223 |
new_server->next = new_server; |
|
224 |
new_server->prev = new_server; |
|
225 |
mc.current_server = new_server; |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
226 |
/* Place the new server last in the list */ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
227 |
} else { |
228 |
new_server->next = mc.current_server; |
|
229 |
new_server->prev = mc.current_server->prev; |
|
230 |
new_server->prev->next = new_server; |
|
231 |
mc.current_server->prev = new_server; |
|
232 |
} |
|
233 |
ret = clock_gettime(CLOCK_MONOTONIC, &mc.current_server->last_seen); |
|
234 |
if(ret == -1){ |
|
235 |
perror_plus("clock_gettime"); |
|
505.1.27
by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers |
236 |
return false; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
237 |
} |
505.1.27
by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers |
238 |
return true; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
239 |
}
|
240 |
||
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
241 |
/*
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
242 |
* Initialize GPGME.
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
243 |
*/
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
244 |
static bool init_gpgme(const char *seckey, const char *pubkey, |
245 |
const char *tempdir){ |
|
13
by Björn Påhlsson
Added following support: |
246 |
gpgme_error_t rc; |
247 |
gpgme_engine_info_t engine_info; |
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
248 |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
249 |
|
250 |
/* |
|
288
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Use separate bool variable instead |
251 |
* Helper function to insert pub and seckey to the engine keyring.
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
252 |
*/
|
253 |
bool import_key(const char *filename){ |
|
361
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the |
254 |
int ret; |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
255 |
int fd; |
256 |
gpgme_data_t pgp_data; |
|
257 |
|
|
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
258 |
fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY)); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
259 |
if(fd == -1){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
260 |
perror_plus("open"); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
261 |
return false; |
262 |
} |
|
263 |
|
|
264 |
rc = gpgme_data_new_from_fd(&pgp_data, fd); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
265 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
266 |
fprintf_plus(stderr, "bad gpgme_data_new_from_fd: %s: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
267 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
268 |
return false; |
269 |
} |
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
270 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
271 |
rc = gpgme_op_import(mc.ctx, pgp_data); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
272 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
273 |
fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
274 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
275 |
return false; |
276 |
} |
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
277 |
|
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
278 |
ret = (int)TEMP_FAILURE_RETRY(close(fd)); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
279 |
if(ret == -1){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
280 |
perror_plus("close"); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
281 |
} |
282 |
gpgme_data_release(pgp_data); |
|
283 |
return true; |
|
284 |
} |
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
285 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
286 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
287 |
fprintf_plus(stderr, "Initializing GPGME\n"); |
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
288 |
} |
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
289 |
|
13
by Björn Påhlsson
Added following support: |
290 |
/* Init GPGME */ |
291 |
gpgme_check_version(NULL); |
|
24.1.4
by Björn Påhlsson
Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. |
292 |
rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
293 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
294 |
fprintf_plus(stderr, "bad gpgme_engine_check_version: %s: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
295 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
296 |
return false; |
24.1.4
by Björn Påhlsson
Added optional parameters certdir, certkey and certfile that can be iven at start in the command line. |
297 |
} |
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
298 |
|
492
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around |
299 |
/* Set GPGME home directory for the OpenPGP engine only */ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
300 |
rc = gpgme_get_engine_info(&engine_info); |
301 |
if(rc != GPG_ERR_NO_ERROR){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
302 |
fprintf_plus(stderr, "bad gpgme_get_engine_info: %s: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
303 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
304 |
return false; |
13
by Björn Påhlsson
Added following support: |
305 |
} |
306 |
while(engine_info != NULL){ |
|
307 |
if(engine_info->protocol == GPGME_PROTOCOL_OpenPGP){ |
|
308 |
gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
309 |
engine_info->file_name, tempdir); |
13
by Björn Påhlsson
Added following support: |
310 |
break; |
311 |
} |
|
312 |
engine_info = engine_info->next; |
|
313 |
} |
|
314 |
if(engine_info == NULL){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
315 |
fprintf_plus(stderr, "Could not set GPGME home dir to %s\n", |
316 |
tempdir); |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
317 |
return false; |
318 |
} |
|
168
by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only |
319 |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
320 |
/* Create new GPGME "context" */ |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
321 |
rc = gpgme_new(&(mc.ctx)); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
322 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
323 |
fprintf_plus(stderr, "Mandos plugin mandos-client: " |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
324 |
"bad gpgme_new: %s: %s\n", gpgme_strsource(rc), |
325 |
gpgme_strerror(rc)); |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
326 |
return false; |
327 |
} |
|
328 |
|
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
329 |
if(not import_key(pubkey) or not import_key(seckey)){ |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
330 |
return false; |
331 |
} |
|
332 |
|
|
355
by Teddy Hogeborn
* mandos: White-space fixes only. |
333 |
return true; |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
334 |
}
|
335 |
||
336 |
/*
|
|
337 |
* Decrypt OpenPGP data.
|
|
338 |
* Returns -1 on error
|
|
339 |
*/
|
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
340 |
static ssize_t pgp_packet_decrypt(const char *cryptotext, |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
341 |
size_t crypto_size, |
342 |
char **plaintext){ |
|
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
343 |
gpgme_data_t dh_crypto, dh_plain; |
344 |
gpgme_error_t rc; |
|
345 |
ssize_t ret; |
|
346 |
size_t plaintext_capacity = 0; |
|
347 |
ssize_t plaintext_length = 0; |
|
348 |
|
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
349 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
350 |
fprintf_plus(stderr, "Trying to decrypt OpenPGP data\n"); |
13
by Björn Påhlsson
Added following support: |
351 |
} |
352 |
|
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
353 |
/* Create new GPGME data buffer from memory cryptotext */ |
354 |
rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size, |
|
355 |
0); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
356 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
357 |
fprintf_plus(stderr, "bad gpgme_data_new_from_mem: %s: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
358 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
13
by Björn Påhlsson
Added following support: |
359 |
return -1; |
360 |
} |
|
361 |
|
|
362 |
/* Create new empty GPGME data buffer for the plaintext */ |
|
363 |
rc = gpgme_data_new(&dh_plain); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
364 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
365 |
fprintf_plus(stderr, "Mandos plugin mandos-client: " |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
366 |
"bad gpgme_data_new: %s: %s\n", |
367 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
368 |
gpgme_data_release(dh_crypto); |
13
by Björn Påhlsson
Added following support: |
369 |
return -1; |
370 |
} |
|
371 |
|
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
372 |
/* Decrypt data from the cryptotext data buffer to the plaintext |
373 |
data buffer */
|
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
374 |
rc = gpgme_op_decrypt(mc.ctx, dh_crypto, dh_plain); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
375 |
if(rc != GPG_ERR_NO_ERROR){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
376 |
fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
377 |
gpgme_strsource(rc), gpgme_strerror(rc)); |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
378 |
plaintext_length = -1; |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
379 |
if(debug){ |
99
by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. |
380 |
gpgme_decrypt_result_t result; |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
381 |
result = gpgme_op_decrypt_result(mc.ctx); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
382 |
if(result == NULL){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
383 |
fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n"); |
99
by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. |
384 |
} else { |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
385 |
fprintf_plus(stderr, "Unsupported algorithm: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
386 |
result->unsupported_algorithm); |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
387 |
fprintf_plus(stderr, "Wrong key usage: %u\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
388 |
result->wrong_key_usage); |
99
by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. |
389 |
if(result->file_name != NULL){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
390 |
fprintf_plus(stderr, "File name: %s\n", result->file_name); |
99
by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. |
391 |
} |
392 |
gpgme_recipient_t recipient; |
|
393 |
recipient = result->recipients; |
|
349
by Teddy Hogeborn
* plugins.d/mandos-client.c (pgp_packet_decrypt): Remove redundant |
394 |
while(recipient != NULL){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
395 |
fprintf_plus(stderr, "Public key algorithm: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
396 |
gpgme_pubkey_algo_name |
397 |
(recipient->pubkey_algo)); |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
398 |
fprintf_plus(stderr, "Key ID: %s\n", recipient->keyid); |
399 |
fprintf_plus(stderr, "Secret key available: %s\n", |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
400 |
recipient->status == GPG_ERR_NO_SECKEY |
401 |
? "No" : "Yes"); |
|
349
by Teddy Hogeborn
* plugins.d/mandos-client.c (pgp_packet_decrypt): Remove redundant |
402 |
recipient = recipient->next; |
99
by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify. |
403 |
} |
404 |
} |
|
405 |
} |
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
406 |
goto decrypt_end; |
13
by Björn Påhlsson
Added following support: |
407 |
} |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
408 |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
409 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
410 |
fprintf_plus(stderr, "Decryption of OpenPGP data succeeded\n"); |
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
411 |
} |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
412 |
|
13
by Björn Påhlsson
Added following support: |
413 |
/* Seek back to the beginning of the GPGME plaintext data buffer */ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
414 |
if(gpgme_data_seek(dh_plain, (off_t)0, SEEK_SET) == -1){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
415 |
perror_plus("gpgme_data_seek"); |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
416 |
plaintext_length = -1; |
417 |
goto decrypt_end; |
|
24.1.5
by Björn Påhlsson
plugbasedclient: |
418 |
} |
419 |
|
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
420 |
*plaintext = NULL; |
13
by Björn Påhlsson
Added following support: |
421 |
while(true){ |
24.1.132
by Björn Påhlsson
Fixed a bug in fallback handling |
422 |
plaintext_capacity = incbuffer(plaintext, |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
423 |
(size_t)plaintext_length, |
424 |
plaintext_capacity); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
425 |
if(plaintext_capacity == 0){ |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
426 |
perror_plus("incbuffer"); |
427 |
plaintext_length = -1; |
|
428 |
goto decrypt_end; |
|
13
by Björn Påhlsson
Added following support: |
429 |
} |
430 |
|
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
431 |
ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length, |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
432 |
BUFFER_SIZE); |
13
by Björn Påhlsson
Added following support: |
433 |
/* Print the data, if any */ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
434 |
if(ret == 0){ |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
435 |
/* EOF */ |
13
by Björn Påhlsson
Added following support: |
436 |
break; |
437 |
} |
|
438 |
if(ret < 0){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
439 |
perror_plus("gpgme_data_read"); |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
440 |
plaintext_length = -1; |
441 |
goto decrypt_end; |
|
13
by Björn Påhlsson
Added following support: |
442 |
} |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
443 |
plaintext_length += ret; |
13
by Björn Påhlsson
Added following support: |
444 |
} |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
445 |
|
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
446 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
447 |
fprintf_plus(stderr, "Decrypted password is: "); |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
448 |
for(ssize_t i = 0; i < plaintext_length; i++){ |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
449 |
fprintf(stderr, "%02hhX ", (*plaintext)[i]); |
450 |
} |
|
451 |
fprintf(stderr, "\n"); |
|
452 |
} |
|
453 |
|
|
454 |
decrypt_end: |
|
455 |
|
|
456 |
/* Delete the GPGME cryptotext data buffer */ |
|
457 |
gpgme_data_release(dh_crypto); |
|
15.1.3
by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt |
458 |
|
459 |
/* Delete the GPGME plaintext data buffer */ |
|
13
by Björn Påhlsson
Added following support: |
460 |
gpgme_data_release(dh_plain); |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
461 |
return plaintext_length; |
13
by Björn Påhlsson
Added following support: |
462 |
}
|
463 |
||
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
464 |
static const char * safer_gnutls_strerror(int value){ |
267
by Teddy Hogeborn
* plugins.d/mandos-client.c: Only comment changes. |
465 |
const char *ret = gnutls_strerror(value); /* Spurious warning from |
466 |
-Wunreachable-code */
|
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
467 |
if(ret == NULL) |
13
by Björn Påhlsson
Added following support: |
468 |
ret = "(unknown)"; |
469 |
return ret; |
|
470 |
}
|
|
471 |
||
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
472 |
/* GnuTLS log function callback */
|
36
by Teddy Hogeborn
* TODO: Converted to org-mode style |
473 |
static void debuggnutls(__attribute__((unused)) int level, |
474 |
const char* string){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
475 |
fprintf_plus(stderr, "GnuTLS: %s", string); |
13
by Björn Påhlsson
Added following support: |
476 |
}
|
477 |
||
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
478 |
static int init_gnutls_global(const char *pubkeyfilename, |
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
479 |
const char *seckeyfilename){ |
13
by Björn Påhlsson
Added following support: |
480 |
int ret; |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
481 |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
482 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
483 |
fprintf_plus(stderr, "Initializing GnuTLS\n"); |
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
484 |
} |
24.1.29
by Björn Påhlsson
Added more header file comments |
485 |
|
486 |
ret = gnutls_global_init(); |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
487 |
if(ret != GNUTLS_E_SUCCESS){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
488 |
fprintf_plus(stderr, "GnuTLS global_init: %s\n", |
489 |
safer_gnutls_strerror(ret)); |
|
13
by Björn Påhlsson
Added following support: |
490 |
return -1; |
491 |
} |
|
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
492 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
493 |
if(debug){ |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
494 |
/* "Use a log level over 10 to enable all debugging options." |
495 |
* - GnuTLS manual
|
|
496 |
*/
|
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
497 |
gnutls_global_set_log_level(11); |
498 |
gnutls_global_set_log_function(debuggnutls); |
|
499 |
} |
|
500 |
|
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
501 |
/* OpenPGP credentials */ |
484
by Teddy Hogeborn
* Makefile (plugins.d/mandos-client): Bug fix: Put $^ before all |
502 |
ret = gnutls_certificate_allocate_credentials(&mc.cred); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
503 |
if(ret != GNUTLS_E_SUCCESS){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
504 |
fprintf_plus(stderr, "GnuTLS memory error: %s\n", |
505 |
safer_gnutls_strerror(ret)); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
506 |
gnutls_global_deinit(); |
13
by Björn Påhlsson
Added following support: |
507 |
return -1; |
508 |
} |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
509 |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
510 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
511 |
fprintf_plus(stderr, "Attempting to use OpenPGP public key %s and" |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
512 |
" secret key %s as GnuTLS credentials\n", |
513 |
pubkeyfilename, |
|
514 |
seckeyfilename); |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
515 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
516 |
|
13
by Björn Påhlsson
Added following support: |
517 |
ret = gnutls_certificate_set_openpgp_key_file |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
518 |
(mc.cred, pubkeyfilename, seckeyfilename, |
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
519 |
GNUTLS_OPENPGP_FMT_BASE64); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
520 |
if(ret != GNUTLS_E_SUCCESS){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
521 |
fprintf_plus(stderr, |
522 |
"Error[%d] while reading the OpenPGP key pair ('%s'," |
|
523 |
" '%s')\n", ret, pubkeyfilename, seckeyfilename); |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
524 |
fprintf_plus(stderr, "The GnuTLS error is: %s\n", |
525 |
safer_gnutls_strerror(ret)); |
|
24.1.20
by Björn Påhlsson
mandosclient |
526 |
goto globalfail; |
13
by Björn Påhlsson
Added following support: |
527 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
528 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
529 |
/* GnuTLS server initialization */ |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
530 |
ret = gnutls_dh_params_init(&mc.dh_params); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
531 |
if(ret != GNUTLS_E_SUCCESS){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
532 |
fprintf_plus(stderr, "Error in GnuTLS DH parameter" |
533 |
" initialization: %s\n", |
|
534 |
safer_gnutls_strerror(ret)); |
|
24.1.20
by Björn Påhlsson
mandosclient |
535 |
goto globalfail; |
13
by Björn Påhlsson
Added following support: |
536 |
} |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
537 |
ret = gnutls_dh_params_generate2(mc.dh_params, mc.dh_bits); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
538 |
if(ret != GNUTLS_E_SUCCESS){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
539 |
fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
540 |
safer_gnutls_strerror(ret)); |
24.1.20
by Björn Påhlsson
mandosclient |
541 |
goto globalfail; |
13
by Björn Påhlsson
Added following support: |
542 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
543 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
544 |
gnutls_certificate_set_dh_params(mc.cred, mc.dh_params); |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
545 |
|
24.1.13
by Björn Påhlsson
mandosclient |
546 |
return 0; |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
547 |
|
24.1.20
by Björn Påhlsson
mandosclient |
548 |
globalfail: |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
549 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
550 |
gnutls_certificate_free_credentials(mc.cred); |
24.1.26
by Björn Påhlsson
tally count of used symbols |
551 |
gnutls_global_deinit(); |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
552 |
gnutls_dh_params_deinit(mc.dh_params); |
24.1.20
by Björn Påhlsson
mandosclient |
553 |
return -1; |
24.1.13
by Björn Påhlsson
mandosclient |
554 |
}
|
555 |
||
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
556 |
static int init_gnutls_session(gnutls_session_t *session){ |
24.1.13
by Björn Påhlsson
mandosclient |
557 |
int ret; |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
558 |
/* GnuTLS session creation */ |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
559 |
do { |
560 |
ret = gnutls_init(session, GNUTLS_SERVER); |
|
371
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and |
561 |
if(quit_now){ |
562 |
return -1; |
|
563 |
} |
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
564 |
} while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
565 |
if(ret != GNUTLS_E_SUCCESS){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
566 |
fprintf_plus(stderr, |
567 |
"Error in GnuTLS session initialization: %s\n", |
|
568 |
safer_gnutls_strerror(ret)); |
|
13
by Björn Påhlsson
Added following support: |
569 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
570 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
571 |
{ |
572 |
const char *err; |
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
573 |
do { |
574 |
ret = gnutls_priority_set_direct(*session, mc.priority, &err); |
|
371
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and |
575 |
if(quit_now){ |
576 |
gnutls_deinit(*session); |
|
577 |
return -1; |
|
578 |
} |
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
579 |
} while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
580 |
if(ret != GNUTLS_E_SUCCESS){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
581 |
fprintf_plus(stderr, "Syntax error at: %s\n", err); |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
582 |
fprintf_plus(stderr, "GnuTLS error: %s\n", |
583 |
safer_gnutls_strerror(ret)); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
584 |
gnutls_deinit(*session); |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
585 |
return -1; |
586 |
} |
|
13
by Björn Påhlsson
Added following support: |
587 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
588 |
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
589 |
do { |
590 |
ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, |
|
591 |
mc.cred); |
|
371
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and |
592 |
if(quit_now){ |
593 |
gnutls_deinit(*session); |
|
594 |
return -1; |
|
595 |
} |
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
596 |
} while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
597 |
if(ret != GNUTLS_E_SUCCESS){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
598 |
fprintf_plus(stderr, "Error setting GnuTLS credentials: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
599 |
safer_gnutls_strerror(ret)); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
600 |
gnutls_deinit(*session); |
13
by Björn Påhlsson
Added following support: |
601 |
return -1; |
602 |
} |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
603 |
|
13
by Björn Påhlsson
Added following support: |
604 |
/* ignore client certificate if any. */ |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
605 |
gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE); |
13
by Björn Påhlsson
Added following support: |
606 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
607 |
gnutls_dh_set_prime_bits(*session, mc.dh_bits); |
13
by Björn Påhlsson
Added following support: |
608 |
|
609 |
return 0; |
|
610 |
}
|
|
611 |
||
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
612 |
/* Avahi log function callback */
|
36
by Teddy Hogeborn
* TODO: Converted to org-mode style |
613 |
static void empty_log(__attribute__((unused)) AvahiLogLevel level, |
614 |
__attribute__((unused)) const char *txt){} |
|
13
by Björn Påhlsson
Added following support: |
615 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
616 |
/* Called when a Mandos server is found */
|
36
by Teddy Hogeborn
* TODO: Converted to org-mode style |
617 |
static int start_mandos_communication(const char *ip, uint16_t port, |
24.1.9
by Björn Påhlsson
not working midwork... |
618 |
AvahiIfIndex if_index, |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
619 |
int af){ |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
620 |
int ret, tcp_sd = -1; |
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
621 |
ssize_t sret; |
304
by Teddy Hogeborn
Four new interrelated features: |
622 |
union { |
623 |
struct sockaddr_in in; |
|
624 |
struct sockaddr_in6 in6; |
|
625 |
} to; |
|
13
by Björn Påhlsson
Added following support: |
626 |
char *buffer = NULL; |
372
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix: |
627 |
char *decrypted_buffer = NULL; |
13
by Björn Påhlsson
Added following support: |
628 |
size_t buffer_length = 0; |
629 |
size_t buffer_capacity = 0; |
|
24.1.10
by Björn Påhlsson
merge commit |
630 |
size_t written; |
372
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix: |
631 |
int retval = -1; |
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
632 |
gnutls_session_t session; |
304
by Teddy Hogeborn
Four new interrelated features: |
633 |
int pf; /* Protocol family */ |
634 |
|
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
635 |
errno = 0; |
636 |
|
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
637 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
638 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
639 |
return -1; |
640 |
} |
|
641 |
|
|
304
by Teddy Hogeborn
Four new interrelated features: |
642 |
switch(af){ |
643 |
case AF_INET6: |
|
644 |
pf = PF_INET6; |
|
645 |
break; |
|
646 |
case AF_INET: |
|
647 |
pf = PF_INET; |
|
648 |
break; |
|
649 |
default: |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
650 |
fprintf_plus(stderr, "Bad address family: %d\n", af); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
651 |
errno = EINVAL; |
304
by Teddy Hogeborn
Four new interrelated features: |
652 |
return -1; |
653 |
} |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
654 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
655 |
ret = init_gnutls_session(&session); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
656 |
if(ret != 0){ |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
657 |
return -1; |
658 |
} |
|
659 |
|
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
660 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
661 |
fprintf_plus(stderr, "Setting up a TCP connection to %s, port %" |
662 |
PRIu16 "\n", ip, port); |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
663 |
} |
13
by Björn Påhlsson
Added following support: |
664 |
|
304
by Teddy Hogeborn
Four new interrelated features: |
665 |
tcp_sd = socket(pf, SOCK_STREAM, 0); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
666 |
if(tcp_sd < 0){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
667 |
int e = errno; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
668 |
perror_plus("socket"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
669 |
errno = e; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
670 |
goto mandos_end; |
671 |
} |
|
672 |
|
|
673 |
if(quit_now){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
674 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
675 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
676 |
} |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
677 |
|
84
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do |
678 |
memset(&to, 0, sizeof(to)); |
304
by Teddy Hogeborn
Four new interrelated features: |
679 |
if(af == AF_INET6){ |
325
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): "sin6_family" |
680 |
to.in6.sin6_family = (sa_family_t)af; |
304
by Teddy Hogeborn
Four new interrelated features: |
681 |
ret = inet_pton(af, ip, &to.in6.sin6_addr); |
682 |
} else { /* IPv4 */ |
|
683 |
to.in.sin_family = (sa_family_t)af; |
|
684 |
ret = inet_pton(af, ip, &to.in.sin_addr); |
|
685 |
} |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
686 |
if(ret < 0 ){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
687 |
int e = errno; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
688 |
perror_plus("inet_pton"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
689 |
errno = e; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
690 |
goto mandos_end; |
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
691 |
} |
13
by Björn Påhlsson
Added following support: |
692 |
if(ret == 0){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
693 |
int e = errno; |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
694 |
fprintf_plus(stderr, "Bad address: %s\n", ip); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
695 |
errno = e; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
696 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
697 |
} |
304
by Teddy Hogeborn
Four new interrelated features: |
698 |
if(af == AF_INET6){ |
699 |
to.in6.sin6_port = htons(port); /* Spurious warnings from |
|
700 |
-Wconversion and
|
|
701 |
-Wunreachable-code */
|
|
702 |
|
|
703 |
if(IN6_IS_ADDR_LINKLOCAL /* Spurious warnings from */ |
|
704 |
(&to.in6.sin6_addr)){ /* -Wstrict-aliasing=2 or lower and |
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
705 |
-Wunreachable-code*/
|
304
by Teddy Hogeborn
Four new interrelated features: |
706 |
if(if_index == AVAHI_IF_UNSPEC){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
707 |
fprintf_plus(stderr, "An IPv6 link-local address is" |
708 |
" incomplete without a network interface\n"); |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
709 |
errno = EINVAL; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
710 |
goto mandos_end; |
304
by Teddy Hogeborn
Four new interrelated features: |
711 |
} |
712 |
/* Set the network interface number as scope */ |
|
713 |
to.in6.sin6_scope_id = (uint32_t)if_index; |
|
714 |
} |
|
715 |
} else { |
|
716 |
to.in.sin_port = htons(port); /* Spurious warnings from |
|
267
by Teddy Hogeborn
* plugins.d/mandos-client.c: Only comment changes. |
717 |
-Wconversion and
|
718 |
-Wunreachable-code */
|
|
304
by Teddy Hogeborn
Four new interrelated features: |
719 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
720 |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
721 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
722 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
723 |
goto mandos_end; |
724 |
} |
|
725 |
|
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
726 |
if(debug){ |
304
by Teddy Hogeborn
Four new interrelated features: |
727 |
if(af == AF_INET6 and if_index != AVAHI_IF_UNSPEC){ |
728 |
char interface[IF_NAMESIZE]; |
|
729 |
if(if_indextoname((unsigned int)if_index, interface) == NULL){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
730 |
perror_plus("if_indextoname"); |
304
by Teddy Hogeborn
Four new interrelated features: |
731 |
} else { |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
732 |
fprintf_plus(stderr, "Connection to: %s%%%s, port %" PRIu16 |
733 |
"\n", ip, interface, port); |
|
304
by Teddy Hogeborn
Four new interrelated features: |
734 |
} |
735 |
} else { |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
736 |
fprintf_plus(stderr, "Connection to: %s, port %" PRIu16 "\n", |
737 |
ip, port); |
|
304
by Teddy Hogeborn
Four new interrelated features: |
738 |
} |
739 |
char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ? |
|
740 |
INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = ""; |
|
741 |
const char *pcret; |
|
742 |
if(af == AF_INET6){ |
|
743 |
pcret = inet_ntop(af, &(to.in6.sin6_addr), addrstr, |
|
744 |
sizeof(addrstr)); |
|
745 |
} else { |
|
746 |
pcret = inet_ntop(af, &(to.in.sin_addr), addrstr, |
|
747 |
sizeof(addrstr)); |
|
748 |
} |
|
749 |
if(pcret == NULL){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
750 |
perror_plus("inet_ntop"); |
37
by Teddy Hogeborn
Non-tested commit for merge purposes. |
751 |
} else { |
752 |
if(strcmp(addrstr, ip) != 0){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
753 |
fprintf_plus(stderr, "Canonical address form: %s\n", addrstr); |
37
by Teddy Hogeborn
Non-tested commit for merge purposes. |
754 |
} |
755 |
} |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
756 |
} |
13
by Björn Påhlsson
Added following support: |
757 |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
758 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
759 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
760 |
goto mandos_end; |
761 |
} |
|
762 |
|
|
304
by Teddy Hogeborn
Four new interrelated features: |
763 |
if(af == AF_INET6){ |
764 |
ret = connect(tcp_sd, &to.in6, sizeof(to)); |
|
765 |
} else { |
|
766 |
ret = connect(tcp_sd, &to.in, sizeof(to)); /* IPv4 */ |
|
767 |
} |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
768 |
if(ret < 0){ |
24.1.163
by Björn Påhlsson
mandos-client: Added never ending loop for --connect |
769 |
if ((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){ |
770 |
int e = errno; |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
771 |
perror_plus("connect"); |
24.1.163
by Björn Påhlsson
mandos-client: Added never ending loop for --connect |
772 |
errno = e; |
773 |
} |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
774 |
goto mandos_end; |
775 |
} |
|
776 |
|
|
777 |
if(quit_now){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
778 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
779 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
780 |
} |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
781 |
|
24.1.12
by Björn Påhlsson
merge + |
782 |
const char *out = mandos_protocol_version; |
24.1.10
by Björn Påhlsson
merge commit |
783 |
written = 0; |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
784 |
while(true){ |
24.1.10
by Björn Påhlsson
merge commit |
785 |
size_t out_size = strlen(out); |
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
786 |
ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written, |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
787 |
out_size - written)); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
788 |
if(ret == -1){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
789 |
int e = errno; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
790 |
perror_plus("write"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
791 |
errno = e; |
24.1.12
by Björn Påhlsson
merge + |
792 |
goto mandos_end; |
24.1.10
by Björn Påhlsson
merge commit |
793 |
} |
24.1.12
by Björn Påhlsson
merge + |
794 |
written += (size_t)ret; |
24.1.10
by Björn Påhlsson
merge commit |
795 |
if(written < out_size){ |
796 |
continue; |
|
797 |
} else { |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
798 |
if(out == mandos_protocol_version){ |
24.1.10
by Björn Påhlsson
merge commit |
799 |
written = 0; |
800 |
out = "\r\n"; |
|
801 |
} else { |
|
802 |
break; |
|
803 |
} |
|
804 |
} |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
805 |
|
806 |
if(quit_now){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
807 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
808 |
goto mandos_end; |
809 |
} |
|
24.1.10
by Björn Påhlsson
merge commit |
810 |
} |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
811 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
812 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
813 |
fprintf_plus(stderr, "Establishing TLS session with %s\n", ip); |
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
814 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
815 |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
816 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
817 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
818 |
goto mandos_end; |
819 |
} |
|
820 |
|
|
485
by Teddy Hogeborn
Merge from Björn. |
821 |
/* Spurious warning from -Wint-to-pointer-cast */ |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
822 |
gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) tcp_sd); |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
823 |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
824 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
825 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
826 |
goto mandos_end; |
827 |
} |
|
828 |
|
|
363
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
829 |
do { |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
830 |
ret = gnutls_handshake(session); |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
831 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
832 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
833 |
goto mandos_end; |
834 |
} |
|
24.1.29
by Björn Påhlsson
Added more header file comments |
835 |
} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); |
13
by Björn Påhlsson
Added following support: |
836 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
837 |
if(ret != GNUTLS_E_SUCCESS){ |
25
by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section. |
838 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
839 |
fprintf_plus(stderr, "*** GnuTLS Handshake failed ***\n"); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
840 |
gnutls_perror(ret); |
25
by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section. |
841 |
} |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
842 |
errno = EPROTO; |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
843 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
844 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
845 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
846 |
/* Read OpenPGP packet that contains the wanted password */ |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
847 |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
848 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
849 |
fprintf_plus(stderr, "Retrieving OpenPGP encrypted password from" |
850 |
" %s\n", ip); |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
851 |
} |
143
by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and |
852 |
|
13
by Björn Påhlsson
Added following support: |
853 |
while(true){ |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
854 |
|
855 |
if(quit_now){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
856 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
857 |
goto mandos_end; |
858 |
} |
|
859 |
|
|
24.1.132
by Björn Påhlsson
Fixed a bug in fallback handling |
860 |
buffer_capacity = incbuffer(&buffer, buffer_length, |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
861 |
buffer_capacity); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
862 |
if(buffer_capacity == 0){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
863 |
int e = errno; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
864 |
perror_plus("incbuffer"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
865 |
errno = e; |
24.1.12
by Björn Påhlsson
merge + |
866 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
867 |
} |
868 |
|
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
869 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
870 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
871 |
goto mandos_end; |
872 |
} |
|
873 |
|
|
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
874 |
sret = gnutls_record_recv(session, buffer+buffer_length, |
875 |
BUFFER_SIZE); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
876 |
if(sret == 0){ |
13
by Björn Påhlsson
Added following support: |
877 |
break; |
878 |
} |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
879 |
if(sret < 0){ |
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
880 |
switch(sret){ |
13
by Björn Påhlsson
Added following support: |
881 |
case GNUTLS_E_INTERRUPTED: |
882 |
case GNUTLS_E_AGAIN: |
|
883 |
break; |
|
884 |
case GNUTLS_E_REHANDSHAKE: |
|
363
by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes. |
885 |
do { |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
886 |
ret = gnutls_handshake(session); |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
887 |
|
888 |
if(quit_now){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
889 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
890 |
goto mandos_end; |
891 |
} |
|
24.1.29
by Björn Påhlsson
Added more header file comments |
892 |
} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
893 |
if(ret < 0){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
894 |
fprintf_plus(stderr, "*** GnuTLS Re-handshake failed " |
895 |
"***\n"); |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
896 |
gnutls_perror(ret); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
897 |
errno = EPROTO; |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
898 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
899 |
} |
900 |
break; |
|
901 |
default: |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
902 |
fprintf_plus(stderr, "Unknown error while reading data from" |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
903 |
" encrypted session with Mandos server\n"); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
904 |
gnutls_bye(session, GNUTLS_SHUT_RDWR); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
905 |
errno = EIO; |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
906 |
goto mandos_end; |
13
by Björn Påhlsson
Added following support: |
907 |
} |
908 |
} else { |
|
257.1.2
by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for |
909 |
buffer_length += (size_t) sret; |
13
by Björn Påhlsson
Added following support: |
910 |
} |
911 |
} |
|
15.1.1
by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient |
912 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
913 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
914 |
fprintf_plus(stderr, "Closing TLS session\n"); |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
915 |
} |
916 |
|
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
917 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
918 |
errno = EINTR; |
371
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and |
919 |
goto mandos_end; |
920 |
} |
|
921 |
|
|
922 |
do { |
|
923 |
ret = gnutls_bye(session, GNUTLS_SHUT_RDWR); |
|
924 |
if(quit_now){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
925 |
errno = EINTR; |
371
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and |
926 |
goto mandos_end; |
927 |
} |
|
928 |
} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED); |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
929 |
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
930 |
if(buffer_length > 0){ |
362
by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR |
931 |
ssize_t decrypted_buffer_size; |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
932 |
decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length, |
24.1.81
by Björn Påhlsson
removed keyring pre-requirement for starting password-request. |
933 |
&decrypted_buffer); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
934 |
if(decrypted_buffer_size >= 0){ |
361
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the |
935 |
|
24.1.10
by Björn Påhlsson
merge commit |
936 |
written = 0; |
28
by Teddy Hogeborn
* server.conf: New file. |
937 |
while(written < (size_t) decrypted_buffer_size){ |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
938 |
if(quit_now){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
939 |
errno = EINTR; |
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
940 |
goto mandos_end; |
941 |
} |
|
942 |
|
|
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
943 |
ret = (int)fwrite(decrypted_buffer + written, 1, |
944 |
(size_t)decrypted_buffer_size - written, |
|
945 |
stdout); |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
946 |
if(ret == 0 and ferror(stdout)){ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
947 |
int e = errno; |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
948 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
949 |
fprintf_plus(stderr, "Error writing encrypted data: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
950 |
strerror(errno)); |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
951 |
} |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
952 |
errno = e; |
372
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix: |
953 |
goto mandos_end; |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
954 |
} |
22
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to |
955 |
written += (size_t)ret; |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
956 |
} |
372
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix: |
957 |
retval = 0; |
13
by Björn Påhlsson
Added following support: |
958 |
} |
959 |
} |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
960 |
|
961 |
/* Shutdown procedure */ |
|
962 |
|
|
963 |
mandos_end: |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
964 |
{ |
965 |
int e = errno; |
|
966 |
free(decrypted_buffer); |
|
967 |
free(buffer); |
|
968 |
if(tcp_sd >= 0){ |
|
969 |
ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd)); |
|
970 |
} |
|
971 |
if(ret == -1){ |
|
972 |
if(e == 0){ |
|
973 |
e = errno; |
|
974 |
} |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
975 |
perror_plus("close"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
976 |
} |
977 |
gnutls_deinit(session); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
978 |
errno = e; |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
979 |
if(quit_now){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
980 |
errno = EINTR; |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
981 |
retval = -1; |
982 |
} |
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
983 |
} |
13
by Björn Påhlsson
Added following support: |
984 |
return retval; |
985 |
}
|
|
986 |
||
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
987 |
static void resolve_callback(AvahiSServiceResolver *r, |
988 |
AvahiIfIndex interface, |
|
304
by Teddy Hogeborn
Four new interrelated features: |
989 |
AvahiProtocol proto, |
39
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. |
990 |
AvahiResolverEvent event, |
991 |
const char *name, |
|
992 |
const char *type, |
|
993 |
const char *domain, |
|
994 |
const char *host_name, |
|
995 |
const AvahiAddress *address, |
|
996 |
uint16_t port, |
|
997 |
AVAHI_GCC_UNUSED AvahiStringList *txt, |
|
998 |
AVAHI_GCC_UNUSED AvahiLookupResultFlags |
|
999 |
flags, |
|
307
by Teddy Hogeborn
Merge from Björn: |
1000 |
AVAHI_GCC_UNUSED void* userdata){ |
84
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do |
1001 |
assert(r); |
22
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to |
1002 |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1003 |
/* Called whenever a service has been resolved successfully or |
1004 |
timed out */
|
|
22
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to |
1005 |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1006 |
if(quit_now){ |
1007 |
return; |
|
1008 |
} |
|
1009 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1010 |
switch(event){ |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1011 |
default: |
1012 |
case AVAHI_RESOLVER_FAILURE: |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1013 |
fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service " |
1014 |
"'%s' of type '%s' in domain '%s': %s\n", name, type, |
|
1015 |
domain, |
|
1016 |
avahi_strerror(avahi_server_errno(mc.server))); |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1017 |
break; |
22
by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to |
1018 |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1019 |
case AVAHI_RESOLVER_FOUND: |
1020 |
{ |
|
1021 |
char ip[AVAHI_ADDRESS_STR_MAX]; |
|
1022 |
avahi_address_snprint(ip, sizeof(ip), address); |
|
1023 |
if(debug){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1024 |
fprintf_plus(stderr, "Mandos server \"%s\" found on %s (%s, %" |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1025 |
PRIdMAX ") on port %" PRIu16 "\n", name, |
1026 |
host_name, ip, (intmax_t)interface, port); |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1027 |
} |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
1028 |
int ret = start_mandos_communication(ip, port, interface, |
304
by Teddy Hogeborn
Four new interrelated features: |
1029 |
avahi_proto_to_af(proto)); |
266
by Teddy Hogeborn
* plugin-runner.c: Only space changes. |
1030 |
if(ret == 0){ |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
1031 |
avahi_simple_poll_quit(mc.simple_poll); |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1032 |
} else { |
505.1.27
by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers |
1033 |
if(not add_server(ip, port, interface, |
1034 |
avahi_proto_to_af(proto))){ |
|
1035 |
fprintf_plus(stderr, "Failed to add server \"%s\" to server" |
|
1036 |
" list\n", name); |
|
1037 |
} |
|
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1038 |
} |
13
by Björn Påhlsson
Added following support: |
1039 |
} |
21
by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and |
1040 |
} |
1041 |
avahi_s_service_resolver_free(r); |
|
13
by Björn Påhlsson
Added following support: |
1042 |
}
|
1043 |
||
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1044 |
static void browse_callback(AvahiSServiceBrowser *b, |
1045 |
AvahiIfIndex interface, |
|
1046 |
AvahiProtocol protocol, |
|
1047 |
AvahiBrowserEvent event, |
|
1048 |
const char *name, |
|
1049 |
const char *type, |
|
1050 |
const char *domain, |
|
1051 |
AVAHI_GCC_UNUSED AvahiLookupResultFlags |
|
1052 |
flags, |
|
307
by Teddy Hogeborn
Merge from Björn: |
1053 |
AVAHI_GCC_UNUSED void* userdata){ |
84
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do |
1054 |
assert(b); |
24.1.9
by Björn Påhlsson
not working midwork... |
1055 |
|
1056 |
/* Called whenever a new services becomes available on the LAN or |
|
1057 |
is removed from the LAN */
|
|
1058 |
|
|
358
by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check |
1059 |
if(quit_now){ |
1060 |
return; |
|
1061 |
} |
|
1062 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1063 |
switch(event){ |
24.1.9
by Björn Påhlsson
not working midwork... |
1064 |
default: |
1065 |
case AVAHI_BROWSER_FAILURE: |
|
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
1066 |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1067 |
fprintf_plus(stderr, "(Avahi browser) %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1068 |
avahi_strerror(avahi_server_errno(mc.server))); |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
1069 |
avahi_simple_poll_quit(mc.simple_poll); |
24.1.9
by Björn Påhlsson
not working midwork... |
1070 |
return; |
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
1071 |
|
24.1.9
by Björn Påhlsson
not working midwork... |
1072 |
case AVAHI_BROWSER_NEW: |
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
1073 |
/* We ignore the returned Avahi resolver object. In the callback |
1074 |
function we free it. If the Avahi server is terminated before
|
|
1075 |
the callback function is called the Avahi server will free the
|
|
1076 |
resolver for us. */
|
|
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
1077 |
|
313
by Teddy Hogeborn
* plugins.d/mandos-client.c (browse_callback, main): Do not require |
1078 |
if(avahi_s_service_resolver_new(mc.server, interface, protocol, |
1079 |
name, type, domain, protocol, 0, |
|
1080 |
resolve_callback, NULL) == NULL) |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1081 |
fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':" |
1082 |
" %s\n", name, |
|
1083 |
avahi_strerror(avahi_server_errno(mc.server))); |
|
24.1.9
by Björn Påhlsson
not working midwork... |
1084 |
break; |
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
1085 |
|
24.1.9
by Björn Påhlsson
not working midwork... |
1086 |
case AVAHI_BROWSER_REMOVE: |
1087 |
break; |
|
38
by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options. |
1088 |
|
24.1.9
by Björn Påhlsson
not working midwork... |
1089 |
case AVAHI_BROWSER_ALL_FOR_NOW: |
1090 |
case AVAHI_BROWSER_CACHE_EXHAUSTED: |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
1091 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1092 |
fprintf_plus(stderr, "No Mandos server found, still" |
1093 |
" searching...\n"); |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
1094 |
} |
24.1.9
by Björn Påhlsson
not working midwork... |
1095 |
break; |
1096 |
} |
|
13
by Björn Påhlsson
Added following support: |
1097 |
}
|
1098 |
||
485
by Teddy Hogeborn
Merge from Björn. |
1099 |
/* Signal handler that stops main loop after SIGTERM */
|
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
1100 |
static void handle_sigterm(int sig){ |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
1101 |
if(quit_now){ |
1102 |
return; |
|
1103 |
} |
|
1104 |
quit_now = 1; |
|
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
1105 |
signal_received = sig; |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
1106 |
int old_errno = errno; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1107 |
/* set main loop to exit */ |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
1108 |
if(mc.simple_poll != NULL){ |
1109 |
avahi_simple_poll_quit(mc.simple_poll); |
|
1110 |
} |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
1111 |
errno = old_errno; |
1112 |
}
|
|
1113 |
||
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1114 |
bool get_flags(const char *ifname, struct ifreq *ifr){ |
505.2.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1115 |
int ret; |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1116 |
|
505.2.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1117 |
int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); |
1118 |
if(s < 0){ |
|
1119 |
perror_plus("socket"); |
|
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1120 |
return false; |
505.2.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1121 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1122 |
strcpy(ifr->ifr_name, ifname); |
1123 |
ret = ioctl(s, SIOCGIFFLAGS, ifr); |
|
505.2.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1124 |
if(ret == -1){ |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1125 |
if(debug){ |
505.2.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1126 |
perror_plus("ioctl SIOCGIFFLAGS"); |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1127 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1128 |
return false; |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1129 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1130 |
return true; |
1131 |
}
|
|
1132 |
||
1133 |
bool good_flags(const char *ifname, const struct ifreq *ifr){ |
|
1134 |
|
|
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1135 |
/* Reject the loopback device */ |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1136 |
if(ifr->ifr_flags & IFF_LOOPBACK){ |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1137 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1138 |
fprintf_plus(stderr, "Rejecting loopback interface \"%s\"\n", |
1139 |
ifname); |
|
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1140 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1141 |
return false; |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1142 |
} |
1143 |
/* Accept point-to-point devices only if connect_to is specified */ |
|
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1144 |
if(connect_to != NULL and (ifr->ifr_flags & IFF_POINTOPOINT)){ |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1145 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1146 |
fprintf_plus(stderr, "Accepting point-to-point interface" |
1147 |
" \"%s\"\n", ifname); |
|
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1148 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1149 |
return true; |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1150 |
} |
1151 |
/* Otherwise, reject non-broadcast-capable devices */ |
|
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1152 |
if(not (ifr->ifr_flags & IFF_BROADCAST)){ |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1153 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1154 |
fprintf_plus(stderr, "Rejecting non-broadcast interface" |
1155 |
" \"%s\"\n", ifname); |
|
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1156 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1157 |
return false; |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1158 |
} |
481
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP |
1159 |
/* Reject non-ARP interfaces (including dummy interfaces) */ |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1160 |
if(ifr->ifr_flags & IFF_NOARP){ |
481
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP |
1161 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1162 |
fprintf_plus(stderr, "Rejecting non-ARP interface \"%s\"\n", |
1163 |
ifname); |
|
481
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP |
1164 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1165 |
return false; |
481
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP |
1166 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1167 |
|
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1168 |
/* Accept this device */ |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1169 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1170 |
fprintf_plus(stderr, "Interface \"%s\" is good\n", ifname); |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1171 |
} |
1172 |
return true; |
|
1173 |
}
|
|
1174 |
||
1175 |
/*
|
|
1176 |
* This function determines if a directory entry in /sys/class/net
|
|
1177 |
* corresponds to an acceptable network device.
|
|
1178 |
* (This function is passed to scandir(3) as a filter function.)
|
|
1179 |
*/
|
|
1180 |
int good_interface(const struct dirent *if_entry){ |
|
1181 |
if(if_entry->d_name[0] == '.'){ |
|
1182 |
return 0; |
|
1183 |
} |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1184 |
|
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1185 |
struct ifreq ifr; |
1186 |
if(not get_flags(if_entry->d_name, &ifr)){ |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1187 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1188 |
fprintf_plus(stderr, "Failed to get flags for interface " |
1189 |
"\"%s\"\n", if_entry->d_name); |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1190 |
} |
505.2.2
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead |
1191 |
return 0; |
1192 |
} |
|
1193 |
|
|
1194 |
if(not good_flags(if_entry->d_name, &ifr)){ |
|
1195 |
return 0; |
|
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1196 |
} |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1197 |
return 1; |
1198 |
}
|
|
1199 |
||
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1200 |
/*
|
1201 |
* This function determines if a directory entry in /sys/class/net
|
|
1202 |
* corresponds to an acceptable network device which is up.
|
|
1203 |
* (This function is passed to scandir(3) as a filter function.)
|
|
1204 |
*/
|
|
1205 |
int up_interface(const struct dirent *if_entry){ |
|
1206 |
if(if_entry->d_name[0] == '.'){ |
|
1207 |
return 0; |
|
1208 |
} |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1209 |
|
1210 |
struct ifreq ifr; |
|
1211 |
if(not get_flags(if_entry->d_name, &ifr)){ |
|
1212 |
if(debug){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1213 |
fprintf_plus(stderr, "Failed to get flags for interface " |
1214 |
"\"%s\"\n", if_entry->d_name); |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1215 |
} |
1216 |
return 0; |
|
1217 |
} |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1218 |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1219 |
/* Reject down interfaces */ |
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1220 |
if(not (ifr.ifr_flags & IFF_UP)){ |
1221 |
if(debug){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1222 |
fprintf_plus(stderr, "Rejecting down interface \"%s\"\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1223 |
if_entry->d_name); |
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1224 |
} |
1225 |
return 0; |
|
1226 |
} |
|
1227 |
|
|
1228 |
/* Reject non-running interfaces */ |
|
1229 |
if(not (ifr.ifr_flags & IFF_RUNNING)){ |
|
1230 |
if(debug){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1231 |
fprintf_plus(stderr, "Rejecting non-running interface \"%s\"\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1232 |
if_entry->d_name); |
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1233 |
} |
1234 |
return 0; |
|
1235 |
} |
|
1236 |
|
|
1237 |
if(not good_flags(if_entry->d_name, &ifr)){ |
|
1238 |
return 0; |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1239 |
} |
1240 |
return 1; |
|
1241 |
}
|
|
1242 |
||
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
1243 |
int notdotentries(const struct dirent *direntry){ |
1244 |
/* Skip "." and ".." */ |
|
1245 |
if(direntry->d_name[0] == '.' |
|
1246 |
and (direntry->d_name[1] == '\0' |
|
1247 |
or (direntry->d_name[1] == '.' |
|
1248 |
and direntry->d_name[2] == '\0'))){ |
|
1249 |
return 0; |
|
1250 |
} |
|
1251 |
return 1; |
|
1252 |
}
|
|
1253 |
||
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1254 |
/* Is this directory entry a runnable program? */
|
1255 |
int runnable_hook(const struct dirent *direntry){ |
|
1256 |
int ret; |
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1257 |
size_t sret; |
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1258 |
struct stat st; |
1259 |
|
|
1260 |
if((direntry->d_name)[0] == '\0'){ |
|
1261 |
/* Empty name? */ |
|
1262 |
return 0; |
|
1263 |
} |
|
1264 |
|
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1265 |
sret = strspn(direntry->d_name, "ABCDEFGHIJKLMNOPQRSTUVWXYZ" |
1266 |
"abcdefghijklmnopqrstuvwxyz" |
|
1267 |
"0123456789" |
|
1268 |
"_-"); |
|
1269 |
if((direntry->d_name)[sret] != '\0'){ |
|
1270 |
/* Contains non-allowed characters */ |
|
1271 |
if(debug){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1272 |
fprintf_plus(stderr, "Ignoring hook \"%s\" with bad name\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1273 |
direntry->d_name); |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1274 |
} |
1275 |
return 0; |
|
1276 |
} |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1277 |
|
505.3.4
by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the |
1278 |
char *fullname = NULL; |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1279 |
ret = asprintf(&fullname, "%s/%s", hookdir, direntry->d_name); |
505.3.4
by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the |
1280 |
if(ret < 0){ |
1281 |
perror_plus("asprintf"); |
|
1282 |
return 0; |
|
1283 |
} |
|
1284 |
|
|
1285 |
ret = stat(fullname, &st); |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1286 |
if(ret == -1){ |
1287 |
if(debug){ |
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1288 |
perror_plus("Could not stat hook"); |
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1289 |
} |
1290 |
return 0; |
|
1291 |
} |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1292 |
if(not (S_ISREG(st.st_mode))){ |
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1293 |
/* Not a regular file */ |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1294 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1295 |
fprintf_plus(stderr, "Ignoring hook \"%s\" - not a file\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1296 |
direntry->d_name); |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1297 |
} |
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1298 |
return 0; |
1299 |
} |
|
1300 |
if(not (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))){ |
|
1301 |
/* Not executable */ |
|
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1302 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1303 |
fprintf_plus(stderr, "Ignoring hook \"%s\" - not executable\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1304 |
direntry->d_name); |
505.3.6
by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes. |
1305 |
} |
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1306 |
return 0; |
1307 |
} |
|
505.3.12
by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output. |
1308 |
if(debug){ |
1309 |
fprintf_plus(stderr, "Hook \"%s\" is acceptable\n", |
|
1310 |
direntry->d_name); |
|
1311 |
} |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1312 |
return 1; |
1313 |
}
|
|
1314 |
||
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1315 |
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval){ |
1316 |
int ret; |
|
1317 |
struct timespec now; |
|
1318 |
struct timespec waited_time; |
|
1319 |
intmax_t block_time; |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
1320 |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1321 |
while(true){ |
1322 |
if(mc.current_server == NULL){ |
|
1323 |
if (debug){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1324 |
fprintf_plus(stderr, "Wait until first server is found." |
1325 |
" No timeout!\n"); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1326 |
} |
1327 |
ret = avahi_simple_poll_iterate(s, -1); |
|
1328 |
} else { |
|
1329 |
if (debug){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1330 |
fprintf_plus(stderr, "Check current_server if we should run" |
1331 |
" it, or wait\n"); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1332 |
} |
1333 |
/* the current time */ |
|
1334 |
ret = clock_gettime(CLOCK_MONOTONIC, &now); |
|
1335 |
if(ret == -1){ |
|
1336 |
perror_plus("clock_gettime"); |
|
1337 |
return -1; |
|
1338 |
} |
|
1339 |
/* Calculating in ms how long time between now and server |
|
1340 |
who we visted longest time ago. Now - last seen. */
|
|
485
by Teddy Hogeborn
Merge from Björn. |
1341 |
waited_time.tv_sec = (now.tv_sec |
1342 |
- mc.current_server->last_seen.tv_sec); |
|
1343 |
waited_time.tv_nsec = (now.tv_nsec |
|
1344 |
- mc.current_server->last_seen.tv_nsec); |
|
1345 |
/* total time is 10s/10,000ms. |
|
1346 |
Converting to s from ms by dividing by 1,000,
|
|
1347 |
and ns to ms by dividing by 1,000,000. */
|
|
1348 |
block_time = ((retry_interval |
|
1349 |
- ((intmax_t)waited_time.tv_sec * 1000)) |
|
1350 |
- ((intmax_t)waited_time.tv_nsec / 1000000)); |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
1351 |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1352 |
if (debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1353 |
fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n", |
1354 |
block_time); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1355 |
} |
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
1356 |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1357 |
if(block_time <= 0){ |
1358 |
ret = start_mandos_communication(mc.current_server->ip, |
|
485
by Teddy Hogeborn
Merge from Björn. |
1359 |
mc.current_server->port, |
1360 |
mc.current_server->if_index, |
|
1361 |
mc.current_server->af); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1362 |
if(ret == 0){ |
1363 |
avahi_simple_poll_quit(mc.simple_poll); |
|
1364 |
return 0; |
|
1365 |
} |
|
485
by Teddy Hogeborn
Merge from Björn. |
1366 |
ret = clock_gettime(CLOCK_MONOTONIC, |
1367 |
&mc.current_server->last_seen); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1368 |
if(ret == -1){ |
1369 |
perror_plus("clock_gettime"); |
|
1370 |
return -1; |
|
1371 |
} |
|
1372 |
mc.current_server = mc.current_server->next; |
|
485
by Teddy Hogeborn
Merge from Björn. |
1373 |
block_time = 0; /* Call avahi to find new Mandos |
1374 |
servers, but don't block */
|
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1375 |
} |
1376 |
|
|
1377 |
ret = avahi_simple_poll_iterate(s, (int)block_time); |
|
1378 |
} |
|
1379 |
if(ret != 0){ |
|
505.3.3
by teddy at bsnet
* plugins.d/mandos-client.c: Prefix all printouts with "Mandos plugin |
1380 |
if (ret > 0 or errno != EINTR){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1381 |
return (ret != 1) ? ret : 0; |
1382 |
} |
|
1383 |
} |
|
1384 |
} |
|
1385 |
}
|
|
1386 |
||
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1387 |
bool run_network_hooks(const char *mode, const char *interface, |
1388 |
const float delay){ |
|
1389 |
struct dirent **direntries; |
|
1390 |
struct dirent *direntry; |
|
1391 |
int ret; |
|
1392 |
int numhooks = scandir(hookdir, &direntries, runnable_hook, |
|
1393 |
alphasort); |
|
1394 |
if(numhooks == -1){ |
|
1395 |
perror_plus("scandir"); |
|
1396 |
} else { |
|
1397 |
int devnull = open("/dev/null", O_RDONLY); |
|
1398 |
for(int i = 0; i < numhooks; i++){ |
|
505.3.11
by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option. |
1399 |
direntry = direntries[i]; |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1400 |
char *fullname = NULL; |
1401 |
ret = asprintf(&fullname, "%s/%s", hookdir, direntry->d_name); |
|
1402 |
if(ret < 0){ |
|
1403 |
perror_plus("asprintf"); |
|
1404 |
continue; |
|
1405 |
} |
|
505.3.11
by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option. |
1406 |
if(debug){ |
1407 |
fprintf_plus(stderr, "Running network hook \"%s\"\n", |
|
1408 |
direntry->d_name); |
|
1409 |
} |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1410 |
pid_t hook_pid = fork(); |
1411 |
if(hook_pid == 0){ |
|
1412 |
/* Child */ |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
1413 |
/* Raise privileges */ |
1414 |
errno = 0; |
|
1415 |
ret = seteuid(0); |
|
1416 |
if(ret == -1){ |
|
1417 |
perror_plus("seteuid"); |
|
1418 |
} |
|
1419 |
/* Raise privileges even more */ |
|
1420 |
errno = 0; |
|
1421 |
ret = setuid(0); |
|
1422 |
if(ret == -1){ |
|
1423 |
perror_plus("setuid"); |
|
1424 |
} |
|
1425 |
/* Set group */ |
|
1426 |
errno = 0; |
|
1427 |
ret = setgid(0); |
|
1428 |
if(ret == -1){ |
|
1429 |
perror_plus("setgid"); |
|
1430 |
} |
|
1431 |
/* Reset supplementary groups */ |
|
1432 |
errno = 0; |
|
1433 |
ret = setgroups(0, NULL); |
|
1434 |
if(ret == -1){ |
|
1435 |
perror_plus("setgroups"); |
|
1436 |
} |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1437 |
dup2(devnull, STDIN_FILENO); |
1438 |
close(devnull); |
|
1439 |
dup2(STDERR_FILENO, STDOUT_FILENO); |
|
1440 |
ret = setenv("MANDOSNETHOOKDIR", hookdir, 1); |
|
1441 |
if(ret == -1){ |
|
1442 |
perror_plus("setenv"); |
|
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
1443 |
_exit(EX_OSERR); |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1444 |
} |
1445 |
ret = setenv("DEVICE", interface, 1); |
|
1446 |
if(ret == -1){ |
|
1447 |
perror_plus("setenv"); |
|
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
1448 |
_exit(EX_OSERR); |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1449 |
} |
1450 |
ret = setenv("VERBOSE", debug ? "1" : "0", 1); |
|
1451 |
if(ret == -1){ |
|
1452 |
perror_plus("setenv"); |
|
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
1453 |
_exit(EX_OSERR); |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1454 |
} |
1455 |
ret = setenv("MODE", mode, 1); |
|
1456 |
if(ret == -1){ |
|
1457 |
perror_plus("setenv"); |
|
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
1458 |
_exit(EX_OSERR); |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1459 |
} |
1460 |
char *delaystring; |
|
1461 |
ret = asprintf(&delaystring, "%f", delay); |
|
1462 |
if(ret == -1){ |
|
1463 |
perror_plus("asprintf"); |
|
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
1464 |
_exit(EX_OSERR); |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1465 |
} |
1466 |
ret = setenv("DELAY", delaystring, 1); |
|
1467 |
if(ret == -1){ |
|
1468 |
free(delaystring); |
|
1469 |
perror_plus("setenv"); |
|
505.3.15
by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure |
1470 |
_exit(EX_OSERR); |
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1471 |
} |
1472 |
free(delaystring); |
|
1473 |
ret = execl(fullname, direntry->d_name, mode, NULL); |
|
1474 |
perror_plus("execl"); |
|
1475 |
} else { |
|
1476 |
int status; |
|
1477 |
if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){ |
|
1478 |
perror_plus("waitpid"); |
|
1479 |
free(fullname); |
|
1480 |
continue; |
|
1481 |
} |
|
1482 |
if(WIFEXITED(status)){ |
|
1483 |
if(WEXITSTATUS(status) != 0){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1484 |
fprintf_plus(stderr, "Warning: network hook \"%s\" exited" |
1485 |
" with status %d\n", direntry->d_name, |
|
1486 |
WEXITSTATUS(status)); |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1487 |
free(fullname); |
1488 |
continue; |
|
1489 |
} |
|
1490 |
} else if(WIFSIGNALED(status)){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1491 |
fprintf_plus(stderr, "Warning: network hook \"%s\" died by" |
1492 |
" signal %d\n", direntry->d_name, |
|
1493 |
WTERMSIG(status)); |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1494 |
free(fullname); |
1495 |
continue; |
|
1496 |
} else { |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1497 |
fprintf_plus(stderr, "Warning: network hook \"%s\"" |
1498 |
" crashed\n", direntry->d_name); |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1499 |
free(fullname); |
1500 |
continue; |
|
1501 |
} |
|
1502 |
} |
|
1503 |
free(fullname); |
|
505.3.12
by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output. |
1504 |
if(debug){ |
1505 |
fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n", |
|
1506 |
direntry->d_name); |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
1507 |
} |
1508 |
} |
|
1509 |
close(devnull); |
|
1510 |
} |
|
1511 |
return true; |
|
1512 |
}
|
|
1513 |
||
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
1514 |
int main(int argc, char *argv[]){ |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1515 |
AvahiSServiceBrowser *sb = NULL; |
1516 |
int error; |
|
1517 |
int ret; |
|
1518 |
intmax_t tmpmax; |
|
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
1519 |
char *tmp; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1520 |
int exitcode = EXIT_SUCCESS; |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1521 |
const char *interface = ""; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1522 |
struct ifreq network; |
350
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on |
1523 |
int sd = -1; |
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1524 |
bool take_down_interface = false; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1525 |
uid_t uid; |
1526 |
gid_t gid; |
|
1527 |
char tempdir[] = "/tmp/mandosXXXXXX"; |
|
1528 |
bool tempdir_created = false; |
|
1529 |
AvahiIfIndex if_index = AVAHI_IF_UNSPEC; |
|
1530 |
const char *seckey = PATHDIR "/" SECKEY; |
|
1531 |
const char *pubkey = PATHDIR "/" PUBKEY; |
|
1532 |
|
|
1533 |
bool gnutls_initialized = false; |
|
1534 |
bool gpgme_initialized = false; |
|
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
1535 |
float delay = 2.5f; |
485
by Teddy Hogeborn
Merge from Björn. |
1536 |
double retry_interval = 10; /* 10s between trying a server and |
1537 |
retrying the same server again */
|
|
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
1538 |
|
369
by Teddy Hogeborn
* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added |
1539 |
struct sigaction old_sigterm_action = { .sa_handler = SIG_DFL }; |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
1540 |
struct sigaction sigterm_action = { .sa_handler = handle_sigterm }; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1541 |
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1542 |
uid = getuid(); |
1543 |
gid = getgid(); |
|
1544 |
|
|
1545 |
/* Lower any group privileges we might have, just to be safe */ |
|
1546 |
errno = 0; |
|
1547 |
ret = setgid(gid); |
|
1548 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1549 |
perror_plus("setgid"); |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1550 |
} |
1551 |
|
|
1552 |
/* Lower user privileges (temporarily) */ |
|
1553 |
errno = 0; |
|
1554 |
ret = seteuid(uid); |
|
1555 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1556 |
perror_plus("seteuid"); |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1557 |
} |
1558 |
|
|
1559 |
if(quit_now){ |
|
1560 |
goto end; |
|
1561 |
} |
|
1562 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1563 |
{ |
1564 |
struct argp_option options[] = { |
|
1565 |
{ .name = "debug", .key = 128, |
|
1566 |
.doc = "Debug mode", .group = 3 }, |
|
1567 |
{ .name = "connect", .key = 'c', |
|
1568 |
.arg = "ADDRESS:PORT", |
|
1569 |
.doc = "Connect directly to a specific Mandos server", |
|
1570 |
.group = 1 }, |
|
1571 |
{ .name = "interface", .key = 'i', |
|
1572 |
.arg = "NAME", |
|
304
by Teddy Hogeborn
Four new interrelated features: |
1573 |
.doc = "Network interface that will be used to search for" |
1574 |
" Mandos servers", |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1575 |
.group = 1 }, |
1576 |
{ .name = "seckey", .key = 's', |
|
1577 |
.arg = "FILE", |
|
1578 |
.doc = "OpenPGP secret key file base name", |
|
1579 |
.group = 1 }, |
|
1580 |
{ .name = "pubkey", .key = 'p', |
|
1581 |
.arg = "FILE", |
|
1582 |
.doc = "OpenPGP public key file base name", |
|
1583 |
.group = 2 }, |
|
1584 |
{ .name = "dh-bits", .key = 129, |
|
1585 |
.arg = "BITS", |
|
1586 |
.doc = "Bit length of the prime number used in the" |
|
1587 |
" Diffie-Hellman key exchange", |
|
1588 |
.group = 2 }, |
|
1589 |
{ .name = "priority", .key = 130, |
|
1590 |
.arg = "STRING", |
|
1591 |
.doc = "GnuTLS priority string for the TLS handshake", |
|
1592 |
.group = 1 }, |
|
1593 |
{ .name = "delay", .key = 131, |
|
1594 |
.arg = "SECONDS", |
|
1595 |
.doc = "Maximum delay to wait for interface startup", |
|
1596 |
.group = 2 }, |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1597 |
{ .name = "retry", .key = 132, |
1598 |
.arg = "SECONDS", |
|
1599 |
.doc = "Retry interval used when denied by the mandos server", |
|
1600 |
.group = 2 }, |
|
505.3.4
by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the |
1601 |
{ .name = "network-hook-dir", .key = 133, |
1602 |
.arg = "DIR", |
|
1603 |
.doc = "Directory where network hooks are located", |
|
1604 |
.group = 2 }, |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1605 |
/* |
1606 |
* These reproduce what we would get without ARGP_NO_HELP
|
|
1607 |
*/
|
|
1608 |
{ .name = "help", .key = '?', |
|
1609 |
.doc = "Give this help list", .group = -1 }, |
|
1610 |
{ .name = "usage", .key = -3, |
|
1611 |
.doc = "Give a short usage message", .group = -1 }, |
|
1612 |
{ .name = "version", .key = 'V', |
|
1613 |
.doc = "Print program version", .group = -1 }, |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1614 |
{ .name = NULL } |
1615 |
}; |
|
1616 |
|
|
1617 |
error_t parse_opt(int key, char *arg, |
|
1618 |
struct argp_state *state){ |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1619 |
errno = 0; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1620 |
switch(key){ |
1621 |
case 128: /* --debug */ |
|
1622 |
debug = true; |
|
1623 |
break; |
|
1624 |
case 'c': /* --connect */ |
|
1625 |
connect_to = arg; |
|
1626 |
break; |
|
1627 |
case 'i': /* --interface */ |
|
1628 |
interface = arg; |
|
1629 |
break; |
|
1630 |
case 's': /* --seckey */ |
|
1631 |
seckey = arg; |
|
1632 |
break; |
|
1633 |
case 'p': /* --pubkey */ |
|
1634 |
pubkey = arg; |
|
1635 |
break; |
|
1636 |
case 129: /* --dh-bits */ |
|
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
1637 |
errno = 0; |
1638 |
tmpmax = strtoimax(arg, &tmp, 10); |
|
1639 |
if(errno != 0 or tmp == arg or *tmp != '\0' |
|
1640 |
or tmpmax != (typeof(mc.dh_bits))tmpmax){ |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1641 |
argp_error(state, "Bad number of DH bits"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1642 |
} |
1643 |
mc.dh_bits = (typeof(mc.dh_bits))tmpmax; |
|
1644 |
break; |
|
1645 |
case 130: /* --priority */ |
|
1646 |
mc.priority = arg; |
|
1647 |
break; |
|
1648 |
case 131: /* --delay */ |
|
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
1649 |
errno = 0; |
1650 |
delay = strtof(arg, &tmp); |
|
1651 |
if(errno != 0 or tmp == arg or *tmp != '\0'){ |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1652 |
argp_error(state, "Bad delay"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1653 |
} |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1654 |
case 132: /* --retry */ |
1655 |
errno = 0; |
|
1656 |
retry_interval = strtod(arg, &tmp); |
|
1657 |
if(errno != 0 or tmp == arg or *tmp != '\0' |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
1658 |
or (retry_interval * 1000) > INT_MAX |
1659 |
or retry_interval < 0){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1660 |
argp_error(state, "Bad retry interval"); |
1661 |
} |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1662 |
break; |
505.3.4
by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the |
1663 |
case 133: /* --network-hook-dir */ |
1664 |
hookdir = arg; |
|
1665 |
break; |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1666 |
/* |
1667 |
* These reproduce what we would get without ARGP_NO_HELP
|
|
1668 |
*/
|
|
1669 |
case '?': /* --help */ |
|
1670 |
argp_state_help(state, state->out_stream, |
|
1671 |
(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR) |
|
1672 |
& ~(unsigned int)ARGP_HELP_EXIT_OK); |
|
1673 |
case -3: /* --usage */ |
|
1674 |
argp_state_help(state, state->out_stream, |
|
1675 |
ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR); |
|
1676 |
case 'V': /* --version */ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1677 |
fprintf_plus(state->out_stream, "%s\n", argp_program_version); |
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1678 |
exit(argp_err_exit_status); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1679 |
break; |
1680 |
default: |
|
1681 |
return ARGP_ERR_UNKNOWN; |
|
1682 |
} |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1683 |
return errno; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1684 |
} |
1685 |
|
|
1686 |
struct argp argp = { .options = options, .parser = parse_opt, |
|
1687 |
.args_doc = "", |
|
1688 |
.doc = "Mandos client -- Get and decrypt" |
|
1689 |
" passwords from a Mandos server" }; |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1690 |
ret = argp_parse(&argp, argc, argv, |
1691 |
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL); |
|
1692 |
switch(ret){ |
|
1693 |
case 0: |
|
1694 |
break; |
|
1695 |
case ENOMEM: |
|
1696 |
default: |
|
1697 |
errno = ret; |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1698 |
perror_plus("argp_parse"); |
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1699 |
exitcode = EX_OSERR; |
1700 |
goto end; |
|
1701 |
case EINVAL: |
|
1702 |
exitcode = EX_USAGE; |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1703 |
goto end; |
1704 |
} |
|
1705 |
} |
|
487
by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed |
1706 |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
1707 |
{ |
487
by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed |
1708 |
/* Work around Debian bug #633582: |
1709 |
<http://bugs.debian.org/633582> */
|
|
1710 |
|
|
1711 |
/* Re-raise priviliges */ |
|
1712 |
errno = 0; |
|
1713 |
ret = seteuid(0); |
|
1714 |
if(ret == -1){ |
|
1715 |
perror_plus("seteuid"); |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
1716 |
} else { |
1717 |
struct stat st; |
|
1718 |
|
|
1719 |
if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){ |
|
1720 |
int seckey_fd = open(seckey, O_RDONLY); |
|
1721 |
if(seckey_fd == -1){ |
|
1722 |
perror_plus("open"); |
|
1723 |
} else { |
|
1724 |
ret = (int)TEMP_FAILURE_RETRY(fstat(seckey_fd, &st)); |
|
1725 |
if(ret == -1){ |
|
1726 |
perror_plus("fstat"); |
|
1727 |
} else { |
|
1728 |
if(S_ISREG(st.st_mode) |
|
1729 |
and st.st_uid == 0 and st.st_gid == 0){ |
|
1730 |
ret = fchown(seckey_fd, uid, gid); |
|
1731 |
if(ret == -1){ |
|
1732 |
perror_plus("fchown"); |
|
1733 |
} |
|
1734 |
} |
|
1735 |
} |
|
1736 |
TEMP_FAILURE_RETRY(close(seckey_fd)); |
|
1737 |
} |
|
1738 |
} |
|
1739 |
|
|
1740 |
if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){ |
|
1741 |
int pubkey_fd = open(pubkey, O_RDONLY); |
|
1742 |
if(pubkey_fd == -1){ |
|
1743 |
perror_plus("open"); |
|
1744 |
} else { |
|
1745 |
ret = (int)TEMP_FAILURE_RETRY(fstat(pubkey_fd, &st)); |
|
1746 |
if(ret == -1){ |
|
1747 |
perror_plus("fstat"); |
|
1748 |
} else { |
|
1749 |
if(S_ISREG(st.st_mode) |
|
1750 |
and st.st_uid == 0 and st.st_gid == 0){ |
|
1751 |
ret = fchown(pubkey_fd, uid, gid); |
|
1752 |
if(ret == -1){ |
|
1753 |
perror_plus("fchown"); |
|
1754 |
} |
|
1755 |
} |
|
1756 |
} |
|
1757 |
TEMP_FAILURE_RETRY(close(pubkey_fd)); |
|
1758 |
} |
|
1759 |
} |
|
1760 |
|
|
505.3.11
by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option. |
1761 |
/* Lower privileges */ |
1762 |
errno = 0; |
|
1763 |
ret = seteuid(uid); |
|
1764 |
if(ret == -1){ |
|
1765 |
perror_plus("seteuid"); |
|
1766 |
} |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1767 |
} |
1768 |
} |
|
1769 |
|
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
1770 |
/* Run network hooks */ |
1771 |
if(not run_network_hooks("start", interface, delay)){ |
|
1772 |
goto end; |
|
1773 |
} |
|
1774 |
|
|
24.1.135
by Björn Påhlsson
Earlier signal handling |
1775 |
if(not debug){ |
1776 |
avahi_set_log_function(empty_log); |
|
1777 |
} |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
1778 |
|
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1779 |
if(interface[0] == '\0'){ |
1780 |
struct dirent **direntries; |
|
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1781 |
/* First look for interfaces that are up */ |
1782 |
ret = scandir(sys_class_net, &direntries, up_interface, |
|
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1783 |
alphasort); |
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1784 |
if(ret == 0){ |
1785 |
/* No up interfaces, look for any good interfaces */ |
|
1786 |
free(direntries); |
|
1787 |
ret = scandir(sys_class_net, &direntries, good_interface, |
|
1788 |
alphasort); |
|
1789 |
} |
|
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1790 |
if(ret >= 1){ |
505.3.1
by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message. |
1791 |
/* Pick the first interface returned */ |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1792 |
interface = strdup(direntries[0]->d_name); |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1793 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1794 |
fprintf_plus(stderr, "Using interface \"%s\"\n", interface); |
237.2.34
by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output. |
1795 |
} |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1796 |
if(interface == NULL){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1797 |
perror_plus("malloc"); |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1798 |
free(direntries); |
1799 |
exitcode = EXIT_FAILURE; |
|
1800 |
goto end; |
|
1801 |
} |
|
1802 |
free(direntries); |
|
1803 |
} else { |
|
1804 |
free(direntries); |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1805 |
fprintf_plus(stderr, "Could not find a network interface\n"); |
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1806 |
exitcode = EXIT_FAILURE; |
1807 |
goto end; |
|
1808 |
} |
|
1809 |
} |
|
309
by Teddy Hogeborn
Merge from Björn: |
1810 |
|
24.1.135
by Björn Påhlsson
Earlier signal handling |
1811 |
/* Initialize Avahi early so avahi_simple_poll_quit() can be called |
1812 |
from the signal handler */
|
|
1813 |
/* Initialize the pseudo-RNG for Avahi */ |
|
1814 |
srand((unsigned int) time(NULL)); |
|
1815 |
mc.simple_poll = avahi_simple_poll_new(); |
|
1816 |
if(mc.simple_poll == NULL){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
1817 |
fprintf_plus(stderr, |
1818 |
"Avahi: Failed to create simple poll object.\n"); |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1819 |
exitcode = EX_UNAVAILABLE; |
24.1.135
by Björn Påhlsson
Earlier signal handling |
1820 |
goto end; |
1821 |
} |
|
309
by Teddy Hogeborn
Merge from Björn: |
1822 |
|
24.1.135
by Björn Påhlsson
Earlier signal handling |
1823 |
sigemptyset(&sigterm_action.sa_mask); |
309
by Teddy Hogeborn
Merge from Björn: |
1824 |
ret = sigaddset(&sigterm_action.sa_mask, SIGINT); |
1825 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1826 |
perror_plus("sigaddset"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1827 |
exitcode = EX_OSERR; |
309
by Teddy Hogeborn
Merge from Björn: |
1828 |
goto end; |
1829 |
} |
|
1830 |
ret = sigaddset(&sigterm_action.sa_mask, SIGHUP); |
|
1831 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1832 |
perror_plus("sigaddset"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1833 |
exitcode = EX_OSERR; |
309
by Teddy Hogeborn
Merge from Björn: |
1834 |
goto end; |
1835 |
} |
|
24.1.135
by Björn Påhlsson
Earlier signal handling |
1836 |
ret = sigaddset(&sigterm_action.sa_mask, SIGTERM); |
1837 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1838 |
perror_plus("sigaddset"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1839 |
exitcode = EX_OSERR; |
24.1.135
by Björn Påhlsson
Earlier signal handling |
1840 |
goto end; |
1841 |
} |
|
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1842 |
/* Need to check if the handler is SIG_IGN before handling: |
1843 |
| [[info:libc:Initial Signal Actions]] |
|
|
1844 |
| [[info:libc:Basic Signal Handling]] |
|
|
1845 |
*/
|
|
1846 |
ret = sigaction(SIGINT, NULL, &old_sigterm_action); |
|
1847 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1848 |
perror_plus("sigaction"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1849 |
return EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1850 |
} |
1851 |
if(old_sigterm_action.sa_handler != SIG_IGN){ |
|
1852 |
ret = sigaction(SIGINT, &sigterm_action, NULL); |
|
1853 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1854 |
perror_plus("sigaction"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1855 |
exitcode = EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1856 |
goto end; |
1857 |
} |
|
1858 |
} |
|
1859 |
ret = sigaction(SIGHUP, NULL, &old_sigterm_action); |
|
1860 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1861 |
perror_plus("sigaction"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1862 |
return EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1863 |
} |
1864 |
if(old_sigterm_action.sa_handler != SIG_IGN){ |
|
1865 |
ret = sigaction(SIGHUP, &sigterm_action, NULL); |
|
1866 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1867 |
perror_plus("sigaction"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1868 |
exitcode = EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1869 |
goto end; |
1870 |
} |
|
1871 |
} |
|
1872 |
ret = sigaction(SIGTERM, NULL, &old_sigterm_action); |
|
1873 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1874 |
perror_plus("sigaction"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1875 |
return EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1876 |
} |
1877 |
if(old_sigterm_action.sa_handler != SIG_IGN){ |
|
1878 |
ret = sigaction(SIGTERM, &sigterm_action, NULL); |
|
1879 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1880 |
perror_plus("sigaction"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1881 |
exitcode = EX_OSERR; |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
1882 |
goto end; |
1883 |
} |
|
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
1884 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1885 |
|
1886 |
/* If the interface is down, bring it up */ |
|
237.2.33
by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to |
1887 |
if(strcmp(interface, "none") != 0){ |
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1888 |
if_index = (AvahiIfIndex) if_nametoindex(interface); |
1889 |
if(if_index == 0){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
1890 |
fprintf_plus(stderr, "No such interface: \"%s\"\n", interface); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1891 |
exitcode = EX_UNAVAILABLE; |
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1892 |
goto end; |
1893 |
} |
|
1894 |
|
|
1895 |
if(quit_now){ |
|
1896 |
goto end; |
|
1897 |
} |
|
1898 |
|
|
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1899 |
/* Re-raise priviliges */ |
1900 |
errno = 0; |
|
1901 |
ret = seteuid(0); |
|
1902 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1903 |
perror_plus("seteuid"); |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1904 |
} |
1905 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1906 |
#ifdef __linux__
|
1907 |
/* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO |
|
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
1908 |
messages about the network interface to mess up the prompt */
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1909 |
ret = klogctl(8, NULL, 5); |
304
by Teddy Hogeborn
Four new interrelated features: |
1910 |
bool restore_loglevel = true; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1911 |
if(ret == -1){ |
304
by Teddy Hogeborn
Four new interrelated features: |
1912 |
restore_loglevel = false; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1913 |
perror_plus("klogctl"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1914 |
} |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
1915 |
#endif /* __linux__ */ |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1916 |
|
1917 |
sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); |
|
1918 |
if(sd < 0){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1919 |
perror_plus("socket"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1920 |
exitcode = EX_OSERR; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1921 |
#ifdef __linux__
|
304
by Teddy Hogeborn
Four new interrelated features: |
1922 |
if(restore_loglevel){ |
1923 |
ret = klogctl(7, NULL, 0); |
|
1924 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1925 |
perror_plus("klogctl"); |
304
by Teddy Hogeborn
Four new interrelated features: |
1926 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1927 |
} |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
1928 |
#endif /* __linux__ */ |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1929 |
/* Lower privileges */ |
1930 |
errno = 0; |
|
1931 |
ret = seteuid(uid); |
|
1932 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1933 |
perror_plus("seteuid"); |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1934 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1935 |
goto end; |
1936 |
} |
|
1937 |
strcpy(network.ifr_name, interface); |
|
1938 |
ret = ioctl(sd, SIOCGIFFLAGS, &network); |
|
1939 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1940 |
perror_plus("ioctl SIOCGIFFLAGS"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1941 |
#ifdef __linux__
|
304
by Teddy Hogeborn
Four new interrelated features: |
1942 |
if(restore_loglevel){ |
1943 |
ret = klogctl(7, NULL, 0); |
|
1944 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1945 |
perror_plus("klogctl"); |
304
by Teddy Hogeborn
Four new interrelated features: |
1946 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1947 |
} |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
1948 |
#endif /* __linux__ */ |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1949 |
exitcode = EX_OSERR; |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1950 |
/* Lower privileges */ |
1951 |
errno = 0; |
|
1952 |
ret = seteuid(uid); |
|
1953 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1954 |
perror_plus("seteuid"); |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1955 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1956 |
goto end; |
1957 |
} |
|
1958 |
if((network.ifr_flags & IFF_UP) == 0){ |
|
1959 |
network.ifr_flags |= IFF_UP; |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1960 |
take_down_interface = true; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1961 |
ret = ioctl(sd, SIOCSIFFLAGS, &network); |
1962 |
if(ret == -1){ |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1963 |
take_down_interface = false; |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1964 |
perror_plus("ioctl SIOCSIFFLAGS +IFF_UP"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
1965 |
exitcode = EX_OSERR; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1966 |
#ifdef __linux__
|
304
by Teddy Hogeborn
Four new interrelated features: |
1967 |
if(restore_loglevel){ |
1968 |
ret = klogctl(7, NULL, 0); |
|
1969 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1970 |
perror_plus("klogctl"); |
304
by Teddy Hogeborn
Four new interrelated features: |
1971 |
} |
24.1.124
by Björn Påhlsson
Added lower kernel loglevel to reduce clutter on system console. |
1972 |
} |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
1973 |
#endif /* __linux__ */ |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1974 |
/* Lower privileges */ |
1975 |
errno = 0; |
|
1976 |
ret = seteuid(uid); |
|
1977 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1978 |
perror_plus("seteuid"); |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
1979 |
} |
65
by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network |
1980 |
goto end; |
1981 |
} |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1982 |
} |
485
by Teddy Hogeborn
Merge from Björn. |
1983 |
/* Sleep checking until interface is running. |
1984 |
Check every 0.25s, up to total time of delay */
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1985 |
for(int i=0; i < delay * 4; i++){ |
65
by Teddy Hogeborn
* plugins.d/password-request.c (main): Bug fix: Bring up network |
1986 |
ret = ioctl(sd, SIOCGIFFLAGS, &network); |
1987 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1988 |
perror_plus("ioctl SIOCGIFFLAGS"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1989 |
} else if(network.ifr_flags & IFF_RUNNING){ |
1990 |
break; |
|
1991 |
} |
|
1992 |
struct timespec sleeptime = { .tv_nsec = 250000000 }; |
|
1993 |
ret = nanosleep(&sleeptime, NULL); |
|
1994 |
if(ret == -1 and errno != EINTR){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1995 |
perror_plus("nanosleep"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
1996 |
} |
1997 |
} |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
1998 |
if(not take_down_interface){ |
1999 |
/* We won't need the socket anymore */ |
|
350
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on |
2000 |
ret = (int)TEMP_FAILURE_RETRY(close(sd)); |
2001 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2002 |
perror_plus("close"); |
350
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on |
2003 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2004 |
} |
2005 |
#ifdef __linux__
|
|
304
by Teddy Hogeborn
Four new interrelated features: |
2006 |
if(restore_loglevel){ |
2007 |
/* Restores kernel loglevel to default */ |
|
2008 |
ret = klogctl(7, NULL, 0); |
|
2009 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2010 |
perror_plus("klogctl"); |
304
by Teddy Hogeborn
Four new interrelated features: |
2011 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2012 |
} |
308
by Teddy Hogeborn
* plugin-runner.c: Comment change. |
2013 |
#endif /* __linux__ */ |
368
by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted |
2014 |
/* Lower privileges */ |
2015 |
errno = 0; |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
2016 |
/* Lower privileges */ |
2017 |
ret = seteuid(uid); |
|
2018 |
if(ret == -1){ |
|
2019 |
perror_plus("seteuid"); |
|
365
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). |
2020 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2021 |
} |
2022 |
|
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2023 |
if(quit_now){ |
2024 |
goto end; |
|
2025 |
} |
|
2026 |
|
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
2027 |
ret = init_gnutls_global(pubkey, seckey); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2028 |
if(ret == -1){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2029 |
fprintf_plus(stderr, "init_gnutls_global failed\n"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2030 |
exitcode = EX_UNAVAILABLE; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2031 |
goto end; |
2032 |
} else { |
|
2033 |
gnutls_initialized = true; |
|
2034 |
} |
|
2035 |
|
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2036 |
if(quit_now){ |
2037 |
goto end; |
|
2038 |
} |
|
2039 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2040 |
if(mkdtemp(tempdir) == NULL){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2041 |
perror_plus("mkdtemp"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2042 |
goto end; |
2043 |
} |
|
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
2044 |
tempdir_created = true; |
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2045 |
|
2046 |
if(quit_now){ |
|
2047 |
goto end; |
|
2048 |
} |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2049 |
|
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
2050 |
if(not init_gpgme(pubkey, seckey, tempdir)){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2051 |
fprintf_plus(stderr, "init_gpgme failed\n"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2052 |
exitcode = EX_UNAVAILABLE; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2053 |
goto end; |
2054 |
} else { |
|
2055 |
gpgme_initialized = true; |
|
2056 |
} |
|
2057 |
|
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2058 |
if(quit_now){ |
2059 |
goto end; |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2060 |
} |
2061 |
|
|
2062 |
if(connect_to != NULL){ |
|
2063 |
/* Connect directly, do not use Zeroconf */ |
|
2064 |
/* (Mainly meant for debugging) */ |
|
2065 |
char *address = strrchr(connect_to, ':'); |
|
2066 |
if(address == NULL){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2067 |
fprintf_plus(stderr, "No colon in address\n"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2068 |
exitcode = EX_USAGE; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2069 |
goto end; |
2070 |
} |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2071 |
|
2072 |
if(quit_now){ |
|
2073 |
goto end; |
|
2074 |
} |
|
2075 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2076 |
uint16_t port; |
311
by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it: |
2077 |
errno = 0; |
2078 |
tmpmax = strtoimax(address+1, &tmp, 10); |
|
2079 |
if(errno != 0 or tmp == address+1 or *tmp != '\0' |
|
2080 |
or tmpmax != (uint16_t)tmpmax){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2081 |
fprintf_plus(stderr, "Bad port number\n"); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2082 |
exitcode = EX_USAGE; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2083 |
goto end; |
2084 |
} |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2085 |
|
2086 |
if(quit_now){ |
|
2087 |
goto end; |
|
2088 |
} |
|
2089 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2090 |
port = (uint16_t)tmpmax; |
2091 |
*address = '\0'; |
|
304
by Teddy Hogeborn
Four new interrelated features: |
2092 |
/* Colon in address indicates IPv6 */ |
2093 |
int af; |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
2094 |
if(strchr(connect_to, ':') != NULL){ |
304
by Teddy Hogeborn
Four new interrelated features: |
2095 |
af = AF_INET6; |
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
2096 |
/* Accept [] around IPv6 address - see RFC 5952 */ |
2097 |
if(connect_to[0] == '[' and address[-1] == ']') |
|
2098 |
{ |
|
2099 |
connect_to++; |
|
2100 |
address[-1] = '\0'; |
|
2101 |
} |
|
304
by Teddy Hogeborn
Four new interrelated features: |
2102 |
} else { |
2103 |
af = AF_INET; |
|
2104 |
} |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
2105 |
address = connect_to; |
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2106 |
|
2107 |
if(quit_now){ |
|
2108 |
goto end; |
|
2109 |
} |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
2110 |
|
24.1.163
by Björn Påhlsson
mandos-client: Added never ending loop for --connect |
2111 |
while(not quit_now){ |
2112 |
ret = start_mandos_communication(address, port, if_index, af); |
|
2113 |
if(quit_now or ret == 0){ |
|
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2114 |
break; |
2115 |
} |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
2116 |
if(debug){ |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
2117 |
fprintf_plus(stderr, "Retrying in %d seconds\n", |
2118 |
(int)retry_interval); |
|
491
by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning. |
2119 |
} |
2120 |
sleep((int)retry_interval); |
|
492
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around |
2121 |
} |
2122 |
|
|
24.1.163
by Björn Påhlsson
mandos-client: Added never ending loop for --connect |
2123 |
if (not quit_now){ |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2124 |
exitcode = EXIT_SUCCESS; |
2125 |
} |
|
505.2.3
by Teddy Hogeborn
Intermediate commit - this does *not* work yet. |
2126 |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2127 |
goto end; |
2128 |
} |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2129 |
|
2130 |
if(quit_now){ |
|
2131 |
goto end; |
|
2132 |
} |
|
2133 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2134 |
{ |
2135 |
AvahiServerConfig config; |
|
2136 |
/* Do not publish any local Zeroconf records */ |
|
2137 |
avahi_server_config_init(&config); |
|
2138 |
config.publish_hinfo = 0; |
|
2139 |
config.publish_addresses = 0; |
|
2140 |
config.publish_workstation = 0; |
|
2141 |
config.publish_domain = 0; |
|
2142 |
|
|
2143 |
/* Allocate a new server */ |
|
2144 |
mc.server = avahi_server_new(avahi_simple_poll_get |
|
2145 |
(mc.simple_poll), &config, NULL, |
|
2146 |
NULL, &error); |
|
2147 |
|
|
2148 |
/* Free the Avahi configuration data */ |
|
2149 |
avahi_server_config_free(&config); |
|
2150 |
} |
|
2151 |
|
|
2152 |
/* Check if creating the Avahi server object succeeded */ |
|
2153 |
if(mc.server == NULL){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2154 |
fprintf_plus(stderr, "Failed to create Avahi server: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
2155 |
avahi_strerror(error)); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2156 |
exitcode = EX_UNAVAILABLE; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2157 |
goto end; |
2158 |
} |
|
2159 |
|
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2160 |
if(quit_now){ |
2161 |
goto end; |
|
2162 |
} |
|
2163 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2164 |
/* Create the Avahi service browser */ |
2165 |
sb = avahi_s_service_browser_new(mc.server, if_index, |
|
313
by Teddy Hogeborn
* plugins.d/mandos-client.c (browse_callback, main): Do not require |
2166 |
AVAHI_PROTO_UNSPEC, "_mandos._tcp", |
24.1.134
by Björn Påhlsson
plugin-runner: Added support for empty string arguments |
2167 |
NULL, 0, browse_callback, NULL); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2168 |
if(sb == NULL){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2169 |
fprintf_plus(stderr, "Failed to create service browser: %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
2170 |
avahi_strerror(avahi_server_errno(mc.server))); |
399
by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment. |
2171 |
exitcode = EX_UNAVAILABLE; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2172 |
goto end; |
2173 |
} |
|
307
by Teddy Hogeborn
Merge from Björn: |
2174 |
|
353
by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before |
2175 |
if(quit_now){ |
2176 |
goto end; |
|
2177 |
} |
|
2178 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2179 |
/* Run the main loop */ |
2180 |
|
|
2181 |
if(debug){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2182 |
fprintf_plus(stderr, "Starting Avahi loop search\n"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2183 |
} |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2184 |
|
485
by Teddy Hogeborn
Merge from Björn. |
2185 |
ret = avahi_loop_with_timeout(mc.simple_poll, |
2186 |
(int)(retry_interval * 1000)); |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2187 |
if(debug){ |
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2188 |
fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n", |
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
2189 |
(ret == 0) ? "successfully" : "with error"); |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2190 |
} |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2191 |
|
40
by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its |
2192 |
end: |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2193 |
|
2194 |
if(debug){ |
|
505.2.6
by Björn Påhlsson
replace calls to fprintf with fprintf_plus. |
2195 |
fprintf_plus(stderr, "%s exiting\n", argv[0]); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2196 |
} |
2197 |
|
|
2198 |
/* Cleanup things */ |
|
2199 |
if(sb != NULL) |
|
2200 |
avahi_s_service_browser_free(sb); |
|
2201 |
|
|
2202 |
if(mc.server != NULL) |
|
2203 |
avahi_server_free(mc.server); |
|
2204 |
|
|
2205 |
if(mc.simple_poll != NULL) |
|
2206 |
avahi_simple_poll_free(mc.simple_poll); |
|
2207 |
|
|
2208 |
if(gnutls_initialized){ |
|
2209 |
gnutls_certificate_free_credentials(mc.cred); |
|
2210 |
gnutls_global_deinit(); |
|
2211 |
gnutls_dh_params_deinit(mc.dh_params); |
|
2212 |
} |
|
2213 |
|
|
2214 |
if(gpgme_initialized){ |
|
2215 |
gpgme_release(mc.ctx); |
|
2216 |
} |
|
505.3.12
by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output. |
2217 |
|
485
by Teddy Hogeborn
Merge from Björn. |
2218 |
/* Cleans up the circular linked list of Mandos servers the client |
2219 |
has seen */
|
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2220 |
if(mc.current_server != NULL){ |
2221 |
mc.current_server->prev->next = NULL; |
|
2222 |
while(mc.current_server != NULL){ |
|
2223 |
server *next = mc.current_server->next; |
|
2224 |
free(mc.current_server); |
|
2225 |
mc.current_server = next; |
|
2226 |
} |
|
2227 |
} |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2228 |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
2229 |
/* Run network hooks */ |
2230 |
run_network_hooks("stop", interface, delay); |
|
2231 |
|
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
2232 |
/* Re-raise priviliges */ |
2233 |
{ |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
2234 |
errno = 0; |
2235 |
ret = seteuid(0); |
|
2236 |
if(ret == -1){ |
|
2237 |
perror_plus("seteuid"); |
|
350
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on |
2238 |
} |
505.3.12
by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output. |
2239 |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
2240 |
/* Take down the network interface */ |
2241 |
if(take_down_interface and geteuid() == 0){ |
|
365
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). |
2242 |
ret = ioctl(sd, SIOCGIFFLAGS, &network); |
2243 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2244 |
perror_plus("ioctl SIOCGIFFLAGS"); |
505.3.3
by teddy at bsnet
* plugins.d/mandos-client.c: Prefix all printouts with "Mandos plugin |
2245 |
} else if(network.ifr_flags & IFF_UP){ |
394
by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change |
2246 |
network.ifr_flags &= ~(short)IFF_UP; /* clear flag */ |
365
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). |
2247 |
ret = ioctl(sd, SIOCSIFFLAGS, &network); |
2248 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2249 |
perror_plus("ioctl SIOCSIFFLAGS -IFF_UP"); |
365
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). |
2250 |
} |
2251 |
} |
|
2252 |
ret = (int)TEMP_FAILURE_RETRY(close(sd)); |
|
2253 |
if(ret == -1){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2254 |
perror_plus("close"); |
365
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid(). |
2255 |
} |
350
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on |
2256 |
} |
2257 |
} |
|
505.3.16
by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly. |
2258 |
/* Lower privileges permanently */ |
2259 |
errno = 0; |
|
2260 |
ret = setuid(uid); |
|
2261 |
if(ret == -1){ |
|
2262 |
perror_plus("setuid"); |
|
505.3.8
by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New. |
2263 |
} |
350
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on |
2264 |
|
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
2265 |
/* Removes the GPGME temp directory and all files inside */ |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2266 |
if(tempdir_created){ |
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
2267 |
struct dirent **direntries = NULL; |
2268 |
struct dirent *direntry = NULL; |
|
492
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around |
2269 |
int numentries = scandir(tempdir, &direntries, notdotentries, |
2270 |
alphasort); |
|
2271 |
if (numentries > 0){ |
|
2272 |
for(int i = 0; i < numentries; i++){ |
|
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
2273 |
direntry = direntries[i]; |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2274 |
char *fullname = NULL; |
2275 |
ret = asprintf(&fullname, "%s/%s", tempdir, |
|
2276 |
direntry->d_name); |
|
2277 |
if(ret < 0){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2278 |
perror_plus("asprintf"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2279 |
continue; |
2280 |
} |
|
2281 |
ret = remove(fullname); |
|
2282 |
if(ret == -1){ |
|
505.3.9
by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system. |
2283 |
fprintf_plus(stderr, "remove(\"%s\"): %s\n", fullname, |
2284 |
strerror(errno)); |
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2285 |
} |
2286 |
free(fullname); |
|
2287 |
} |
|
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
2288 |
} |
2289 |
||
492
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around |
2290 |
/* need to clean even if 0 because man page doesn't specify */ |
24.1.172
by Björn Påhlsson
using scandir instead of readdir |
2291 |
free(direntries); |
492
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around |
2292 |
if (numentries == -1){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2293 |
perror_plus("scandir"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2294 |
} |
2295 |
ret = rmdir(tempdir); |
|
2296 |
if(ret == -1 and errno != ENOENT){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2297 |
perror_plus("rmdir"); |
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2298 |
} |
2299 |
} |
|
2300 |
|
|
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
2301 |
if(quit_now){ |
357
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals. |
2302 |
sigemptyset(&old_sigterm_action.sa_mask); |
2303 |
old_sigterm_action.sa_handler = SIG_DFL; |
|
374
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on |
2304 |
ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received, |
2305 |
&old_sigterm_action, |
|
2306 |
NULL)); |
|
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
2307 |
if(ret == -1){ |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2308 |
perror_plus("sigaction"); |
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
2309 |
} |
374
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on |
2310 |
do { |
2311 |
ret = raise(signal_received); |
|
2312 |
} while(ret != 0 and errno == EINTR); |
|
2313 |
if(ret != 0){ |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2314 |
perror_plus("raise"); |
374
by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on |
2315 |
abort(); |
2316 |
} |
|
2317 |
TEMP_FAILURE_RETRY(pause()); |
|
354
by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New. |
2318 |
} |
2319 |
|
|
293
by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only. |
2320 |
return exitcode; |
13
by Björn Påhlsson
Added following support: |
2321 |
}
|