/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-03-23 07:11:22 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 343.
  • Revision ID: teddy@recompile.se-20160323071122-55srtjdizr21rr7f
Use HTTPS in home page links

Since we have a real certificate now, change all links to the home
page to use HTTPS.

* README: Use HTTPS in home page links
* debian/control (Source: mandos/Homepage): - '' -
* debian/copyright (Source): - '' -
* intro.xml (SEE ALSO): - '' -
* mandos.lsm (Primary-site): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008-2016 Teddy Hogeborn
 
15
# Copyright © 2008-2016 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
 
37
try:
 
38
    from future_builtins import *
 
39
except ImportError:
 
40
    pass
38
41
 
39
42
try:
40
43
    import SocketServer as socketserver
44
47
import argparse
45
48
import datetime
46
49
import errno
47
 
import gnutls.crypto
48
 
import gnutls.connection
49
 
import gnutls.errors
50
 
import gnutls.library.functions
51
 
import gnutls.library.constants
52
 
import gnutls.library.types
53
50
try:
54
51
    import ConfigParser as configparser
55
52
except ImportError:
78
75
import tempfile
79
76
import itertools
80
77
import collections
 
78
import codecs
81
79
 
82
80
import dbus
83
81
import dbus.service
84
 
try:
85
 
    import gobject
86
 
except ImportError:
87
 
    from gi.repository import GObject as gobject
88
 
import avahi
 
82
from gi.repository import GLib
89
83
from dbus.mainloop.glib import DBusGMainLoop
90
84
import ctypes
91
85
import ctypes.util
103
97
if sys.version_info.major == 2:
104
98
    str = unicode
105
99
 
106
 
version = "1.6.9"
 
100
version = "1.7.7"
107
101
stored_state_file = "clients.pickle"
108
102
 
109
103
logger = logging.getLogger()
124
118
        return interface_index
125
119
 
126
120
 
 
121
def copy_function(func):
 
122
    """Make a copy of a function"""
 
123
    if sys.version_info.major == 2:
 
124
        return types.FunctionType(func.func_code,
 
125
                                  func.func_globals,
 
126
                                  func.func_name,
 
127
                                  func.func_defaults,
 
128
                                  func.func_closure)
 
129
    else:
 
130
        return types.FunctionType(func.__code__,
 
131
                                  func.__globals__,
 
132
                                  func.__name__,
 
133
                                  func.__defaults__,
 
134
                                  func.__closure__)
 
135
 
 
136
 
127
137
def initlogger(debug, level=logging.WARNING):
128
138
    """init logger and add loglevel"""
129
139
    
156
166
    
157
167
    def __init__(self):
158
168
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
169
        self.gpg = "gpg"
 
170
        try:
 
171
            output = subprocess.check_output(["gpgconf"])
 
172
            for line in output.splitlines():
 
173
                name, text, path = line.split(b":")
 
174
                if name == "gpg":
 
175
                    self.gpg = path
 
176
                    break
 
177
        except OSError as e:
 
178
            if e.errno != errno.ENOENT:
 
179
                raise
159
180
        self.gnupgargs = ['--batch',
160
 
                          '--home', self.tempdir,
 
181
                          '--homedir', self.tempdir,
161
182
                          '--force-mdc',
162
183
                          '--quiet',
163
184
                          '--no-use-agent']
202
223
                dir=self.tempdir) as passfile:
203
224
            passfile.write(passphrase)
204
225
            passfile.flush()
205
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
226
            proc = subprocess.Popen([self.gpg, '--symmetric',
206
227
                                     '--passphrase-file',
207
228
                                     passfile.name]
208
229
                                    + self.gnupgargs,
220
241
                dir = self.tempdir) as passfile:
221
242
            passfile.write(passphrase)
222
243
            passfile.flush()
223
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
244
            proc = subprocess.Popen([self.gpg, '--decrypt',
224
245
                                     '--passphrase-file',
225
246
                                     passfile.name]
226
247
                                    + self.gnupgargs,
232
253
            raise PGPError(err)
233
254
        return decrypted_plaintext
234
255
 
 
256
# Pretend that we have an Avahi module
 
257
class Avahi(object):
 
258
    """This isn't so much a class as it is a module-like namespace.
 
259
    It is instantiated once, and simulates having an Avahi module."""
 
260
    IF_UNSPEC = -1              # avahi-common/address.h
 
261
    PROTO_UNSPEC = -1           # avahi-common/address.h
 
262
    PROTO_INET = 0              # avahi-common/address.h
 
263
    PROTO_INET6 = 1             # avahi-common/address.h
 
264
    DBUS_NAME = "org.freedesktop.Avahi"
 
265
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
266
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
267
    DBUS_PATH_SERVER = "/"
 
268
    def string_array_to_txt_array(self, t):
 
269
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
270
                           for s in t), signature="ay")
 
271
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
 
272
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
 
273
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
 
274
    SERVER_INVALID = 0          # avahi-common/defs.h
 
275
    SERVER_REGISTERING = 1      # avahi-common/defs.h
 
276
    SERVER_RUNNING = 2          # avahi-common/defs.h
 
277
    SERVER_COLLISION = 3        # avahi-common/defs.h
 
278
    SERVER_FAILURE = 4          # avahi-common/defs.h
 
279
avahi = Avahi()
235
280
 
236
281
class AvahiError(Exception):
237
282
    def __init__(self, value, *args, **kwargs):
394
439
                    logger.error(bad_states[state] + ": %r", error)
395
440
            self.cleanup()
396
441
        elif state == avahi.SERVER_RUNNING:
397
 
            self.add()
 
442
            try:
 
443
                self.add()
 
444
            except dbus.exceptions.DBusException as error:
 
445
                if (error.get_dbus_name()
 
446
                    == "org.freedesktop.Avahi.CollisionError"):
 
447
                    logger.info("Local Zeroconf service name"
 
448
                                " collision.")
 
449
                    return self.rename(remove=False)
 
450
                else:
 
451
                    logger.critical("D-Bus Exception", exc_info=error)
 
452
                    self.cleanup()
 
453
                    os._exit(1)
398
454
        else:
399
455
            if error is None:
400
456
                logger.debug("Unknown state: %r", state)
423
479
            .format(self.name)))
424
480
        return ret
425
481
 
426
 
def subprocess_call_pipe(connection, # : multiprocessing.Connection
427
 
                         *args, **kwargs):
 
482
# Pretend that we have a GnuTLS module
 
483
class GnuTLS(object):
 
484
    """This isn't so much a class as it is a module-like namespace.
 
485
    It is instantiated once, and simulates having a GnuTLS module."""
 
486
    
 
487
    _library = ctypes.cdll.LoadLibrary(
 
488
        ctypes.util.find_library("gnutls"))
 
489
    _need_version = b"3.3.0"
 
490
    def __init__(self):
 
491
        # Need to use class name "GnuTLS" here, since this method is
 
492
        # called before the assignment to the "gnutls" global variable
 
493
        # happens.
 
494
        if GnuTLS.check_version(self._need_version) is None:
 
495
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
496
                               .format(self._need_version))
 
497
    
 
498
    # Unless otherwise indicated, the constants and types below are
 
499
    # all from the gnutls/gnutls.h C header file.
 
500
    
 
501
    # Constants
 
502
    E_SUCCESS = 0
 
503
    E_INTERRUPTED = -52
 
504
    E_AGAIN = -28
 
505
    CRT_OPENPGP = 2
 
506
    CLIENT = 2
 
507
    SHUT_RDWR = 0
 
508
    CRD_CERTIFICATE = 1
 
509
    E_NO_CERTIFICATE_FOUND = -49
 
510
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
511
    
 
512
    # Types
 
513
    class session_int(ctypes.Structure):
 
514
        _fields_ = []
 
515
    session_t = ctypes.POINTER(session_int)
 
516
    class certificate_credentials_st(ctypes.Structure):
 
517
        _fields_ = []
 
518
    certificate_credentials_t = ctypes.POINTER(
 
519
        certificate_credentials_st)
 
520
    certificate_type_t = ctypes.c_int
 
521
    class datum_t(ctypes.Structure):
 
522
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
523
                    ('size', ctypes.c_uint)]
 
524
    class openpgp_crt_int(ctypes.Structure):
 
525
        _fields_ = []
 
526
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
527
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
528
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
529
    credentials_type_t = ctypes.c_int
 
530
    transport_ptr_t = ctypes.c_void_p
 
531
    close_request_t = ctypes.c_int
 
532
    
 
533
    # Exceptions
 
534
    class Error(Exception):
 
535
        # We need to use the class name "GnuTLS" here, since this
 
536
        # exception might be raised from within GnuTLS.__init__,
 
537
        # which is called before the assignment to the "gnutls"
 
538
        # global variable has happened.
 
