/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: 2015-05-31 16:13:39 UTC
  • Revision ID: teddy@recompile.se-20150531161339-igb3l0ip3c10ejpz
mandos-ctl: Generate better messages in exceptions.

mandos (rfc3339_duration_to_delta): Remove dead code.  Adjust white
                                    space.
mandos-ctl (rfc3339_duration_to_delta): Do minor formatting and
                                        whitespace adjustments, and
                                        Generate better message in
                                        exception.
(string_to_delta): Adjust quote character in doc string.

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.crypto
 
48
import gnutls.connection
 
49
import gnutls.errors
 
50
import gnutls.library.functions
 
51
import gnutls.library.constants
 
52
import gnutls.library.types
50
53
try:
51
54
    import ConfigParser as configparser
52
55
except ImportError:
79
82
 
80
83
import dbus
81
84
import dbus.service
82
 
from gi.repository import GLib
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
 
89
import avahi
83
90
from dbus.mainloop.glib import DBusGMainLoop
84
91
import ctypes
85
92
import ctypes.util
86
93
import xml.dom.minidom
87
94
import inspect
88
95
 
89
 
# Try to find the value of SO_BINDTODEVICE:
90
96
try:
91
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
 
    # newer, and it is also the most natural place for it:
93
97
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
98
except AttributeError:
95
99
    try:
96
 
        # This is where SO_BINDTODEVICE was up to and including Python
97
 
        # 2.6, and also 3.2:
98
100
        from IN import SO_BINDTODEVICE
99
101
    except ImportError:
100
 
        # In Python 2.7 it seems to have been removed entirely.
101
 
        # Try running the C preprocessor:
102
 
        try:
103
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
104
 
                                   "/dev/stdin"],
105
 
                                  stdin=subprocess.PIPE,
106
 
                                  stdout=subprocess.PIPE)
107
 
            stdout = cc.communicate(
108
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
 
        except (OSError, ValueError, IndexError):
111
 
            # No value found
112
 
            SO_BINDTODEVICE = None
 
102
        SO_BINDTODEVICE = None
113
103
 
114
104
if sys.version_info.major == 2:
115
105
    str = unicode
116
106
 
117
 
version = "1.7.10"
 
107
version = "1.6.9"
118
108
stored_state_file = "clients.pickle"
119
109
 
120
110
logger = logging.getLogger()
135
125
        return interface_index
136
126
 
137
127
 
138
 
def copy_function(func):
139
 
    """Make a copy of a function"""
140
 
    if sys.version_info.major == 2:
141
 
        return types.FunctionType(func.func_code,
142
 
                                  func.func_globals,
143
 
                                  func.func_name,
144
 
                                  func.func_defaults,
145
 
                                  func.func_closure)
146
 
    else:
147
 
        return types.FunctionType(func.__code__,
148
 
                                  func.__globals__,
149
 
                                  func.__name__,
150
 
                                  func.__defaults__,
151
 
                                  func.__closure__)
152
 
 
153
 
 
154
128
def initlogger(debug, level=logging.WARNING):
155
129
    """init logger and add loglevel"""
156
130
    
183
157
    
184
158
    def __init__(self):
185
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
186
 
        self.gpg = "gpg"
187
 
        try:
188
 
            output = subprocess.check_output(["gpgconf"])
189
 
            for line in output.splitlines():
190
 
                name, text, path = line.split(b":")
191
 
                if name == "gpg":
192
 
                    self.gpg = path
193
 
                    break
194
 
        except OSError as e:
195
 
            if e.errno != errno.ENOENT:
196
 
                raise
197
160
        self.gnupgargs = ['--batch',
198
 
                          '--homedir', self.tempdir,
 
161
                          '--home', self.tempdir,
199
162
                          '--force-mdc',
200
 
                          '--quiet']
201
 
        # Only GPG version 1 has the --no-use-agent option.
202
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
203
 
            self.gnupgargs.append("--no-use-agent")
 
163
                          '--quiet',
 
164
                          '--no-use-agent']
204
165
    
205
166
    def __enter__(self):
206
167
        return self
242
203
                dir=self.tempdir) as passfile:
243
204
            passfile.write(passphrase)
244
205
            passfile.flush()
245
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
206
            proc = subprocess.Popen(['gpg', '--symmetric',
246
207
                                     '--passphrase-file',
247
208
                                     passfile.name]
248
209
                                    + self.gnupgargs,
260
221
                dir = self.tempdir) as passfile:
261
222
            passfile.write(passphrase)
262
223
            passfile.flush()
263
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
224
            proc = subprocess.Popen(['gpg', '--decrypt',
264
225
                                     '--passphrase-file',
265
226
                                     passfile.name]
266
227
                                    + self.gnupgargs,
272
233
            raise PGPError(err)
273
234
        return decrypted_plaintext
274
235
 
275
 
# Pretend that we have an Avahi module
276
 
class Avahi(object):
277
 
    """This isn't so much a class as it is a module-like namespace.
278
 
    It is instantiated once, and simulates having an Avahi module."""
279
 
    IF_UNSPEC = -1              # avahi-common/address.h
280
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
281
 
    PROTO_INET = 0              # avahi-common/address.h
282
 
    PROTO_INET6 = 1             # avahi-common/address.h
283
 
    DBUS_NAME = "org.freedesktop.Avahi"
284
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
285
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
286
 
    DBUS_PATH_SERVER = "/"
287
 
    def string_array_to_txt_array(self, t):
288
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
289
 
                           for s in t), signature="ay")
290
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
291
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
292
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
293
 
    SERVER_INVALID = 0          # avahi-common/defs.h
294
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
295
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
296
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
297
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
298
 
avahi = Avahi()
299
236
 
300
237
class AvahiError(Exception):
301
238
    def __init__(self, value, *args, **kwargs):
458
395
                    logger.error(bad_states[state] + ": %r", error)
459
396
            self.cleanup()
460
397
        elif state == avahi.SERVER_RUNNING:
461
 
            try:
462
 
                self.add()
463
 
            except dbus.exceptions.DBusException as error:
464
 
                if (error.get_dbus_name()
465
 
                    == "org.freedesktop.Avahi.CollisionError"):
466
 
                    logger.info("Local Zeroconf service name"
467
 
                                " collision.")
468
 
                    return self.rename(remove=False)
469
 
                else:
470
 
                    logger.critical("D-Bus Exception", exc_info=error)
471
 
                    self.cleanup()
472
 
                    os._exit(1)
 
398
            self.add()
473
399
        else:
474
400
            if error is None:
475
401
                logger.debug("Unknown state: %r", state)
498
424
            .format(self.name)))
499
425
        return ret
500
426
 
501
 
# Pretend that we have a GnuTLS module
502
 
class GnuTLS(object):
503
 
    """This isn't so much a class as it is a module-like namespace.
504
 
    It is instantiated once, and simulates having a GnuTLS module."""
505
 
    
506
 
    _library = ctypes.cdll.LoadLibrary(
507
 
        ctypes.util.find_library("gnutls"))
508
 
    _need_version = b"3.3.0"
509
 
    def __init__(self):
510
 
        # Need to use class name "GnuTLS" here, since this method is
511
 
        # called before the assignment to the "gnutls" global variable
512
 
        # happens.
513
 
        if GnuTLS.check_version(self._need_version) is None:
514
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
515
 
                               .format(self._need_version))
516
 
    
517
 
    # Unless otherwise indicated, the constants and types below are
518
 
    # all from the gnutls/gnutls.h C header file.
519
 
    
520
 
    # Constants
521
 
    E_SUCCESS = 0
522
 
    E_INTERRUPTED = -52
523
 
    E_AGAIN = -28
524
 
    CRT_OPENPGP = 2
525
 
    CLIENT = 2
526
 
    SHUT_RDWR = 0
527
 
    CRD_CERTIFICATE = 1
528
 
    E_NO_CERTIFICATE_FOUND = -49
529
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
530
 
    
531
 
    # Types
532
 
    class session_int(ctypes.Structure):
533
 
        _fields_ = []
534
 
    session_t = ctypes.POINTER(session_int)
535
 
    class certificate_credentials_st(ctypes.Structure):
536
 
        _fields_ = []
537
 
    certificate_credentials_t = ctypes.POINTER(
538
 
        certificate_credentials_st)
539
 
    certificate_type_t = ctypes.c_int
540
 
    class datum_t(ctypes.Structure):
541
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
542
 
                    ('size', ctypes.c_uint)]
543
 
    class openpgp_crt_int(ctypes.Structure):
544
 
        _fields_ = []
545
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
546
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
547
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
548
 
    credentials_type_t = ctypes.c_int
549
 
    transport_ptr_t = ctypes.c_void_p
550
 
    close_request_t = ctypes.c_int
551
 
    
552
 
    # Exceptions
553
 
    class Error(Exception):
554
 
        # We need to use the class name "GnuTLS" here, since this
555
 
        # exception might be raised from within GnuTLS.__init__,
556
 
        # which is called before the assignment to the "gnutls"
557
 
        # global variable has happened.
558
 
        def __init__(self, message = None, code = None, args=()):
559
 
            # Default usage is by a message string, but if a return
560
 
            # code is passed, convert it to a string with
561
 
            # gnutls.strerror()
562
 
            self.code = code
563
 
            if message is None and code is not None:
564
 
                message = GnuTLS.strerror(code)
565
 
            return super(GnuTLS.Error, self).__init__(
566
 
                message, *args)
567
 
    
568
 
    class CertificateSecurityError(Error):
569
 
        pass
