/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-03-08 00:05:04 UTC
  • mfrom: (826 trunk)
  • mto: This revision was merged to the branch mainline in revision 827.
  • Revision ID: teddy@recompile.se-20160308000504-6m8f4c9kkfmgg686
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008-2016 Teddy Hogeborn
 
15
# Copyright © 2008-2016 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
44
44
import argparse
45
45
import datetime
46
46
import errno
47
 
import gnutls.crypto
48
 
import gnutls.connection
49
 
import gnutls.errors
50
 
import gnutls.library.functions
51
 
import gnutls.library.constants
52
 
import gnutls.library.types
53
47
try:
54
48
    import ConfigParser as configparser
55
49
except ImportError:
83
77
import dbus
84
78
import dbus.service
85
79
try:
86
 
    import gobject
 
80
    from gi.repository import GObject
87
81
except ImportError:
88
 
    from gi.repository import GObject as gobject
 
82
    import gobject as GObject
89
83
import avahi
90
84
from dbus.mainloop.glib import DBusGMainLoop
91
85
import ctypes
104
98
if sys.version_info.major == 2:
105
99
    str = unicode
106
100
 
107
 
version = "1.7.1"
 
101
version = "1.7.4"
108
102
stored_state_file = "clients.pickle"
109
103
 
110
104
logger = logging.getLogger()
157
151
    
158
152
    def __init__(self):
159
153
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
154
        self.gpg = "gpg"
 
155
        try:
 
156
            output = subprocess.check_output(["gpgconf"])
 
157
            for line in output.splitlines():
 
158
                name, text, path = line.split(":")
 
159
                if name == "gpg":
 
160
                    self.gpg = path
 
161
                    break
 
162
        except OSError as e:
 
163
            if e.errno != errno.ENOENT:
 
164
                raise
160
165
        self.gnupgargs = ['--batch',
161
 
                          '--home', self.tempdir,
 
166
                          '--homedir', self.tempdir,
162
167
                          '--force-mdc',
163
168
                          '--quiet',
164
169
                          '--no-use-agent']
203
208
                dir=self.tempdir) as passfile:
204
209
            passfile.write(passphrase)
205
210
            passfile.flush()
206
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
211
            proc = subprocess.Popen([self.gpg, '--symmetric',
207
212
                                     '--passphrase-file',
208
213
                                     passfile.name]
209
214
                                    + self.gnupgargs,
221
226
                dir = self.tempdir) as passfile:
222
227
            passfile.write(passphrase)
223
228
            passfile.flush()
224
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
229
            proc = subprocess.Popen([self.gpg, '--decrypt',
225
230
                                     '--passphrase-file',
226
231
                                     passfile.name]
227
232
                                    + self.gnupgargs,
435
440
            .format(self.name)))
436
441
        return ret
437
442
 
 
443
# Pretend that we have a GnuTLS module
 
444
class GnuTLS(object):
 
445
    """This isn't so much a class as it is a module-like namespace.
 
446
    It is instantiated once, and simulates having a GnuTLS module."""
 
447
    
 
448
    _library = ctypes.cdll.LoadLibrary(
 
449
        ctypes.util.find_library("gnutls"))
 
450
    _need_version = "3.3.0"
 
451
    def __init__(self):
 
452
        # Need to use class name "GnuTLS" here, since this method is
 
453
        # called before the assignment to the "gnutls" global variable
 
454
        # happens.
 
455
        if GnuTLS.check_version(self._need_version) is None:
 
456
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
457
                               .format(self._need_version))
 
458
    
 
459
    # Unless otherwise indicated, the constants and types below are
 
460
    # all from the gnutls/gnutls.h C header file.
 
461
    
 
462
    # Constants
 
463
    E_SUCCESS = 0
 
464
    E_INTERRUPTED = -52
 
465
    E_AGAIN = -28
 
466
    CRT_OPENPGP = 2
 
467
    CLIENT = 2
 
468
    SHUT_RDWR = 0
 