539
        def __init__(self, message = None, code = None, args=()):
 
540
            # Default usage is by a message string, but if a return
 
541
            # code is passed, convert it to a string with
 
542
            # gnutls.strerror()
 
543
            self.code = code
 
544
            if message is None and code is not None:
 
545
                message = GnuTLS.strerror(code)
 
546
            return super(GnuTLS.Error, self).__init__(
 
547
                message, *args)
 
548
    
 
549
    class CertificateSecurityError(Error):
 
550
        pass
 
551
    
 
552
    # Classes
 
553
    class Credentials(object):
 
554
        def __init__(self):
 
555
            self._c_object = gnutls.certificate_credentials_t()
 
556
            gnutls.certificate_allocate_credentials(
 
557
                ctypes.byref(self._c_object))
 
558
            self.type = gnutls.CRD_CERTIFICATE
 
559
        
 
560
        def __del__(self):
 
561
            gnutls.certificate_free_credentials(self._c_object)
 
562
    
 
563
    class ClientSession(object):
 
564
        def __init__(self, socket, credentials = None):
 
565
            self._c_object = gnutls.session_t()
 
566
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
567
            gnutls.set_default_priority(self._c_object)
 
568
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
569
            gnutls.handshake_set_private_extensions(self._c_object,
 
570
                                                    True)
 
571
            self.socket = socket
 
572
            if credentials is None:
 
573
                credentials = gnutls.Credentials()
 
574
            gnutls.credentials_set(self._c_object, credentials.type,
 
575
                                   ctypes.cast(credentials._c_object,
 
576
                                               ctypes.c_void_p))
 
577
            self.credentials = credentials
 
578
        
 
579
        def __del__(self):
 
580
            gnutls.deinit(self._c_object)
 
581
        
 
582
        def handshake(self):
 
583
            return gnutls.handshake(self._c_object)
 
584
        
 
585
        def send(self, data):
 
586
            data = bytes(data)
 
587
            data_len = len(data)
 
588
            while data_len > 0:
 
589
                data_len -= gnutls.record_send(self._c_object,
 
590
                                               data[-data_len:],
 
591
                                               data_len)
 
592
        
 
593
        def bye(self):
 
594
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
595
    
 
596
    # Error handling functions
 
597
    def _error_code(result):
 
598
        """A function to raise exceptions on errors, suitable
 
599
        for the 'restype' attribute on ctypes functions"""
 
600
        if result >= 0:
 
601
            return result
 
602
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
603
            raise gnutls.CertificateSecurityError(code = result)
 
604
        raise gnutls.Error(code = result)
 
605
    
 
606
    def _retry_on_error(result, func, arguments):
 
607
        """A function to retry on some errors, suitable
 
608
        for the 'errcheck' attribute on ctypes functions"""
 
609
        while result < 0:
 
610
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
611
                return _error_code(result)
 
612
            result = func(*arguments)
 
613
        return result
 
614
    
 
615
    # Unless otherwise indicated, the function declarations below are
 
616
    # all from the gnutls/gnutls.h C header file.
 
617
    
 
618
    # Functions
 
619
    priority_set_direct = _library.gnutls_priority_set_direct
 
620
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
621
                                    ctypes.POINTER(ctypes.c_char_p)]
 
622
    priority_set_direct.restype = _error_code
 
623
    
 
624
    init = _library.gnutls_init
 
625
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
626
    init.restype = _error_code
 
627
    
 
628
    set_default_priority = _library.gnutls_set_default_priority
 
629
    set_default_priority.argtypes = [session_t]
 
630
    set_default_priority.restype = _error_code
 
631
    
 
632
    record_send = _library.gnutls_record_send
 
633
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
634
                            ctypes.c_size_t]
 
635
    record_send.restype = ctypes.c_ssize_t
 
636
    record_send.errcheck = _retry_on_error
 
637
    
 
638
    certificate_allocate_credentials = (
 
639
        _library.gnutls_certificate_allocate_credentials)
 
640
    certificate_allocate_credentials.argtypes = [
 
641
        ctypes.POINTER(certificate_credentials_t)]
 
642
    certificate_allocate_credentials.restype = _error_code
 
643
    
 
644
    certificate_free_credentials = (
 
645
        _library.gnutls_certificate_free_credentials)
 
646
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
647
    certificate_free_credentials.restype = None
 
648
    
 
649
    handshake_set_private_extensions = (
 
650
        _library.gnutls_handshake_set_private_extensions)
 
651
    handshake_set_private_extensions.argtypes = [session_t,
 
652
                                                 ctypes.c_int]
 
653
    handshake_set_private_extensions.restype = None
 
654
    
 
655
    credentials_set = _library.gnutls_credentials_set
 
656
    credentials_set.argtypes = [session_t, credentials_type_t,
 
657
                                ctypes.c_void_p]
 
658
    credentials_set.restype = _error_code
 
659
    
 
660
    strerror = _library.gnutls_strerror
 
661
    strerror.argtypes = [ctypes.c_int]
 
662
    strerror.restype = ctypes.c_char_p
 
663
    
 
664
    certificate_type_get = _library.gnutls_certificate_type_get
 
665
    certificate_type_get.argtypes = [session_t]
 
666
    certificate_type_get.restype = _error_code
 
667
    
 
668
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
669
    certificate_get_peers.argtypes = [session_t,
 
670
                                      ctypes.POINTER(ctypes.c_uint)]
 
671
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
672
    
 
673
    global_set_log_level = _library.gnutls_global_set_log_level
 
674
    global_set_log_level.argtypes = [ctypes.c_int]
 
675
    global_set_log_level.restype = None
 
676
    
 
677
    global_set_log_function = _library.gnutls_global_set_log_function
 
678
    global_set_log_function.argtypes = [log_func]
 
679
    global_set_log_function.restype = None
 
680
    
 
681
    deinit = _library.gnutls_deinit
 
682
    deinit.argtypes = [session_t]
 
683
    deinit.restype = None
 
684
    
 
685
    handshake = _library.gnutls_handshake
 
686
    handshake.argtypes = [session_t]
 
687
    handshake.restype = _error_code
 
688
    handshake.errcheck = _retry_on_error
 
689
    
 
690
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
691
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
692
    transport_set_ptr.restype = None
 
693
    
 
694
    bye = _library.gnutls_bye
 
695
    bye.argtypes = [session_t, close_request_t]
 
696
    bye.restype = _error_code
 
697
    bye.errcheck = _retry_on_error
 
698
    
 
699
    check_version = _library.gnutls_check_version
 
700
    check_version.argtypes = [ctypes.c_char_p]
 
701
    check_version.restype = ctypes.c_char_p
 
702
    
 
703
    # All the function declarations below are from gnutls/openpgp.h
 
704
    
 
705
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
706
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
707
    openpgp_crt_init.restype = _error_code
 
708
    
 
709
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
710
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
711
                                   ctypes.POINTER(datum_t),
 
712
                                   openpgp_crt_fmt_t]
 
713
    openpgp_crt_import.restype = _error_code
 
714
    
 
715
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
716
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
717
                                        ctypes.POINTER(ctypes.c_uint)]
 
718
    openpgp_crt_verify_self.restype = _error_code
 
719
    
 
720
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
721
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
722
    openpgp_crt_deinit.restype = None
 
723
    
 
724
    openpgp_crt_get_fingerprint = (
 
725
        _library.gnutls_openpgp_crt_get_fingerprint)
 
726
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
727
                                            ctypes.c_void_p,
 
728
                                            ctypes.POINTER(
 
729
                                                ctypes.c_size_t)]
 
730
    openpgp_crt_get_fingerprint.restype = _error_code
 
731
    
 
732
    # Remove non-public functions
 
733
    del _error_code, _retry_on_error
 
734
# Create the global "gnutls" object, simulating a module
 
735
gnutls = GnuTLS()
 
736
 
 
737
def call_pipe(connection,       # : multiprocessing.Connection
 
738
              func, *args, **kwargs):
428
739
    """This function is meant to be called by multiprocessing.Process
429
740
    
430
 
    This function runs a synchronous subprocess.call(), and writes the
431
 
    resulting return code on the provided multiprocessing.Connection.
 
741
    This function runs func(*args, **kwargs), and writes the resulting
 
742
    return value on the provided multiprocessing.Connection.
432
743
    """
433
 
    connection.send(subprocess.call(*args, **kwargs))
 
744
    connection.send(func(*args, **kwargs))
434
745
    connection.close()
435
746
 
436
747
class Client(object):
443
754
    checker:    subprocess.Popen(); a running checker process used
444
755
                                    to see if the client lives.
445
756
                                    'None' if no process is running.
446
 
    checker_callback_tag: a gobject event source tag, or None
 
757
    checker_callback_tag: a GLib event source tag, or None
447
758
    checker_command: string; External command which is run to check