570
 
    
571
 
    # Classes
572
 
    class Credentials(object):
573
 
        def __init__(self):
574
 
            self._c_object = gnutls.certificate_credentials_t()
575
 
            gnutls.certificate_allocate_credentials(
576
 
                ctypes.byref(self._c_object))
577
 
            self.type = gnutls.CRD_CERTIFICATE
578
 
        
579
 
        def __del__(self):
580
 
            gnutls.certificate_free_credentials(self._c_object)
581
 
    
582
 
    class ClientSession(object):
583
 
        def __init__(self, socket, credentials = None):
584
 
            self._c_object = gnutls.session_t()
585
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
586
 
            gnutls.set_default_priority(self._c_object)
587
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
588
 
            gnutls.handshake_set_private_extensions(self._c_object,
589
 
                                                    True)
590
 
            self.socket = socket
591
 
            if credentials is None:
592
 
                credentials = gnutls.Credentials()
593
 
            gnutls.credentials_set(self._c_object, credentials.type,
594
 
                                   ctypes.cast(credentials._c_object,
595
 
                                               ctypes.c_void_p))
596
 
            self.credentials = credentials
597
 
        
598
 
        def __del__(self):
599
 
            gnutls.deinit(self._c_object)
600
 
        
601
 
        def handshake(self):
602
 
            return gnutls.handshake(self._c_object)
603
 
        
604
 
        def send(self, data):
605
 
            data = bytes(data)
606
 
            data_len = len(data)
607
 
            while data_len > 0:
608
 
                data_len -= gnutls.record_send(self._c_object,
609
 
                                               data[-data_len:],
610
 
                                               data_len)
611
 
        
612
 
        def bye(self):
613
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
614
 
    
615
 
    # Error handling functions
616
 
    def _error_code(result):
617
 
        """A function to raise exceptions on errors, suitable
618
 
        for the 'restype' attribute on ctypes functions"""
619
 
        if result >= 0:
620
 
            return result
621
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
622
 
            raise gnutls.CertificateSecurityError(code = result)
623
 
        raise gnutls.Error(code = result)
624
 
    
625
 
    def _retry_on_error(result, func, arguments):
626
 
        """A function to retry on some errors, suitable
627
 
        for the 'errcheck' attribute on ctypes functions"""
628
 
        while result < 0:
629
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
630
 
                return _error_code(result)
631
 
            result = func(*arguments)
632
 
        return result
633
 
    
634
 
    # Unless otherwise indicated, the function declarations below are
635
 
    # all from the gnutls/gnutls.h C header file.
636
 
    
637
 
    # Functions
638
 
    priority_set_direct = _library.gnutls_priority_set_direct
639
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
640
 
                                    ctypes.POINTER(ctypes.c_char_p)]
641
 
    priority_set_direct.restype = _error_code
642
 
    
643
 
    init = _library.gnutls_init
644
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
645
 
    init.restype = _error_code
646
 
    
647
 
    set_default_priority = _library.gnutls_set_default_priority
648
 
    set_default_priority.argtypes = [session_t]
649
 
    set_default_priority.restype = _error_code
650
 
    
651
 
    record_send = _library.gnutls_record_send
652
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
653
 
                            ctypes.c_size_t]
654
 
    record_send.restype = ctypes.c_ssize_t
655
 
    record_send.errcheck = _retry_on_error
656
 
    
657
 
    certificate_allocate_credentials = (
658
 
        _library.gnutls_certificate_allocate_credentials)
659
 
    certificate_allocate_credentials.argtypes = [
660
 
        ctypes.POINTER(certificate_credentials_t)]
661
 
    certificate_allocate_credentials.restype = _error_code
662
 
    
663
 
    certificate_free_credentials = (
664
 
        _library.gnutls_certificate_free_credentials)
665
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
666
 
    certificate_free_credentials.restype = None
667
 
    
668
 
    handshake_set_private_extensions = (
669
 
        _library.gnutls_handshake_set_private_extensions)
670
 
    handshake_set_private_extensions.argtypes = [session_t,
671
 
                                                 ctypes.c_int]
672
 
    handshake_set_private_extensions.restype = None
673
 
    
674
 
    credentials_set = _library.gnutls_credentials_set
675
 
    credentials_set.argtypes = [session_t, credentials_type_t,
676
 
                                ctypes.c_void_p]
677
 
    credentials_set.restype = _error_code
678
 
    
679
 
    strerror = _library.gnutls_strerror
680
 
    strerror.argtypes = [ctypes.c_int]
681
 
    strerror.restype = ctypes.c_char_p
682
 
    
683
 
    certificate_type_get = _library.gnutls_certificate_type_get
684
 
    certificate_type_get.argtypes = [session_t]
685
 
    certificate_type_get.restype = _error_code
686
 
    
687
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
688
 
    certificate_get_peers.argtypes = [session_t,
689
 
                                      ctypes.POINTER(ctypes.c_uint)]
690
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
691
 
    
692
 
    global_set_log_level = _library.gnutls_global_set_log_level
693
 
    global_set_log_level.argtypes = [ctypes.c_int]
694
 
    global_set_log_level.restype = None
695
 
    
696
 
    global_set_log_function = _library.gnutls_global_set_log_function
697
 
    global_set_log_function.argtypes = [log_func]
698
 
    global_set_log_function.restype = None
699
 
    
700
 
    deinit = _library.gnutls_deinit
701
 
    deinit.argtypes = [session_t]
702
 
    deinit.restype = None
703
 
    
704
 
    handshake = _library.gnutls_handshake
705
 
    handshake.argtypes = [session_t]
706
 
    handshake.restype = _error_code
707
 
    handshake.errcheck = _retry_on_error
708
 
    
709
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
710
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
711
 
    transport_set_ptr.restype = None
712
 
    
713
 
    bye = _library.gnutls_bye
714
 
    bye.argtypes = [session_t, close_request_t]
715
 
    bye.restype = _error_code
716
 
    bye.errcheck = _retry_on_error
717
 
    
718
 
    check_version = _library.gnutls_check_version
719
 
    check_version.argtypes = [ctypes.c_char_p]
720
 
    check_version.restype = ctypes.c_char_p
721
 
    
722
 
    # All the function declarations below are from gnutls/openpgp.h
723
 
    
724
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
725
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
726
 
    openpgp_crt_init.restype = _error_code
727
 
    
728
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
729
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
730
 
                                   ctypes.POINTER(datum_t),
731
 
                                   openpgp_crt_fmt_t]
732
 
    openpgp_crt_import.restype = _error_code
733
 
    
734
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
735
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
736
 
                                        ctypes.POINTER(ctypes.c_uint)]
737
 
    openpgp_crt_verify_self.restype = _error_code
738
 
    
739
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
740
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
741
 
    openpgp_crt_deinit.restype = None
742
 
    
743
 
    openpgp_crt_get_fingerprint = (
744
 
        _library.gnutls_openpgp_crt_get_fingerprint)
745
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
746
 
                                            ctypes.c_void_p,
747
 
                                            ctypes.POINTER(
748
 
                                                ctypes.c_size_t)]
749
 
    openpgp_crt_get_fingerprint.restype = _error_code
750
 
    
751
 
    # Remove non-public functions
752
 
    del _error_code, _retry_on_error
753
 
# Create the global "gnutls" object, simulating a module
754
 
gnutls = GnuTLS()
755
 
 
756
 
def call_pipe(connection,       # : multiprocessing.Connection
757
 
              func, *args, **kwargs):
758
 
    """This function is meant to be called by multiprocessing.Process
759
 
    
760
 
    This function runs func(*args, **kwargs), and writes the resulting
761
 
    return value on the provided multiprocessing.Connection.
762
 
    """
763
 
    connection.send(func(*args, **kwargs))
764
 
    connection.close()
765
427
 
