(root)/mandos/release
» Revision
237.7.510
(compared to revision 237.7.318)
: plugins.d/mandos-client.c
To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugins.d/mandos-client.c
- browse files at revision 237.7.510
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.510
- Committer: Teddy Hogeborn
- Date: 2019-02-09 23:23:26 UTC
- mto: (237.7.594 trunk)
- mto: This revision was merged to the branch mainline in revision 370.
- Revision ID: teddy@recompile.se-20190209232326-z1z2kzpgfixz7iaj
Add support for using raw public keys in TLS (RFC 7250)
Since GnuTLS removed support for OpenPGP keys in TLS (RFC 6091), and
no other library supports it, we have to change the protocol to use
something else. We choose to use "raw public keys" (RFC 7250). Since
we still use OpenPGP keys to decrypt the secret password, this means
that each client will have two keys: One OpenPGP key and one TLS
public/private key, and the key ID of the latter key is used to
identify clients instead of the fingerprint of the OpenPGP key.
Note that this code is still compatible with GnuTLS before version
3.6.0 (when OpenPGP key support was removed). This commit merely adds
support for using raw pulic keys instead with GnuTLS 3.6.6. or later.
* DBUS-API (Signals/ClientNotFound): Change name of first parameter
from "Fingerprint" to "KeyID".
(Mandos Client Interface/Properties/KeyID): New.
* INSTALL: Document conflict with GnuTLS 3.6.0 (which removed OpenPGP
key support) up until 3.6.6, when support for raw public
keys was added. Also document new dependency of client on
"gnutls-bin" package (for certtool).
* Makefile (run-client): Depend on TLS key files, and also pass them
as arguments to client.
(keydir/tls-privkey.pem, keydir/tls-pubkey.pem): New.
(confdir/clients.conf): Add dependency on TLS public key.
(purge-client): Add removal of TLS key files.
* clients.conf ([foo]/key_id, [bar]/key_id): New.
* debian/control (Source: mandos/Build-Depends): Also allow
libgnutls30 (>= 3.6.6)
(Package: mandos/Depends): - '' -
(Package: mandos/Description): Alter description to match new
design.
(Package: mandos-client/Description): - '' -
(Package: mandos-client/Depends): Move "gnutls-bin | openssl" to
here from "Recommends".
* debian/mandos-client.README.Debian: Add --tls-privkey and
--tls-pubkey options to test
command.
* debian/mandos-client.postinst (create_key): Renamed to "create_keys"
(all callers changed),
and also create TLS key.
* debian/mandos-client.postrm (purge): Also remove TLS key files.
* intro.xml (DESCRIPTION): Describe new dual-key design.
* mandos (GnuTLS): Define different functions depending on whether
support for raw public keys is detected.
(Client.key_id): New attribute.
(ClientDBus.KeyID_dbus_property): New method.
(ProxyClient.__init__): Take new "key_id" parameter.
(ClientHandler.handle): Use key IDs when using raw public keys and
use fingerprints when using OpenPGP keys.
(ClientHandler.peer_certificate): Also handle raw public keys.
(ClientHandler.key_id): New.
(MandosServer.handle_ipc): Pass key ID over the pipe IPC. Also
check for key ID matches when looking up
clients.
(main): Default GnuTLS priority string depends on whether we are
using raw public keys or not. When unpickling clients, set
key_id if not set in the pickle.
(main/MandosDBusService.ClientNotFound): Change name of first
parameter from
"Fingerprint" to "KeyID".
* mandos-clients.conf.xml (OPTIONS): Document new "key_id" option.
(OPTIONS/secret): Mention new key ID matchning.
(EXPANSION/RUNTIME EXPANSION): Add new "key_id" option.
(EXAMPLE): - '' -
* mandos-ctl (tablewords, main/keywords): Add new "KeyID" property.
* mandos-keygen: Create TLS key files. New "--tls-keytype" (-T)
option. Alter help text to be more clear about key
types. When in password mode, also output "key_id"
option.
* mandos-keygen.xml (SYNOPSIS): Add new "--tls-keytype" (-T) option.
(DESCRIPTION): Alter to match new dual-key design.
(OVERVIEW): - '' -
(FILES): Add TLS key files.
* mandos-options.xml (priority): Document new default priority string
when using raw public keys.
* mandos.xml (NETWORK PROTOCOL): Describe new protocol using key ID.
(BUGS): Remove issue about checking expire times of OpenPGP keys,
since TLS public keys do not have expiration times.
(SECURITY/CLIENT): Alter description to match new design.
(SEE ALSO/GnuTLS): - '' -
(SEE ALSO): Add reference to RFC 7250, and alter description of when
RFC 6091 is used.
* overview.xml: Alter text to match new design.
* plugin-runner.xml (EXAMPLE): Add --tls-pubkey and --tls-privkey
options to mandos-client options.
* plugins.d/mandos-client.c: Use raw public keys when compiling with
supporting GnuTLS versions. Add new
"--tls-pubkey" and "--tls-privkey"
options (which do nothing if GnuTLS
library does not support raw public
keys). Alter text throughout to reflect
new design. Only generate new DH
parameters (based on size of OpenPGP key)
when using OpenPGP in TLS. Default
GnuTLS priority string depends on whether
we are using raw public keys or not.
* plugins.d/mandos-client.xml (SYNOPSIS): Add new "--tls-privkey" (-t)
and "--tls-pubkey" (-T)
options.
(DESCRIPTION): Describe new dual-key design.
(OPTIONS): Document new "--tls-privkey" (-t) and "--tls-pubkey" (-T)
options.
(OPTIONS/--dh-bits): No longer necessarily depends on OpenPGP key
size.
(FILES): Add default locations for TLS public and private key files.
(EXAMPLE): Use new --tls-pubkey and --tls-privkey options.
(SECURITY): Alter wording slightly to reflect new dual-key design.
(SEE ALSO/GnuTLS): Alter description to match new design.
(SEE ALSO): Add reference to RFC 7250, and alter description of when
RFC 6091 is used.
Since GnuTLS removed support for OpenPGP keys in TLS (RFC 6091), and
no other library supports it, we have to change the protocol to use
something else. We choose to use "raw public keys" (RFC 7250). Since
we still use OpenPGP keys to decrypt the secret password, this means
that each client will have two keys: One OpenPGP key and one TLS
public/private key, and the key ID of the latter key is used to
identify clients instead of the fingerprint of the OpenPGP key.
Note that this code is still compatible with GnuTLS before version
3.6.0 (when OpenPGP key support was removed). This commit merely adds
support for using raw pulic keys instead with GnuTLS 3.6.6. or later.
* DBUS-API (Signals/ClientNotFound): Change name of first parameter
from "Fingerprint" to "KeyID".
(Mandos Client Interface/Properties/KeyID): New.
* INSTALL: Document conflict with GnuTLS 3.6.0 (which removed OpenPGP
key support) up until 3.6.6, when support for raw public
keys was added. Also document new dependency of client on
"gnutls-bin" package (for certtool).
* Makefile (run-client): Depend on TLS key files, and also pass them
as arguments to client.
(keydir/tls-privkey.pem, keydir/tls-pubkey.pem): New.
(confdir/clients.conf): Add dependency on TLS public key.
(purge-client): Add removal of TLS key files.
* clients.conf ([foo]/key_id, [bar]/key_id): New.
* debian/control (Source: mandos/Build-Depends): Also allow
libgnutls30 (>= 3.6.6)
(Package: mandos/Depends): - '' -
(Package: mandos/Description): Alter description to match new
design.
(Package: mandos-client/Description): - '' -
(Package: mandos-client/Depends): Move "gnutls-bin | openssl" to
here from "Recommends".
* debian/mandos-client.README.Debian: Add --tls-privkey and
--tls-pubkey options to test
command.
* debian/mandos-client.postinst (create_key): Renamed to "create_keys"
(all callers changed),
and also create TLS key.
* debian/mandos-client.postrm (purge): Also remove TLS key files.
* intro.xml (DESCRIPTION): Describe new dual-key design.
* mandos (GnuTLS): Define different functions depending on whether
support for raw public keys is detected.
(Client.key_id): New attribute.
(ClientDBus.KeyID_dbus_property): New method.
(ProxyClient.__init__): Take new "key_id" parameter.
(ClientHandler.handle): Use key IDs when using raw public keys and
use fingerprints when using OpenPGP keys.
(ClientHandler.peer_certificate): Also handle raw public keys.
(ClientHandler.key_id): New.
(MandosServer.handle_ipc): Pass key ID over the pipe IPC. Also
check for key ID matches when looking up
clients.
(main): Default GnuTLS priority string depends on whether we are
using raw public keys or not. When unpickling clients, set
key_id if not set in the pickle.
(main/MandosDBusService.ClientNotFound): Change name of first
parameter from
"Fingerprint" to "KeyID".
* mandos-clients.conf.xml (OPTIONS): Document new "key_id" option.
(OPTIONS/secret): Mention new key ID matchning.
(EXPANSION/RUNTIME EXPANSION): Add new "key_id" option.
(EXAMPLE): - '' -
* mandos-ctl (tablewords, main/keywords): Add new "KeyID" property.
* mandos-keygen: Create TLS key files. New "--tls-keytype" (-T)
option. Alter help text to be more clear about key
types. When in password mode, also output "key_id"
option.
* mandos-keygen.xml (SYNOPSIS): Add new "--tls-keytype" (-T) option.
(DESCRIPTION): Alter to match new dual-key design.
(OVERVIEW): - '' -
(FILES): Add TLS key files.
* mandos-options.xml (priority): Document new default priority string
when using raw public keys.
* mandos.xml (NETWORK PROTOCOL): Describe new protocol using key ID.
(BUGS): Remove issue about checking expire times of OpenPGP keys,
since TLS public keys do not have expiration times.
(SECURITY/CLIENT): Alter description to match new design.
(SEE ALSO/GnuTLS): - '' -
(SEE ALSO): Add reference to RFC 7250, and alter description of when
RFC 6091 is used.
* overview.xml: Alter text to match new design.
* plugin-runner.xml (EXAMPLE): Add --tls-pubkey and --tls-privkey
options to mandos-client options.
* plugins.d/mandos-client.c: Use raw public keys when compiling with
supporting GnuTLS versions. Add new
"--tls-pubkey" and "--tls-privkey"
options (which do nothing if GnuTLS
library does not support raw public
keys). Alter text throughout to reflect
new design. Only generate new DH
parameters (based on size of OpenPGP key)
when using OpenPGP in TLS. Default
GnuTLS priority string depends on whether
we are using raw public keys or not.
* plugins.d/mandos-client.xml (SYNOPSIS): Add new "--tls-privkey" (-t)
and "--tls-pubkey" (-T)
options.
(DESCRIPTION): Describe new dual-key design.
(OPTIONS): Document new "--tls-privkey" (-t) and "--tls-pubkey" (-T)
options.
(OPTIONS/--dh-bits): No longer necessarily depends on OpenPGP key
size.
(FILES): Add default locations for TLS public and private key files.
(EXAMPLE): Use new --tls-pubkey and --tls-privkey options.
(SECURITY): Alter wording slightly to reflect new dual-key design.
(SEE ALSO/GnuTLS): Alter description to match new design.
(SEE ALSO): Add reference to RFC 7250, and alter description of when
RFC 6091 is used.
- files added:
- bugs.xml
- files removed:
- initramfs-tools-hook-conf
- files modified:
- DBUS-API
added
removed
plugins.d/mandos-client.c
9
9
* "browse_callback", and parts of "main".
10
10
*
11
11
* Everything else is
12
* Copyright © 2008-2015 Teddy Hogeborn
13
* Copyright © 2008-2015 Björn Påhlsson
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
12
* Copyright © 2008-2018 Teddy Hogeborn
13
* Copyright © 2008-2018 Björn Påhlsson
14
*
15
* This file is part of Mandos.
16
*
17
* Mandos is free software: you can redistribute it and/or modify it
18
* under the terms of the GNU General Public License as published by
19
* the Free Software Foundation, either version 3 of the License, or
20
* (at your option) any later version.
21
*
22
* Mandos is distributed in the hope that it will be useful, but
21
23
* WITHOUT ANY WARRANTY; without even the implied warranty of
22
24
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23
25
* General Public License for more details.
24
26
*
25
27
* 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
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
29
*
29
30
* Contact the authors at <mandos@recompile.se>.
30
31
*/
46
47
#include <stdlib.h> /* free(), EXIT_SUCCESS, srand(),
47
48
strtof(), abort() */
48
49
#include <stdbool.h> /* bool, false, true */
49
#include <string.h> /* memset(), strcmp(), strlen(),
50
strerror(), asprintf(), strcpy() */
50
#include <string.h> /* strcmp(), strlen(), strerror(),
51
asprintf(), strncpy(), strsignal()
52
*/
51
53
#include <sys/ioctl.h> /* ioctl */
52
54
#include <sys/types.h> /* socket(), inet_pton(), sockaddr,
53
55
sockaddr_in6, PF_INET6,
57
59
#include <sys/socket.h> /* socket(), struct sockaddr_in6,
58
60
inet_pton(), connect(),
59
61
getnameinfo() */
60
#include <fcntl.h> /* open(), unlinkat() */
62
#include <fcntl.h> /* open(), unlinkat(), AT_REMOVEDIR */
61
63
#include <dirent.h> /* opendir(), struct dirent, readdir()
62
64
*/
63
65
#include <inttypes.h> /* PRIu16, PRIdMAX, intmax_t,
64
66
strtoimax() */
65
#include <errno.h> /* perror(), errno,
67
#include <errno.h> /* perror(), errno, EINTR, EINVAL,
68
EAI_SYSTEM, ENETUNREACH,
69
EHOSTUNREACH, ECONNREFUSED, EPROTO,
70
EIO, ENOENT, ENXIO, ENOMEM, EISDIR,
71
ENOTEMPTY,
66
72
program_invocation_short_name */
67
73
#include <time.h> /* nanosleep(), time(), sleep() */
68
74
#include <net/if.h> /* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
117
123
gnutls_*
118
124
init_gnutls_session(),
119
125
GNUTLS_* */
126
#if GNUTLS_VERSION_NUMBER < 0x030600
120
127
#include <gnutls/openpgp.h>
121
128
/* gnutls_certificate_set_openpgp_key_file(),
122
129
GNUTLS_OPENPGP_FMT_BASE64 */
130
#elif GNUTLS_VERSION_NUMBER >= 0x030606
131
#include <gnutls/x509.h> /* gnutls_pkcs_encrypt_flags_t,
132
GNUTLS_PKCS_PLAIN,
133
GNUTLS_PKCS_NULL_PASSWORD */
134
#endif
123
135
124
136
/* GPGME */
125
137
#include <gpgme.h> /* All GPGME types, constants and
133
145
#define PATHDIR "/conf/conf.d/mandos"
134
146
#define SECKEY "seckey.txt"
135
147
#define PUBKEY "pubkey.txt"
148
#define TLS_PRIVKEY "tls-privkey.pem"
149
#define TLS_PUBKEY "tls-pubkey.pem"
136
150
#define HOOKDIR "/lib/mandos/network-hooks.d"
137
151
138
152
bool debug = false;
266
280
return true;
267
281
}
268
282
283
/* Set effective uid to 0, return errno */
284
__attribute__((warn_unused_result))
285
int raise_privileges(void){
286
int old_errno = errno;
287
int ret = 0;
288
if(seteuid(0) == -1){
289
ret = errno;
290
}
291
errno = old_errno;
292
return ret;
293
}
294
295
/* Set effective and real user ID to 0. Return errno. */
296
__attribute__((warn_unused_result))
297
int raise_privileges_permanently(void){
298
int old_errno = errno;
299
int ret = raise_privileges();
300
if(ret != 0){
301
errno = old_errno;
302
return ret;
303
}
304
if(setuid(0) == -1){
305
ret = errno;
306
}
307
errno = old_errno;
308
return ret;
309
}
310
311
/* Set effective user ID to unprivileged saved user ID */
312
__attribute__((warn_unused_result))
313
int lower_privileges(void){
314
int old_errno = errno;
315
int ret = 0;
316
if(seteuid(uid) == -1){
317
ret = errno;
318
}
319
errno = old_errno;
320
return ret;
321
}
322
323
/* Lower privileges permanently */
324
__attribute__((warn_unused_result))
325
int lower_privileges_permanently(void){
326
int old_errno = errno;
327
int ret = 0;
328
if(setuid(uid) == -1){
329
ret = errno;
330
}
331
errno = old_errno;
332
return ret;
333
}
334
269
335
/*
270
336
* Initialize GPGME.
271
337
*/
291
357
return false;
292
358
}
293
359
360
/* Workaround for systems without a real-time clock; see also
361
Debian bug #894495: <https://bugs.debian.org/894495> */
362
do {
363
{
364
time_t currtime = time(NULL);
365
if(currtime != (time_t)-1){
366
struct tm tm;
367
if(gmtime_r(&currtime, &tm) == NULL) {
368
perror_plus("gmtime_r");
369
break;
370
}
371
if(tm.tm_year != 70 or tm.tm_mon != 0){
372
break;
373
}
374
if(debug){
375
fprintf_plus(stderr, "System clock is January 1970");
376
}
377
} else {
378
if(debug){
379
fprintf_plus(stderr, "System clock is invalid");
380
}
381
}
382
}
383
struct stat keystat;
384
ret = fstat(fd, &keystat);
385
if(ret != 0){
386
perror_plus("fstat");
387
break;
388
}
389
ret = raise_privileges();
390
if(ret != 0){
391
errno = ret;
392
perror_plus("Failed to raise privileges");
393
break;
394
}
395
if(debug){
396
fprintf_plus(stderr,
397
"Setting system clock to key file mtime");
398
}
399
time_t keytime = keystat.st_mtim.tv_sec;
400
if(stime(&keytime) != 0){
401
perror_plus("stime");
402
}
403
ret = lower_privileges();
404
if(ret != 0){
405
errno = ret;
406
perror_plus("Failed to lower privileges");
407
}
408
} while(false);
409
294
410
rc = gpgme_data_new_from_fd(&pgp_data, fd);
295
411
if(rc != GPG_ERR_NO_ERROR){
296
412
fprintf_plus(stderr, "bad gpgme_data_new_from_fd: %s: %s\n",
304
420
gpgme_strsource(rc), gpgme_strerror(rc));
305
421
return false;
306
422
}
423
{
424
gpgme_import_result_t import_result
425
= gpgme_op_import_result(mc->ctx);
426
if((import_result->imported < 1
427
or import_result->not_imported > 0)
428
and import_result->unchanged == 0){
429
fprintf_plus(stderr, "bad gpgme_op_import_results:\n");
430
fprintf_plus(stderr,
431
"The total number of considered keys: %d\n",
432
import_result->considered);
433
fprintf_plus(stderr,
434
"The number of keys without user ID: %d\n",
435
import_result->no_user_id);
436
fprintf_plus(stderr,
437
"The total number of imported keys: %d\n",
438
import_result->imported);
439
fprintf_plus(stderr, "The number of imported RSA keys: %d\n",
440
import_result->imported_rsa);
441
fprintf_plus(stderr, "The number of unchanged keys: %d\n",
442
import_result->unchanged);
443
fprintf_plus(stderr, "The number of new user IDs: %d\n",
444
import_result->new_user_ids);
445
fprintf_plus(stderr, "The number of new sub keys: %d\n",
446
import_result->new_sub_keys);
447
fprintf_plus(stderr, "The number of new signatures: %d\n",
448
import_result->new_signatures);
449
fprintf_plus(stderr, "The number of new revocations: %d\n",
450
import_result->new_revocations);
451
fprintf_plus(stderr,
452
"The total number of secret keys read: %d\n",
453
import_result->secret_read);
454
fprintf_plus(stderr,
455
"The number of imported secret keys: %d\n",
456
import_result->secret_imported);
457
fprintf_plus(stderr,
458
"The number of unchanged secret keys: %d\n",
459
import_result->secret_unchanged);
460
fprintf_plus(stderr, "The number of keys not imported: %d\n",
461
import_result->not_imported);
462
for(gpgme_import_status_t import_status
463
= import_result->imports;
464
import_status != NULL;
465
import_status = import_status->next){
466
fprintf_plus(stderr, "Import status for key: %s\n",
467
import_status->fpr);
468
if(import_status->result != GPG_ERR_NO_ERROR){
469
fprintf_plus(stderr, "Import result: %s: %s\n",
470
gpgme_strsource(import_status->result),
471
gpgme_strerror(import_status->result));
472
}
473
fprintf_plus(stderr, "Key status:\n");
474
fprintf_plus(stderr,
475
import_status->status & GPGME_IMPORT_NEW
476
? "The key was new.\n"
477
: "The key was not new.\n");
478
fprintf_plus(stderr,
479
import_status->status & GPGME_IMPORT_UID
480
? "The key contained new user IDs.\n"
481
: "The key did not contain new user IDs.\n");
482
fprintf_plus(stderr,
483
import_status->status & GPGME_IMPORT_SIG
484
? "The key contained new signatures.\n"
485
: "The key did not contain new signatures.\n");
486
fprintf_plus(stderr,
487
import_status->status & GPGME_IMPORT_SUBKEY
488
? "The key contained new sub keys.\n"
489
: "The key did not contain new sub keys.\n");
490
fprintf_plus(stderr,
491
import_status->status & GPGME_IMPORT_SECRET
492
? "The key contained a secret key.\n"
493
: "The key did not contain a secret key.\n");
494
}
495
return false;
496
}
497
}
307
498
308
ret = (int)TEMP_FAILURE_RETRY(close(fd));
499
ret = close(fd);
309
500
if(ret == -1){
310
501
perror_plus("close");
311
502
}
350
541
/* Create new GPGME "context" */
351
542
rc = gpgme_new(&(mc->ctx));
352
543
if(rc != GPG_ERR_NO_ERROR){
353
fprintf_plus(stderr, "Mandos plugin mandos-client: "
354
"bad gpgme_new: %s: %s\n", gpgme_strsource(rc),
355
gpgme_strerror(rc));
544
fprintf_plus(stderr, "bad gpgme_new: %s: %s\n",
545
gpgme_strsource(rc), gpgme_strerror(rc));
356
546
return false;
357
547
}
358
548
394
584
/* Create new empty GPGME data buffer for the plaintext */
395
585
rc = gpgme_data_new(&dh_plain);
396
586
if(rc != GPG_ERR_NO_ERROR){
397
fprintf_plus(stderr, "Mandos plugin mandos-client: "
398
"bad gpgme_data_new: %s: %s\n",
587
fprintf_plus(stderr, "bad gpgme_data_new: %s: %s\n",
399
588
gpgme_strsource(rc), gpgme_strerror(rc));
400
589
gpgme_data_release(dh_crypto);
401
590
return -1;
414
603
if(result == NULL){
415
604
fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
416
605
} else {
417
fprintf_plus(stderr, "Unsupported algorithm: %s\n",
418
result->unsupported_algorithm);
419
fprintf_plus(stderr, "Wrong key usage: %u\n",
420
result->wrong_key_usage);
606
if(result->unsupported_algorithm != NULL) {
607
fprintf_plus(stderr, "Unsupported algorithm: %s\n",
608
result->unsupported_algorithm);
609
}
610
fprintf_plus(stderr, "Wrong key usage: %s\n",
611
result->wrong_key_usage ? "Yes" : "No");
421
612
if(result->file_name != NULL){
422
613
fprintf_plus(stderr, "File name: %s\n", result->file_name);
423
614
}
424
gpgme_recipient_t recipient;
425
recipient = result->recipients;
426
while(recipient != NULL){
615
616
for(gpgme_recipient_t r = result->recipients; r != NULL;
617
r = r->next){
427
618
fprintf_plus(stderr, "Public key algorithm: %s\n",
428
gpgme_pubkey_algo_name
429
(recipient->pubkey_algo));
430
fprintf_plus(stderr, "Key ID: %s\n", recipient->keyid);
619
gpgme_pubkey_algo_name(r->pubkey_algo));
620
fprintf_plus(stderr, "Key ID: %s\n", r->keyid);
431
621
fprintf_plus(stderr, "Secret key available: %s\n",
432
recipient->status == GPG_ERR_NO_SECKEY
433
? "No" : "Yes");
434
recipient = recipient->next;
622
r->status == GPG_ERR_NO_SECKEY ? "No" : "Yes");
435
623
}
436
624
}
437
625
}
513
701
fprintf_plus(stderr, "GnuTLS: %s", string);
514
702
}
515
703
516
__attribute__((nonnull, warn_unused_result))
704
__attribute__((nonnull(1, 2, 4), warn_unused_result))
517
705
static int init_gnutls_global(const char *pubkeyfilename,
518
706
const char *seckeyfilename,
519
707
const char *dhparamsfilename,
520
708
mandos_context *mc){
521
709
int ret;
522
unsigned int uret;
523
710
524
711
if(debug){
525
712
fprintf_plus(stderr, "Initializing GnuTLS\n");
526
713
}
527
714
528
ret = gnutls_global_init();
529
if(ret != GNUTLS_E_SUCCESS){
530
fprintf_plus(stderr, "GnuTLS global_init: %s\n",
531
safer_gnutls_strerror(ret));
532
return -1;
533
}
534
535
715
if(debug){
536
716
/* "Use a log level over 10 to enable all debugging options."
537
717
* - GnuTLS manual
545
725
if(ret != GNUTLS_E_SUCCESS){
546
726
fprintf_plus(stderr, "GnuTLS memory error: %s\n",
547
727
safer_gnutls_strerror(ret));
548
gnutls_global_deinit();
549
728
return -1;
550
729
}
551
730
552
731
if(debug){
553
fprintf_plus(stderr, "Attempting to use OpenPGP public key %s and"
554
" secret key %s as GnuTLS credentials\n",
732
fprintf_plus(stderr, "Attempting to use public key %s and"
733
" private key %s as GnuTLS credentials\n",
555
734
pubkeyfilename,
556
735
seckeyfilename);
557
736
}
558
737
738
#if GNUTLS_VERSION_NUMBER >= 0x030606
739
ret = gnutls_certificate_set_rawpk_key_file
740
(mc->cred, pubkeyfilename, seckeyfilename,
741
GNUTLS_X509_FMT_PEM, /* format */
742
NULL, /* pass */
743
/* key_usage */
744
GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT,
745
NULL, /* names */
746
0, /* names_length */
747
/* privkey_flags */
748
GNUTLS_PKCS_PLAIN | GNUTLS_PKCS_NULL_PASSWORD,
749
0); /* pkcs11_flags */
750
#elif GNUTLS_VERSION_NUMBER < 0x030600
559
751
ret = gnutls_certificate_set_openpgp_key_file
560
752
(mc->cred, pubkeyfilename, seckeyfilename,
561
753
GNUTLS_OPENPGP_FMT_BASE64);
754
#else
755
#error "Needs GnuTLS 3.6.6 or later, or before 3.6.0"
756
#endif
562
757
if(ret != GNUTLS_E_SUCCESS){
563
758
fprintf_plus(stderr,
564
"Error[%d] while reading the OpenPGP key pair ('%s',"
759
"Error[%d] while reading the key pair ('%s',"
565
760
" '%s')\n", ret, pubkeyfilename, seckeyfilename);
566
761
fprintf_plus(stderr, "The GnuTLS error is: %s\n",
567
762
safer_gnutls_strerror(ret));
615
810
}
616
811
params.size += (unsigned int)bytes_read;
617
812
}
813
ret = close(dhpfile);
814
if(ret == -1){
815
perror_plus("close");
816
}
618
817
if(params.data == NULL){
619
818
dhparamsfilename = NULL;
620
819
}
629
828
safer_gnutls_strerror(ret));
630
829
dhparamsfilename = NULL;
631
830
}
831
free(params.data);
632
832
} while(false);
633
833
}
634
834
if(dhparamsfilename == NULL){
635
835
if(mc->dh_bits == 0){
836
#if GNUTLS_VERSION_NUMBER < 0x030600
636
837
/* Find out the optimal number of DH bits */
637
838
/* Try to read the private key file */
638
839
gnutls_datum_t buffer = { .data = NULL, .size = 0 };
718
919
}
719
920
}
720
921
}
721
uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
922
unsigned int uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);
722
923
if(uret != 0){
723
924
mc->dh_bits = uret;
724
925
if(debug){
736
937
safer_gnutls_strerror(ret));
737
938
goto globalfail;
738
939
}
739
} else if(debug){
740
fprintf_plus(stderr, "DH bits explicitly set to %u\n",
741
mc->dh_bits);
742
}
743
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
744
if(ret != GNUTLS_E_SUCCESS){
745
fprintf_plus(stderr, "Error in GnuTLS prime generation (%u"
746
" bits): %s\n", mc->dh_bits,
747
safer_gnutls_strerror(ret));
748
goto globalfail;
940
#endif
941
} else { /* dh_bits != 0 */
942
if(debug){
943
fprintf_plus(stderr, "DH bits explicitly set to %u\n",
944
mc->dh_bits);
945
}
946
ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
947
if(ret != GNUTLS_E_SUCCESS){
948
fprintf_plus(stderr, "Error in GnuTLS prime generation (%u"
949
" bits): %s\n", mc->dh_bits,
950
safer_gnutls_strerror(ret));
951
goto globalfail;
952
}
953
gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
749
954
}
750
955
}
751
gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
752
956
753
957
return 0;
754
958
755
959
globalfail:
756
960
757
961
gnutls_certificate_free_credentials(mc->cred);
758
gnutls_global_deinit();
759
962
gnutls_dh_params_deinit(mc->dh_params);
760
963
return -1;
761
964
}
766
969
int ret;
767
970
/* GnuTLS session creation */
768
971
do {
769
ret = gnutls_init(session, GNUTLS_SERVER);
972
ret = gnutls_init(session, (GNUTLS_SERVER
973
#if GNUTLS_VERSION_NUMBER >= 0x030506
974
| GNUTLS_NO_TICKETS
975
#endif
976
#if GNUTLS_VERSION_NUMBER >= 0x030606
977
| GNUTLS_ENABLE_RAWPK
978
#endif
979
));
770
980
if(quit_now){
771
981
return -1;
772
982
}
820
1030
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
821
1031
__attribute__((unused)) const char *txt){}
822
1032
823
/* Set effective uid to 0, return errno */
824
__attribute__((warn_unused_result))
825
error_t raise_privileges(void){
826
error_t old_errno = errno;
827
error_t ret_errno = 0;
828
if(seteuid(0) == -1){
829
ret_errno = errno;
830
}
831
errno = old_errno;
832
return ret_errno;
833
}
834
835
/* Set effective and real user ID to 0. Return errno. */
836
__attribute__((warn_unused_result))
837
error_t raise_privileges_permanently(void){
838
error_t old_errno = errno;
839
error_t ret_errno = raise_privileges();
840
if(ret_errno != 0){
841
errno = old_errno;
842
return ret_errno;
843
}
844
if(setuid(0) == -1){
845
ret_errno = errno;
846
}
847
errno = old_errno;
848
return ret_errno;
849
}
850
851
/* Set effective user ID to unprivileged saved user ID */
852
__attribute__((warn_unused_result))
853
error_t lower_privileges(void){
854
error_t old_errno = errno;
855
error_t ret_errno = 0;
856
if(seteuid(uid) == -1){
857
ret_errno = errno;
858
}
859
errno = old_errno;
860
return ret_errno;
861
}
862
863
/* Lower privileges permanently */
864
__attribute__((warn_unused_result))
865
error_t lower_privileges_permanently(void){
866
error_t old_errno = errno;
867
error_t ret_errno = 0;
868
if(setuid(uid) == -1){
869
ret_errno = errno;
870
}
871
errno = old_errno;
872
return ret_errno;
873
}
874
875
1033
/* Helper function to add_local_route() and delete_local_route() */
876
1034
__attribute__((nonnull, warn_unused_result))
877
1035
static bool add_delete_local_route(const bool add,
931
1089
perror_plus("dup2(devnull, STDIN_FILENO)");
932
1090
_exit(EX_OSERR);
933
1091
}
934
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
1092
ret = close(devnull);
935
1093
if(ret == -1){
936
1094
perror_plus("close");
937
1095
_exit(EX_OSERR);
954
1112
helper, O_RDONLY));
955
1113
if(helper_fd == -1){
956
1114
perror_plus("openat");
1115
close(helperdir_fd);
957
1116
_exit(EX_UNAVAILABLE);
958
1117
}
959
TEMP_FAILURE_RETRY(close(helperdir_fd));
1118
close(helperdir_fd);
960
1119
#ifdef __GNUC__
961
1120
#pragma GCC diagnostic push
962
1121
#pragma GCC diagnostic ignored "-Wcast-qual"
1081
1240
bool match = false;
1082
1241
{
1083
1242
char *interface = NULL;
1084
while((interface=argz_next(mc->interfaces, mc->interfaces_size,
1085
interface))){
1243
while((interface = argz_next(mc->interfaces,
1244
mc->interfaces_size,
1245
interface))){
1086
1246
if(if_nametoindex(interface) == (unsigned int)if_index){
1087
1247
match = true;
1088
1248
break;
1130
1290
goto mandos_end;
1131
1291
}
1132
1292
1133
memset(&to, 0, sizeof(to));
1134
1293
if(af == AF_INET6){
1135
((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
1136
ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
1294
struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)&to;
1295
*to6 = (struct sockaddr_in6){ .sin6_family = (sa_family_t)af };
1296
ret = inet_pton(af, ip, &to6->sin6_addr);
1137
1297
} else { /* IPv4 */
1138
((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
1139
ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
1298
struct sockaddr_in *to4 = (struct sockaddr_in *)&to;
1299
*to4 = (struct sockaddr_in){ .sin_family = (sa_family_t)af };
1300
ret = inet_pton(af, ip, &to4->sin_addr);
1140
1301
}
1141
1302
if(ret < 0 ){
1142
1303
int e = errno;
1221
1382
sizeof(struct sockaddr_in));
1222
1383
}
1223
1384
if(ret < 0){
1224
if(errno == ENETUNREACH
1385
if(((errno == ENETUNREACH) or (errno == EHOSTUNREACH))
1225
1386
and if_index != AVAHI_IF_UNSPEC
1226
1387
and connect_to == NULL
1227
1388
and not route_added and
1240
1401
with an explicit route added with the server's address.
1241
1402
1242
1403
Avahi bug reference:
1243
http://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1404
https://lists.freedesktop.org/archives/avahi/2010-February/001833.html
1244
1405
https://bugs.debian.org/587961
1245
1406
*/
1246
1407
if(debug){
1426
1587
&decrypted_buffer, mc);
1427
1588
if(decrypted_buffer_size >= 0){
1428
1589
1590
clearerr(stdout);
1429
1591
written = 0;
1430
1592
while(written < (size_t) decrypted_buffer_size){
1431
1593
if(quit_now){
1447
1609
}
1448
1610
written += (size_t)ret;
1449
1611
}
1612
ret = fflush(stdout);
1613
if(ret != 0){
1614
int e = errno;
1615
if(debug){
1616
fprintf_plus(stderr, "Error writing encrypted data: %s\n",
1617
strerror(errno));
1618
}
1619
errno = e;
1620
goto mandos_end;
1621
}
1450
1622
retval = 0;
1451
1623
}
1452
1624
}
1465
1637
free(decrypted_buffer);
1466
1638
free(buffer);
1467
1639
if(tcp_sd >= 0){
1468
ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
1640
ret = close(tcp_sd);
1469
1641
}
1470
1642
if(ret == -1){
1471
1643
if(e == 0){
1483
1655
return retval;
1484
1656
}
1485
1657
1486
__attribute__((nonnull))
1487
1658
static void resolve_callback(AvahiSServiceResolver *r,
1488
1659
AvahiIfIndex interface,
1489
1660
AvahiProtocol proto,
1626
1797
__attribute__((nonnull, warn_unused_result))
1627
1798
bool get_flags(const char *ifname, struct ifreq *ifr){
1628
1799
int ret;
1629
error_t ret_errno;
1800
int old_errno;
1630
1801
1631
1802
int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1632
1803
if(s < 0){
1633
ret_errno = errno;
1804
old_errno = errno;
1634
1805
perror_plus("socket");
1635
errno = ret_errno;
1806
errno = old_errno;
1636
1807
return false;
1637
1808
}
1638
strcpy(ifr->ifr_name, ifname);
1809
strncpy(ifr->ifr_name, ifname, IF_NAMESIZE);
1810
ifr->ifr_name[IF_NAMESIZE-1] = '\0'; /* NUL terminate */
1639
1811
ret = ioctl(s, SIOCGIFFLAGS, ifr);
1640
1812
if(ret == -1){
1641
1813
if(debug){
1642
ret_errno = errno;
1814
old_errno = errno;
1643
1815
perror_plus("ioctl SIOCGIFFLAGS");
1644
errno = ret_errno;
1816
errno = old_errno;
1817
}
1818
if((close(s) == -1) and debug){
1819
old_errno = errno;
1820
perror_plus("close");
1821
errno = old_errno;
1645
1822
}
1646
1823
return false;
1647
1824
}
1825
if((close(s) == -1) and debug){
1826
old_errno = errno;
1827
perror_plus("close");
1828
errno = old_errno;
1829
}
1648
1830
return true;
1649
1831
}
1650
1832
1911
2093
return;
1912
2094
}
1913
2095
}
1914
#ifdef __GLIBC__
1915
#if __GLIBC_PREREQ(2, 15)
2096
int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
2097
if(devnull == -1){
2098
perror_plus("open(\"/dev/null\", O_RDONLY)");
2099
return;
2100
}
1916
2101
int numhooks = scandirat(hookdir_fd, ".", &direntries,
1917
2102
runnable_hook, alphasort);
1918
#else /* not __GLIBC_PREREQ(2, 15) */
1919
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1920
alphasort);
1921
#endif /* not __GLIBC_PREREQ(2, 15) */
1922
#else /* not __GLIBC__ */
1923
int numhooks = scandir(hookdir, &direntries, runnable_hook,
1924
alphasort);
1925
#endif /* not __GLIBC__ */
1926
2103
if(numhooks == -1){
1927
2104
perror_plus("scandir");
2105
close(devnull);
1928
2106
return;
1929
2107
}
1930
2108
struct dirent *direntry;
1931
2109
int ret;
1932
int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1933
if(devnull == -1){
1934
perror_plus("open(\"/dev/null\", O_RDONLY)");
1935
return;
1936
}
1937
2110
for(int i = 0; i < numhooks; i++){
1938
2111
direntry = direntries[i];
1939
2112
if(debug){
2010
2183
perror_plus("openat");
2011
2184
_exit(EXIT_FAILURE);
2012
2185
}
2013
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2186
if(close(hookdir_fd) == -1){
2014
2187
perror_plus("close");
2015
2188
_exit(EXIT_FAILURE);
2016
2189
}
2019
2192
perror_plus("dup2(devnull, STDIN_FILENO)");
2020
2193
_exit(EX_OSERR);
2021
2194
}
2022
ret = (int)TEMP_FAILURE_RETRY(close(devnull));
2195
ret = close(devnull);
2023
2196
if(ret == -1){
2024
2197
perror_plus("close");
2025
2198
_exit(EX_OSERR);
2074
2247
free(direntry);
2075
2248
}
2076
2249
free(direntries);
2077
if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
2250
if(close(hookdir_fd) == -1){
2078
2251
perror_plus("close");
2079
2252
} else {
2080
2253
hookdir_fd = -1;
2083
2256
}
2084
2257
2085
2258
__attribute__((nonnull, warn_unused_result))
2086
error_t bring_up_interface(const char *const interface,
2087
const float delay){
2088
error_t old_errno = errno;
2259
int bring_up_interface(const char *const interface,
2260
const float delay){
2261
int old_errno = errno;
2089
2262
int ret;
2090
2263
struct ifreq network;
2091
2264
unsigned int if_index = if_nametoindex(interface);
2101
2274
}
2102
2275
2103
2276
if(not interface_is_up(interface)){
2104
error_t ret_errno = 0, ioctl_errno = 0;
2277
int ret_errno = 0;
2278
int ioctl_errno = 0;
2105
2279
if(not get_flags(interface, &network)){
2106
2280
ret_errno = errno;
2107
2281
fprintf_plus(stderr, "Failed to get flags for interface "
2120
2294
}
2121
2295
2122
2296
if(quit_now){
2123
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2297
ret = close(sd);
2124
2298
if(ret == -1){
2125
2299
perror_plus("close");
2126
2300
}
2176
2350
}
2177
2351
2178
2352
/* Close the socket */
2179
ret = (int)TEMP_FAILURE_RETRY(close(sd));
2353
ret = close(sd);
2180
2354
if(ret == -1){
2181
2355
perror_plus("close");
2182
2356
}
2194
2368
2195
2369
/* Sleep checking until interface is running.
2196
2370
Check every 0.25s, up to total time of delay */
2197
for(int i=0; i < delay * 4; i++){
2371
for(int i = 0; i < delay * 4; i++){
2198
2372
if(interface_is_running(interface)){
2199
2373
break;
2200
2374
}
2210
2384
}
2211
2385
2212
2386
__attribute__((nonnull, warn_unused_result))
2213
error_t take_down_interface(const char *const interface){
2214
error_t old_errno = errno;
2387
int take_down_interface(const char *const interface){
2388
int old_errno = errno;
2215
2389
struct ifreq network;
2216
2390
unsigned int if_index = if_nametoindex(interface);
2217
2391
if(if_index == 0){
2220
2394
return ENXIO;
2221
2395
}
2222
2396
if(interface_is_up(interface)){
2223
error_t ret_errno = 0, ioctl_errno = 0;
2397
int ret_errno = 0;
2398
int ioctl_errno = 0;
2224
2399
if(not get_flags(interface, &network) and debug){
2225
2400
ret_errno = errno;
2226
2401
fprintf_plus(stderr, "Failed to get flags for interface "
2264
2439
}
2265
2440
2266
2441
/* Close the socket */
2267
int ret = (int)TEMP_FAILURE_RETRY(close(sd));
2442
int ret = close(sd);
2268
2443
if(ret == -1){
2269
2444
perror_plus("close");
2270
2445
}
2286
2461
2287
2462
int main(int argc, char *argv[]){
2288
2463
mandos_context mc = { .server = NULL, .dh_bits = 0,
2289
.priority = "SECURE256:!CTYPE-X.509:"
2290
"+CTYPE-OPENPGP:!RSA", .current_server = NULL,
2291
.interfaces = NULL, .interfaces_size = 0 };
2464
#if GNUTLS_VERSION_NUMBER >= 0x030606
2465
.priority = "SECURE128:!CTYPE-X.509"
2466
":+CTYPE-RAWPK:!RSA:!VERS-ALL:+VERS-TLS1.3"
2467
":%PROFILE_ULTRA",
2468
#elif GNUTLS_VERSION_NUMBER < 0x030600
2469
.priority = "SECURE256:!CTYPE-X.509"
2470
":+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256",
2471
#else
2472
#error "Needs GnuTLS 3.6.6 or later, or before 3.6.0"
2473
#endif
2474
.current_server = NULL, .interfaces = NULL,
2475
.interfaces_size = 0 };
2292
2476
AvahiSServiceBrowser *sb = NULL;
2293
2477
error_t ret_errno;
2294
2478
int ret;
2303
2487
AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
2304
2488
const char *seckey = PATHDIR "/" SECKEY;
2305
2489
const char *pubkey = PATHDIR "/" PUBKEY;
2490
#if GNUTLS_VERSION_NUMBER >= 0x030606
2491
const char *tls_privkey = PATHDIR "/" TLS_PRIVKEY;
2492
const char *tls_pubkey = PATHDIR "/" TLS_PUBKEY;
2493
#endif
2306
2494
const char *dh_params_file = NULL;
2307
2495
char *interfaces_hooks = NULL;
2308
2496
2356
2544
{ .name = "pubkey", .key = 'p',
2357
2545
.arg = "FILE",
2358
2546
.doc = "OpenPGP public key file base name",
2359
.group = 2 },
2547
.group = 1 },
2548
{ .name = "tls-privkey", .key = 't',
2549
.arg = "FILE",
2550
#if GNUTLS_VERSION_NUMBER >= 0x030606
2551
.doc = "TLS private key file base name",
2552
#else
2553
.doc = "Dummy; ignored (requires GnuTLS 3.6.6)",
2554
#endif
2555
.group = 1 },
2556
{ .name = "tls-pubkey", .key = 'T',
2557
.arg = "FILE",
2558
#if GNUTLS_VERSION_NUMBER >= 0x030606
2559
.doc = "TLS public key file base name",
2560
#else
2561
.doc = "Dummy; ignored (requires GnuTLS 3.6.6)",
2562
#endif
2563
.group = 1 },
2360
2564
{ .name = "dh-bits", .key = 129,
2361
2565
.arg = "BITS",
2362
2566
.doc = "Bit length of the prime number used in the"
2418
2622
case 'p': /* --pubkey */
2419
2623
pubkey = arg;
2420
2624
break;
2625
case 't': /* --tls-privkey */
2626
#if GNUTLS_VERSION_NUMBER >= 0x030606
2627
tls_privkey = arg;
2628
#endif
2629
break;
2630
case 'T': /* --tls-pubkey */
2631
#if GNUTLS_VERSION_NUMBER >= 0x030606
2632
tls_pubkey = arg;
2633
#endif
2634
break;
2421
2635
case 129: /* --dh-bits */
2422
2636
errno = 0;
2423
2637
tmpmax = strtoimax(arg, &tmp, 10);
2475
2689
.args_doc = "",
2476
2690
.doc = "Mandos client -- Get and decrypt"
2477
2691
" passwords from a Mandos server" };
2478
ret = argp_parse(&argp, argc, argv,
2479
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2480
switch(ret){
2692
ret_errno = argp_parse(&argp, argc, argv,
2693
ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2694
switch(ret_errno){
2481
2695
case 0:
2482
2696
break;
2483
2697
case ENOMEM:
2484
2698
default:
2485
errno = ret;
2699
errno = ret_errno;
2486
2700
perror_plus("argp_parse");
2487
2701
exitcode = EX_OSERR;
2488
2702
goto end;
2494
2708
2495
2709
{
2496
2710
/* Work around Debian bug #633582:
2497
<http://bugs.debian.org/633582> */
2711
<https://bugs.debian.org/633582> */
2498
2712
2499
2713
/* Re-raise privileges */
2500
ret_errno = raise_privileges();
2501
if(ret_errno != 0){
2502
errno = ret_errno;
2714
ret = raise_privileges();
2715
if(ret != 0){
2716
errno = ret;
2503
2717
perror_plus("Failed to raise privileges");
2504
2718
} else {
2505
2719
struct stat st;
2521
2735
}
2522
2736
}
2523
2737
}
2524
TEMP_FAILURE_RETRY(close(seckey_fd));
2738
close(seckey_fd);
2525
2739
}
2526
2740
}
2527
2741
2542
2756
}
2543
2757
}
2544
2758
}
2545
TEMP_FAILURE_RETRY(close(pubkey_fd));
2759
close(pubkey_fd);
2546
2760
}
2547
2761
}
2548
2762
2549
if(strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
2763
if(dh_params_file != NULL
2764
and strcmp(dh_params_file, PATHDIR "/dhparams.pem" ) == 0){
2550
2765
int dhparams_fd = open(dh_params_file, O_RDONLY);
2551
2766
if(dhparams_fd == -1){
2552
2767
perror_plus("open");
2563
2778
}
2564
2779
}
2565
2780
}
2566
TEMP_FAILURE_RETRY(close(dhparams_fd));
2781
close(dhparams_fd);
2567
2782
}
2568
2783
}
2569
2784
2570
2785
/* Lower privileges */
2571
ret_errno = lower_privileges();
2572
if(ret_errno != 0){
2573
errno = ret_errno;
2786
ret = lower_privileges();
2787
if(ret != 0){
2788
errno = ret;
2574
2789
perror_plus("Failed to lower privileges");
2575
2790
}
2576
2791
}
2776
2991
goto end;
2777
2992
}
2778
2993
2994
#if GNUTLS_VERSION_NUMBER >= 0x030606
2995
ret = init_gnutls_global(tls_pubkey, tls_privkey, dh_params_file, &mc);
2996
#elif GNUTLS_VERSION_NUMBER < 0x030600
2779
2997
ret = init_gnutls_global(pubkey, seckey, dh_params_file, &mc);
2998
#else
2999
#error "Needs GnuTLS 3.6.6 or later, or before 3.6.0"
3000
#endif
2780
3001
if(ret == -1){
2781
3002
fprintf_plus(stderr, "init_gnutls_global failed\n");
2782
3003
exitcode = EX_UNAVAILABLE;
2904
3125
2905
3126
/* Allocate a new server */
2906
3127
mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll),
2907
&config, NULL, NULL, &ret_errno);
3128
&config, NULL, NULL, &ret);
2908
3129
2909
3130
/* Free the Avahi configuration data */
2910
3131
avahi_server_config_free(&config);
2913
3134
/* Check if creating the Avahi server object succeeded */
2914
3135
if(mc.server == NULL){
2915
3136
fprintf_plus(stderr, "Failed to create Avahi server: %s\n",
2916
avahi_strerror(ret_errno));
3137
avahi_strerror(ret));
2917
3138
exitcode = EX_UNAVAILABLE;
2918
3139
goto end;
2919
3140
}
2954
3175
end:
2955
3176
2956
3177
if(debug){
2957
fprintf_plus(stderr, "%s exiting\n", argv[0]);
3178
if(signal_received){
3179
fprintf_plus(stderr, "%s exiting due to signal %d: %s\n",
3180
argv[0], signal_received,
3181
strsignal(signal_received));
3182
} else {
3183
fprintf_plus(stderr, "%s exiting\n", argv[0]);
3184
}
2958
3185
}
2959
3186
2960
3187
/* Cleanup things */
2971
3198
2972
3199
if(gnutls_initialized){
2973
3200
gnutls_certificate_free_credentials(mc.cred);
2974
gnutls_global_deinit();
2975
3201
gnutls_dh_params_deinit(mc.dh_params);
2976
3202
}
2977
3203
3000
3226
3001
3227
/* Re-raise privileges */
3002
3228
{
3003
ret_errno = raise_privileges();
3004
if(ret_errno != 0){
3005
errno = ret_errno;
3229
ret = raise_privileges();
3230
if(ret != 0){
3231
errno = ret;
3006
3232
perror_plus("Failed to raise privileges");
3007
3233
} else {
3008
3234
3013
3239
/* Take down the network interfaces which were brought up */
3014
3240
{
3015
3241
char *interface = NULL;
3016
while((interface=argz_next(interfaces_to_take_down,
3017
interfaces_to_take_down_size,
3018
interface))){
3019
ret_errno = take_down_interface(interface);
3020
if(ret_errno != 0){
3021
errno = ret_errno;
3242
while((interface = argz_next(interfaces_to_take_down,
3243
interfaces_to_take_down_size,
3244
interface))){
3245
ret = take_down_interface(interface);
3246
if(ret != 0){
3247
errno = ret;
3022
3248
perror_plus("Failed to take down interface");
3023
3249
}
3024
3250
}
3029
3255
}
3030
3256
}
3031
3257
3032
ret_errno = lower_privileges_permanently();
3033
if(ret_errno != 0){
3034
errno = ret_errno;
3258
ret = lower_privileges_permanently();
3259
if(ret != 0){
3260
errno = ret;
3035
3261
perror_plus("Failed to lower privileges permanently");
3036
3262
}
3037
3263
}
3039
3265
free(interfaces_to_take_down);
3040
3266
free(interfaces_hooks);
3041
3267
3268
void clean_dir_at(int base, const char * const dirname,
3269
uintmax_t level){
3270
struct dirent **direntries = NULL;
3271
int dret;
3272
int dir_fd = (int)TEMP_FAILURE_RETRY(openat(base, dirname,
3273
O_RDONLY
3274
| O_NOFOLLOW
3275
| O_DIRECTORY
3276
| O_PATH));
3277
if(dir_fd == -1){
3278
perror_plus("open");
3279
return;
3280
}
3281
int numentries = scandirat(dir_fd, ".", &direntries,
3282
notdotentries, alphasort);
3283
if(numentries >= 0){
3284
for(int i = 0; i < numentries; i++){
3285
if(debug){
3286
fprintf_plus(stderr, "Unlinking \"%s/%s\"\n",
3287
dirname, direntries[i]->d_name);
3288
}
3289
dret = unlinkat(dir_fd, direntries[i]->d_name, 0);
3290
if(dret == -1){
3291
if(errno == EISDIR){
3292
dret = unlinkat(dir_fd, direntries[i]->d_name,
3293
AT_REMOVEDIR);
3294
}
3295
if((dret == -1) and (errno == ENOTEMPTY)
3296
and (strcmp(direntries[i]->d_name, "private-keys-v1.d")
3297
== 0) and (level == 0)){
3298
/* Recurse only in this special case */
3299
clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3300
dret = 0;
3301
}
3302
if((dret == -1) and (errno != ENOENT)){
3303
fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3304
direntries[i]->d_name, strerror(errno));
3305
}
3306
}
3307
free(direntries[i]);
3308
}
3309
3310
/* need to clean even if 0 because man page doesn't specify */
3311
free(direntries);
3312
dret = unlinkat(base, dirname, AT_REMOVEDIR);
3313
if(dret == -1 and errno != ENOENT){
3314
perror_plus("rmdir");
3315
}
3316
} else {
3317
perror_plus("scandirat");
3318
}
3319
close(dir_fd);
3320
}
3321
3042
3322
/* Removes the GPGME temp directory and all files inside */
3043
3323
if(tempdir != NULL){
3044
struct dirent **direntries = NULL;
3045
int tempdir_fd = (int)TEMP_FAILURE_RETRY(open(tempdir, O_RDONLY
3046
| O_NOFOLLOW
3047
| O_DIRECTORY
3048
| O_PATH));
3049
if(tempdir_fd == -1){
3050
perror_plus("open");
3051
} else {
3052
#ifdef __GLIBC__
3053
#if __GLIBC_PREREQ(2, 15)
3054
int numentries = scandirat(tempdir_fd, ".", &direntries,
3055
notdotentries, alphasort);
3056
#else /* not __GLIBC_PREREQ(2, 15) */
3057
int numentries = scandir(tempdir, &direntries, notdotentries,
3058
alphasort);
3059
#endif /* not __GLIBC_PREREQ(2, 15) */
3060
#else /* not __GLIBC__ */
3061
int numentries = scandir(tempdir, &direntries, notdotentries,
3062
alphasort);
3063
#endif /* not __GLIBC__ */
3064
if(numentries >= 0){
3065
for(int i = 0; i < numentries; i++){
3066
ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);
3067
if(ret == -1){
3068
fprintf_plus(stderr, "unlinkat(open(\"%s\", O_RDONLY),"
3069
" \"%s\", 0): %s\n", tempdir,
3070
direntries[i]->d_name, strerror(errno));
3071
}
3072
free(direntries[i]);
3073
}
3074
3075
/* need to clean even if 0 because man page doesn't specify */
3076
free(direntries);
3077
if(numentries == -1){
3078
perror_plus("scandir");
3079
}
3080
ret = rmdir(tempdir);
3081
if(ret == -1 and errno != ENOENT){
3082
perror_plus("rmdir");
3083
}
3084
}
3085
TEMP_FAILURE_RETRY(close(tempdir_fd));
3086
}
3324
clean_dir_at(-1, tempdir, 0);
3087
3325
}
3088
3326
3089
3327
if(quit_now){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0