448
759
                     if client lives.  %() expansions are done at
449
760
                     runtime with vars(self) as dict, so that for
450
761
                     instance %(name)s can be used in the command.
451
 
    checker_initiator_tag: a gobject event source tag, or None
 
762
    checker_initiator_tag: a GLib event source tag, or None
452
763
    created:    datetime.datetime(); (UTC) object creation
453
764
    client_structure: Object describing what attributes a client has
454
765
                      and is used for storing the client at exit
455
766
    current_checker_command: string; current running checker_command
456
 
    disable_initiator_tag: a gobject event source tag, or None
 
767
    disable_initiator_tag: a GLib event source tag, or None
457
768
    enabled:    bool()
458
769
    fingerprint: string (40 or 32 hexadecimal digits); used to
459
770
                 uniquely identify the client
522
833
            client["fingerprint"] = (section["fingerprint"].upper()
523
834
                                     .replace(" ", ""))
524
835
            if "secret" in section:
525
 
                client["secret"] = section["secret"].decode("base64")
 
836
                client["secret"] = codecs.decode(section["secret"]
 
837
                                                 .encode("utf-8"),
 
838
                                                 "base64")
526
839
            elif "secfile" in section:
527
840
                with open(os.path.expanduser(os.path.expandvars
528
841
                                             (section["secfile"])),
581
894
        self.changedstate = multiprocessing_manager.Condition(
582
895
            multiprocessing_manager.Lock())
583
896
        self.client_structure = [attr
584
 
                                 for attr in self.__dict__.iterkeys()
 
897
                                 for attr in self.__dict__.keys()
585
898
                                 if not attr.startswith("_")]
586
899
        self.client_structure.append("client_structure")
587
900
        
613
926
        if not quiet:
614
927
            logger.info("Disabling client %s", self.name)
615
928
        if getattr(self, "disable_initiator_tag", None) is not None:
616
 
            gobject.source_remove(self.disable_initiator_tag)
 
929
            GLib.source_remove(self.disable_initiator_tag)
617
930
            self.disable_initiator_tag = None
618
931
        self.expires = None
619
932
        if getattr(self, "checker_initiator_tag", None) is not None:
620
 
            gobject.source_remove(self.checker_initiator_tag)
 
933
            GLib.source_remove(self.checker_initiator_tag)
621
934
            self.checker_initiator_tag = None
622
935
        self.stop_checker()
623
936
        self.enabled = False
624
937
        if not quiet:
625
938
            self.send_changedstate()
626
 
        # Do not run this again if called by a gobject.timeout_add
 
939
        # Do not run this again if called by a GLib.timeout_add
627
940
        return False
628
941
    
629
942
    def __del__(self):
633
946
        # Schedule a new checker to be started an 'interval' from now,
634
947
        # and every interval from then on.
635
948
        if self.checker_initiator_tag is not None:
636
 
            gobject.source_remove(self.checker_initiator_tag)
637
 
        self.checker_initiator_tag = gobject.timeout_add(
 
949
            GLib.source_remove(self.checker_initiator_tag)
 
950
        self.checker_initiator_tag = GLib.timeout_add(
638
951
            int(self.interval.total_seconds() * 1000),
639
952
            self.start_checker)
640
953
        # Schedule a disable() when 'timeout' has passed
641
954
        if self.disable_initiator_tag is not None:
642
 
            gobject.source_remove(self.disable_initiator_tag)
643
 
        self.disable_initiator_tag = gobject.timeout_add(
 
955
            GLib.source_remove(self.disable_initiator_tag)
 
956
        self.disable_initiator_tag = GLib.timeout_add(
644
957
            int(self.timeout.total_seconds() * 1000), self.disable)
645
958
        # Also start a new checker *right now*.
646
959
        self.start_checker()
647
960
    
648
 
    def checker_callback(self, source, condition,
649
 
                         (connection, command)):
 
961
    def checker_callback(self, source, condition, connection,
 
962
                         command):
650
963
        """The checker has completed, so take appropriate actions."""
651
964
        self.checker_callback_tag = None
652
965
        self.checker = None
653
 
        # Read return code from connection (see subprocess_call_pipe)
 
966
        # Read return code from connection (see call_pipe)
654
967
        returncode = connection.recv()
655
968
        connection.close()
656
969
        
682
995
        if timeout is None:
683
996
            timeout = self.timeout
684
997
        if self.disable_initiator_tag is not None:
685
 
            gobject.source_remove(self.disable_initiator_tag)
 
998
            GLib.source_remove(self.disable_initiator_tag)
686
999
            self.disable_initiator_tag = None
687
1000
        if getattr(self, "enabled", False):
688
 
            self.disable_initiator_tag = gobject.timeout_add(
 
1001
            self.disable_initiator_tag = GLib.timeout_add(
689
1002
                int(timeout.total_seconds() * 1000), self.disable)
690
1003
            self.expires = datetime.datetime.utcnow() + timeout
691
1004
    
740
1053
                and self.server_settings["foreground"]):
741
1054
                popen_args.update({"stdout": wnull,
742
1055
                                   "stderr": wnull })
743
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1056
            pipe = multiprocessing.Pipe(duplex = False)
744
1057
            self.checker = multiprocessing.Process(
745
 
                target=subprocess_call_pipe, args=(pipe[1], command),
746
 
                kwargs=popen_args)
 
1058
                target = call_pipe,
 
1059
                args = (pipe[1], subprocess.call, command),
 
1060
                kwargs = popen_args)
747
1061
            self.checker.start()
748
 
            self.checker_callback_tag = gobject.io_add_watch(
749
 
                pipe[0].fileno(), gobject.IO_IN,
750
 
                self.checker_callback, (pipe[0], command))
751
 
        # Re-run this periodically if run by gobject.timeout_add
 
1062
            self.checker_callback_tag = GLib.io_add_watch(
 
1063
                pipe[0].fileno(), GLib.IO_IN,
 
1064
                self.checker_callback, pipe[0], command)
 
1065
        # Re-run this periodically if run by GLib.timeout_add
752
1066
        return True
753
1067
    
754
1068
    def stop_checker(self):
755
1069
        """Force the checker process, if any, to stop."""
756
1070
        if self.checker_callback_tag:
757
 
            gobject.source_remove(self.checker_callback_tag)
 
1071
            GLib.source_remove(self.checker_callback_tag)
758
1072
            self.checker_callback_tag = None
759
1073
        if getattr(self, "checker", None) is None:
760
1074
            return
829
1143
                           access="r")
830
1144
    def Property_dbus_property(self):
831
1145
        return dbus.Boolean(False)
 
1146
    
 
1147
    See also the DBusObjectWithAnnotations class.
832
1148
    """
833
1149
    
834
1150
    def decorator(func):
856
1172
    pass
857
1173
 
858
1174
 
859
 
class DBusObjectWithProperties(dbus.service.Object):
860
 
    """A D-Bus object with properties.
 
1175
class DBusObjectWithAnnotations(dbus.service.Object):
 
1176
    """A D-Bus object with annotations.
861
1177
    
862
 
    Classes inheriting from this can use the dbus_service_property
863
 
    decorator to expose methods as D-Bus properties.  It exposes the
864
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
1178
    Classes inheriting from this can use the dbus_annotations
 
1179
    decorator to add annotations to methods or signals.
865
1180
    """
866
1181
    
867
1182
    @staticmethod
883
1198
                for name, athing in
884
1199
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
885
1200
    
 
1201
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1202
                         out_signature = "s",
 
1203
                         path_keyword = 'object_path',
 
1204
                         connection_keyword = 'connection')
 
1205
    def Introspect(self, object_path, connection):
 
1206
        """Overloading of standard D-Bus method.
 
1207
        
 
1208
        Inserts annotation tags on methods and signals.
 
1209
        """
 
1210
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1211
                                                   connection)
 
1212
        try:
 
1213
            document = xml.dom.minidom.parseString(xmlstring)
 
1214
            
 
1215
            for if_tag in document.getElementsByTagName("interface"):
 
1216
                # Add annotation tags
 
1217
                for typ in ("method", "signal"):
 
1218
                    for tag in if_tag.getElementsByTagName(typ):
 
1219
                        annots = dict()
 
1220
                        for name, prop in (self.
 
1221
                                           _get_all_dbus_things(typ)):
 
1222
                            if (name == tag.getAttribute("name")
 
1223
                                and prop._dbus_interface
 
1224
                                == if_tag.getAttribute("name")):
 
1225
                                annots.update(getattr(
 
1226
                                    prop, "_dbus_annotations", {}))
 
1227
                        for name, value in annots.items():
 
1228
                            ann_tag = document.createElement(
 
1229
                                "annotation")
 
1230
                            ann_tag.setAttribute("name", name)
 
1231
                            ann_tag.setAttribute("value", value)
 