766
428
class Client(object):
767
429
    """A representation of a client host served by this server.
773
435
    checker:    subprocess.Popen(); a running checker process used
774
436
                                    to see if the client lives.
775
437
                                    'None' if no process is running.
776
 
    checker_callback_tag: a GLib event source tag, or None
 
438
    checker_callback_tag: a gobject event source tag, or None
777
439
    checker_command: string; External command which is run to check
778
440
                     if client lives.  %() expansions are done at
779
441
                     runtime with vars(self) as dict, so that for
780
442
                     instance %(name)s can be used in the command.
781
 
    checker_initiator_tag: a GLib event source tag, or None
 
443
    checker_initiator_tag: a gobject event source tag, or None
782
444
    created:    datetime.datetime(); (UTC) object creation
783
445
    client_structure: Object describing what attributes a client has
784
446
                      and is used for storing the client at exit
785
447
    current_checker_command: string; current running checker_command
786
 
    disable_initiator_tag: a GLib event source tag, or None
 
448
    disable_initiator_tag: a gobject event source tag, or None
787
449
    enabled:    bool()
788
450
    fingerprint: string (40 or 32 hexadecimal digits); used to
789
451
                 uniquely identify the client
794
456
    last_checker_status: integer between 0 and 255 reflecting exit
795
457
                         status of last checker. -1 reflects crashed
796
458
                         checker, -2 means no checker completed yet.
797
 
    last_checker_signal: The signal which killed the last checker, if
798
 
                         last_checker_status is -1
799
459
    last_enabled: datetime.datetime(); (UTC) or None
800
460
    name:       string; from the config file, used in log messages and
801
461
                        D-Bus identifiers
852
512
            client["fingerprint"] = (section["fingerprint"].upper()
853
513
                                     .replace(" ", ""))
854
514
            if "secret" in section:
855
 
                client["secret"] = codecs.decode(section["secret"]
856
 
                                                 .encode("utf-8"),
857
 
                                                 "base64")
 
515
                client["secret"] = section["secret"].decode("base64")
858
516
            elif "secfile" in section:
859
517
                with open(os.path.expanduser(os.path.expandvars
860
518
                                             (section["secfile"])),
913
571
        self.changedstate = multiprocessing_manager.Condition(
914
572
            multiprocessing_manager.Lock())
915
573
        self.client_structure = [attr
916
 
                                 for attr in self.__dict__.keys()
 
574
                                 for attr in self.__dict__.iterkeys()
917
575
                                 if not attr.startswith("_")]
918
576
        self.client_structure.append("client_structure")
919
577
        
945
603
        if not quiet:
946
604
            logger.info("Disabling client %s", self.name)
947
605
        if getattr(self, "disable_initiator_tag", None) is not None:
948
 
            GLib.source_remove(self.disable_initiator_tag)
 
606
            gobject.source_remove(self.disable_initiator_tag)
949
607
            self.disable_initiator_tag = None
950
608
        self.expires = None
951
609
        if getattr(self, "checker_initiator_tag", None) is not None:
952
 
            GLib.source_remove(self.checker_initiator_tag)
 
610
            gobject.source_remove(self.checker_initiator_tag)
953
611
            self.checker_initiator_tag = None
954
612
        self.stop_checker()
955
613
        self.enabled = False
956
614
        if not quiet:
957
615
            self.send_changedstate()
958
 
        # Do not run this again if called by a GLib.timeout_add
 
616
        # Do not run this again if called by a gobject.timeout_add
959
617
        return False
960
618
    
961
619
    def __del__(self):
965
623
        # Schedule a new checker to be started an 'interval' from now,
966
624
        # and every interval from then on.
967
625
        if self.checker_initiator_tag is not None:
968
 
            GLib.source_remove(self.checker_initiator_tag)
969
 
        self.checker_initiator_tag = GLib.timeout_add(
 
626
            gobject.source_remove(self.checker_initiator_tag)
 
627
        self.checker_initiator_tag = gobject.timeout_add(
970
628
            int(self.interval.total_seconds() * 1000),
971
629
            self.start_checker)
972
630
        # Schedule a disable() when 'timeout' has passed
973
631
        if self.disable_initiator_tag is not None:
974
 
            GLib.source_remove(self.disable_initiator_tag)
975
 
        self.disable_initiator_tag = GLib.timeout_add(
 
632
            gobject.source_remove(self.disable_initiator_tag)
 
633
        self.disable_initiator_tag = gobject.timeout_add(
976
634
            int(self.timeout.total_seconds() * 1000), self.disable)
977
635
        # Also start a new checker *right now*.
978
636
        self.start_checker()
979
637
    
980
 
    def checker_callback(self, source, condition, connection,
981
 
                         command):
 
638
    def checker_callback(self, pid, condition, command):
982
639
        """The checker has completed, so take appropriate actions."""
983
640
        self.checker_callback_tag = None
984
641
        self.checker = None
985
 
        # Read return code from connection (see call_pipe)
986
 
        returncode = connection.recv()
987
 
        connection.close()
988
 
        
989
 
        if returncode >= 0:
990
 
            self.last_checker_status = returncode
991
 
            self.last_checker_signal = None
 
642
        if os.WIFEXITED(condition):
 
643
            self.last_checker_status = os.WEXITSTATUS(condition)
992
644
            if self.last_checker_status == 0:
993
645
                logger.info("Checker for %(name)s succeeded",
994
646
                            vars(self))
997
649
                logger.info("Checker for %(name)s failed", vars(self))
998
650
        else:
999
651
            self.last_checker_status = -1
1000
 
            self.last_checker_signal = -returncode
1001
652
            logger.warning("Checker for %(name)s crashed?",
1002
653
                           vars(self))
1003
 
        return False
1004
654
    
1005
655
    def checked_ok(self):
1006
656
        """Assert that the client has been seen, alive and well."""
1007
657
        self.last_checked_ok = datetime.datetime.utcnow()
1008
658
        self.last_checker_status = 0
1009
 
        self.last_checker_signal = None
1010
659
        self.bump_timeout()
1011
660
    
1012
661
    def bump_timeout(self, timeout=None):
1014
663
        if timeout is None:
1015
664
            timeout = self.timeout
1016
665
        if self.disable_initiator_tag is not None:
1017
 
            GLib.source_remove(self.disable_initiator_tag)
 
666
            gobject.source_remove(self.disable_initiator_tag)
1018
667
            self.disable_initiator_tag = None
1019
668
        if getattr(self, "enabled", False):
1020
 
            self.disable_initiator_tag = GLib.timeout_add(
 
669
            self.disable_initiator_tag = gobject.timeout_add(
1021
670
                int(timeout.total_seconds() * 1000), self.disable)
1022
671
            self.expires = datetime.datetime.utcnow() + timeout
1023
672
    
1038
687
        # than 'timeout' for the client to be disabled, which is as it
1039
688
        # should be.
1040
689
        
1041
 
        if self.checker is not None and not self.checker.is_alive():
1042
 
            logger.warning("Checker was not alive; joining")
1043
 
            self.checker.join()
1044
 
            self.checker = None
 
690
        # If a checker exists, make sure it is not a zombie
 
691
        try:
 
692
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
693
        except AttributeError:
 
694
            pass
 
695
        except OSError as error:
 
696
            if error.errno != errno.ECHILD:
 
697
                raise
 
698
        else:
 
699
            if pid:
 
700
                logger.warning("Checker was a zombie")
 
701
                gobject.source_remove(self.checker_callback_tag)
 
702
                self.checker_callback(pid, status,
 
703
                                      self.current_checker_command)
1045
704
        # Start a new checker if needed
1046
705
        if self.checker is None:
1047
706
            # Escape attributes for the shell
1056
715
                             exc_info=error)
1057
716
                return True     # Try again later
1058
717
            self.current_checker_command = command
1059
 
            logger.info("Starting checker %r for %s", command,
1060
 
                        self.name)
1061
 
            # We don't need to redirect stdout and stderr, since
1062
 
            # in normal mode, that is already done by daemon(),
1063
 
            # and in debug mode we don't want to.  (Stdin is
1064
 
            # always replaced by /dev/null.)
1065
 
            # The exception is when not debugging but nevertheless
1066
 
            # running in the foreground; use the previously
1067
 
            # created wnull.
1068
 
            popen_args = { "close_fds": True,
1069
 
                           "shell": True,
1070
 
                           "cwd": "/" }
1071
 
            if (not self.server_settings["debug"]
1072
 
                and self.server_settings["foreground"]):
1073
 
                popen_args.update({"stdout": wnull,
1074
 
                                   "stderr": wnull })
1075
 
            pipe = multiprocessing.Pipe(duplex = False)
1076
 
            self.checker = multiprocessing.Process(
1077
 
                target = call_pipe,
1078
 
                args = (pipe[1], subprocess.call, command),
1079
 
                kwargs = popen_args)
1080
 
            self.checker.start()
1081
 
            self.checker_callback_tag = GLib.io_add_watch(
1082
 
                pipe[0].fileno(), GLib.IO_IN,
1083
 
                self.checker_callback, pipe[0], command)
1084
 
        # Re-run this periodically if run by GLib.timeout_add
 
718
            try:
 
719
                logger.info("Starting checker %r for %s", command,
 
720
                            self.name)
 
721
                # We don't need to redirect stdout and stderr, since
 
722
                # in normal mode, that is already done by daemon(),
 
723
                # and in debug mode we don't want to.  (Stdin is
 
724
                # always replaced by /dev/null.)
 
725
                # The exception is when not debugging but nevertheless
 
726
                # running in the foreground; use the previously
 
727
                # created wnull.
 
728
                popen_args = {}
 
729
                if (not self.server_settings["debug"]
 
730
                    and self.server_settings["foreground"]):
 
731
                    popen_args.update({"stdout": wnull,
 
732
                                       "stderr": wnull })
 
733
                self.checker = subprocess.Popen(command,
 
734
                                                close_fds=True,
 
735
                                                shell=True,
 
736
                                                cwd="/",
 
737
                                                **popen_args)
 
738
            except OSError as error:
 
739
                logger.error("Failed to start subprocess",
 
740
                             exc_info=error)
 
741
                return True
 
742
            self.checker_callback_tag = gobject.child_watch_add(
 
743
                self.checker.pid, self.checker_callback, data=command)
 
744
            # The checker may have completed before the gobject
 
745
            # watch was added.  Check for this.
 
746
            try:
 
747
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
748
            except OSError as error:
 
749
                if error.errno == errno.ECHILD:
 
750
                    # This should never happen
 
751
                    logger.error("Child process vanished",
 
752
                                 exc_info=error)
 
753
                    return True
 
754
                raise
 
755
            if pid:
 
756
                gobject.source_remove(self.checker_callback_tag)
 
757
                self.checker_callback(pid, status, command)
 
758
        # Re-run this periodically if run by gobject.timeout_add
1085
759
        return True
1086
760
    
1087
761
    def stop_checker(self):
1088
762
        """Force the checker process, if any, to stop."""
1089
763
        if self.checker_callback_tag:
1090
 
            GLib.source_remove(self.checker_callback_tag)
 
764
            gobject.source_remove(self.checker_callback_tag)
1091
765
            self.checker_callback_tag = None
1092
766
        if getattr(self, "checker", None) is None:
1093
767
            return
1094
768
        logger.debug("Stopping checker for %(name)s", vars(self))
1095
 
        self.checker.terminate()
 
769
        try:
 
770
            self.checker.terminate()
 
771
            #time.sleep(0.5)
 
772
            #if self.checker.poll() is None:
 
773
            #    self.checker.kill()
 
774
        except OSError as error:
 
775
            if error.errno != errno.ESRCH: # No such process
 
776
                raise
1096
777
        self.checker = None
1097
778
 
1098
779
 
1162
843
                           access="r")
1163
844
    def Property_dbus_property(self):
1164
845
        return dbus.Boolean(False)
1165
 
    
1166
 
    See also the DBusObjectWithAnnotations class.
1167
846
    """
