/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-02-21 14:24:01 UTC
  • Revision ID: teddy@recompile.se-20160221142401-j7glu6a2hg604d1e
Use AddressSanitizer and UndefinedBehaviorSanitizer.

* Makefile (SANITIZE): New; set to all sanitizing options depending on
                       GCC version.
  (CFLAGS): Added "$(SANITIZE)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
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-2016 Teddy Hogeborn
15
 
# Copyright © 2008-2016 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
try:
38
 
    from future_builtins import *
39
 
except ImportError:
40
 
    pass
 
37
from future_builtins import *
41
38
 
42
39
try:
43
40
    import SocketServer as socketserver
47
44
import argparse
48
45
import datetime
49
46
import errno
 
47
import gnutls.connection
 
48
import gnutls.errors
 
49
import gnutls.library.functions
 
50
import gnutls.library.constants
 
51
import gnutls.library.types
50
52
try:
51
53
    import ConfigParser as configparser
52
54
except ImportError:
79
81
 
80
82
import dbus
81
83
import dbus.service
82
 
from gi.repository import GLib
 
84
try:
 
85
    import gobject
 
86
except ImportError:
 
87
    from gi.repository import GObject as gobject
 
88
import avahi
83
89
from dbus.mainloop.glib import DBusGMainLoop
84
90
import ctypes
85
91
import ctypes.util
97
103
if sys.version_info.major == 2:
98
104
    str = unicode
99
105
 
100
 
version = "1.7.7"
 
106
version = "1.7.1"
101
107
stored_state_file = "clients.pickle"
102
108
 
103
109
logger = logging.getLogger()
118
124
        return interface_index
119
125
 
120
126
 
121
 
def copy_function(func):
122
 
    """Make a copy of a function"""
123
 
    if sys.version_info.major == 2:
124
 
        return types.FunctionType(func.func_code,
125
 
                                  func.func_globals,
126
 
                                  func.func_name,
127
 
                                  func.func_defaults,
128
 
                                  func.func_closure)
129
 
    else:
130
 
        return types.FunctionType(func.__code__,
131
 
                                  func.__globals__,
132
 
                                  func.__name__,
133
 
                                  func.__defaults__,
134
 
                                  func.__closure__)
135
 
 
136
 
 
137
127
def initlogger(debug, level=logging.WARNING):
138
128
    """init logger and add loglevel"""
139
129
    
166
156
    
167
157
    def __init__(self):
168
158
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
169
 
        self.gpg = "gpg"
170
 
        try:
171
 
            output = subprocess.check_output(["gpgconf"])
172
 
            for line in output.splitlines():
173
 
                name, text, path = line.split(b":")
174
 
                if name == "gpg":
175
 
                    self.gpg = path
176
 
                    break
177
 
        except OSError as e:
178
 
            if e.errno != errno.ENOENT:
179
 
                raise
180
159
        self.gnupgargs = ['--batch',
181
 
                          '--homedir', self.tempdir,
 
160
                          '--home', self.tempdir,
182
161
                          '--force-mdc',
183
162
                          '--quiet',
184
163
                          '--no-use-agent']
223
202
                dir=self.tempdir) as passfile:
224
203
            passfile.write(passphrase)
225
204
            passfile.flush()
226
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
205
            proc = subprocess.Popen(['gpg', '--symmetric',
227
206
                                     '--passphrase-file',
228
207
                                     passfile.name]
229
208
                                    + self.gnupgargs,
241
220
                dir = self.tempdir) as passfile:
242
221
            passfile.write(passphrase)
243
222
            passfile.flush()
244
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
223
            proc = subprocess.Popen(['gpg', '--decrypt',
245
224
                                     '--passphrase-file',
246
225
                                     passfile.name]
247
226
                                    + self.gnupgargs,
253
232
            raise PGPError(err)
254
233
        return decrypted_plaintext
255
234
 
256
 
# Pretend that we have an Avahi module
257
 
class Avahi(object):
258
 
    """This isn't so much a class as it is a module-like namespace.
259
 
    It is instantiated once, and simulates having an Avahi module."""
260
 
    IF_UNSPEC = -1              # avahi-common/address.h
261
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
262
 
    PROTO_INET = 0              # avahi-common/address.h
263
 
    PROTO_INET6 = 1             # avahi-common/address.h
264
 
    DBUS_NAME = "org.freedesktop.Avahi"
265
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
266
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
267
 
    DBUS_PATH_SERVER = "/"
268
 
    def string_array_to_txt_array(self, t):
269
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
270
 
                           for s in t), signature="ay")
271
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
272
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
273
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
274
 
    SERVER_INVALID = 0          # avahi-common/defs.h
275
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
276
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
277
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
278
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
279
 
avahi = Avahi()
280
235
 
281
236
class AvahiError(Exception):
282
237
    def __init__(self, value, *args, **kwargs):
479
434
            .format(self.name)))
480
435
        return ret
481
436
 
482
 
# Pretend that we have a GnuTLS module
483
 
class GnuTLS(object):
484
 
    """This isn't so much a class as it is a module-like namespace.
485
 
    It is instantiated once, and simulates having a GnuTLS module."""
486
 
    
487
 
    _library = ctypes.cdll.LoadLibrary(
488
 
        ctypes.util.find_library("gnutls"))
489
 
    _need_version = b"3.3.0"
490
 
    def __init__(self):
491
 
        # Need to use class name "GnuTLS" here, since this method is
492
 
        # called before the assignment to the "gnutls" global variable
493
 
        # happens.