1232
                            tag.appendChild(ann_tag)
 
1233
                # Add interface annotation tags
 
1234
                for annotation, value in dict(
 
1235
                    itertools.chain.from_iterable(
 
1236
                        annotations().items()
 
1237
                        for name, annotations
 
1238
                        in self._get_all_dbus_things("interface")
 
1239
                        if name == if_tag.getAttribute("name")
 
1240
                        )).items():
 
1241
                    ann_tag = document.createElement("annotation")
 
1242
                    ann_tag.setAttribute("name", annotation)
 
1243
                    ann_tag.setAttribute("value", value)
 
1244
                    if_tag.appendChild(ann_tag)
 
1245
                # Fix argument name for the Introspect method itself
 
1246
                if (if_tag.getAttribute("name")
 
1247
                                == dbus.INTROSPECTABLE_IFACE):
 
1248
                    for cn in if_tag.getElementsByTagName("method"):
 
1249
                        if cn.getAttribute("name") == "Introspect":
 
1250
                            for arg in cn.getElementsByTagName("arg"):
 
1251
                                if (arg.getAttribute("direction")
 
1252
                                    == "out"):
 
1253
                                    arg.setAttribute("name",
 
1254
                                                     "xml_data")
 
1255
            xmlstring = document.toxml("utf-8")
 
1256
            document.unlink()
 
1257
        except (AttributeError, xml.dom.DOMException,
 
1258
                xml.parsers.expat.ExpatError) as error:
 
1259
            logger.error("Failed to override Introspection method",
 
1260
                         exc_info=error)
 
1261
        return xmlstring
 
1262
 
 
1263
 
 
1264
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
1265
    """A D-Bus object with properties.
 
1266
    
 
1267
    Classes inheriting from this can use the dbus_service_property
 
1268
    decorator to expose methods as D-Bus properties.  It exposes the
 
1269
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
1270
    """
 
1271
    
886
1272
    def _get_dbus_property(self, interface_name, property_name):
887
1273
        """Returns a bound method if one exists which is a D-Bus
888
1274
        property with the specified name and interface.
898
1284
        raise DBusPropertyNotFound("{}:{}.{}".format(
899
1285
            self.dbus_object_path, interface_name, property_name))
900
1286
    
 
1287
    @classmethod
 
1288
    def _get_all_interface_names(cls):
 
1289
        """Get a sequence of all interfaces supported by an object"""
 
1290
        return (name for name in set(getattr(getattr(x, attr),
 
1291
                                             "_dbus_interface", None)
 
1292
                                     for x in (inspect.getmro(cls))
 
1293
                                     for attr in dir(x))
 
1294
                if name is not None)
 
1295
    
901
1296
    @dbus.service.method(dbus.PROPERTIES_IFACE,
902
1297
                         in_signature="ss",
903
1298
                         out_signature="v")
973
1368
        
974
1369
        Inserts property tags and interface annotation tags.
975
1370
        """
976
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
977
 
                                                   connection)
 
1371
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1372
                                                         object_path,
 
1373
                                                         connection)
978
1374
        try:
979
1375
            document = xml.dom.minidom.parseString(xmlstring)
980
1376
            
993
1389
                            if prop._dbus_interface
994
1390
                            == if_tag.getAttribute("name")):
995
1391
                    if_tag.appendChild(tag)
996
 
                # Add annotation tags
997
 
                for typ in ("method", "signal", "property"):
998
 
                    for tag in if_tag.getElementsByTagName(typ):
999
 
                        annots = dict()
1000
 
                        for name, prop in (self.
1001
 
                                           _get_all_dbus_things(typ)):
1002
 
                            if (name == tag.getAttribute("name")
1003
 
                                and prop._dbus_interface
1004
 
                                == if_tag.getAttribute("name")):
1005
 
                                annots.update(getattr(
1006
 
                                    prop, "_dbus_annotations", {}))
1007
 
                        for name, value in annots.items():
1008
 
                            ann_tag = document.createElement(
1009
 
                                "annotation")
1010
 
                            ann_tag.setAttribute("name", name)
1011
 
                            ann_tag.setAttribute("value", value)
1012
 
                            tag.appendChild(ann_tag)
1013
 
                # Add interface annotation tags
1014
 
                for annotation, value in dict(
1015
 
                    itertools.chain.from_iterable(
1016
 
                        annotations().items()
1017
 
                        for name, annotations
1018
 
                        in self._get_all_dbus_things("interface")
1019
 
                        if name == if_tag.getAttribute("name")
1020
 
                        )).items():
1021
 
                    ann_tag = document.createElement("annotation")
1022
 
                    ann_tag.setAttribute("name", annotation)
1023
 
                    ann_tag.setAttribute("value", value)
1024
 
                    if_tag.appendChild(ann_tag)
 
1392
                # Add annotation tags for properties
 
1393
                for tag in if_tag.getElementsByTagName("property"):
 
1394
                    annots = dict()
 
1395
                    for name, prop in self._get_all_dbus_things(
 
1396
                            "property"):
 
1397
                        if (name == tag.getAttribute("name")
 
1398
                            and prop._dbus_interface
 
1399
                            == if_tag.getAttribute("name")):
 
1400
                            annots.update(getattr(
 
1401
                                prop, "_dbus_annotations", {}))
 
1402
                    for name, value in annots.items():
 
1403
                        ann_tag = document.createElement(
 
1404
                            "annotation")
 
1405
                        ann_tag.setAttribute("name", name)
 
1406
                        ann_tag.setAttribute("value", value)
 
1407
                        tag.appendChild(ann_tag)
1025
1408
                # Add the names to the return values for the
1026
1409
                # "org.freedesktop.DBus.Properties" methods
1027
1410
                if (if_tag.getAttribute("name")
1045
1428
                         exc_info=error)
1046
1429
        return xmlstring
1047
1430
 
 
1431
try:
 
1432
    dbus.OBJECT_MANAGER_IFACE
 
1433
except AttributeError:
 
1434
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1435
 
 
1436
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1437
    """A D-Bus object with an ObjectManager.
 
1438
    
 
1439
    Classes inheriting from this exposes the standard
 
1440
    GetManagedObjects call and the InterfacesAdded and
 
1441
    InterfacesRemoved signals on the standard
 
1442
    "org.freedesktop.DBus.ObjectManager" interface.
 
1443
    
 
1444
    Note: No signals are sent automatically; they must be sent
 
1445
    manually.
 
1446
    """
 
1447
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1448
                         out_signature = "a{oa{sa{sv}}}")
 
1449
    def GetManagedObjects(self):
 
1450
        """This function must be overridden"""
 
1451
        raise NotImplementedError()
 
1452
    
 
1453
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1454
                         signature = "oa{sa{sv}}")
 
1455
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1456
        pass
 
1457
    
 
1458
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
1459
    def InterfacesRemoved(self, object_path, interfaces):
 
1460
        pass
 
1461
    
 
1462
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1463
                         out_signature = "s",
 
1464
                         path_keyword = 'object_path',
 
1465
                         connection_keyword = 'connection')
 
1466
    def Introspect(self, object_path, connection):
 
1467
        """Overloading of standard D-Bus method.
 
1468
        
 
1469
        Override return argument name of GetManagedObjects to be
 
1470
        "objpath_interfaces_and_properties"
 
1471
        """
 
1472
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1473
                                                         object_path,
 
1474
                                                         connection)
 
1475
        try:
 
1476
            document = xml.dom.minidom.parseString(xmlstring)
 
1477
            
 
1478
            for if_tag in document.getElementsByTagName("interface"):
 
1479
                # Fix argument name for the GetManagedObjects method
 
1480
                if (if_tag.getAttribute("name")
 
1481
                                == dbus.OBJECT_MANAGER_IFACE):
 
1482
                    for cn in if_tag.getElementsByTagName("method"):
 
1483
                        if (cn.getAttribute("name")
 
1484
                            == "GetManagedObjects"):
 
1485
                            for arg in cn.getElementsByTagName("arg"):
 
1486
                                if (arg.getAttribute("direction")
 
1487
                                    == "out"):
 
1488
                                    arg.setAttribute(
 
1489
                                        "name",
 
1490
                                        "objpath_interfaces"
 
1491
                                        "_and_properties")
 
1492
            xmlstring = document.toxml("utf-8")
 
1493
            document.unlink()
 
1494
        except (AttributeError, xml.dom.DOMException,
 
1495
                xml.parsers.expat.ExpatError) as error:
 
1496
            logger.error("Failed to override Introspection method",
 
1497
                         exc_info = error)
 
1498
        return xmlstring
1048
1499
 
1049
1500
def datetime_to_dbus(dt, variant_level=0):
1050
1501
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1099
1550
                if getattr(attribute, "_dbus_is_signal", False):
1100
1551
                    # Extract the original non-method undecorated