1168
847
    
1169
848
    def decorator(func):
1191
870
    pass
1192
871
 
1193
872
 
1194
 
class DBusObjectWithAnnotations(dbus.service.Object):
1195
 
    """A D-Bus object with annotations.
 
873
class DBusObjectWithProperties(dbus.service.Object):
 
874
    """A D-Bus object with properties.
1196
875
    
1197
 
    Classes inheriting from this can use the dbus_annotations
1198
 
    decorator to add annotations to methods or signals.
 
876
    Classes inheriting from this can use the dbus_service_property
 
877
    decorator to expose methods as D-Bus properties.  It exposes the
 
878
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1199
879
    """
1200
880
    
1201
881
    @staticmethod
1217
897
                for name, athing in
1218
898
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
1219
899
    
1220
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1221
 
                         out_signature = "s",
1222
 
                         path_keyword = 'object_path',
1223
 
                         connection_keyword = 'connection')
1224
 
    def Introspect(self, object_path, connection):
1225
 
        """Overloading of standard D-Bus method.
1226
 
        
1227
 
        Inserts annotation tags on methods and signals.
1228
 
        """
1229
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
1230
 
                                                   connection)
1231
 
        try:
1232
 
            document = xml.dom.minidom.parseString(xmlstring)
1233
 
            
1234
 
            for if_tag in document.getElementsByTagName("interface"):
1235
 
                # Add annotation tags
1236
 
                for typ in ("method", "signal"):
1237
 
                    for tag in if_tag.getElementsByTagName(typ):
1238
 
                        annots = dict()
1239
 
                        for name, prop in (self.
1240
 
                                           _get_all_dbus_things(typ)):
1241
 
                            if (name == tag.getAttribute("name")
1242
 
                                and prop._dbus_interface
1243
 
                                == if_tag.getAttribute("name")):
1244
 
                                annots.update(getattr(
1245
 
                                    prop, "_dbus_annotations", {}))
1246
 
                        for name, value in annots.items():
1247
 
                            ann_tag = document.createElement(
1248
 
                                "annotation")
1249
 
                            ann_tag.setAttribute("name", name)
1250
 
                            ann_tag.setAttribute("value", value)
1251
 
                            tag.appendChild(ann_tag)
1252
 
                # Add interface annotation tags
1253
 
                for annotation, value in dict(
1254
 
                    itertools.chain.from_iterable(
1255
 
                        annotations().items()
1256
 
                        for name, annotations
1257
 
                        in self._get_all_dbus_things("interface")
1258
 
                        if name == if_tag.getAttribute("name")
1259
 
                        )).items():
1260
 
                    ann_tag = document.createElement("annotation")
1261
 
                    ann_tag.setAttribute("name", annotation)
1262
 
                    ann_tag.setAttribute("value", value)
1263
 
                    if_tag.appendChild(ann_tag)
1264
 
                # Fix argument name for the Introspect method itself
1265
 
                if (if_tag.getAttribute("name")
1266
 
                                == dbus.INTROSPECTABLE_IFACE):
1267
 
                    for cn in if_tag.getElementsByTagName("method"):
1268
 
                        if cn.getAttribute("name") == "Introspect":
1269
 
                            for arg in cn.getElementsByTagName("arg"):
1270
 
                                if (arg.getAttribute("direction")
1271
 
                                    == "out"):
1272
 
                                    arg.setAttribute("name",
1273
 
                                                     "xml_data")
1274
 
            xmlstring = document.toxml("utf-8")
1275
 
            document.unlink()
1276
 
        except (AttributeError, xml.dom.DOMException,
1277
 
                xml.parsers.expat.ExpatError) as error:
1278
 
            logger.error("Failed to override Introspection method",
1279
 
                         exc_info=error)
1280
 
        return xmlstring
1281
 
 
1282
 
 
1283
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1284
 
    """A D-Bus object with properties.
1285
 
    
1286
 
    Classes inheriting from this can use the dbus_service_property
1287
 
    decorator to expose methods as D-Bus properties.  It exposes the
1288
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1289
 
    """
1290
 
    
1291
900
    def _get_dbus_property(self, interface_name, property_name):
1292
901
        """Returns a bound method if one exists which is a D-Bus
1293
902
        property with the specified name and interface.
1303
912
        raise DBusPropertyNotFound("{}:{}.{}".format(
1304
913
            self.dbus_object_path, interface_name, property_name))
1305
914
    
1306
 
    @classmethod
1307
 
    def _get_all_interface_names(cls):
1308
 
        """Get a sequence of all interfaces supported by an object"""
1309
 
        return (name for name in set(getattr(getattr(x, attr),
1310
 
                                             "_dbus_interface", None)
1311
 
                                     for x in (inspect.getmro(cls))
1312
 
                                     for attr in dir(x))
1313
 
                if name is not None)
1314
 
    
1315
915
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1316
916
                         in_signature="ss",
1317
917
                         out_signature="v")
1387
987
        
1388
988
        Inserts property tags and interface annotation tags.
1389
989
        """
1390
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1391
 
                                                         object_path,
1392
 
                                                         connection)
 
990
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
991
                                                   connection)
1393
992
        try:
1394
993
            document = xml.dom.minidom.parseString(xmlstring)
1395
994
            
1408
1007
                            if prop._dbus_interface
1409
1008
                            == if_tag.getAttribute("name")):
1410
1009
                    if_tag.appendChild(tag)
1411
 
                # Add annotation tags for properties
1412
 
                for tag in if_tag.getElementsByTagName("property"):
1413
 
                    annots = dict()
1414
 
                    for name, prop in self._get_all_dbus_things(
1415
 
                            "property"):
1416
 
                        if (name == tag.getAttribute("name")
1417
 
                            and prop._dbus_interface
1418
 
                            == if_tag.getAttribute("name")):
1419
 
                            annots.update(getattr(
1420
 
                                prop, "_dbus_annotations", {}))
1421
 
                    for name, value in annots.items():
1422
 
                        ann_tag = document.createElement(
1423
 
                            "annotation")
1424
 
                        ann_tag.setAttribute("name", name)
1425
 
                        ann_tag.setAttribute("value", value)
1426
 
                        tag.appendChild(ann_tag)
 
1010
                # Add annotation tags
 
1011
                for typ in ("method", "signal", "property"):
 
1012
                    for tag in if_tag.getElementsByTagName(typ):
 
1013
                        annots = dict()
 
1014
                        for name, prop in (self.
 
1015
                                           _get_all_dbus_things(typ)):
 
1016
                            if (name == tag.getAttribute("name")
 
1017
                                and prop._dbus_interface
 
1018
                                == if_tag.getAttribute("name")):
 
1019
                                annots.update(getattr(
 
1020
                                    prop, "_dbus_annotations", {}))
 
1021
                        for name, value in annots.items():
 
1022
                            ann_tag = document.createElement(
 
1023
                                "annotation")
 
1024
                            ann_tag.setAttribute("name", name)
 
1025
                            ann_tag.setAttribute("value", value)
 
1026
                            tag.appendChild(ann_tag)
 
1027
                # Add interface annotation tags
 
1028
                for annotation, value in dict(
 
1029
                    itertools.chain.from_iterable(
 
1030
                        annotations().items()
 
1031
                        for name, annotations
 
1032
                        in self._get_all_dbus_things("interface")
 
1033
                        if name == if_tag.getAttribute("name")
 
1034
                        )).items():
 
1035
                    ann_tag = document.createElement("annotation")
 
1036
                    ann_tag.setAttribute("name", annotation)
 
1037
                    ann_tag.setAttribute("value", value)
 
1038
                    if_tag.appendChild(ann_tag)
1427
1039
                # Add the names to the return values for the
1428
1040
                # "org.freedesktop.DBus.Properties" methods
1429
1041
                if (if_tag.getAttribute("name")
1447
1059
                         exc_info=error)
1448
1060
        return xmlstring
1449
1061
 
1450
 
try:
1451
 
    dbus.OBJECT_MANAGER_IFACE
1452
 
except AttributeError:
1453
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1454
 
 
1455
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1456
 
    """A D-Bus object with an ObjectManager.
1457
 
    
1458
 
    Classes inheriting from this exposes the standard
1459
 
    GetManagedObjects call and the InterfacesAdded and
1460
 
    InterfacesRemoved signals on the standard
1461
 
    "org.freedesktop.DBus.ObjectManager" interface.
1462
 
    
1463
 
    Note: No signals are sent automatically; they must be sent
1464
 
    manually.