494
 
        if GnuTLS.check_version(self._need_version) is None:
495
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
496
 
                               .format(self._need_version))
497
 
    
498
 
    # Unless otherwise indicated, the constants and types below are
499
 
    # all from the gnutls/gnutls.h C header file.
500
 
    
501
 
    # Constants
502
 
    E_SUCCESS = 0
503
 
    E_INTERRUPTED = -52
504
 
    E_AGAIN = -28
505
 
    CRT_OPENPGP = 2
506
 
    CLIENT = 2
507
 
    SHUT_RDWR = 0
508
 
    CRD_CERTIFICATE = 1
509
 
    E_NO_CERTIFICATE_FOUND = -49
510
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
511
 
    
512
 
    # Types
513
 
    class session_int(ctypes.Structure):
514
 
        _fields_ = []
515
 
    session_t = ctypes.POINTER(session_int)
516
 
    class certificate_credentials_st(ctypes.Structure):
517
 
        _fields_ = []
518
 
    certificate_credentials_t = ctypes.POINTER(
519
 
        certificate_credentials_st)
520
 
    certificate_type_t = ctypes.c_int
521
 
    class datum_t(ctypes.Structure):
522
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
523
 
                    ('size', ctypes.c_uint)]
524
 
    class openpgp_crt_int(ctypes.Structure):
525
 
        _fields_ = []
526
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
527
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
528
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
529
 
    credentials_type_t = ctypes.c_int
530
 
    transport_ptr_t = ctypes.c_void_p
531
 
    close_request_t = ctypes.c_int
532
 
    
533
 
    # Exceptions
534
 
    class Error(Exception):
535
 
        # We need to use the class name "GnuTLS" here, since this
536
 
        # exception might be raised from within GnuTLS.__init__,
537
 
        # which is called before the assignment to the "gnutls"
538
 
        # global variable has happened.
539
 
        def __init__(self, message = None, code = None, args=()):
540
 
            # Default usage is by a message string, but if a return
541
 
            # code is passed, convert it to a string with
542
 
            # gnutls.strerror()
543
 
            self.code = code
544
 
            if message is None and code is not None:
545
 
                message = GnuTLS.strerror(code)
546
 
            return super(GnuTLS.Error, self).__init__(
547
 
                message, *args)
548
 
    
549
 
    class CertificateSecurityError(Error):
550
 
        pass
551
 
    
552
 
    # Classes
553
 
    class Credentials(object):
554
 
        def __init__(self):
555
 
            self._c_object = gnutls.certificate_credentials_t()
556
 
            gnutls.certificate_allocate_credentials(
557
 
                ctypes.byref(self._c_object))
558
 
            self.type = gnutls.CRD_CERTIFICATE
559
 
        
560
 
        def __del__(self):
561
 
            gnutls.certificate_free_credentials(self._c_object)
562
 
    
563
 
    class ClientSession(object):
564
 
        def __init__(self, socket, credentials = None):
565
 
            self._c_object = gnutls.session_t()
566
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
567
 
            gnutls.set_default_priority(self._c_object)
568
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
569
 
            gnutls.handshake_set_private_extensions(self._c_object,
570
 
                                                    True)
571
 
            self.socket = socket
572
 
            if credentials is None:
573
 
                credentials = gnutls.Credentials()
574
 
            gnutls.credentials_set(self._c_object, credentials.type,
575
 
                                   ctypes.cast(credentials._c_object,
576
 
                                               ctypes.c_void_p))
577
 
            self.credentials = credentials
578
 
        
579
 
        def __del__(self):
580
 
            gnutls.deinit(self._c_object)
581
 
        
582
 
        def handshake(self):
583
 
            return gnutls.handshake(self._c_object)
584
 
        
585
 
        def send(self, data):
586
 
            data = bytes(data)
587
 
            data_len = len(data)
588
 
            while data_len > 0:
589
 
                data_len -= gnutls.record_send(self._c_object,
590
 
                                               data[-data_len:],
591
 
                                               data_len)
592
 
        
593
 
        def bye(self):
594
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
595
 
    
596
 
    # Error handling functions
597
 
    def _error_code(result):
598
 
        """A function to raise exceptions on errors, suitable
599
 
        for the 'restype' attribute on ctypes functions"""
600
 
        if result >= 0:
601
 
            return result
602
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
603
 
            raise gnutls.CertificateSecurityError(code = result)
604
 
        raise gnutls.Error(code = result)
605
 
    
606
 
    def _retry_on_error(result, func, arguments):
607
 
        """A function to retry on some errors, suitable
608
 
        for the 'errcheck' attribute on ctypes functions"""
609
 
        while result < 0:
610
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
611
 
                return _error_code(result)
612
 
            result = func(*arguments)
613
 
        return result
614
 
    
615
 
    # Unless otherwise indicated, the function declarations below are
616
 
    # all from the gnutls/gnutls.h C header file.
617
 
    
618
 
    # Functions
619
 
    priority_set_direct = _library.gnutls_priority_set_direct
620
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
621
 
                                    ctypes.POINTER(ctypes.c_char_p)]
622
 
    priority_set_direct.restype = _error_code
623
 
    
624
 
    init = _library.gnutls_init
625
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
626
 
    init.restype = _error_code
627
 
    
628
 
    set_default_priority = _library.gnutls_set_default_priority
629
 
    set_default_priority.argtypes = [session_t]
630
 
    set_default_priority.restype = _error_code
631
 
    
632
 
    record_send = _library.gnutls_record_send
633
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
634
 
                            ctypes.c_size_t]