469
    CRD_CERTIFICATE = 1
 
470
    E_NO_CERTIFICATE_FOUND = -49
 
471
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
472
    
 
473
    # Types
 
474
    class session_int(ctypes.Structure):
 
475
        _fields_ = []
 
476
    session_t = ctypes.POINTER(session_int)
 
477
    class certificate_credentials_st(ctypes.Structure):
 
478
        _fields_ = []
 
479
    certificate_credentials_t = ctypes.POINTER(
 
480
        certificate_credentials_st)
 
481
    certificate_type_t = ctypes.c_int
 
482
    class datum_t(ctypes.Structure):
 
483
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
484
                    ('size', ctypes.c_uint)]
 
485
    class openpgp_crt_int(ctypes.Structure):
 
486
        _fields_ = []
 
487
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
488
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
489
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
490
    credentials_type_t = ctypes.c_int
 
491
    transport_ptr_t = ctypes.c_void_p
 
492
    close_request_t = ctypes.c_int
 
493
    
 
494
    # Exceptions
 
495
    class Error(Exception):
 
496
        # We need to use the class name "GnuTLS" here, since this
 
497
        # exception might be raised from within GnuTLS.__init__,
 
498
        # which is called before the assignment to the "gnutls"
 
499
        # global variable has happened.
 
500
        def __init__(self, message = None, code = None, args=()):
 
501
            # Default usage is by a message string, but if a return
 
502
            # code is passed, convert it to a string with
 
503
            # gnutls.strerror()
 
504
            self.code = code
 
505
            if message is None and code is not None:
 
506
                message = GnuTLS.strerror(code)
 
507
            return super(GnuTLS.Error, self).__init__(
 
508
                message, *args)
 
509
    
 
510
    class CertificateSecurityError(Error):
 
511
        pass
 
512
    
 
513
    # Classes
 
514
    class Credentials(object):
 
515
        def __init__(self):
 
516
            self._c_object = gnutls.certificate_credentials_t()
 
517
            gnutls.certificate_allocate_credentials(
 
518
                ctypes.byref(self._c_object))
 
519
            self.type = gnutls.CRD_CERTIFICATE
 
520
        
 
521
        def __del__(self):
 
522
            gnutls.certificate_free_credentials(self._c_object)
 
523
    
 
524
    class ClientSession(object):
 
525
        def __init__(self, socket, credentials = None):
 
526
            self._c_object = gnutls.session_t()
 
527
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
528
            gnutls.set_default_priority(self._c_object)
 
529
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
530
            gnutls.handshake_set_private_extensions(self._c_object,
 
531
                                                    True)
 
532
            self.socket = socket
 
533
            if credentials is None:
 
534
                credentials = gnutls.Credentials()
 
535
            gnutls.credentials_set(self._c_object, credentials.type,
 
536
                                   ctypes.cast(credentials._c_object,
 
537
                                               ctypes.c_void_p))
 
538
            self.credentials = credentials
 
539
        
 
540
        def __del__(self):
 
541
            gnutls.deinit(self._c_object)
 
542
        
 
543
        def handshake(self):
 
544
            return gnutls.handshake(self._c_object)
 
545
        
 
546
        def send(self, data):
 
547
            data = bytes(data)
 
548
            data_len = len(data)
 
549
            while data_len > 0:
 
550
                data_len -= gnutls.record_send(self._c_object,
 
551
                                               data[-data_len:],
 
552
                                               data_len)
 
553
        
 
554
        def bye(self):
 
555
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
556
    
 
557
    # Error handling functions
 
558
    def _error_code(result):
 
559
        """A function to raise exceptions on errors, suitable
 
560
        for the 'restype' attribute on ctypes functions"""
 
561
        if result >= 0:
 
562
            return result
 
563
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
564
            raise gnutls.CertificateSecurityError(code = result)
 
565
        raise gnutls.Error(code = result)
 
566
    
 
567
    def _retry_on_error(result, func, arguments):
 