1465
 
    """
1466
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1467
 
                         out_signature = "a{oa{sa{sv}}}")
1468
 
    def GetManagedObjects(self):
1469
 
        """This function must be overridden"""
1470
 
        raise NotImplementedError()
1471
 
    
1472
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1473
 
                         signature = "oa{sa{sv}}")
1474
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
1475
 
        pass
1476
 
    
1477
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1478
 
    def InterfacesRemoved(self, object_path, interfaces):
1479
 
        pass
1480
 
    
1481
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1482
 
                         out_signature = "s",
1483
 
                         path_keyword = 'object_path',
1484
 
                         connection_keyword = 'connection')
1485
 
    def Introspect(self, object_path, connection):
1486
 
        """Overloading of standard D-Bus method.
1487
 
        
1488
 
        Override return argument name of GetManagedObjects to be
1489
 
        "objpath_interfaces_and_properties"
1490
 
        """
1491
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1492
 
                                                         object_path,
1493
 
                                                         connection)
1494
 
        try:
1495
 
            document = xml.dom.minidom.parseString(xmlstring)
1496
 
            
1497
 
            for if_tag in document.getElementsByTagName("interface"):
1498
 
                # Fix argument name for the GetManagedObjects method
1499
 
                if (if_tag.getAttribute("name")
1500
 
                                == dbus.OBJECT_MANAGER_IFACE):
1501
 
                    for cn in if_tag.getElementsByTagName("method"):
1502
 
                        if (cn.getAttribute("name")
1503
 
                            == "GetManagedObjects"):
1504
 
                            for arg in cn.getElementsByTagName("arg"):
1505
 
                                if (arg.getAttribute("direction")
1506
 
                                    == "out"):
1507
 
                                    arg.setAttribute(
1508
 
                                        "name",
1509
 
                                        "objpath_interfaces"
1510
 
                                        "_and_properties")
1511
 
            xmlstring = document.toxml("utf-8")
1512
 
            document.unlink()
1513
 
        except (AttributeError, xml.dom.DOMException,
1514
 
                xml.parsers.expat.ExpatError) as error:
1515
 
            logger.error("Failed to override Introspection method",
1516
 
                         exc_info = error)
1517
 
        return xmlstring
1518
1062
 
1519
1063
def datetime_to_dbus(dt, variant_level=0):
1520
1064
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1569
1113
                if getattr(attribute, "_dbus_is_signal", False):
1570
1114
                    # Extract the original non-method undecorated
1571
1115
                    # function by black magic
1572
 
                    if sys.version_info.major == 2:
1573
 
                        nonmethod_func = (dict(
1574
 
                            zip(attribute.func_code.co_freevars,
1575
 
                                attribute.__closure__))
1576
 
                                          ["func"].cell_contents)
1577
 
                    else:
1578
 
                        nonmethod_func = (dict(
1579
 
                            zip(attribute.__code__.co_freevars,
1580
 
                                attribute.__closure__))
1581
 
                                          ["func"].cell_contents)
 
1116
                    nonmethod_func = (dict(
 
1117
                        zip(attribute.func_code.co_freevars,
 
1118
                            attribute.__closure__))
 
1119
                                      ["func"].cell_contents)
1582
1120
                    # Create a new, but exactly alike, function
1583
1121
                    # object, and decorate it to be a new D-Bus signal
1584
1122
                    # with the alternate D-Bus interface name
1585
 
                    new_function = copy_function(nonmethod_func)
1586
1123
                    new_function = (dbus.service.signal(
1587
 
                        alt_interface,
1588
 
                        attribute._dbus_signature)(new_function))
 
1124
                        alt_interface, attribute._dbus_signature)
 
1125
                                    (types.FunctionType(
 
1126
                                        nonmethod_func.func_code,
 
1127
                                        nonmethod_func.func_globals,
 
1128
                                        nonmethod_func.func_name,
 
1129
                                        nonmethod_func.func_defaults,
 
1130
                                        nonmethod_func.func_closure)))
1589
1131
                    # Copy annotations, if any
1590
1132
                    try:
1591
1133
                        new_function._dbus_annotations = dict(
1601
1143
                        func1 and func2 to the "call_both" function
1602
1144
                        outside of its arguments"""
1603
1145
                        
1604
 
                        @functools.wraps(func2)
1605
1146
                        def call_both(*args, **kwargs):
1606
1147
                            """This function will emit two D-Bus
1607
1148
                            signals by calling func1 and func2"""
1608
1149
                            func1(*args, **kwargs)
1609
1150
                            func2(*args, **kwargs)
1610
 
                        # Make wrapper function look like a D-Bus signal
1611
 
                        for name, attr in inspect.getmembers(func2):
1612
 
                            if name.startswith("_dbus_"):
1613
 
                                setattr(call_both, name, attr)
1614
1151
                        
1615
1152
                        return call_both
1616
1153
                    # Create the "call_both" function and add it to
1627
1164
                            alt_interface,
1628
1165
                            attribute._dbus_in_signature,
1629
1166
                            attribute._dbus_out_signature)
1630
 
                        (copy_function(attribute)))
 
1167
                        (types.FunctionType(attribute.func_code,
 
1168
                                            attribute.func_globals,
 
1169
                                            attribute.func_name,
 
1170
                                            attribute.func_defaults,
 
1171
                                            attribute.func_closure)))
1631
1172
                    # Copy annotations, if any
1632
1173
                    try:
1633
1174
                        attr[attrname]._dbus_annotations = dict(
1645
1186
                        attribute._dbus_access,
1646
1187
                        attribute._dbus_get_args_options
1647
1188
                        ["byte_arrays"])
1648
 
                                      (copy_function(attribute)))
 
1189
                                      (types.FunctionType(
 
1190
                                          attribute.func_code,
 
1191
                                          attribute.func_globals,
 
1192
                                          attribute.func_name,
 
1193
                                          attribute.func_defaults,
 
1194
                                          attribute.func_closure)))
1649
1195
                    # Copy annotations, if any
1650
1196
                    try:
1651
1197
                        attr[attrname]._dbus_annotations = dict(
1660
1206
                    # to the class.
1661
1207
                    attr[attrname] = (
1662
1208
                        dbus_interface_annotations(alt_interface)
1663
 
                        (copy_function(attribute)))
 
1209
                        (types.FunctionType(attribute.func_code,
 
1210
                                            attribute.func_globals,
 
1211
                                            attribute.func_name,
 
1212
                                            attribute.func_defaults,
 
1213
                                            attribute.func_closure)))
1664
1214
            if deprecate:
1665
1215
                # Deprecate all alternate interfaces
1666
1216
                iname="_AlternateDBusNames_interface_annotation{}"
1679
1229
            if interface_names:
1680
1230
                # Replace the class with a new subclass of it with
1681
1231
                # methods, signals, etc. as created above.
1682
 
                if sys.version_info.major == 2:
1683
 
                    cls = type(b"{}Alternate".format(cls.__name__),
1684
 
                               (cls, ), attr)
1685
 
                else:
1686
 
                    cls = type("{}Alternate".format(cls.__name__),
1687
 
                               (cls, ), attr)
 
1232
                cls = type(b"{}Alternate".format(cls.__name__),
 
1233
                           (cls, ), attr)
1688
1234
        return cls
1689
1235
    
1690
1236
    return wrapper
1810
1356
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1811
1357
        Client.__del__(self, *args, **kwargs)
1812
1358
    
1813
 
    def checker_callback(self, source, condition,
1814
 
                         connection, command, *args, **kwargs):
1815
 
        ret = Client.checker_callback(self, source, condition,
1816
 
                                      connection, command, *args,
1817
 
                                      **kwargs)
1818
 
        exitstatus = self.last_checker_status
1819
 
        if exitstatus >= 0:
 
1359
    def checker_callback(self, pid, condition, command,
 
1360
                         *args, **kwargs):
 
1361
        self.checker_callback_tag = None
 
1362
        self.checker = None
 
1363
        if os.WIFEXITED(condition):
 
1364
            exitstatus = os.WEXITSTATUS(condition)
1820
1365
            # Emit D-Bus signal
1821
1366
            self.CheckerCompleted(dbus.Int16(exitstatus),
1822
 
                                  # This is specific to GNU libC
1823
 
                                  dbus.Int64(exitstatus << 8),
 
1367
                                  dbus.Int64(condition),
1824
1368
                                  dbus.String(command))
1825
1369
        else:
1826
1370
            # Emit D-Bus signal
1827
1371
            self.CheckerCompleted(dbus.Int16(-1),
1828
 
                                  dbus.Int64(
1829
 
                                      # This is specific to GNU libC
1830
 
                                      (exitstatus << 8)
1831
 
                                      | self.last_checker_signal),
 
1372
                                  dbus.Int64(condition),
1832
1373
                                  dbus.String(command))
1833
 
        return ret
 
1374
        
 
1375
        return Client.checker_callback(self, pid, condition, command,
 
1376
                                       *args, **kwargs)
1834
1377
    
1835
1378
    def start_checker(self, *args, **kwargs):
1836
1379
        old_checker_pid = getattr(self.checker, "pid", None)
1848
1391
    
1849
1392
    def approve(self, value=True):
1850
1393
        self.approved = value
1851
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1852
 
                             * 1000), self._reset_approved)
 
1394
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1395
                                * 1000), self._reset_approved)
1853
1396
        self.send_changedstate()
1854
1397
    
1855
1398
    ## D-Bus methods, signals & properties
1911
1454
        self.checked_ok()
1912
1455
    
1913
1456
    # Enable - method
1914
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1915
1457
    @dbus.service.method(_interface)
1916
1458
    def Enable(self):
1917
1459
        "D-Bus method"
1918
1460
        self.enable()
1919
1461
    
1920
1462
    # StartChecker - method