635
 
    record_send.restype = ctypes.c_ssize_t
636
 
    record_send.errcheck = _retry_on_error
637
 
    
638
 
    certificate_allocate_credentials = (
639
 
        _library.gnutls_certificate_allocate_credentials)
640
 
    certificate_allocate_credentials.argtypes = [
641
 
        ctypes.POINTER(certificate_credentials_t)]
642
 
    certificate_allocate_credentials.restype = _error_code
643
 
    
644
 
    certificate_free_credentials = (
645
 
        _library.gnutls_certificate_free_credentials)
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
647
 
    certificate_free_credentials.restype = None
648
 
    
649
 
    handshake_set_private_extensions = (
650
 
        _library.gnutls_handshake_set_private_extensions)
651
 
    handshake_set_private_extensions.argtypes = [session_t,
652
 
                                                 ctypes.c_int]
653
 
    handshake_set_private_extensions.restype = None
654
 
    
655
 
    credentials_set = _library.gnutls_credentials_set
656
 
    credentials_set.argtypes = [session_t, credentials_type_t,
657
 
                                ctypes.c_void_p]
658
 
    credentials_set.restype = _error_code
659
 
    
660
 
    strerror = _library.gnutls_strerror
661
 
    strerror.argtypes = [ctypes.c_int]
662
 
    strerror.restype = ctypes.c_char_p
663
 
    
664
 
    certificate_type_get = _library.gnutls_certificate_type_get
665
 
    certificate_type_get.argtypes = [session_t]
666
 
    certificate_type_get.restype = _error_code
667
 
    
668
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
669
 
    certificate_get_peers.argtypes = [session_t,
670
 
                                      ctypes.POINTER(ctypes.c_uint)]
671
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
672
 
    
673
 
    global_set_log_level = _library.gnutls_global_set_log_level
674
 
    global_set_log_level.argtypes = [ctypes.c_int]
675
 
    global_set_log_level.restype = None
676
 
    
677
 
    global_set_log_function = _library.gnutls_global_set_log_function
678
 
    global_set_log_function.argtypes = [log_func]
679
 
    global_set_log_function.restype = None
680
 
    
681
 
    deinit = _library.gnutls_deinit
682
 
    deinit.argtypes = [session_t]
683
 
    deinit.restype = None
684
 
    
685
 
    handshake = _library.gnutls_handshake
686
 
    handshake.argtypes = [session_t]
687
 
    handshake.restype = _error_code
688
 
    handshake.errcheck = _retry_on_error
689
 
    
690
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
691
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
692
 
    transport_set_ptr.restype = None
693
 
    
694
 
    bye = _library.gnutls_bye
695
 
    bye.argtypes = [session_t, close_request_t]
696
 
    bye.restype = _error_code
697
 
    bye.errcheck = _retry_on_error
698
 
    
699
 
    check_version = _library.gnutls_check_version
700
 
    check_version.argtypes = [ctypes.c_char_p]
701
 
    check_version.restype = ctypes.c_char_p
702
 
    
703
 
    # All the function declarations below are from gnutls/openpgp.h
704
 
    
705
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
706
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
707
 
    openpgp_crt_init.restype = _error_code
708
 
    
709
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
710
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
711
 
                                   ctypes.POINTER(datum_t),
712
 
                                   openpgp_crt_fmt_t]
713
 
    openpgp_crt_import.restype = _error_code
714
 
    
715
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
716
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
717
 
                                        ctypes.POINTER(ctypes.c_uint)]
718
 
    openpgp_crt_verify_self.restype = _error_code
719
 
    
720
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
721
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
722
 
    openpgp_crt_deinit.restype = None
723
 
    
724
 
    openpgp_crt_get_fingerprint = (
725
 
        _library.gnutls_openpgp_crt_get_fingerprint)
726
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
727
 
                                            ctypes.c_void_p,
728
 
                                            ctypes.POINTER(
729
 
                                                ctypes.c_size_t)]
730
 
    openpgp_crt_get_fingerprint.restype = _error_code
731
 
    
732
 
    # Remove non-public functions
733
 
    del _error_code, _retry_on_error
734
 
# Create the global "gnutls" object, simulating a module
735
 
gnutls = GnuTLS()
736
 
 
737
437
def call_pipe(connection,       # : multiprocessing.Connection
738
438
              func, *args, **kwargs):