568
        """A function to retry on some errors, suitable
 
569
        for the 'errcheck' attribute on ctypes functions"""
 
570
        while result < 0:
 
571
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
572
                return _error_code(result)
 
573
            result = func(*arguments)
 
574
        return result
 
575
    
 
576
    # Unless otherwise indicated, the function declarations below are
 
577
    # all from the gnutls/gnutls.h C header file.
 
578
    
 
579
    # Functions
 
580
    priority_set_direct = _library.gnutls_priority_set_direct
 
581
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
582
                                    ctypes.POINTER(ctypes.c_char_p)]
 
583
    priority_set_direct.restype = _error_code
 
584
    
 
585
    init = _library.gnutls_init
 
586
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
587
    init.restype = _error_code
 
588
    
 
589
    set_default_priority = _library.gnutls_set_default_priority
 
590
    set_default_priority.argtypes = [session_t]
 
591
    set_default_priority.restype = _error_code
 
592
    
 
593
    record_send = _library.gnutls_record_send
 
594
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
595
                            ctypes.c_size_t]
 
596
    record_send.restype = ctypes.c_ssize_t
 
597
    record_send.errcheck = _retry_on_error
 
598
    
 
599
    certificate_allocate_credentials = (
 
600
        _library.gnutls_certificate_allocate_credentials)
 
601
    certificate_allocate_credentials.argtypes = [
 
602
        ctypes.POINTER(certificate_credentials_t)]
 
603
    certificate_allocate_credentials.restype = _error_code
 
604
    
 
605
    certificate_free_credentials = (
 
606
        _library.gnutls_certificate_free_credentials)
 
607
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
608
    certificate_free_credentials.restype = None
 
609
    
 
610
    handshake_set_private_extensions = (
 
611
        _library.gnutls_handshake_set_private_extensions)
 
612
    handshake_set_private_extensions.argtypes = [session_t,
 
613
                                                 ctypes.c_int]
 
614
    handshake_set_private_extensions.restype = None
 
615
    
 
616
    credentials_set = _library.gnutls_credentials_set
 
617
    credentials_set.argtypes = [session_t, credentials_type_t,
 
618
                                ctypes.c_void_p]
 
619
    credentials_set.restype = _error_code
 
620
    
 
621
    strerror = _library.gnutls_strerror
 
622
    strerror.argtypes = [ctypes.c_int]
 
623
    strerror.restype = ctypes.c_char_p
 
624
    
 
625
    certificate_type_get = _library.gnutls_certificate_type_get
 
626
    certificate_type_get.argtypes = [session_t]
 
627
    certificate_type_get.restype = _error_code
 
628
    
 
629
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
630
    certificate_get_peers.argtypes = [session_t,
 
631
                                      ctypes.POINTER(ctypes.c_uint)]
 
632
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
633
    
 
634
    global_set_log_level = _library.gnutls_global_set_log_level
 
635
    global_set_log_level.argtypes = [ctypes.c_int]
 
636
    global_set_log_level.restype = None
 
637
    
 
638
    global_set_log_function = _library.gnutls_global_set_log_function
 
639
    global_set_log_function.argtypes = [log_func]
 
640
    global_set_log_function.restype = None
 
641
    
 
642
    deinit = _library.gnutls_deinit
 
643
    deinit.argtypes = [session_t]
 
644
    deinit.restype = None
 
645
    
 
646
    handshake = _library.gnutls_handshake
 
647
    handshake.argtypes = [session_t]
 
648
    handshake.restype = _error_code
 
649
    handshake.errcheck = _retry_on_error
 
650
    
 
651
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
652
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
653
    transport_set_ptr.restype = None
 
654
    
 
655
    bye = _library.gnutls_bye
 
656
    bye.argtypes = [session_t, close_request_t]
 
657
    bye.restype = _error_code
 
658
    bye.errcheck = _retry_on_error
 
659
    
 
660
    check_version = _library.gnutls_check_version
 
661
    check_version.argtypes = [ctypes.c_char_p]
 