1921
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1922
1463
    @dbus.service.method(_interface)
1923
1464
    def StartChecker(self):
1924
1465
        "D-Bus method"
1925
1466
        self.start_checker()
1926
1467
    
1927
1468
    # Disable - method
1928
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1929
1469
    @dbus.service.method(_interface)
1930
1470
    def Disable(self):
1931
1471
        "D-Bus method"
1932
1472
        self.disable()
1933
1473
    
1934
1474
    # StopChecker - method
1935
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1936
1475
    @dbus.service.method(_interface)
1937
1476
    def StopChecker(self):
1938
1477
        self.stop_checker()
1974
1513
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1975
1514
    
1976
1515
    # Name - property
1977
 
    @dbus_annotations(
1978
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1979
1516
    @dbus_service_property(_interface, signature="s", access="read")
1980
1517
    def Name_dbus_property(self):
1981
1518
        return dbus.String(self.name)
1982
1519
    
1983
1520
    # Fingerprint - property
1984
 
    @dbus_annotations(
1985
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1986
1521
    @dbus_service_property(_interface, signature="s", access="read")
1987
1522
    def Fingerprint_dbus_property(self):
1988
1523
        return dbus.String(self.fingerprint)
1997
1532
        self.host = str(value)
1998
1533
    
1999
1534
    # Created - property
2000
 
    @dbus_annotations(
2001
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2002
1535
    @dbus_service_property(_interface, signature="s", access="read")
2003
1536
    def Created_dbus_property(self):
2004
1537
        return datetime_to_dbus(self.created)
2065
1598
                if (getattr(self, "disable_initiator_tag", None)
2066
1599
                    is None):
2067
1600
                    return
2068
 
                GLib.source_remove(self.disable_initiator_tag)
2069
 
                self.disable_initiator_tag = GLib.timeout_add(
 
1601
                gobject.source_remove(self.disable_initiator_tag)
 
1602
                self.disable_initiator_tag = gobject.timeout_add(
2070
1603
                    int((self.expires - now).total_seconds() * 1000),
2071
1604
                    self.disable)
2072
1605
    
2092
1625
            return
2093
1626
        if self.enabled:
2094
1627
            # Reschedule checker run
2095
 
            GLib.source_remove(self.checker_initiator_tag)
2096
 
            self.checker_initiator_tag = GLib.timeout_add(
 
1628
            gobject.source_remove(self.checker_initiator_tag)
 
1629
            self.checker_initiator_tag = gobject.timeout_add(
2097
1630
                value, self.start_checker)
2098
1631
            self.start_checker() # Start one now, too
2099
1632
    
2119
1652
            self.stop_checker()
2120
1653
    
2121
1654
    # ObjectPath - property
2122
 
    @dbus_annotations(
2123
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2124
 
         "org.freedesktop.DBus.Deprecated": "true"})
2125
1655
    @dbus_service_property(_interface, signature="o", access="read")
2126
1656
    def ObjectPath_dbus_property(self):
2127
1657
        return self.dbus_object_path # is already a dbus.ObjectPath
2128
1658
    
2129
1659
    # Secret = property
2130
 
    @dbus_annotations(
2131
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2132
 
         "invalidates"})
2133
1660
    @dbus_service_property(_interface,
2134
1661
                           signature="ay",
2135
1662
                           access="write",
2181
1708
            logger.debug("Pipe FD: %d",
2182
1709
                         self.server.child_pipe.fileno())
2183
1710
            
2184
 
            session = gnutls.ClientSession(self.request)
 
1711
            session = gnutls.connection.ClientSession(
 
1712
                self.request, gnutls.connection .X509Credentials())
 
1713
            
 
1714
            # Note: gnutls.connection.X509Credentials is really a
 
1715
            # generic GnuTLS certificate credentials object so long as
 
1716
            # no X.509 keys are added to it.  Therefore, we can use it
 
1717
            # here despite using OpenPGP certificates.
2185
1718
            
2186
1719
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2187
1720
            #                      "+AES-256-CBC", "+SHA1",
2191
1724
            priority = self.server.gnutls_priority
2192
1725
            if priority is None:
2193
1726
                priority = "NORMAL"
2194
 
            gnutls.priority_set_direct(session._c_object,
2195
 
                                       priority.encode("utf-8"),
2196
 
                                       None)
 
1727
            gnutls.library.functions.gnutls_priority_set_direct(
 
1728
                session._c_object, priority, None)
2197
1729
            
2198
1730
            # Start communication using the Mandos protocol
2199
1731
            # Get protocol number
2209
1741
            # Start GnuTLS connection
2210
1742
            try:
2211
1743
                session.handshake()
2212
 
            except gnutls.Error as error:
 
1744
            except gnutls.errors.GNUTLSError as error:
2213
1745
                logger.warning("Handshake failed: %s", error)
2214
1746
                # Do not run session.bye() here: the session is not
2215
1747
                # established.  Just abandon the request.
2221
1753
                try:
2222
1754
                    fpr = self.fingerprint(
2223
1755
                        self.peer_certificate(session))
2224
 
                except (TypeError, gnutls.Error) as error:
 
1756
                except (TypeError,
 
1757
                        gnutls.errors.GNUTLSError) as error:
2225
1758
                    logger.warning("Bad certificate: %s", error)
2226
1759
                    return
2227
1760
                logger.debug("Fingerprint: %s", fpr)
2285
1818
                    else:
2286
1819
                        delay -= time2 - time
2287
1820
                
2288
 
                try:
2289
 
                    session.send(client.secret)
2290
 
                except gnutls.Error as error:
2291
 
                    logger.warning("gnutls send failed",
2292
 
                                   exc_info = error)
2293
 
                    return
 
1821
                sent_size = 0
 
1822
                while sent_size < len(client.secret):
 
1823
                    try:
 
1824
                        sent = session.send(client.secret[sent_size:])
 
1825
                    except gnutls.errors.GNUTLSError as error:
 
1826
                        logger.warning("gnutls send failed",
 
1827
                                       exc_info=error)
 
1828
                        return
 
1829
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1830
                                 len(client.secret) - (sent_size
 
1831
                                                       + sent))
 
1832
                    sent_size += sent
2294
1833
                
2295
1834
                logger.info("Sending secret to %s", client.name)
2296
1835
                # bump the timeout using extended_timeout
2304
1843
                    client.approvals_pending -= 1
2305
1844
                try:
2306
1845
                    session.bye()
2307
 
                except gnutls.Error as error:
 
1846
                except gnutls.errors.GNUTLSError as error:
2308
1847
                    logger.warning("GnuTLS bye failed",
2309
1848
                                   exc_info=error)
2310
1849
    
2312
1851
    def peer_certificate(session):
2313
1852
        "Return the peer's OpenPGP certificate as a bytestring"
2314
1853
        # If not an OpenPGP certificate...
2315
 
        if (gnutls.certificate_type_get(session._c_object)
2316
 
            != gnutls.CRT_OPENPGP):
2317
 
            # ...return invalid data
2318
 
            return b""
 
1854
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1855
                session._c_object)
 
1856
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1857
            # ...do the normal thing
 
1858
            return session.peer_certificate
2319
1859
        list_size = ctypes.c_uint(1)
2320
 
        cert_list = (gnutls.certificate_get_peers
 
1860
        cert_list = (gnutls.library.functions
 
1861
                     .gnutls_certificate_get_peers
2321
1862
                     (session._c_object, ctypes.byref(list_size)))
2322
1863
        if not bool(cert_list) and list_size.value != 0:
2323
 
            raise gnutls.Error("error getting peer certificate")
 
1864
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1865
                                            " certificate")
2324
1866
        if list_size.value == 0:
2325
1867
            return None
2326
1868
        cert = cert_list[0]
2330
1872
    def fingerprint(openpgp):
2331
1873
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2332
1874
        # New GnuTLS "datum" with the OpenPGP public key
2333
 
        datum = gnutls.datum_t(
 
1875
        datum = gnutls.library.types.gnutls_datum_t(
2334
1876
            ctypes.cast(ctypes.c_char_p(openpgp),
2335
1877
                        ctypes.POINTER(ctypes.c_ubyte)),
2336
1878
            ctypes.c_uint(len(openpgp)))
2337
1879
        # New empty GnuTLS certificate
2338
 
        crt = gnutls.openpgp_crt_t()
2339
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1880
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1881
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1882
            ctypes.byref(crt))
2340
1883
        # Import the OpenPGP public key into the certificate
2341
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2342
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1884
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1885
            crt, ctypes.byref(datum),
 
1886
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2343
1887
        # Verify the self signature in the key
2344
1888
        crtverify = ctypes.c_uint()
2345
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2346
 
                                       ctypes.byref(crtverify))
 
1889
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1890
            crt, 0, ctypes.byref(crtverify))
2347
1891
        if crtverify.value != 0:
2348
 
            gnutls.openpgp_crt_deinit(crt)
2349
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1892
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1893
            raise gnutls.errors.CertificateSecurityError(
 
1894
                "Verify failed")
2350
1895
        # New buffer for the fingerprint
2351
1896
        buf = ctypes.create_string_buffer(20)
2352
1897
        buf_len = ctypes.c_size_t()
2353
1898
        # Get the fingerprint from the certificate into the buffer
2354
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2355
 
                                           ctypes.byref(buf_len))
 
1899
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1900
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
2356
1901
        # Deinit the certificate
2357
 
        gnutls.openpgp_crt_deinit(crt)
 
1902
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2358
1903
        # Convert the buffer to a Python bytestring