739
439
    """This function is meant to be called by multiprocessing.Process
754
454
    checker:    subprocess.Popen(); a running checker process used
755
455
                                    to see if the client lives.
756
456
                                    'None' if no process is running.
757
 
    checker_callback_tag: a GLib event source tag, or None
 
457
    checker_callback_tag: a gobject event source tag, or None
758
458
    checker_command: string; External command which is run to check
759
459
                     if client lives.  %() expansions are done at
760
460
                     runtime with vars(self) as dict, so that for
761
461
                     instance %(name)s can be used in the command.
762
 
    checker_initiator_tag: a GLib event source tag, or None
 
462
    checker_initiator_tag: a gobject event source tag, or None
763
463
    created:    datetime.datetime(); (UTC) object creation
764
464
    client_structure: Object describing what attributes a client has
765
465
                      and is used for storing the client at exit
766
466
    current_checker_command: string; current running checker_command
767
 
    disable_initiator_tag: a GLib event source tag, or None
 
467
    disable_initiator_tag: a gobject event source tag, or None
768
468
    enabled:    bool()
769
469
    fingerprint: string (40 or 32 hexadecimal digits); used to
770
470
                 uniquely identify the client
833
533
            client["fingerprint"] = (section["fingerprint"].upper()
834
534
                                     .replace(" ", ""))
835
535
            if "secret" in section:
836
 
                client["secret"] = codecs.decode(section["secret"]
837
 
                                                 .encode("utf-8"),
838
 
                                                 "base64")
 
536
                client["secret"] = section["secret"].decode("base64")
839
537
            elif "secfile" in section:
840
538
                with open(os.path.expanduser(os.path.expandvars
841
539
                                             (section["secfile"])),
894
592
        self.changedstate = multiprocessing_manager.Condition(
895
593
            multiprocessing_manager.Lock())
896
594
        self.client_structure = [attr
897
 
                                 for attr in self.__dict__.keys()
 
595
                                 for attr in self.__dict__.iterkeys()
898
596
                                 if not attr.startswith("_")]
899
597
        self.client_structure.append("client_structure")
900
598
        
926
624
        if not quiet:
927
625
            logger.info("Disabling client %s", self.name)
928
626
        if getattr(self, "disable_initiator_tag", None) is not None:
929
 
            GLib.source_remove(self.disable_initiator_tag)
 
627
            gobject.source_remove(self.disable_initiator_tag)
930
628
            self.disable_initiator_tag = None
931
629
        self.expires = None
932
630
        if getattr(self, "checker_initiator_tag", None) is not None:
933
 
            GLib.source_remove(self.checker_initiator_tag)
 
631
            gobject.source_remove(self.checker_initiator_tag)
934
632
            self.checker_initiator_tag = None
935
633
        self.stop_checker()
936
634
        self.enabled = False
937
635
        if not quiet:
938
636
            self.send_changedstate()
939
 
        # Do not run this again if called by a GLib.timeout_add
 
637
        # Do not run this again if called by a gobject.timeout_add
940
638
        return False
941
639
    
942
640
    def __del__(self):
946
644
        # Schedule a new checker to be started an 'interval' from now,
947
645
        # and every interval from then on.
948
646
        if self.checker_initiator_tag is not None:
949
 
            GLib.source_remove(self.checker_initiator_tag)
950
 
        self.checker_initiator_tag = GLib.timeout_add(
 
647
            gobject.source_remove(self.checker_initiator_tag)
 
648
        self.checker_initiator_tag = gobject.timeout_add(
951
649
            int(self.interval.total_seconds() * 1000),
952
650
            self.start_checker)
953
651
        # Schedule a disable() when 'timeout' has passed
954
652
        if self.disable_initiator_tag is not None:
955
 
            GLib.source_remove(self.disable_initiator_tag)
956
 
        self.disable_initiator_tag = GLib.timeout_add(
 
653
            gobject.source_remove(self.disable_initiator_tag)
 
654
        self.disable_initiator_tag = gobject.timeout_add(
957
655
            int(self.timeout.total_seconds() * 1000), self.disable)
958
656
        # Also start a new checker *right now*.
959
657
        self.start_checker()
995
693
        if timeout is None:
996
694
            timeout = self.timeout
997
695
        if self.disable_initiator_tag is not None:
998
 
            GLib.source_remove(self.disable_initiator_tag)
 
696
            gobject.source_remove(self.disable_initiator_tag)
999
697
            self.disable_initiator_tag = None
1000
698
        if getattr(self, "enabled", False):
1001
 
            self.disable_initiator_tag = GLib.timeout_add(
 
699
            self.disable_initiator_tag = gobject.timeout_add(
1002
700
                int(timeout.total_seconds() * 1000), self.disable)
1003
701
            self.expires = datetime.datetime.utcnow() + timeout
1004
702
    
1059
757
                args = (pipe[1], subprocess.call, command),
1060
758
                kwargs = popen_args)
1061
759
            self.checker.start()
1062
 
            self.checker_callback_tag = GLib.io_add_watch(
1063
 
                pipe[0].fileno(), GLib.IO_IN,
 
760
            self.checker_callback_tag = gobject.io_add_watch(
 
761
                pipe[0].fileno(), gobject.IO_IN,
1064
762
                self.checker_callback, pipe[0], command)
1065
 
        # Re-run this periodically if run by GLib.timeout_add
 
763
        # Re-run this periodically if run by gobject.timeout_add
1066
764
        return True
1067
765
    
1068
766
    def stop_checker(self):
1069
767
        """Force the checker process, if any, to stop."""
1070
768
        if self.checker_callback_tag:
1071
 
            GLib.source_remove(self.checker_callback_tag)
 
769
            gobject.source_remove(self.checker_callback_tag)
1072
770
            self.checker_callback_tag = None
1073
771
        if getattr(self, "checker", None) is None:
1074
772
            return
1548
1246
                interface_names.add(alt_interface)
1549
1247
                # Is this a D-Bus signal?
1550
1248
                if getattr(attribute, "_dbus_is_signal", False):
1551
 
                    # Extract the original non-method undecorated
1552
 
                    # function by black magic
1553
1249
                    if sys.version_info.major == 2:
 
1250
                        # Extract the original non-method undecorated
 
1251
                        # function by black magic
1554
1252
                        nonmethod_func = (dict(
1555
1253
                            zip(attribute.func_code.co_freevars,
1556
1254
                                attribute.__closure__))
1557
1255
                                          ["func"].cell_contents)
1558
1256
                    else:
1559
 
                        nonmethod_func = (dict(
1560
 
                            zip(attribute.__code__.co_freevars,
1561
 
                                attribute.__closure__))
1562
 
                                          ["func"].cell_contents)
 
1257
                        nonmethod_func = attribute
1563
1258
                    # Create a new, but exactly alike, function
1564
1259
                    # object, and decorate it to be a new D-Bus signal
1565
1260
                    # with the alternate D-Bus interface name
1566
 
                    new_function = copy_function(nonmethod_func)
 
1261
                    if sys.version_info.major == 2:
 
1262
                        new_function = types.FunctionType(
 
1263
                            nonmethod_func.func_code,
 
1264
                            nonmethod_func.func_globals,
 
1265
                            nonmethod_func.func_name,
 
1266
                            nonmethod_func.func_defaults,
 
1267
                            nonmethod_func.func_closure)
 
1268
                    else:
 
1269
                        new_function = types.FunctionType(
 
1270
                            nonmethod_func.__code__,
 
1271
                            nonmethod_func.__globals__,
 
1272
                            nonmethod_func.__name__,
 
1273
                            nonmethod_func.__defaults__,
 
1274
                            nonmethod_func.__closure__)
1567
1275
                    new_function = (dbus.service.signal(
1568
1276
                        alt_interface,
1569
1277
                        attribute._dbus_signature)(new_function))
1608
1316
                            alt_interface,
1609
1317
                            attribute._dbus_in_signature,
1610
1318
                            attribute._dbus_out_signature)
1611
 
                        (copy_function(attribute)))
 
1319
                        (types.FunctionType(attribute.func_code,
 
1320
                                            attribute.func_globals,
 
1321
                                            attribute.func_name,
 
1322
                                            attribute.func_defaults,
 
1323
                                            attribute.func_closure)))
1612
1324
                    # Copy annotations, if any
1613
1325
                    try:
1614
1326
                        attr[attrname]._dbus_annotations = dict(
1626
1338
                        attribute._dbus_access,
1627
1339
                        attribute._dbus_get_args_options
1628
1340
                        ["byte_arrays"])
1629
 
                                      (copy_function(attribute)))
 
1341
                                      (types.FunctionType(
 
1342
                                          attribute.func_code,
 
1343
                                          attribute.func_globals,
 
1344
                                          attribute.func_name,
 
1345
                                          attribute.func_defaults,
 
1346
                                          attribute.func_closure)))
1630
1347
                    # Copy annotations, if any
1631
1348
                    try:
1632
1349
                        attr[attrname]._dbus_annotations = dict(
1641
1358
                    # to the class.
1642
1359
                    attr[attrname] = (
1643
1360
                        dbus_interface_annotations(alt_interface)
1644
 
                        (copy_function(attribute)))
 
1361
                        (types.FunctionType(attribute.func_code,
 
1362
                                            attribute.func_globals,
 
1363
                                            attribute.func_name,
 
1364
                                            attribute.func_defaults,
 
1365
                                            attribute.func_closure)))
1645
1366
            if deprecate:
1646
1367
                # Deprecate all alternate interfaces
1647
1368
                iname="_AlternateDBusNames_interface_annotation{}"
1660
1381
            if interface_names:
1661
1382
                # Replace the class with a new subclass of it with
1662
1383
                # methods, signals, etc. as created above.
1663
 
                if sys.version_info.major == 2:
1664
 
                    cls = type(b"{}Alternate".format(cls.__name__),
1665
 
                               (cls, ), attr)
1666
 
                else:
1667
 
                    cls = type("{}Alternate".format(cls.__name__),
1668
 
                               (cls, ), attr)
 
1384
                cls = type(b"{}Alternate".format(cls.__name__),
 
1385
                           (cls, ), attr)
1669
1386
        return cls
1670
1387
    
1671
1388
    return wrapper
1829
1546
    
1830
1547
    def approve(self, value=True):
1831
1548
        self.approved = value
1832
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1833
 
                             * 1000), self._reset_approved)
 
1549
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1550
                                * 1000), self._reset_approved)
1834
1551
        self.send_changedstate()
1835
1552
    
1836
1553
    ## D-Bus methods, signals & properties
2046
1763
                if (getattr(self, "disable_initiator_tag", None)
2047
1764
                    is None):
2048
1765
                    return
2049
 
                GLib.source_remove(self.disable_initiator_tag)
2050
 
                self.disable_initiator_tag = GLib.timeout_add(
 
1766
                gobject.source_remove(self.disable_initiator_tag)
 
1767
                self.disable_initiator_tag = gobject.timeout_add(
2051
1768
                    int((self.expires - now).total_seconds() * 1000),
2052
1769
                    self.disable)
2053
1770
    
2073
1790
            return
2074
1791
        if self.enabled:
2075
1792
            # Reschedule checker run
2076
 
            GLib.source_remove(self.checker_initiator_tag)
2077
 
            self.checker_initiator_tag = GLib.timeout_add(
 
1793
            gobject.source_remove(self.checker_initiator_tag)
 
1794
            self.checker_initiator_tag = gobject.timeout_add(
2078
1795
                value, self.start_checker)
2079
1796
            self.start_checker() # Start one now, too
2080
1797
    
2162
1879
            logger.debug("Pipe FD: %d",
2163
1880
                         self.server.child_pipe.fileno())
2164
1881
            
2165
 
            session = gnutls.ClientSession(self.request)
 
1882
            session = gnutls.connection.ClientSession(
 
1883
                self.request, gnutls.connection.X509Credentials())
 
1884
            
 
1885
            # Note: gnutls.connection.X509Credentials is really a
 
1886
            # generic GnuTLS certificate credentials object so long as
 
1887
            # no X.509 keys are added to it.  Therefore, we can use it
 
1888
            # here despite using OpenPGP certificates.
2166
1889
            
2167
1890
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2168
1891
            #                      "+AES-256-CBC", "+SHA1",
2172
1895
            priority = self.server.gnutls_priority
2173
1896
            if priority is None:
2174
1897
                priority = "NORMAL"
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
2176
 
                                       None)
 
1898
            gnutls.library.functions.gnutls_priority_set_direct(
 
1899
                session._c_object, priority, None)
2177
1900
            
2178
1901
            # Start communication using the Mandos protocol
2179
1902
            # Get protocol number
2189
1912
            # Start GnuTLS connection
2190
1913
            try:
2191
1914
                session.handshake()
2192
 
            except gnutls.Error as error:
 
1915
            except gnutls.errors.GNUTLSError as error:
2193
1916
                logger.warning("Handshake failed: %s", error)
2194
1917
                # Do not run session.bye() here: the session is not
2195
1918
                # established.  Just abandon the request.
2201
1924
                try:
2202
1925
                    fpr = self.fingerprint(
2203
1926
                        self.peer_certificate(session))
2204
 
                except (TypeError, gnutls.Error) as error:
 
1927
                except (TypeError,
 
1928
                        gnutls.errors.GNUTLSError) as error:
2205
1929
                    logger.warning("Bad certificate: %s", error)
2206
1930
                    return
2207
1931
                logger.debug("Fingerprint: %s", fpr)
2265
1989
                    else:
2266
1990
                        delay -= time2 - time
2267
1991
                
2268
 
                try:
2269
 
                    session.send(client.secret)
2270
 
                except gnutls.Error as error:
2271
 
                    logger.warning("gnutls send failed",
2272
 
                                   exc_info = error)
2273
 
                    return
 
1992
                sent_size = 0
 
1993
                while sent_size < len(client.secret):
 
1994
                    try:
 
1995
                        sent = session.send(client.secret[sent_size:])
 
1996
                    except gnutls.errors.GNUTLSError as error:
 
1997
                        logger.warning("gnutls send failed",
 
1998
                                       exc_info=error)
 
1999
                        return
 
2000
                    logger.debug("Sent: %d, remaining: %d", sent,
 
2001
                                 len(client.secret) - (sent_size
 
2002
                                                       + sent))
 
2003
                    sent_size += sent
2274
2004
                
2275
2005
                logger.info("Sending secret to %s", client.name)
2276
2006
                # bump the timeout using extended_timeout
2284
2014
                    client.approvals_pending -= 1
2285
2015
                try:
2286
2016
                    session.bye()
2287
 
                except gnutls.Error as error:
 
2017
                except gnutls.errors.GNUTLSError as error:
2288
2018
                    logger.warning("GnuTLS bye failed",
2289
2019
                                   exc_info=error)
2290
2020
    
2292
2022
    def peer_certificate(session):
2293
2023
        "Return the peer's OpenPGP certificate as a bytestring"
2294
2024
        # If not an OpenPGP certificate...
2295
 
        if (gnutls.certificate_type_get(session._c_object)
2296
 
            != gnutls.CRT_OPENPGP):
2297
 
            # ...return invalid data
2298
 
            return b""
 
2025
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
2026
                session._c_object)
 
2027
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
2028
            # ...do the normal thing
 
2029
            return session.peer_certificate
2299
2030
        list_size = ctypes.c_uint(1)
2300
 
        cert_list = (gnutls.certificate_get_peers
 
2031
        cert_list = (gnutls.library.functions
 
2032
                     .gnutls_certificate_get_peers
2301
2033
                     (session._c_object, ctypes.byref(list_size)))
2302
2034
        if not bool(cert_list) and list_size.value != 0:
2303
 
            raise gnutls.Error("error getting peer certificate")
 
2035
            raise gnutls.errors.GNUTLSError("error getting peer"
 
2036
                                            " certificate")
2304
2037
        if list_size.value == 0:
2305
2038
            return None
2306
2039
        cert = cert_list[0]
2310
2043
    def fingerprint(openpgp):
2311
2044
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2312
2045
        # New GnuTLS "datum" with the OpenPGP public key
2313
 
        datum = gnutls.datum_t(
 
2046
        datum = gnutls.library.types.gnutls_datum_t(
2314
2047
            ctypes.cast(ctypes.c_char_p(openpgp),
2315
2048
                        ctypes.POINTER(ctypes.c_ubyte)),
2316
2049
            ctypes.c_uint(len(openpgp)))
2317
2050
        # New empty GnuTLS certificate
2318
 
        crt = gnutls.openpgp_crt_t()
2319
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
2051
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
2052
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
2053
            ctypes.byref(crt))
2320
2054
        # Import the OpenPGP public key into the certificate
2321
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2322
 
                                  gnutls.OPENPGP_FMT_RAW)
 
2055
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
2056
            crt, ctypes.byref(datum),
 
2057
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2323
2058
        # Verify the self signature in the key
2324
2059
        crtverify = ctypes.c_uint()
2325
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2326
 
                                       ctypes.byref(crtverify))
 
2060
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
2061
            crt, 0, ctypes.byref(crtverify))
2327
2062
        if crtverify.value != 0:
2328
 
            gnutls.openpgp_crt_deinit(crt)
2329
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
2063
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2064
            raise gnutls.errors.CertificateSecurityError(
 
2065
                "Verify failed")
2330
2066
        # New buffer for the fingerprint
2331
2067
        buf = ctypes.create_string_buffer(20)
2332
2068
        buf_len = ctypes.c_size_t()
2333
2069
        # Get the fingerprint from the certificate into the buffer
2334
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2335
 
                                           ctypes.byref(buf_len))
 
2070
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
2071
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
2336
2072
        # Deinit the certificate
2337
 
        gnutls.openpgp_crt_deinit(crt)
 
2073
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2338
2074
        # Convert the buffer to a Python bytestring
2339
2075
        fpr = ctypes.string_at(buf, buf_len.value)
2340
2076
        # Convert the bytestring to hexadecimal notation
2484
2220
        gnutls_priority GnuTLS priority string
2485
2221
        use_dbus:       Boolean; to emit D-Bus signals or not
2486
2222
    
2487
 
    Assumes a GLib.MainLoop event loop.
 
2223
    Assumes a gobject.MainLoop event loop.
2488
2224
    """