662
    check_version.restype = ctypes.c_char_p
 
663
    
 
664
    # All the function declarations below are from gnutls/openpgp.h
 
665
    
 
666
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
667
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
668
    openpgp_crt_init.restype = _error_code
 
669
    
 
670
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
671
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
672
                                   ctypes.POINTER(datum_t),
 
673
                                   openpgp_crt_fmt_t]
 
674
    openpgp_crt_import.restype = _error_code
 
675
    
 
676
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
677
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
678
                                        ctypes.POINTER(ctypes.c_uint)]
 
679
    openpgp_crt_verify_self.restype = _error_code
 
680
    
 
681
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
682
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
683
    openpgp_crt_deinit.restype = None
 
684
    
 
685
    openpgp_crt_get_fingerprint = (
 
686
        _library.gnutls_openpgp_crt_get_fingerprint)
 
687
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
688
                                            ctypes.c_void_p,
 
689
                                            ctypes.POINTER(
 
690
                                                ctypes.c_size_t)]
 
691
    openpgp_crt_get_fingerprint.restype = _error_code
 
692
    
 
693
    # Remove non-public functions
 
694
    del _error_code, _retry_on_error
 
695
# Create the global "gnutls" object, simulating a module
 
696
gnutls = GnuTLS()
 
697
 
438
698
def call_pipe(connection,       # : multiprocessing.Connection
439
699
              func, *args, **kwargs):