2359
1904
        fpr = ctypes.string_at(buf, buf_len.value)
2360
1905
        # Convert the bytestring to hexadecimal notation
2453
1998
        """This overrides the normal server_bind() function
2454
1999
        to bind to an interface if one was specified, and also NOT to
2455
2000
        bind to an address or port if they were not specified."""
2456
 
        global SO_BINDTODEVICE
2457
2001
        if self.interface is not None:
2458
2002
            if SO_BINDTODEVICE is None:
2459
 
                # Fall back to a hard-coded value which seems to be
2460
 
                # common enough.
2461
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
2462
 
                SO_BINDTODEVICE = 25
2463
 
            try:
2464
 
                self.socket.setsockopt(
2465
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
2466
 
                    (self.interface + "\0").encode("utf-8"))
2467
 
            except socket.error as error:
2468
 
                if error.errno == errno.EPERM:
2469
 
                    logger.error("No permission to bind to"
2470
 
                                 " interface %s", self.interface)
2471
 
                elif error.errno == errno.ENOPROTOOPT:
2472
 
                    logger.error("SO_BINDTODEVICE not available;"
2473
 
                                 " cannot bind to interface %s",
2474
 
                                 self.interface)
2475
 
                elif error.errno == errno.ENODEV:
2476
 
                    logger.error("Interface %s does not exist,"
2477
 
                                 " cannot bind", self.interface)
2478
 
                else:
2479
 
                    raise
 
2003
                logger.error("SO_BINDTODEVICE does not exist;"
 
2004
                             " cannot bind to interface %s",
 
2005
                             self.interface)
 
2006
            else:
 
2007
                try:
 
2008
                    self.socket.setsockopt(
 
2009
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2010
                        (self.interface + "\0").encode("utf-8"))
 
2011
                except socket.error as error:
 
2012
                    if error.errno == errno.EPERM:
 
2013
                        logger.error("No permission to bind to"
 
2014
                                     " interface %s", self.interface)
 
2015
                    elif error.errno == errno.ENOPROTOOPT:
 
2016
                        logger.error("SO_BINDTODEVICE not available;"
 
2017
                                     " cannot bind to interface %s",
 
2018
                                     self.interface)
 
2019
                    elif error.errno == errno.ENODEV:
 
2020
                        logger.error("Interface %s does not exist,"
 
2021
                                     " cannot bind", self.interface)
 
2022
                    else:
 
2023
                        raise
2480
2024
        # Only bind(2) the socket if we really need to.
2481
2025
        if self.server_address[0] or self.server_address[1]:
2482
2026
            if not self.server_address[0]:
2505
2049
        gnutls_priority GnuTLS priority string
2506
2050
        use_dbus:       Boolean; to emit D-Bus signals or not
2507
2051
    
2508
 
    Assumes a GLib.MainLoop event loop.
 
2052
    Assumes a gobject.MainLoop event loop.