2489
2225
    
2490
2226
    def __init__(self, server_address, RequestHandlerClass,
2515
2251
    
2516
2252
    def add_pipe(self, parent_pipe, proc):
2517
2253
        # Call "handle_ipc" for both data and EOF events
2518
 
        GLib.io_add_watch(
 
2254
        gobject.io_add_watch(
2519
2255
            parent_pipe.fileno(),
2520
 
            GLib.IO_IN | GLib.IO_HUP,
 
2256
            gobject.IO_IN | gobject.IO_HUP,
2521
2257
            functools.partial(self.handle_ipc,
2522
2258
                              parent_pipe = parent_pipe,
2523
2259
                              proc = proc))
2527
2263
                   proc = None,
2528
2264
                   client_object=None):
2529
2265
        # error, or the other end of multiprocessing.Pipe has closed
2530
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2266
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2531
2267
            # Wait for other process to exit
2532
2268
            proc.join()
2533
2269
            return False
2540
2276
            fpr = request[1]
2541
2277
            address = request[2]
2542
2278
            
2543
 
            for c in self.clients.values():
 
2279
            for c in self.clients.itervalues():
2544
2280
                if c.fingerprint == fpr:
2545
2281
                    client = c
2546
2282
                    break
2554
2290
                parent_pipe.send(False)
2555
2291
                return False
2556
2292
            
2557
 
            GLib.io_add_watch(
 
2293
            gobject.io_add_watch(
2558
2294
                parent_pipe.fileno(),
2559
 
                GLib.IO_IN | GLib.IO_HUP,
 
2295
                gobject.IO_IN | gobject.IO_HUP,
2560
2296
                functools.partial(self.handle_ipc,
2561
2297
                                  parent_pipe = parent_pipe,
2562
2298
                                  proc = proc,
2944
2680
            logger.error("Could not open file %r", pidfilename,
2945
2681
                         exc_info=e)
2946
2682
    
2947
 
    for name, group in (("_mandos", "_mandos"),
2948
 
                        ("mandos", "mandos"),
2949
 
                        ("nobody", "nogroup")):
 
2683
    for name in ("_mandos", "mandos", "nobody"):
2950
2684
        try:
2951
2685
            uid = pwd.getpwnam(name).pw_uid
2952
 
            gid = pwd.getpwnam(group).pw_gid
 
2686
            gid = pwd.getpwnam(name).pw_gid
2953
2687
            break
2954
2688
        except KeyError:
2955
2689
            continue
2959
2693
    try:
2960
2694
        os.setgid(gid)
2961
2695
        os.setuid(uid)
2962
 
        if debug:
2963
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2964
 
                                                             gid))
2965
2696
    except OSError as error:
2966
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2967
 
                       .format(uid, gid, os.strerror(error.errno)))
2968
2697
        if error.errno != errno.EPERM:
2969
2698
            raise
2970
2699
    
2973
2702
        
2974
2703
        # "Use a log level over 10 to enable all debugging options."
2975
2704
        # - GnuTLS manual
2976
 
        gnutls.global_set_log_level(11)
 
2705
        gnutls.library.functions.gnutls_global_set_log_level(11)
2977
2706
        
2978
 
        @gnutls.log_func
 
2707
        @gnutls.library.types.gnutls_log_func
2979
2708
        def debug_gnutls(level, string):
2980
2709
            logger.debug("GnuTLS: %s", string[:-1])
2981
2710
        
2982
 
        gnutls.global_set_log_function(debug_gnutls)
 
2711
        gnutls.library.functions.gnutls_global_set_log_function(
 
2712
            debug_gnutls)
2983
2713
        
2984
2714
        # Redirect stdin so all checkers get /dev/null
2985
2715
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2992
2722
        # Close all input and output, do double fork, etc.
2993
2723
        daemon()
2994
2724
    
2995
 
    # multiprocessing will use threads, so before we use GLib we need
2996
 
    # to inform GLib that threads will be used.
2997
 
    GLib.threads_init()
 
2725
    # multiprocessing will use threads, so before we use gobject we
 
2726
    # need to inform gobject that threads will be used.
 
2727
    gobject.threads_init()
2998
2728
    
2999
2729
    global main_loop
3000
2730
    # From the Avahi example code
3001
2731
    DBusGMainLoop(set_as_default=True)
3002
 
    main_loop = GLib.MainLoop()
 
2732
    main_loop = gobject.MainLoop()
3003
2733
    bus = dbus.SystemBus()
3004
2734
    # End of Avahi example code
3005
2735
    if use_dbus:
3049
2779
    if server_settings["restore"]:
3050
2780
        try:
3051
2781
            with open(stored_state_path, "rb") as stored_state:
3052
 
                if sys.version_info.major == 2:                
3053
 
                    clients_data, old_client_settings = pickle.load(
3054
 
                        stored_state)
3055
 
                else:
3056
 
                    bytes_clients_data, bytes_old_client_settings = (
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
3058
 
                    ### Fix bytes to strings
3059
 
                    ## clients_data
3060
 
                    # .keys()
3061
 
                    clients_data = { (key.decode("utf-8")
3062
 
                                      if isinstance(key, bytes)
3063
 
                                      else key): value
3064
 
                                     for key, value in
3065
 
                                     bytes_clients_data.items() }
3066
 
                    del bytes_clients_data
3067
 
                    for key in clients_data:
3068
 
                        value = { (k.decode("utf-8")
3069
 
                                   if isinstance(k, bytes) else k): v
3070
 
                                  for k, v in
3071
 
                                  clients_data[key].items() }
3072
 
                        clients_data[key] = value
3073
 
                        # .client_structure
3074
 
                        value["client_structure"] = [
3075
 
                            (s.decode("utf-8")
3076
 
                             if isinstance(s, bytes)
3077
 
                             else s) for s in
3078
 
                            value["client_structure"] ]
3079
 
                        # .name & .host
3080
 
                        for k in ("name", "host"):
3081
 
                            if isinstance(value[k], bytes):
3082
 
                                value[k] = value[k].decode("utf-8")
3083
 
                    ## old_client_settings
3084
 
                    # .keys()
3085
 
                    old_client_settings = {
3086
 
                        (key.decode("utf-8")
3087
 
                         if isinstance(key, bytes)
3088
 
                         else key): value
3089
 
                        for key, value in
3090
 
                        bytes_old_client_settings.items() }
3091
 
                    del bytes_old_client_settings
3092
 
                    # .host
3093
 
                    for value in old_client_settings.values():
3094
 
                        if isinstance(value["host"], bytes):
3095
 
                            value["host"] = (value["host"]
3096
 
                                             .decode("utf-8"))
 
2782
                clients_data, old_client_settings = pickle.load(
 
2783
                    stored_state)
3097
2784
            os.remove(stored_state_path)
3098
2785
        except IOError as e:
3099
2786
            if e.errno == errno.ENOENT:
3200
2887
        del pidfile
3201
2888
        del pidfilename
3202
2889
    
3203
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3204
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3205
 
                             lambda: main_loop.quit() and False)
 
2890
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2891
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3206
2892
    
3207
2893
    if use_dbus:
3208
2894
        
3239
2925
            def GetAllClients(self):
3240
2926
                "D-Bus method"
3241
2927
                return dbus.Array(c.dbus_object_path for c in
3242
 
                                  tcp_server.clients.values())
 
2928
                                  tcp_server.clients.itervalues())