1101
1552
                    # function by black magic
1102
 
                    nonmethod_func = (dict(
1103
 
                        zip(attribute.func_code.co_freevars,
1104
 
                            attribute.__closure__))
1105
 
                                      ["func"].cell_contents)
 
1553
                    if sys.version_info.major == 2:
 
1554
                        nonmethod_func = (dict(
 
1555
                            zip(attribute.func_code.co_freevars,
 
1556
                                attribute.__closure__))
 
1557
                                          ["func"].cell_contents)
 
1558
                    else:
 
1559
                        nonmethod_func = (dict(
 
1560
                            zip(attribute.__code__.co_freevars,
 
1561
                                attribute.__closure__))
 
1562
                                          ["func"].cell_contents)
1106
1563
                    # Create a new, but exactly alike, function
1107
1564
                    # object, and decorate it to be a new D-Bus signal
1108
1565
                    # with the alternate D-Bus interface name
 
1566
                    new_function = copy_function(nonmethod_func)
1109
1567
                    new_function = (dbus.service.signal(
1110
 
                        alt_interface, attribute._dbus_signature)
1111
 
                                    (types.FunctionType(
1112
 
                                        nonmethod_func.func_code,
1113
 
                                        nonmethod_func.func_globals,
1114
 
                                        nonmethod_func.func_name,
1115
 
                                        nonmethod_func.func_defaults,
1116
 
                                        nonmethod_func.func_closure)))
 
1568
                        alt_interface,
 
1569
                        attribute._dbus_signature)(new_function))
1117
1570
                    # Copy annotations, if any
1118
1571
                    try:
1119
1572
                        new_function._dbus_annotations = dict(
1129
1582
                        func1 and func2 to the "call_both" function
1130
1583
                        outside of its arguments"""
1131
1584
                        
 
1585
                        @functools.wraps(func2)
1132
1586
                        def call_both(*args, **kwargs):
1133
1587
                            """This function will emit two D-Bus
1134
1588
                            signals by calling func1 and func2"""
1135
1589
                            func1(*args, **kwargs)
1136
1590
                            func2(*args, **kwargs)
 
1591
                        # Make wrapper function look like a D-Bus signal
 
1592
                        for name, attr in inspect.getmembers(func2):
 
1593
                            if name.startswith("_dbus_"):
 
1594
                                setattr(call_both, name, attr)
1137
1595
                        
1138
1596
                        return call_both
1139
1597
                    # Create the "call_both" function and add it to
1150
1608
                            alt_interface,
1151
1609
                            attribute._dbus_in_signature,
1152
1610
                            attribute._dbus_out_signature)
1153
 
                        (types.FunctionType(attribute.func_code,
1154
 
                                            attribute.func_globals,
1155
 
                                            attribute.func_name,
1156
 
                                            attribute.func_defaults,
1157
 
                                            attribute.func_closure)))
 
1611
                        (copy_function(attribute)))
1158
1612
                    # Copy annotations, if any
1159
1613
                    try:
1160
1614
                        attr[attrname]._dbus_annotations = dict(
1172
1626
                        attribute._dbus_access,
1173
1627
                        attribute._dbus_get_args_options
1174
1628
                        ["byte_arrays"])
1175
 
                                      (types.FunctionType(
1176
 
                                          attribute.func_code,
1177
 
                                          attribute.func_globals,
1178
 
                                          attribute.func_name,
1179
 
                                          attribute.func_defaults,
1180
 
                                          attribute.func_closure)))
 
1629
                                      (copy_function(attribute)))
1181
1630
                    # Copy annotations, if any
1182
1631
                    try:
1183
1632
                        attr[attrname]._dbus_annotations = dict(
1192
1641
                    # to the class.
1193
1642
                    attr[attrname] = (
1194
1643
                        dbus_interface_annotations(alt_interface)
1195
 
                        (types.FunctionType(attribute.func_code,
1196
 
                                            attribute.func_globals,
1197
 
                                            attribute.func_name,
1198
 
                                            attribute.func_defaults,
1199
 
                                            attribute.func_closure)))
 
1644
                        (copy_function(attribute)))
1200
1645
            if deprecate:
1201
1646
                # Deprecate all alternate interfaces
1202
1647
                iname="_AlternateDBusNames_interface_annotation{}"
1215
1660
            if interface_names:
1216
1661
                # Replace the class with a new subclass of it with
1217
1662
                # methods, signals, etc. as created above.
1218
 
                cls = type(b"{}Alternate".format(cls.__name__),
1219
 
                           (cls, ), attr)
 
1663
                if sys.version_info.major == 2:
 
1664
                    cls = type(b"{}Alternate".format(cls.__name__),
 
1665
                               (cls, ), attr)
 
1666
                else:
 
1667
                    cls = type("{}Alternate".format(cls.__name__),
 
1668
                               (cls, ), attr)
1220
1669
        return cls
1221
1670
    
1222
1671
    return wrapper
1343
1792
        Client.__del__(self, *args, **kwargs)
1344
1793
    
1345
1794
    def checker_callback(self, source, condition,
1346
 
                         (connection, command), *args, **kwargs):
 
1795
                         connection, command, *args, **kwargs):
1347
1796
        ret = Client.checker_callback(self, source, condition,
1348
 
                                      (connection, command), *args,
 
1797
                                      connection, command, *args,
1349
1798
                                      **kwargs)
1350
1799
        exitstatus = self.last_checker_status
1351
1800
        if exitstatus >= 0:
1352
1801
            # Emit D-Bus signal
1353
1802
            self.CheckerCompleted(dbus.Int16(exitstatus),
1354
 
                                  dbus.Int64(0),
 
1803
                                  # This is specific to GNU libC
 
1804
                                  dbus.Int64(exitstatus << 8),
1355
1805
                                  dbus.String(command))
1356
1806
        else:
1357
1807
            # Emit D-Bus signal
1358
1808
            self.CheckerCompleted(dbus.Int16(-1),
1359
1809
                                  dbus.Int64(
1360
 
                                      self.last_checker_signal),
 
1810
                                      # This is specific to GNU libC
 
1811
                                      (exitstatus << 8)
 
1812
                                      | self.last_checker_signal),
1361
1813
                                  dbus.String(command))
1362
1814
        return ret
1363
1815
    
1377
1829
    
1378
1830
    def approve(self, value=True):
1379
1831
        self.approved = value
1380
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1381
 
                                * 1000), self._reset_approved)
 
1832
        GLib.timeout_add(int(self.approval_duration.total_seconds()
 
1833
                             * 1000), self._reset_approved)
1382
1834
        self.send_changedstate()
1383
1835
    
1384
1836
    ## D-Bus methods, signals & properties
1440
1892
        self.checked_ok()
1441
1893
    
1442
1894
    # Enable - method
 
1895
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1443
1896
    @dbus.service.method(_interface)
1444
1897
    def Enable(self):
1445
1898
        "D-Bus method"
1446
1899
        self.enable()
1447
1900
    
1448
1901
    # StartChecker - method
 
1902
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1449
1903
    @dbus.service.method(_interface)
1450
1904
    def StartChecker(self):
1451
1905
        "D-Bus method"
1452
1906
        self.start_checker()
1453
1907
    
1454
1908
    # Disable - method
 
1909
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1455
1910
    @dbus.service.method(_interface)
1456
1911
    def Disable(self):
1457
1912
        "D-Bus method"
1458
1913
        self.disable()
1459
1914
    
1460
1915
    # StopChecker - method
 
1916
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1461
1917
    @dbus.service.method(_interface)
1462
1918
    def StopChecker(self):
1463
1919
        self.stop_checker()
1499
1955
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1500
1956
    
1501
1957
    # Name - property
 
1958
    @dbus_annotations(
 
1959
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1502
1960
    @dbus_service_property(_interface, signature="s", access="read")
1503
1961
    def Name_dbus_property(self):
1504
1962
        return dbus.String(self.name)
1505
1963
    
1506
1964
    # Fingerprint - property
 
1965
    @dbus_annotations(
 
1966
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1507
1967
    @dbus_service_property(_interface, signature="s", access="read")
1508
1968
    def Fingerprint_dbus_property(self):
1509
1969
        return dbus.String(self.fingerprint)
1518
1978
        self.host = str(value)
1519
1979
    
1520
1980
    # Created - property
 
1981
    @dbus_annotations(
 
1982
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1521
1983
    @dbus_service_property(_interface, signature="s", access="read")
1522
1984
    def Created_dbus_property(self):
1523
1985
        return datetime_to_dbus(self.created)
1584
2046
                if (getattr(self, "disable_initiator_tag", None)
1585
2047
                    is None):
1586
2048
                    return
1587
 
                gobject.source_remove(self.disable_initiator_tag)
1588
 
                self.disable_initiator_tag = gobject.timeout_add(
 
2049
                GLib.source_remove(self.disable_initiator_tag)
 
2050
                self.disable_initiator_tag = GLib.timeout_add(
1589
2051
                    int((self.expires - now).total_seconds() * 1000),
1590
2052
                    self.disable)
1591
2053
    
1611
2073
            return
1612
2074
        if self.enabled:
1613
2075
            # Reschedule checker run
1614
 
            gobject.source_remove(self.checker_initiator_tag)
1615
 
            self.checker_initiator_tag = gobject.timeout_add(
 
2076
            GLib.source_remove(self.checker_initiator_tag)
 
2077
            self.checker_initiator_tag = GLib.timeout_add(
1616
2078
                value, self.start_checker)
1617
2079
            self.start_checker() # Start one now, too
1618
2080
    
1638
2100
            self.stop_checker()
1639
2101
    
1640
2102
    # ObjectPath - property
 
2103
    @dbus_annotations(
 
2104
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2105
         "org.freedesktop.DBus.Deprecated": "true"})
1641
2106
    @dbus_service_property(_interface, signature="o", access="read")
1642
2107
    def ObjectPath_dbus_property(self):
1643
2108
        return self.dbus_object_path # is already a dbus.ObjectPath
1644
2109
    
1645
2110
    # Secret = property
 
2111
    @dbus_annotations(
 
2112
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2113
         "invalidates"})
1646
2114
    @dbus_service_property(_interface,
1647
2115
                           signature="ay",
1648
2116
                           access="write",
1658
2126
        self._pipe = child_pipe
1659
2127
        self._pipe.send(('init', fpr, address))
1660
2128
        if not self._pipe.recv():
1661
 
            raise KeyError()
 
2129
            raise KeyError(fpr)
1662
2130
    
1663
2131
    def __getattribute__(self, name):
1664
2132
        if name == '_pipe':
1694
2162
            logger.debug("Pipe FD: %d",
1695
2163
                         self.server.child_pipe.fileno())
1696
2164
            
1697
 
            session = gnutls.connection.ClientSession(
1698
 
                self.request, gnutls.connection .X509Credentials())
1699
 
            
1700
 
            # Note: gnutls.connection.X509Credentials is really a
1701
 
            # generic GnuTLS certificate credentials object so long as
1702
 
            # no X.509 keys are added to it.  Therefore, we can use it
1703
 
            # here despite using OpenPGP certificates.
 
2165
            session = gnutls.ClientSession(self.request)
1704
2166
            
1705
2167
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1706
2168
            #                      "+AES-256-CBC", "+SHA1",
1710
2172
            priority = self.server.gnutls_priority
1711
2173
            if priority is None:
1712
2174
                priority = "NORMAL"
1713
 
            gnutls.library.functions.gnutls_priority_set_direct(
1714
 
                session._c_object, priority, None)
 
2175
            gnutls.priority_set_direct(session._c_object, priority,
 
2176
                                       None)
1715
2177
            
1716
2178
            # Start communication using the Mandos protocol
1717
2179
            # Get protocol number
1727
2189
            # Start GnuTLS connection
1728
2190
            try:
1729
2191
                session.handshake()
1730
 
            except gnutls.errors.GNUTLSError as error:
 
2192
            except gnutls.Error as error:
1731
2193
                logger.warning("Handshake failed: %s", error)
1732
2194
                # Do not run session.bye() here: the session is not
1733
2195
                # established.  Just abandon the request.
1739
2201
                try:
1740
2202
                    fpr = self.fingerprint(
1741
2203
                        self.peer_certificate(session))
1742
 
                except (TypeError,
1743
 
                        gnutls.errors.GNUTLSError) as error:
 
2204
                except (TypeError, gnutls.Error) as error:
1744
2205
                    logger.warning("Bad certificate: %s", error)
1745
2206
                    return
1746
2207
                logger.debug("Fingerprint: %s", fpr)
1804
2265
                    else:
1805
2266
                        delay -= time2 - time
1806
2267
                
1807
 
                sent_size = 0
1808
 
                while sent_size < len(client.secret):
1809
 
                    try:
1810
 
                        sent = session.send(client.secret[sent_size:])
1811
 
                    except gnutls.errors.GNUTLSError as error:
1812
 
                        logger.warning("gnutls send failed",
1813
 
                                       exc_info=error)
1814
 
                        return
1815
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1816
 
                                 len(client.secret) - (sent_size
1817
 
                                                       + sent))
1818
 
                    sent_size += sent
 
2268
                try:
 
2269
                    session.send(client.secret)
 
2270
                except gnutls.Error as error:
 
2271
                    logger.warning("gnutls send failed",
 
2272
                                   exc_info = error)
 
2273
                    return
1819
2274
                
1820
2275
                logger.info("Sending secret to %s", client.name)
1821
2276
                # bump the timeout using extended_timeout
1829
2284
                    client.approvals_pending -= 1
1830
2285
                try:
1831
2286
                    session.bye()
1832
 
                except gnutls.errors.GNUTLSError as error:
 
2287
                except gnutls.Error as error:
1833
2288
                    logger.warning("GnuTLS bye failed",
1834
2289
                                   exc_info=error)
1835
2290
    
1837
2292
    def peer_certificate(session):
1838
2293
        "Return the peer's OpenPGP certificate as a bytestring"
1839
2294
        # If not an OpenPGP certificate...
1840
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1841
 
                session._c_object)
1842
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1843
 
            # ...do the normal thing
1844
 
            return session.peer_certificate
 
2295
        if (gnutls.certificate_type_get(session._c_object)
 
2296
            != gnutls.CRT_OPENPGP):
 
2297
            # ...return invalid data
 
2298
            return b""
1845
2299
        list_size = ctypes.c_uint(1)
1846
 
        cert_list = (gnutls.library.functions
1847
 
                     .gnutls_certificate_get_peers
 
2300
        cert_list = (gnutls.certificate_get_peers
1848
2301
                     (session._c_object, ctypes.byref(list_size)))
1849
2302
        if not bool(cert_list) and list_size.value != 0:
1850
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1851
 
                                            " certificate")
 
2303
            raise gnutls.Error("error getting peer certificate")
1852
2304
        if list_size.value == 0:
1853
2305
            return None
1854
2306
        cert = cert_list[0]
1858
2310
    def fingerprint(openpgp):
1859
2311
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1860
2312
        # New GnuTLS "datum" with the OpenPGP public key
1861
 
        datum = gnutls.library.types.gnutls_datum_t(
 
2313
        datum = gnutls.datum_t(
1862
2314
            ctypes.cast(ctypes.c_char_p(openpgp),
1863
2315
                        ctypes.POINTER(ctypes.c_ubyte)),
1864
2316
            ctypes.c_uint(len(openpgp)))
1865
2317
        # New empty GnuTLS certificate
1866
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1867
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1868
 
            ctypes.byref(crt))
 
2318
        crt = gnutls.openpgp_crt_t()
 
2319
        gnutls.openpgp_crt_init(ctypes.byref(crt))
1869
2320
        # Import the OpenPGP public key into the certificate
1870
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1871
 
            crt, ctypes.byref(datum),
1872
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
2321
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2322
                                  gnutls.OPENPGP_FMT_RAW)
1873
2323
        # Verify the self signature in the key
1874
2324
        crtverify = ctypes.c_uint()
1875
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1876
 
            crt, 0, ctypes.byref(crtverify))
 
2325
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2326
                                       ctypes.byref(crtverify))
1877
2327
        if crtverify.value != 0:
1878
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1879
 
            raise gnutls.errors.CertificateSecurityError(
1880
 
                "Verify failed")
 
2328
            gnutls.openpgp_crt_deinit(crt)
 
2329
            raise gnutls.CertificateSecurityError("Verify failed")
1881
2330
        # New buffer for the fingerprint
1882
2331
        buf = ctypes.create_string_buffer(20)
1883
2332
        buf_len = ctypes.c_size_t()
1884
2333
        # Get the fingerprint from the certificate into the buffer
1885
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1886
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
2334
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2335
                                           ctypes.byref(buf_len))
1887
2336
        # Deinit the certificate
1888
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2337
        gnutls.openpgp_crt_deinit(crt)
1889
2338
        # Convert the buffer to a Python bytestring
1890
2339
        fpr = ctypes.string_at(buf, buf_len.value)
1891
2340
        # Convert the bytestring to hexadecimal notation
2035
2484
        gnutls_priority GnuTLS priority string
2036
2485
        use_dbus:       Boolean; to emit D-Bus signals or not
2037
2486
    
2038
 
    Assumes a gobject.MainLoop event loop.
 
2487
    Assumes a GLib.MainLoop event loop.
2039
2488
    """
2040
2489
    
2041
2490
    def __init__(self, server_address, RequestHandlerClass,
2066
2515
    
2067
2516
    def add_pipe(self, parent_pipe, proc):
2068
2517
        # Call "handle_ipc" for both data and EOF events
2069
 
        gobject.io_add_watch(
 
2518
        GLib.io_add_watch(
2070
2519
            parent_pipe.fileno(),
2071
 
            gobject.IO_IN | gobject.IO_HUP,
 
2520
            GLib.IO_IN | GLib.IO_HUP,
2072
2521
            functools.partial(self.handle_ipc,
2073
2522
                              parent_pipe = parent_pipe,
2074
2523
                              proc = proc))
2078
2527
                   proc = None,
2079
2528
                   client_object=None):
2080
2529
        # error, or the other end of multiprocessing.Pipe has closed
2081
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2530
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
2082
2531
            # Wait for other process to exit
2083
2532
            proc.join()
2084
2533
            return False
2091
2540
            fpr = request[1]
2092
2541
            address = request[2]
2093
2542
            
2094
 
            for c in self.clients.itervalues():
 
2543
            for c in self.clients.values():
2095
2544
                if c.fingerprint == fpr:
2096
2545
                    client = c
2097
2546
                    break
2105
2554
                parent_pipe.send(False)
2106
2555
                return False
2107
2556
            
2108
 
            gobject.io_add_watch(
 
2557
            GLib.io_add_watch(
2109
2558
                parent_pipe.fileno(),
2110
 
                gobject.IO_IN | gobject.IO_HUP,
 
2559
                GLib.IO_IN | GLib.IO_HUP,
2111
2560
                functools.partial(self.handle_ipc,
2112
2561
                                  parent_pipe = parent_pipe,
2113
2562
                                  proc = proc,
2127
2576
        
2128
2577
        if command == 'getattr':
2129
2578
            attrname = request[1]
2130
 
            if callable(client_object.__getattribute__(attrname)):
 
2579
            if isinstance(client_object.__getattribute__(attrname),
 
2580
                          collections.Callable):
2131
2581
                parent_pipe.send(('function', ))
2132
2582
            else:
2133
2583
                parent_pipe.send((
2168
2618
    # avoid excessive use of external libraries.
2169
2619
    
2170
2620
    # New type for defining tokens, syntax, and semantics all-in-one
2171
 
    Token = collections.namedtuple("Token",
2172
 
                                   ("regexp", # To match token; if
2173
 
                                              # "value" is not None,
2174
 
                                              # must have a "group"
2175
 
                                              # containing digits
2176
 
                                    "value",  # datetime.timedelta or
2177
 
                                              # None
2178
 
                                    "followers")) # Tokens valid after
2179
 
                                                  # this token
2180
2621
    Token = collections.namedtuple("Token", (
2181
2622
        "regexp",  # To match token; if "value" is not None, must have
2182
2623
                   # a "group" containing digits
2217
2658
    # Define starting values
2218
2659
    value = datetime.timedelta() # Value so far
2219
2660
    found_token = None
2220
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2661
    followers = frozenset((token_duration, )) # Following valid tokens
2221
2662
    s = duration                # String left to parse
2222
2663
    # Loop until end token is found
2223
2664
    while found_token is not token_end:
2240
2681
                break
2241
2682
        else:
2242
2683
            # No currently valid tokens were found
2243
 
            raise ValueError("Invalid RFC 3339 duration")
 
2684
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2685
                             .format(duration))
2244
2686
    # End token found
2245
2687
    return value
2246
2688
 
2379
2821
                        "debug": "False",
2380
2822
                        "priority":
2381
2823
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2382
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2824
                        ":+SIGN-DSA-SHA256",
2383
2825
                        "servicename": "Mandos",
2384
2826
                        "use_dbus": "True",
2385
2827
                        "use_ipv6": "True",
2497
2939
            pidfilename = "/var/run/mandos.pid"
2498
2940
        pidfile = None
2499
2941
        try:
2500
 
            pidfile = open(pidfilename, "w")
 
2942
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2501
2943
        except IOError as e:
2502
2944
            logger.error("Could not open file %r", pidfilename,
2503
2945
                         exc_info=e)
2504
2946
    
2505
 
    for name in ("_mandos", "mandos", "nobody"):
 
2947
    for name, group in (("_mandos", "_mandos"),
 
2948
                        ("mandos", "mandos"),
 
2949
                        ("nobody", "nogroup")):
2506
2950
        try:
2507
2951
            uid = pwd.getpwnam(name).pw_uid
2508
 
            gid = pwd.getpwnam(name).pw_gid
 
2952
            gid = pwd.getpwnam(group).pw_gid
2509
2953
            break
2510
2954
        except KeyError:
2511
2955
            continue
2515
2959
    try:
2516
2960
        os.setgid(gid)
2517
2961
        os.setuid(uid)
 
2962
        if debug:
 
2963
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2964
                                                             gid))
2518
2965
    except OSError as error:
 
2966
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
2967
                       .format(uid, gid, os.strerror(error.errno)))
2519
2968
        if error.errno != errno.EPERM:
2520
2969
            raise
2521
2970
    
2524
2973
        
2525
2974
        # "Use a log level over 10 to enable all debugging options."
2526
2975
        # - GnuTLS manual
2527
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2976
        gnutls.global_set_log_level(11)
2528
2977
        
2529
 
        @gnutls.library.types.gnutls_log_func
 
2978
        @gnutls.log_func
2530
2979
        def debug_gnutls(level, string):
2531
2980
            logger.debug("GnuTLS: %s", string[:-1])
2532
2981
        
2533
 
        gnutls.library.functions.gnutls_global_set_log_function(
2534
 
            debug_gnutls)
 
2982
        gnutls.global_set_log_function(debug_gnutls)
2535
2983
        
2536
2984
        # Redirect stdin so all checkers get /dev/null
2537
2985
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2544
2992
        # Close all input and output, do double fork, etc.
2545
2993
        daemon()
2546
2994
    
2547
 
    # multiprocessing will use threads, so before we use gobject we
2548
 
    # need to inform gobject that threads will be used.
2549
 
    gobject.threads_init()
 
2995
    # multiprocessing will use threads, so before we use GLib we need
 
2996
    # to inform GLib that threads will be used.
 
2997
    GLib.threads_init()
2550
2998
    
2551
2999
    global main_loop
2552
3000
    # From the Avahi example code
2553
3001
    DBusGMainLoop(set_as_default=True)
2554
 
    main_loop = gobject.MainLoop()
 
3002
    main_loop = GLib.MainLoop()
2555
3003
    bus = dbus.SystemBus()
2556
3004
    # End of Avahi example code
2557
3005
    if use_dbus:
2562
3010
            old_bus_name = dbus.service.BusName(
2563
3011
                "se.bsnet.fukt.Mandos", bus,
2564
3012
                do_not_queue=True)
2565
 
        except dbus.exceptions.NameExistsException as e:
 
3013
        except dbus.exceptions.DBusException as e:
2566
3014
            logger.error("Disabling D-Bus:", exc_info=e)
2567
3015
            use_dbus = False
2568
3016
            server_settings["use_dbus"] = False
2601
3049
    if server_settings["restore"]:
2602
3050
        try:
2603
3051
            with open(stored_state_path, "rb") as stored_state:
2604
 
                clients_data, old_client_settings = pickle.load(
2605
 
                    stored_state)
 
3052
                if sys.version_info.major == 2:                
 
3053
                    clients_data, old_client_settings = pickle.load(
 
3054
                        stored_state)
 
3055
                else:
 
3056
                    bytes_clients_data, bytes_old_client_settings = (
 
3057
                        pickle.load(stored_state, encoding = "bytes"))
 
3058
                    ### Fix bytes to strings
 
3059
                    ## clients_data
 
3060
                    # .keys()
 
3061
                    clients_data = { (key.decode("utf-8")
 
3062
                                      if isinstance(key, bytes)
 
3063
                                      else key): value
 
3064
                                     for key, value in
 
3065
                                     bytes_clients_data.items() }
 
3066
                    del bytes_clients_data
 
3067
                    for key in clients_data:
 
3068
                        value = { (k.decode("utf-8")
 
3069
                                   if isinstance(k, bytes) else k): v
 
3070
                                  for k, v in
 
3071
                                  clients_data[key].items() }
 
3072
                        clients_data[key] = value
 
3073
                        # .client_structure
 
3074
                        value["client_structure"] = [
 
3075
                            (s.decode("utf-8")
 
3076
                             if isinstance(s, bytes)
 
3077
                             else s) for s in
 
3078
                            value["client_structure"] ]
 
3079
                        # .name & .host
 
3080
                        for k in ("name", "host"):
 
3081
                            if isinstance(value[k], bytes):
 
3082
                                value[k] = value[k].decode("utf-8")
 
3083
                    ## old_client_settings
 
3084
                    # .keys()
 
3085
                    old_client_settings = {
 
3086
                        (key.decode("utf-8")
 
3087
                         if isinstance(key, bytes)
 
3088
                         else key): value
 
3089
                        for key, value in
 
3090
                        bytes_old_client_settings.items() }
 
3091
                    del bytes_old_client_settings
 
3092
                    # .host
 
3093
                    for value in old_client_settings.values():
 
3094
                        if isinstance(value["host"], bytes):
 
3095
                            value["host"] = (value["host"]
 
3096
                                             .decode("utf-8"))
2606
3097
            os.remove(stored_state_path)
2607
3098
        except IOError as e:
2608
3099
            if e.errno == errno.ENOENT:
2699
3190
    
2700
3191
    if not foreground:
2701
3192
        if pidfile is not None:
 
3193
            pid = os.getpid()
2702
3194
            try:
2703
3195
                with pidfile:
2704
 
                    pid = os.getpid()
2705
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
3196
                    print(pid, file=pidfile)
2706
3197
            except IOError:
2707
3198
                logger.error("Could not write to file %r with PID %d",
2708
3199
                             pidfilename, pid)
2709
3200
        del pidfile
2710
3201
        del pidfilename
2711
3202
    
2712
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2713
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
3203
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
3204
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
3205
                             lambda: main_loop.quit() and False)
2714
3206
    
2715
3207
    if use_dbus:
2716
3208
        
2717
3209
        @alternate_dbus_interfaces(
2718
3210
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2719
 
        class MandosDBusService(DBusObjectWithProperties):
 
3211
        class MandosDBusService(DBusObjectWithObjectManager):
2720
3212
            """A D-Bus proxy object"""
2721
3213
            
2722
3214
            def __init__(self):
2724
3216
            
2725
3217
            _interface = "se.recompile.Mandos"
2726
3218
            
2727
 
            @dbus_interface_annotations(_interface)
2728
 
            def _foo(self):
2729
 
                return {
2730
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2731
 
                    "false" }
2732
 
            
2733
3219
            @dbus.service.signal(_interface, signature="o")
2734
3220
            def ClientAdded(self, objpath):
2735
3221
                "D-Bus signal"
2740
3226
                "D-Bus signal"
2741
3227
                pass
2742
3228
            
 
3229
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3230
                               "true"})
2743
3231
            @dbus.service.signal(_interface, signature="os")
2744
3232
            def ClientRemoved(self, objpath, name):
2745
3233
                "D-Bus signal"
2746
3234
                pass
2747
3235
            
 
3236
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3237
                               "true"})
2748
3238
            @dbus.service.method(_interface, out_signature="ao")
2749
3239
            def GetAllClients(self):
2750
3240
                "D-Bus method"
2751
3241
                return dbus.Array(c.dbus_object_path for c in
2752
 
                                  tcp_server.clients.itervalues())
 
3242
                                  tcp_server.clients.values())
