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