2509
2053
    """
2510
2054
    
2511
2055
    def __init__(self, server_address, RequestHandlerClass,
2536
2080
    
2537
2081
    def add_pipe(self, parent_pipe, proc):
2538
2082
        # Call "handle_ipc" for both data and EOF events
2539
 
        GLib.io_add_watch(
 
2083
        gobject.io_add_watch(
2540
2084
            parent_pipe.fileno(),
2541
 
            GLib.IO_IN | GLib.IO_HUP,
 
2085
            gobject.IO_IN | gobject.IO_HUP,
2542
2086
            functools.partial(self.handle_ipc,
2543
2087
                              parent_pipe = parent_pipe,
2544
2088
                              proc = proc))
2548
2092
                   proc = None,
2549
2093
                   client_object=None):
2550
2094
        # error, or the other end of multiprocessing.Pipe has closed
2551
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2095
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2552
2096
            # Wait for other process to exit
2553
2097
            proc.join()
2554
2098
            return False
2561
2105
            fpr = request[1]
2562
2106
            address = request[2]
2563
2107
            
2564
 
            for c in self.clients.values():
 
2108
            for c in self.clients.itervalues():
2565
2109
                if c.fingerprint == fpr:
2566
2110
                    client = c
2567
2111
                    break
2575
2119
                parent_pipe.send(False)
2576
2120
                return False
2577
2121
            
2578
 
            GLib.io_add_watch(
 
2122
            gobject.io_add_watch(
2579
2123
                parent_pipe.fileno(),
2580
 
                GLib.IO_IN | GLib.IO_HUP,
 
2124
                gobject.IO_IN | gobject.IO_HUP,
2581
2125
                functools.partial(self.handle_ipc,
2582
2126
                                  parent_pipe = parent_pipe,
2583
2127
                                  proc = proc,
2597
2141
        
2598
2142
        if command == 'getattr':
2599
2143
            attrname = request[1]
2600
 
            if isinstance(client_object.__getattribute__(attrname),
2601
 
                          collections.Callable):
 
2144
            if callable(client_object.__getattribute__(attrname)):
2602
2145
                parent_pipe.send(('function', ))
2603
2146
            else:
2604
2147
                parent_pipe.send((
2842
2385
                        "debug": "False",
2843
2386
                        "priority":
2844
2387
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2845
 
                        ":+SIGN-DSA-SHA256",
 
2388
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2846
2389
                        "servicename": "Mandos",
2847
2390
                        "use_dbus": "True",
2848
2391
                        "use_ipv6": "True",
2965
2508
            logger.error("Could not open file %r", pidfilename,
2966
2509
                         exc_info=e)
2967
2510
    
2968
 
    for name, group in (("_mandos", "_mandos"),
2969
 
                        ("mandos", "mandos"),
2970
 
                        ("nobody", "nogroup")):
 
2511
    for name in ("_mandos", "mandos", "nobody"):
2971
2512
        try:
2972
2513
            uid = pwd.getpwnam(name).pw_uid
2973
 
            gid = pwd.getpwnam(group).pw_gid
 
2514
            gid = pwd.getpwnam(name).pw_gid
2974
2515
            break
2975
2516
        except KeyError:
2976
2517
            continue
2980
2521
    try:
2981
2522
        os.setgid(gid)
2982
2523
        os.setuid(uid)
2983
 
        if debug:
2984
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2985
 
                                                             gid))
2986
2524
    except OSError as error:
2987
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2988
 
                       .format(uid, gid, os.strerror(error.errno)))
2989
2525
        if error.errno != errno.EPERM:
2990
2526
            raise
2991
2527
    
2994
2530
        
2995
2531
        # "Use a log level over 10 to enable all debugging options."
2996
2532
        # - GnuTLS manual
2997
 
        gnutls.global_set_log_level(11)
 
2533
        gnutls.library.functions.gnutls_global_set_log_level(11)
2998
2534
        
2999
 
        @gnutls.log_func
 
2535
        @gnutls.library.types.gnutls_log_func
3000
2536
        def debug_gnutls(level, string):
3001
2537
            logger.debug("GnuTLS: %s", string[:-1])
3002
2538
        
3003
 
        gnutls.global_set_log_function(debug_gnutls)
 
2539
        gnutls.library.functions.gnutls_global_set_log_function(
 
2540
            debug_gnutls)
3004
2541
        
3005
2542
        # Redirect stdin so all checkers get /dev/null
3006
2543
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3013
2550
        # Close all input and output, do double fork, etc.
3014
2551
        daemon()
3015
2552
    
3016
 
    # multiprocessing will use threads, so before we use GLib we need
3017
 
    # to inform GLib that threads will be used.
3018
 
    GLib.threads_init()
 
2553
    # multiprocessing will use threads, so before we use gobject we
 
2554
    # need to inform gobject that threads will be used.
 
2555
    gobject.threads_init()
3019
2556
    
3020
2557
    global main_loop
3021
2558
    # From the Avahi example code
3022
2559
    DBusGMainLoop(set_as_default=True)
3023
 
    main_loop = GLib.MainLoop()
 
2560
    main_loop = gobject.MainLoop()
3024
2561
    bus = dbus.SystemBus()
3025
2562
    # End of Avahi example code
3026
2563
    if use_dbus:
3070
2607
    if server_settings["restore"]:
3071
2608
        try:
3072
2609
            with open(stored_state_path, "rb") as stored_state:
3073
 
                if sys.version_info.major == 2:                
3074
 
                    clients_data, old_client_settings = pickle.load(
3075
 
                        stored_state)
3076
 
                else:
3077
 
                    bytes_clients_data, bytes_old_client_settings = (
3078
 
                        pickle.load(stored_state, encoding = "bytes"))
3079
 
                    ### Fix bytes to strings
3080
 
                    ## clients_data
3081
 
                    # .keys()
3082
 
                    clients_data = { (key.decode("utf-8")
3083
 
                                      if isinstance(key, bytes)
3084
 
                                      else key): value
3085
 
                                     for key, value in
3086
 
                                     bytes_clients_data.items() }
3087
 
                    del bytes_clients_data
3088
 
                    for key in clients_data:
3089
 
                        value = { (k.decode("utf-8")
3090
 
                                   if isinstance(k, bytes) else k): v
3091
 
                                  for k, v in
3092
 
                                  clients_data[key].items() }
3093
 
                        clients_data[key] = value
3094
 
                        # .client_structure
3095
 
                        value["client_structure"] = [
3096
 
                            (s.decode("utf-8")
3097
 
                             if isinstance(s, bytes)
3098
 
                             else s) for s in
3099
 
                            value["client_structure"] ]
3100
 
                        # .name & .host
3101
 
                        for k in ("name", "host"):
3102
 
                            if isinstance(value[k], bytes):
3103
 
                                value[k] = value[k].decode("utf-8")
3104
 
                    ## old_client_settings
3105
 
                    # .keys()
3106
 
                    old_client_settings = {
3107
 
                        (key.decode("utf-8")
3108
 
                         if isinstance(key, bytes)
3109
 
                         else key): value
3110
 
                        for key, value in
3111
 
                        bytes_old_client_settings.items() }
3112
 
                    del bytes_old_client_settings
3113
 
                    # .host
3114
 
                    for value in old_client_settings.values():
3115
 
                        if isinstance(value["host"], bytes):
3116
 
                            value["host"] = (value["host"]
3117
 
                                             .decode("utf-8"))
 
2610
                clients_data, old_client_settings = pickle.load(
 
2611
                    stored_state)
3118
2612
            os.remove(stored_state_path)
3119
2613
        except IOError as e:
3120
2614
            if e.errno == errno.ENOENT:
3153
2647
                    pass
3154
2648
            
3155
2649
            # Clients who has passed its expire date can still be
3156
 
            # enabled if its last checker was successful.  A Client
 
2650
            # enabled if its last checker was successful.  Clients
3157
2651
            # whose checker succeeded before we stored its state is
3158
2652
            # assumed to have successfully run all checkers during
3159
2653
            # downtime.
3221
2715
        del pidfile
3222
2716
        del pidfilename
3223
2717
    
3224
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3225
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3226
 
                             lambda: main_loop.quit() and False)
 
2718
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2719
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3227
2720
    
3228
2721
    if use_dbus:
3229
2722
        
3230
2723
        @alternate_dbus_interfaces(
3231
2724
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3232
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2725
        class MandosDBusService(DBusObjectWithProperties):
3233
2726
            """A D-Bus proxy object"""
3234
2727
            
3235
2728
            def __init__(self):
3237
2730
            
3238
2731
            _interface = "se.recompile.Mandos"
3239
2732
            
 
2733
            @dbus_interface_annotations(_interface)
 
2734
            def _foo(self):
 
2735
                return {
 
2736
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2737
                    "false" }
 
2738
            
3240
2739
            @dbus.service.signal(_interface, signature="o")
3241
2740
            def ClientAdded(self, objpath):
3242
2741
                "D-Bus signal"
3247
2746
                "D-Bus signal"
3248
2747
                pass
3249
2748
            
3250
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3251
 
                               "true"})
3252
2749
            @dbus.service.signal(_interface, signature="os")
3253
2750
            def ClientRemoved(self, objpath, name):
3254
2751
                "D-Bus signal"
3255
2752
                pass
3256
2753
            
3257
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3258
 
                               "true"})
3259
2754
            @dbus.service.method(_interface, out_signature="ao")
3260
2755
            def GetAllClients(self):
3261
2756
                "D-Bus method"
3262
2757
                return dbus.Array(c.dbus_object_path for c in
3263
 
                                  tcp_server.clients.values())
 
2758
                                  tcp_server.clients.itervalues())
3264
2759
            
3265
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3266
 
                               "true"})
3267
2760
            @dbus.service.method(_interface,
3268
2761
                                 out_signature="a{oa{sv}}")
3269
2762
            def GetAllClientsWithProperties(self):
3270
2763
                "D-Bus method"
3271
2764
                return dbus.Dictionary(
3272
 
                    { c.dbus_object_path: c.GetAll(
3273
 
                        "se.recompile.Mandos.Client")
3274
 
                      for c in tcp_server.clients.values() },
 
2765
                    { c.dbus_object_path: c.GetAll("")
 
2766
                      for c in tcp_server.clients.itervalues() },
3275
2767
                    signature="oa{sv}")
3276
2768
            
3277
2769
            @dbus.service.method(_interface, in_signature="o")
3278
2770
            def RemoveClient(self, object_path):
3279
2771
                "D-Bus method"
3280
 
                for c in tcp_server.clients.values():
 
2772
                for c in tcp_server.clients.itervalues():
3281
2773
                    if c.dbus_object_path == object_path:
3282
2774
                        del tcp_server.clients[c.name]
3283
2775
                        c.remove_from_connection()
3284
 
                        # Don't signal the disabling
 
2776
                        # Don't signal anything except ClientRemoved
3285
2777
                        c.disable(quiet=True)
3286
 
                        # Emit D-Bus signal for removal
3287
 
                        self.client_removed_signal(c)
 
2778
                        # Emit D-Bus signal
 
2779
                        self.ClientRemoved(object_path, c.name)
3288
2780
                        return
3289
2781
                raise KeyError(object_path)
3290
2782
            
3291
2783
            del _interface
3292
 
            
3293
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3294
 
                                 out_signature = "a{oa{sa{sv}}}")
3295
 
            def GetManagedObjects(self):
3296
 
                """D-Bus method"""
3297
 
                return dbus.Dictionary(
3298
 
                    { client.dbus_object_path:
3299
 
                      dbus.Dictionary(
3300
 
                          { interface: client.GetAll(interface)
3301
 
                            for interface in
3302
 
                                 client._get_all_interface_names()})
3303
 
                      for client in tcp_server.clients.values()})
3304
 
            
3305
 
            def client_added_signal(self, client):
3306
 
                """Send the new standard signal and the old signal"""
3307
 
                if use_dbus:
3308
 
                    # New standard signal
3309
 
                    self.InterfacesAdded(
3310
 
                        client.dbus_object_path,
3311
 
                        dbus.Dictionary(
3312
 
                            { interface: client.GetAll(interface)
3313
 
                              for interface in
3314
 
                              client._get_all_interface_names()}))
3315
 
                    # Old signal
3316
 
                    self.ClientAdded(client.dbus_object_path)
3317
 
            
3318
 
            def client_removed_signal(self, client):
3319
 
                """Send the new standard signal and the old signal"""
3320
 
                if use_dbus:
3321
 
                    # New standard signal
3322
 
                    self.InterfacesRemoved(
3323
 
                        client.dbus_object_path,
3324
 
                        client._get_all_interface_names())
3325
 
                    # Old signal
3326
 
                    self.ClientRemoved(client.dbus_object_path,
3327
 
                                       client.name)
3328
2784
        
3329
2785
        mandos_dbus_service = MandosDBusService()
3330
2786
    
3331
 
    # Save modules to variables to exempt the modules from being
3332
 
    # unloaded before the function registered with atexit() is run.
3333
 
    mp = multiprocessing
3334
 
    wn = wnull
3335
2787
    def cleanup():
3336
2788
        "Cleanup function; run on exit"
3337
2789
        if zeroconf:
3338
2790
            service.cleanup()
3339
2791
        
3340
 
        mp.active_children()
3341
 
        wn.close()
 
2792
        multiprocessing.active_children()
 
2793
        wnull.close()
3342
2794
        if not (tcp_server.clients or client_settings):
3343
2795
            return
3344
2796
        
3347
2799
        # removed/edited, old secret will thus be unrecovable.
3348
2800
        clients = {}
3349
2801
        with PGPEngine() as pgp:
3350
 
            for client in tcp_server.clients.values():
 
2802
            for client in tcp_server.clients.itervalues():
3351
2803
                key = client_settings[client.name]["secret"]
3352
2804
                client.encrypted_secret = pgp.encrypt(client.secret,
3353
2805
                                                      key)
3377
2829
                    prefix='clients-',
3378
2830
                    dir=os.path.dirname(stored_state_path),
3379
2831
                    delete=False) as stored_state:
3380
 
                pickle.dump((clients, client_settings), stored_state,
3381
 
                            protocol = 2)
 
2832
                pickle.dump((clients, client_settings), stored_state)
3382
2833
                tempname = stored_state.name
3383
2834
            os.rename(tempname, stored_state_path)
3384
2835
        except (IOError, OSError) as e:
3400
2851
            name, client = tcp_server.clients.popitem()
3401
2852
            if use_dbus:
3402
2853
                client.remove_from_connection()
3403
 
            # Don't signal the disabling
 
2854
            # Don't signal anything except ClientRemoved
3404
2855
            client.disable(quiet=True)
3405
 
            # Emit D-Bus signal for removal
3406
2856
            if use_dbus:
3407
 
                mandos_dbus_service.client_removed_signal(client)
 
2857
                # Emit D-Bus signal
 
2858
                mandos_dbus_service.ClientRemoved(
 
2859
                    client.dbus_object_path, client.name)
3408
2860
        client_settings.clear()
3409
2861
    
3410
2862
    atexit.register(cleanup)
3411
2863
    
3412
 
    for client in tcp_server.clients.values():
 
2864
    for client in tcp_server.clients.itervalues():
3413
2865
        if use_dbus:
3414
 
            # Emit D-Bus signal for adding
3415
 
            mandos_dbus_service.client_added_signal(client)
 
2866
            # Emit D-Bus signal
 
2867
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3416
2868
        # Need to initiate checking of clients
3417
2869
        if client.enabled:
3418
2870
            client.init_checker()
3444
2896
                sys.exit(1)
3445
2897
            # End of Avahi example code
3446
2898
        
3447
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3448
 
                          lambda *args, **kwargs:
3449
 
                          (tcp_server.handle_request
3450
 
                           (*args[2:], **kwargs) or True))
 
2899
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2900
                             lambda *args, **kwargs:
 
2901
                             (tcp_server.handle_request
 
2902
                              (*args[2:], **kwargs) or True))
3451
2903
        
3452
2904
        logger.debug("Starting main loop")
3453
2905
        main_loop.run()