2753
3243
            
 
3244
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3245
                               "true"})
2754
3246
            @dbus.service.method(_interface,
2755
3247
                                 out_signature="a{oa{sv}}")
2756
3248
            def GetAllClientsWithProperties(self):
2757
3249
                "D-Bus method"
2758
3250
                return dbus.Dictionary(
2759
 
                    { c.dbus_object_path: c.GetAll("")
2760
 
                      for c in tcp_server.clients.itervalues() },
 
3251
                    { c.dbus_object_path: c.GetAll(
 
3252
                        "se.recompile.Mandos.Client")
 
3253
                      for c in tcp_server.clients.values() },
2761
3254
                    signature="oa{sv}")
2762
3255
            
2763
3256
            @dbus.service.method(_interface, in_signature="o")
2764
3257
            def RemoveClient(self, object_path):
2765
3258
                "D-Bus method"
2766
 
                for c in tcp_server.clients.itervalues():
 
3259
                for c in tcp_server.clients.values():
2767
3260
                    if c.dbus_object_path == object_path:
2768
3261
                        del tcp_server.clients[c.name]
2769
3262
                        c.remove_from_connection()
2770
 
                        # Don't signal anything except ClientRemoved
 
3263
                        # Don't signal the disabling
2771
3264
                        c.disable(quiet=True)