440
700
    """This function is meant to be called by multiprocessing.Process
455
715
    checker:    subprocess.Popen(); a running checker process used
456
716
                                    to see if the client lives.
457
717
                                    'None' if no process is running.
458
 
    checker_callback_tag: a gobject event source tag, or None
 
718
    checker_callback_tag: a GObject event source tag, or None
459
719
    checker_command: string; External command which is run to check
460
720
                     if client lives.  %() expansions are done at
461
721
                     runtime with vars(self) as dict, so that for
462
722
                     instance %(name)s can be used in the command.
463
 
    checker_initiator_tag: a gobject event source tag, or None
 
723
    checker_initiator_tag: a GObject event source tag, or None
464
724
    created:    datetime.datetime(); (UTC) object creation
465
725
    client_structure: Object describing what attributes a client has
466
726
                      and is used for storing the client at exit
467
727
    current_checker_command: string; current running checker_command
468
 
    disable_initiator_tag: a gobject event source tag, or None
 
728
    disable_initiator_tag: a GObject event source tag, or None
469
729
    enabled:    bool()
470
730
    fingerprint: string (40 or 32 hexadecimal digits); used to
471
731
                 uniquely identify the client
625
885
        if not quiet:
626
886
            logger.info("Disabling client %s", self.name)
627
887
        if getattr(self, "disable_initiator_tag", None) is not None:
628
 
            gobject.source_remove(self.disable_initiator_tag)
 
888
            GObject.source_remove(self.disable_initiator_tag)
629
889
            self.disable_initiator_tag = None
630
890
        self.expires = None
631
891
        if getattr(self, "checker_initiator_tag", None) is not None:
632
 
            gobject.source_remove(self.checker_initiator_tag)
 
892
            GObject.source_remove(self.checker_initiator_tag)
633
893
            self.checker_initiator_tag = None
634
894
        self.stop_checker()
635
895
        self.enabled = False
636
896
        if not quiet:
637
897
            self.send_changedstate()
638
 
        # Do not run this again if called by a gobject.timeout_add
 
898
        # Do not run this again if called by a GObject.timeout_add
639
899
        return False
640
900
    
641
901
    def __del__(self):
645
905
        # Schedule a new checker to be started an 'interval' from now,
646
906
        # and every interval from then on.
647
907
        if self.checker_initiator_tag is not None:
648
 
            gobject.source_remove(self.checker_initiator_tag)
649
 
        self.checker_initiator_tag = gobject.timeout_add(
 
908
            GObject.source_remove(self.checker_initiator_tag)
 
909
        self.checker_initiator_tag = GObject.timeout_add(
650
910
            int(self.interval.total_seconds() * 1000),
651
911
            self.start_checker)
652
912
        # Schedule a disable() when 'timeout' has passed
653
913
        if self.disable_initiator_tag is not None:
654
 
            gobject.source_remove(self.disable_initiator_tag)
655
 
        self.disable_initiator_tag = gobject.timeout_add(
 
914
            GObject.source_remove(self.disable_initiator_tag)
 
915
        self.disable_initiator_tag = GObject.timeout_add(
656
916
            int(self.timeout.total_seconds() * 1000), self.disable)
657
917
        # Also start a new checker *right now*.
658
918
        self.start_checker()
694
954
        if timeout is None:
695
955
            timeout = self.timeout
696
956
        if self.disable_initiator_tag is not None:
697
 
            gobject.source_remove(self.disable_initiator_tag)
 
957
            GObject.source_remove(self.disable_initiator_tag)
698
958
            self.disable_initiator_tag = None
699
959
        if getattr(self, "enabled", False):
700
 
            self.disable_initiator_tag = gobject.timeout_add(
 
960
            self.disable_initiator_tag = GObject.timeout_add(
701
961
                int(timeout.total_seconds() * 1000), self.disable)
702
962
            self.expires = datetime.datetime.utcnow() + timeout
703
963
    
758
1018
                args = (pipe[1], subprocess.call, command),
759
1019
                kwargs = popen_args)
760
1020
            self.checker.start()
761
 
            self.checker_callback_tag = gobject.io_add_watch(
762
 
                pipe[0].fileno(), gobject.IO_IN,
 
1021
            self.checker_callback_tag = GObject.io_add_watch(
 
1022
                pipe[0].fileno(), GObject.IO_IN,
763
1023
                self.checker_callback, pipe[0], command)
764
 
        # Re-run this periodically if run by gobject.timeout_add
 
1024
        # Re-run this periodically if run by GObject.timeout_add
765
1025
        return True
766
1026
    
767
1027
    def stop_checker(self):
768
1028
        """Force the checker process, if any, to stop."""
769
1029
        if self.checker_callback_tag:
770
 
            gobject.source_remove(self.checker_callback_tag)
 
1030
            GObject.source_remove(self.checker_callback_tag)
771
1031
            self.checker_callback_tag = None
772
1032
        if getattr(self, "checker", None) is None:
773
1033
            return
1547
1807
    
1548
1808
    def approve(self, value=True):
1549
1809
        self.approved = value
1550
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1810
        GObject.timeout_add(int(self.approval_duration.total_seconds()
1551
1811
                                * 1000), self._reset_approved)
1552
1812
        self.send_changedstate()
1553
1813
    
1764
2024
                if (getattr(self, "disable_initiator_tag", None)
1765
2025
                    is None):
1766
2026
                    return
1767
 
                gobject.source_remove(self.disable_initiator_tag)
1768
 
                self.disable_initiator_tag = gobject.timeout_add(
 
2027
                GObject.source_remove(self.disable_initiator_tag)
 
2028
                self.disable_initiator_tag = GObject.timeout_add(
1769
2029
                    int((self.expires - now).total_seconds() * 1000),
1770
2030
                    self.disable)
1771
2031
    
1791
2051
            return
1792
2052
        if self.enabled:
1793
2053
            # Reschedule checker run
1794
 
            gobject.source_remove(self.checker_initiator_tag)
1795
 
            self.checker_initiator_tag = gobject.timeout_add(
 
2054
            GObject.source_remove(self.checker_initiator_tag)
 
2055
            self.checker_initiator_tag = GObject.timeout_add(
1796
2056
                value, self.start_checker)
1797
2057
            self.start_checker() # Start one now, too
1798
2058
    
1880
2140
            logger.debug("Pipe FD: %d",
1881
2141
                         self.server.child_pipe.fileno())
1882
2142
            
1883
 
            session = gnutls.connection.ClientSession(
1884
 
                self.request, gnutls.connection .X509Credentials())
1885
 
            
1886
 
            # Note: gnutls.connection.X509Credentials is really a
1887
 
            # generic GnuTLS certificate credentials object so long as
1888
 
            # no X.509 keys are added to it.  Therefore, we can use it
1889
 
            # here despite using OpenPGP certificates.
 
2143
            session = gnutls.ClientSession(self.request)
1890
2144
            
1891
2145
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1892
2146
            #                      "+AES-256-CBC", "+SHA1",
1896
2150
            priority = self.server.gnutls_priority
1897
2151
            if priority is None:
1898
2152
                priority = "NORMAL"
1899
 
            gnutls.library.functions.gnutls_priority_set_direct(
1900
 
                session._c_object, priority, None)
 
2153
            gnutls.priority_set_direct(session._c_object, priority,
 
2154
                                       None)
1901
2155
            
1902
2156
            # Start communication using the Mandos protocol
1903
2157
            # Get protocol number
1913
2167
            # Start GnuTLS connection
1914
2168
            try:
1915
2169
                session.handshake()
1916
 
            except gnutls.errors.GNUTLSError as error:
 
2170
            except gnutls.Error as error:
1917
2171
                logger.warning("Handshake failed: %s", error)
1918
2172
                # Do not run session.bye() here: the session is not
1919
2173
                # established.  Just abandon the request.
1925
2179
                try:
1926
2180
                    fpr = self.fingerprint(
1927
2181
                        self.peer_certificate(session))
1928
 
                except (TypeError,
1929
 
                        gnutls.errors.GNUTLSError) as error:
 
2182
                except (TypeError, gnutls.Error) as error:
1930
2183
                    logger.warning("Bad certificate: %s", error)
1931
2184
                    return
1932
2185
                logger.debug("Fingerprint: %s", fpr)
1990
2243
                    else:
1991
2244
                        delay -= time2 - time
1992
2245
                
1993
 
                sent_size = 0
1994
 
                while sent_size < len(client.secret):
1995
 
                    try:
1996
 
                        sent = session.send(client.secret[sent_size:])
1997
 
                    except gnutls.errors.GNUTLSError as error:
1998
 
                        logger.warning("gnutls send failed",
1999
 
                                       exc_info=error)
2000
 
                        return
2001
 
                    logger.debug("Sent: %d, remaining: %d", sent,
2002
 
                                 len(client.secret) - (sent_size
2003
 
                                                       + sent))
2004
 
                    sent_size += sent
 
2246
                try:
 
2247
                    session.send(client.secret)
 
2248
                except gnutls.Error as error:
 
2249
                    logger.warning("gnutls send failed",
 
2250
                                   exc_info = error)
 
2251
                    return
2005
2252
                
2006
2253
                logger.info("Sending secret to %s", client.name)
2007
2254
                # bump the timeout using extended_timeout
2015
2262
                    client.approvals_pending -= 1
2016
2263
                try:
2017
2264
                    session.bye()
2018
 
                except gnutls.errors.GNUTLSError as error:
 
2265
                except gnutls.Error as error:
2019
2266
                    logger.warning("GnuTLS bye failed",
2020
2267
                                   exc_info=error)
2021
2268
    
2023
2270
    def peer_certificate(session):
2024
2271
        "Return the peer's OpenPGP certificate as a bytestring"
2025
2272
        # If not an OpenPGP certificate...
2026
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
2027
 
                session._c_object)
2028
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
2029
 
            # ...do the normal thing
2030
 
            return session.peer_certificate
 
2273
        if (gnutls.certificate_type_get(session._c_object)
 
2274
            != gnutls.CRT_OPENPGP):
 
2275
            # ...return invalid data
 
2276
            return b""
2031
2277
        list_size = ctypes.c_uint(1)
2032
 
        cert_list = (gnutls.library.functions
2033
 
                     .gnutls_certificate_get_peers
 
2278
        cert_list = (gnutls.certificate_get_peers
2034
2279
                     (session._c_object, ctypes.byref(list_size)))
2035
2280
        if not bool(cert_list) and list_size.value != 0:
2036
 
            raise gnutls.errors.GNUTLSError("error getting peer"
2037
 
                                            " certificate")
 
2281
            raise gnutls.Error("error getting peer certificate")
2038
2282
        if list_size.value == 0:
2039
2283
            return None
2040
2284
        cert = cert_list[0]
2044
2288
    def fingerprint(openpgp):
2045
2289
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2046
2290
        # New GnuTLS "datum" with the OpenPGP public key
2047
 
        datum = gnutls.library.types.gnutls_datum_t(
 
2291
        datum = gnutls.datum_t(
2048
2292
            ctypes.cast(ctypes.c_char_p(openpgp),
2049
2293
                        ctypes.POINTER(ctypes.c_ubyte)),
2050
2294
            ctypes.c_uint(len(openpgp)))
2051
2295
        # New empty GnuTLS certificate
2052
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
2053
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
2054
 
            ctypes.byref(crt))
 
2296
        crt = gnutls.openpgp_crt_t()
 
2297
        gnutls.openpgp_crt_init(ctypes.byref(crt))
2055
2298
        # Import the OpenPGP public key into the certificate
2056
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
2057
 
            crt, ctypes.byref(datum),
2058
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
2299
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2300
                                  gnutls.OPENPGP_FMT_RAW)
2059
2301
        # Verify the self signature in the key
2060
2302
        crtverify = ctypes.c_uint()
2061
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
 
            crt, 0, ctypes.byref(crtverify))
 
2303
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2304
                                       ctypes.byref(crtverify))
2063
2305
        if crtverify.value != 0:
2064
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2065
 
            raise gnutls.errors.CertificateSecurityError(
2066
 
                "Verify failed")
 
2306
            gnutls.openpgp_crt_deinit(crt)
 
2307
            raise gnutls.CertificateSecurityError("Verify failed")
2067
2308
        # New buffer for the fingerprint
2068
2309
        buf = ctypes.create_string_buffer(20)
2069
2310
        buf_len = ctypes.c_size_t()
2070
2311
        # Get the fingerprint from the certificate into the buffer
2071
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
2312
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2313
                                           ctypes.byref(buf_len))
2073
2314
        # Deinit the certificate
2074
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2315
        gnutls.openpgp_crt_deinit(crt)
2075
2316
        # Convert the buffer to a Python bytestring
2076
2317
        fpr = ctypes.string_at(buf, buf_len.value)
2077
2318
        # Convert the bytestring to hexadecimal notation
2221
2462
        gnutls_priority GnuTLS priority string
2222
2463
        use_dbus:       Boolean; to emit D-Bus signals or not
2223
2464
    
2224
 
    Assumes a gobject.MainLoop event loop.
 
2465
    Assumes a GObject.MainLoop event loop.
2225
2466
    """