3243
2929
            
3244
2930
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3245
2931
                               "true"})
3250
2936
                return dbus.Dictionary(
3251
2937
                    { c.dbus_object_path: c.GetAll(
3252
2938
                        "se.recompile.Mandos.Client")
3253
 
                      for c in tcp_server.clients.values() },
 
2939
                      for c in tcp_server.clients.itervalues() },
3254
2940
                    signature="oa{sv}")
3255
2941
            
3256
2942
            @dbus.service.method(_interface, in_signature="o")
3257
2943
            def RemoveClient(self, object_path):
3258
2944
                "D-Bus method"
3259
 
                for c in tcp_server.clients.values():
 
2945
                for c in tcp_server.clients.itervalues():
3260
2946
                    if c.dbus_object_path == object_path:
3261
2947
                        del tcp_server.clients[c.name]
3262
2948
                        c.remove_from_connection()
3322
3008
        # removed/edited, old secret will thus be unrecovable.
3323
3009
        clients = {}
3324
3010
        with PGPEngine() as pgp:
3325
 
            for client in tcp_server.clients.values():
 
3011
            for client in tcp_server.clients.itervalues():
3326
3012
                key = client_settings[client.name]["secret"]
3327
3013
                client.encrypted_secret = pgp.encrypt(client.secret,
3328
3014
                                                      key)