2772
 
                        # Emit D-Bus signal
2773
 
                        self.ClientRemoved(object_path, c.name)
 
3265
                        # Emit D-Bus signal for removal
 
3266
                        self.client_removed_signal(c)
2774
3267
                        return
2775
3268
                raise KeyError(object_path)
2776
3269
            
2777
3270
            del _interface
 
3271
            
 
3272
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3273
                                 out_signature = "a{oa{sa{sv}}}")
 
3274
            def GetManagedObjects(self):
 
3275
                """D-Bus method"""
 
3276
                return dbus.Dictionary(
 
3277
                    { client.dbus_object_path:
 
3278
                      dbus.Dictionary(
 
3279
                          { interface: client.GetAll(interface)
 
3280
                            for interface in
 
3281
                                 client._get_all_interface_names()})
 
3282
                      for client in tcp_server.clients.values()})
 
3283
            
 
3284
            def client_added_signal(self, client):
 
3285
                """Send the new standard signal and the old signal"""
 
3286
                if use_dbus:
 
3287
                    # New standard signal
 
3288
                    self.InterfacesAdded(
 
3289
                        client.dbus_object_path,
 
3290
                        dbus.Dictionary(
 
3291
                            { interface: client.GetAll(interface)
 
3292
                              for interface in
 
3293
                              client._get_all_interface_names()}))
 
3294
                    # Old signal
 
3295
                    self.ClientAdded(client.dbus_object_path)
 
3296
            
 
3297
            def client_removed_signal(self, client):
 
3298
                """Send the new standard signal and the old signal"""
 
3299
                if use_dbus:
 
3300
                    # New standard signal
 
3301
                    self.InterfacesRemoved(
 
3302
                        client.dbus_object_path,
 
3303
                        client._get_all_interface_names())
 
3304
                    # Old signal
 
3305
                    self.ClientRemoved(client.dbus_object_path,
 
3306
                                       client.name)
2778
3307
        
2779
3308
        mandos_dbus_service = MandosDBusService()
2780
3309
    
2793
3322
        # removed/edited, old secret will thus be unrecovable.
2794
3323
        clients = {}
2795
3324
        with PGPEngine() as pgp:
2796
 
            for client in tcp_server.clients.itervalues():
 
3325
            for client in tcp_server.clients.values():
2797
3326
                key = client_settings[client.name]["secret"]
2798
3327
                client.encrypted_secret = pgp.encrypt(client.secret,
2799
3328
                                                      key)
2823
3352
                    prefix='clients-',
2824
3353
                    dir=os.path.dirname(stored_state_path),
2825
3354
                    delete=False) as stored_state:
2826
 
                pickle.dump((clients, client_settings), stored_state)
 
3355
                pickle.dump((clients, client_settings), stored_state,
 
3356
                            protocol = 2)
2827
3357
                tempname = stored_state.name
2828
3358
            os.rename(tempname, stored_state_path)
2829
3359
        except (IOError, OSError) as e:
2845
3375
            name, client = tcp_server.clients.popitem()
2846
3376
            if use_dbus:
2847
3377
                client.remove_from_connection()
2848
 
            # Don't signal anything except ClientRemoved
 
3378
            # Don't signal the disabling
2849
3379
            client.disable(quiet=True)
 
3380
            # Emit D-Bus signal for removal
2850
3381
            if use_dbus:
2851
 
                # Emit D-Bus signal
2852
 
                mandos_dbus_service.ClientRemoved(
2853
 
                    client.dbus_object_path, client.name)
 
3382
                mandos_dbus_service.client_removed_signal(client)
2854
3383
        client_settings.clear()
2855
3384
    
2856
3385
    atexit.register(cleanup)
2857
3386
    
2858
 
    for client in tcp_server.clients.itervalues():
 
3387
    for client in tcp_server.clients.values():
2859
3388
        if use_dbus:
2860
 
            # Emit D-Bus signal
2861
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3389
            # Emit D-Bus signal for adding
 
3390
            mandos_dbus_service.client_added_signal(client)
2862
3391
        # Need to initiate checking of clients
2863
3392
        if client.enabled:
2864
3393
            client.init_checker()
2890
3419
                sys.exit(1)
2891
3420
            # End of Avahi example code
2892
3421
        
2893
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2894
 
                             lambda *args, **kwargs:
2895
 
                             (tcp_server.handle_request
2896
 
                              (*args[2:], **kwargs) or True))
 
3422
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3423
                          lambda *args, **kwargs:
 
3424
                          (tcp_server.handle_request
 
3425
                           (*args[2:], **kwargs) or True))
2897
3426
        
2898
3427
        logger.debug("Starting main loop")
2899
3428
        main_loop.run()