2226
2467
    
2227
2468
    def __init__(self, server_address, RequestHandlerClass,
2252
2493
    
2253
2494
    def add_pipe(self, parent_pipe, proc):
2254
2495
        # Call "handle_ipc" for both data and EOF events
2255
 
        gobject.io_add_watch(
 
2496
        GObject.io_add_watch(
2256
2497
            parent_pipe.fileno(),
2257
 
            gobject.IO_IN | gobject.IO_HUP,
 
2498
            GObject.IO_IN | GObject.IO_HUP,
2258
2499
            functools.partial(self.handle_ipc,
2259
2500
                              parent_pipe = parent_pipe,
2260
2501
                              proc = proc))
2264
2505
                   proc = None,
2265
2506
                   client_object=None):
2266
2507
        # error, or the other end of multiprocessing.Pipe has closed
2267
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2508
        if condition & (GObject.IO_ERR | GObject.IO_HUP):
2268
2509
            # Wait for other process to exit
2269
2510
            proc.join()
2270
2511
            return False
2291
2532
                parent_pipe.send(False)
2292
2533
                return False
2293
2534
            
2294
 
            gobject.io_add_watch(
 
2535
            GObject.io_add_watch(
2295
2536
                parent_pipe.fileno(),
2296
 
                gobject.IO_IN | gobject.IO_HUP,
 
2537
                GObject.IO_IN | GObject.IO_HUP,
2297
2538
                functools.partial(self.handle_ipc,
2298
2539
                                  parent_pipe = parent_pipe,
2299
2540
                                  proc = proc,
2681
2922
            logger.error("Could not open file %r", pidfilename,
2682
2923
                         exc_info=e)
2683
2924
    
2684
 
    for name in ("_mandos", "mandos", "nobody"):
 
2925
    for name, group in (("_mandos", "_mandos"),
 
2926
                        ("mandos", "mandos"),
 
2927
                        ("nobody", "nogroup")):
2685
2928
        try:
2686
2929
            uid = pwd.getpwnam(name).pw_uid
2687
 
            gid = pwd.getpwnam(name).pw_gid
 
2930
            gid = pwd.getpwnam(group).pw_gid
2688
2931
            break
2689
2932
        except KeyError:
2690
2933
            continue
2694
2937
    try:
2695
2938
        os.setgid(gid)
2696
2939
        os.setuid(uid)
 
2940
        if debug:
 
2941
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2942
                                                             gid))
2697
2943
    except OSError as error:
 
2944
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
2945
                       .format(uid, gid, os.strerror(error.errno)))
2698
2946
        if error.errno != errno.EPERM:
2699
2947
            raise
2700
2948
    
2703
2951
        
2704
2952
        # "Use a log level over 10 to enable all debugging options."
2705
2953
        # - GnuTLS manual
2706
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2954
        gnutls.global_set_log_level(11)
2707
2955
        
2708
 
        @gnutls.library.types.gnutls_log_func
 
2956
        @gnutls.log_func
2709
2957
        def debug_gnutls(level, string):
2710
2958
            logger.debug("GnuTLS: %s", string[:-1])
2711
2959
        
2712
 
        gnutls.library.functions.gnutls_global_set_log_function(
2713
 
            debug_gnutls)
 
2960
        gnutls.global_set_log_function(debug_gnutls)
2714
2961
        
2715
2962
        # Redirect stdin so all checkers get /dev/null
2716
2963
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2723
2970
        # Close all input and output, do double fork, etc.
2724
2971
        daemon()
2725
2972
    
2726
 
    # multiprocessing will use threads, so before we use gobject we
2727
 
    # need to inform gobject that threads will be used.
2728
 
    gobject.threads_init()
 
2973
    # multiprocessing will use threads, so before we use GObject we
 
2974
    # need to inform GObject that threads will be used.
 
2975
    GObject.threads_init()
2729
2976
    
2730
2977
    global main_loop
2731
2978
    # From the Avahi example code
2732
2979
    DBusGMainLoop(set_as_default=True)
2733
 
    main_loop = gobject.MainLoop()
 
2980
    main_loop = GObject.MainLoop()
2734
2981
    bus = dbus.SystemBus()
2735
2982
    # End of Avahi example code
2736
2983
    if use_dbus:
3064
3311
            # Don't signal the disabling
3065
3312
            client.disable(quiet=True)
3066
3313
            # Emit D-Bus signal for removal
3067
 
            mandos_dbus_service.client_removed_signal(client)
 
3314
            if use_dbus:
 
3315
                mandos_dbus_service.client_removed_signal(client)
3068
3316
        client_settings.clear()
3069
3317
    
3070
3318
    atexit.register(cleanup)
3104
3352
                sys.exit(1)
3105
3353
            # End of Avahi example code
3106
3354
        
3107
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
3355
        GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
3108
3356
                             lambda *args, **kwargs:
3109
3357
                             (tcp_server.handle_request
3110
3358
                              (*args[2:], **kwargs) or True))