3352
3038
                    prefix='clients-',
3353
3039
                    dir=os.path.dirname(stored_state_path),
3354
3040
                    delete=False) as stored_state:
3355
 
                pickle.dump((clients, client_settings), stored_state,
3356
 
                            protocol = 2)
 
3041
                pickle.dump((clients, client_settings), stored_state)
3357
3042
                tempname = stored_state.name
3358
3043
            os.rename(tempname, stored_state_path)
3359
3044
        except (IOError, OSError) as e:
3384
3069
    
3385
3070
    atexit.register(cleanup)
3386
3071
    
3387
 
    for client in tcp_server.clients.values():
 
3072
    for client in tcp_server.clients.itervalues():
3388
3073
        if use_dbus:
3389
3074
            # Emit D-Bus signal for adding
3390
3075
            mandos_dbus_service.client_added_signal(client)
3419
3104
                sys.exit(1)
3420
3105
            # End of Avahi example code
3421
3106
        
3422
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3423
 
                          lambda *args, **kwargs:
3424
 
                          (tcp_server.handle_request
3425
 
                           (*args[2:], **kwargs) or True))
 
3107
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
3108
                             lambda *args, **kwargs:
 
3109
                             (tcp_server.handle_request
 
3110
                              (*args[2:], **kwargs) or True))
3426
3111
        
3427
3112
        logger.debug("Starting main loop")
3428
3113
        main_loop.run()