/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:
82
79
 
83
80
import dbus
84
81
import dbus.service
85
 
try:
86
 
    import gobject
87
 
except ImportError:
88
 
    from gi.repository import GObject as gobject
89
 
import avahi
 
82
from gi.repository import GLib
90
83
from dbus.mainloop.glib import DBusGMainLoop
91
84
import ctypes
92
85
import ctypes.util
104
97
if sys.version_info.major == 2:
105
98
    str = unicode
106
99
 
107
 
version = "1.6.9"
 
100
version = "1.7.7"
108
101
stored_state_file = "clients.pickle"
109
102
 
110
103
logger = logging.getLogger()
125
118
        return interface_index
126
119
 
127
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
 
128
137
def initlogger(debug, level=logging.WARNING):
129
138
    """init logger and add loglevel"""
130
139
    
157
166
    
158
167
    def __init__(self):
159
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
160
180
        self.gnupgargs = ['--batch',
161
 
                          '--home', self.tempdir,
 
181
                          '--homedir', self.tempdir,
162
182
                          '--force-mdc',
163
183
                          '--quiet',
164
184
                          '--no-use-agent']
203
223
                dir=self.tempdir) as passfile:
204
224
            passfile.write(passphrase)
205
225
            passfile.flush()
206
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
226
            proc = subprocess.Popen([self.gpg, '--symmetric',
207
227
                                     '--passphrase-file',
208
228
                                     passfile.name]
209
229
                                    + self.gnupgargs,
221
241
                dir = self.tempdir) as passfile:
222
242
            passfile.write(passphrase)
223
243
            passfile.flush()
224
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
244
            proc = subprocess.Popen([self.gpg, '--decrypt',
225
245
                                     '--passphrase-file',
226
246
                                     passfile.name]
227
247
                                    + self.gnupgargs,
233
253
            raise PGPError(err)
234
254
        return decrypted_plaintext
235
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()
236
280
 
237
281
class AvahiError(Exception):
238
282
    def __init__(self, value, *args, **kwargs):
435
479
            .format(self.name)))
436
480
        return ret
437
481
 
 
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
 
438
737
def call_pipe(connection,       # : multiprocessing.Connection
439
738
              func, *args, **kwargs):
440
739
    """This function is meant to be called by multiprocessing.Process
455
754
    checker:    subprocess.Popen(); a running checker process used
456
755
                                    to see if the client lives.
457
756
                                    'None' if no process is running.
458
 
    checker_callback_tag: a gobject event source tag, or None
 
757
    checker_callback_tag: a GLib event source tag, or None
459
758
    checker_command: string; External command which is run to check
460
759
                     if client lives.  %() expansions are done at
461
760
                     runtime with vars(self) as dict, so that for
462
761
                     instance %(name)s can be used in the command.
463
 
    checker_initiator_tag: a gobject event source tag, or None
 
762
    checker_initiator_tag: a GLib event source tag, or None
464
763
    created:    datetime.datetime(); (UTC) object creation
465
764
    client_structure: Object describing what attributes a client has
466
765
                      and is used for storing the client at exit
467
766
    current_checker_command: string; current running checker_command
468
 
    disable_initiator_tag: a gobject event source tag, or None
 
767
    disable_initiator_tag: a GLib event source tag, or None
469
768
    enabled:    bool()
470
769
    fingerprint: string (40 or 32 hexadecimal digits); used to
471
770
                 uniquely identify the client
534
833
            client["fingerprint"] = (section["fingerprint"].upper()
535
834
                                     .replace(" ", ""))
536
835
            if "secret" in section:
537
 
                client["secret"] = section["secret"].decode("base64")
 
836
                client["secret"] = codecs.decode(section["secret"]
 
837
                                                 .encode("utf-8"),
 
838
                                                 "base64")
538
839
            elif "secfile" in section:
539
840
                with open(os.path.expanduser(os.path.expandvars
540
841
                                             (section["secfile"])),
593
894
        self.changedstate = multiprocessing_manager.Condition(
594
895
            multiprocessing_manager.Lock())
595
896
        self.client_structure = [attr
596
 
                                 for attr in self.__dict__.iterkeys()
 
897
                                 for attr in self.__dict__.keys()
597
898
                                 if not attr.startswith("_")]
598
899
        self.client_structure.append("client_structure")
599
900
        
625
926
        if not quiet:
626
927
            logger.info("Disabling client %s", self.name)
627
928
        if getattr(self, "disable_initiator_tag", None) is not None:
628
 
            gobject.source_remove(self.disable_initiator_tag)
 
929
            GLib.source_remove(self.disable_initiator_tag)
629
930
            self.disable_initiator_tag = None
630
931
        self.expires = None
631
932
        if getattr(self, "checker_initiator_tag", None) is not None:
632
 
            gobject.source_remove(self.checker_initiator_tag)
 
933
            GLib.source_remove(self.checker_initiator_tag)
633
934
            self.checker_initiator_tag = None
634
935
        self.stop_checker()
635
936
        self.enabled = False
636
937
        if not quiet:
637
938
            self.send_changedstate()
638
 
        # 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
639
940
        return False
640
941
    
641
942
    def __del__(self):
645
946
        # Schedule a new checker to be started an 'interval' from now,
646
947
        # and every interval from then on.
647
948
        if self.checker_initiator_tag is not None:
648
 
            gobject.source_remove(self.checker_initiator_tag)
649
 
        self.checker_initiator_tag = gobject.timeout_add(
 
949
            GLib.source_remove(self.checker_initiator_tag)
 
950
        self.checker_initiator_tag = GLib.timeout_add(
650
951
            int(self.interval.total_seconds() * 1000),
651
952
            self.start_checker)
652
953
        # Schedule a disable() when 'timeout' has passed
653
954
        if self.disable_initiator_tag is not None:
654
 
            gobject.source_remove(self.disable_initiator_tag)
655
 
        self.disable_initiator_tag = gobject.timeout_add(
 
955
            GLib.source_remove(self.disable_initiator_tag)
 
956
        self.disable_initiator_tag = GLib.timeout_add(
656
957
            int(self.timeout.total_seconds() * 1000), self.disable)
657
958
        # Also start a new checker *right now*.
658
959
        self.start_checker()
694
995
        if timeout is None:
695
996
            timeout = self.timeout
696
997
        if self.disable_initiator_tag is not None:
697
 
            gobject.source_remove(self.disable_initiator_tag)
 
998
            GLib.source_remove(self.disable_initiator_tag)
698
999
            self.disable_initiator_tag = None
699
1000
        if getattr(self, "enabled", False):
700
 
            self.disable_initiator_tag = gobject.timeout_add(
 
1001
            self.disable_initiator_tag = GLib.timeout_add(
701
1002
                int(timeout.total_seconds() * 1000), self.disable)
702
1003
            self.expires = datetime.datetime.utcnow() + timeout
703
1004
    
758
1059
                args = (pipe[1], subprocess.call, command),
759
1060
                kwargs = popen_args)
760
1061
            self.checker.start()
761
 
            self.checker_callback_tag = gobject.io_add_watch(
762
 
                pipe[0].fileno(), gobject.IO_IN,
 
1062
            self.checker_callback_tag = GLib.io_add_watch(
 
1063
                pipe[0].fileno(), GLib.IO_IN,
763
1064
                self.checker_callback, pipe[0], command)
764
 
        # Re-run this periodically if run by gobject.timeout_add
 
1065
        # Re-run this periodically if run by GLib.timeout_add
765
1066
        return True
766
1067
    
767
1068
    def stop_checker(self):
768
1069
        """Force the checker process, if any, to stop."""
769
1070
        if self.checker_callback_tag:
770
 
            gobject.source_remove(self.checker_callback_tag)
 
1071
            GLib.source_remove(self.checker_callback_tag)
771
1072
            self.checker_callback_tag = None
772
1073
        if getattr(self, "checker", None) is None:
773
1074
            return
1154
1455
    def InterfacesAdded(self, object_path, interfaces_and_properties):
1155
1456
        pass
1156
1457
    
1157
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1158
 
                         signature = "oas")
 
1458
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1159
1459
    def InterfacesRemoved(self, object_path, interfaces):
1160
1460
        pass
1161
1461
    
1169
1469
        Override return argument name of GetManagedObjects to be
1170
1470
        "objpath_interfaces_and_properties"
1171
1471
        """
1172
 
        xmlstring = DBusObjectWithAnnotations(self, object_path,
1173
 
                                              connection)
 
1472
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1473
                                                         object_path,
 
1474
                                                         connection)
1174
1475
        try:
1175
1476
            document = xml.dom.minidom.parseString(xmlstring)
1176
1477
            
1247
1548
                interface_names.add(alt_interface)
1248
1549
                # Is this a D-Bus signal?
1249
1550
                if getattr(attribute, "_dbus_is_signal", False):
 
1551
                    # Extract the original non-method undecorated
 
1552
                    # function by black magic
1250
1553
                    if sys.version_info.major == 2:
1251
 
                        # Extract the original non-method undecorated
1252
 
                        # function by black magic
1253
1554
                        nonmethod_func = (dict(
1254
1555
                            zip(attribute.func_code.co_freevars,
1255
1556
                                attribute.__closure__))
1256
1557
                                          ["func"].cell_contents)
1257
1558
                    else:
1258
 
                        nonmethod_func = attribute
 
1559
                        nonmethod_func = (dict(
 
1560
                            zip(attribute.__code__.co_freevars,
 
1561
                                attribute.__closure__))
 
1562
                                          ["func"].cell_contents)
1259
1563
                    # Create a new, but exactly alike, function
1260
1564
                    # object, and decorate it to be a new D-Bus signal
1261
1565
                    # with the alternate D-Bus interface name
1262
 
                    if sys.version_info.major == 2:
1263
 
                        new_function = types.FunctionType(
1264
 
                            nonmethod_func.func_code,
1265
 
                            nonmethod_func.func_globals,
1266
 
                            nonmethod_func.func_name,
1267
 
                            nonmethod_func.func_defaults,
1268
 
                            nonmethod_func.func_closure)
1269
 
                    else:
1270
 
                        new_function = types.FunctionType(
1271
 
                            nonmethod_func.__code__,
1272
 
                            nonmethod_func.__globals__,
1273
 
                            nonmethod_func.__name__,
1274
 
                            nonmethod_func.__defaults__,
1275
 
                            nonmethod_func.__closure__)
 
1566
                    new_function = copy_function(nonmethod_func)
1276
1567
                    new_function = (dbus.service.signal(
1277
1568
                        alt_interface,
1278
1569
                        attribute._dbus_signature)(new_function))
1291
1582
                        func1 and func2 to the "call_both" function
1292
1583
                        outside of its arguments"""
1293
1584
                        
 
1585
                        @functools.wraps(func2)
1294
1586
                        def call_both(*args, **kwargs):
1295
1587
                            """This function will emit two D-Bus
1296
1588
                            signals by calling func1 and func2"""
1297
1589
                            func1(*args, **kwargs)
1298
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)
1299
1595
                        
1300
1596
                        return call_both
1301
1597
                    # Create the "call_both" function and add it to
1312
1608
                            alt_interface,
1313
1609
                            attribute._dbus_in_signature,
1314
1610
                            attribute._dbus_out_signature)
1315
 
                        (types.FunctionType(attribute.func_code,
1316
 
                                            attribute.func_globals,
1317
 
                                            attribute.func_name,
1318
 
                                            attribute.func_defaults,
1319
 
                                            attribute.func_closure)))
 
1611
                        (copy_function(attribute)))
1320
1612
                    # Copy annotations, if any
1321
1613
                    try:
1322
1614
                        attr[attrname]._dbus_annotations = dict(
1334
1626
                        attribute._dbus_access,
1335
1627
                        attribute._dbus_get_args_options
1336
1628
                        ["byte_arrays"])
1337
 
                                      (types.FunctionType(
1338
 
                                          attribute.func_code,
1339
 
                                          attribute.func_globals,
1340
 
                                          attribute.func_name,
1341
 
                                          attribute.func_defaults,
1342
 
                                          attribute.func_closure)))
 
1629
                                      (copy_function(attribute)))
1343
1630
                    # Copy annotations, if any
1344
1631
                    try:
1345
1632
                        attr[attrname]._dbus_annotations = dict(
1354
1641
                    # to the class.
1355
1642
                    attr[attrname] = (
1356
1643
                        dbus_interface_annotations(alt_interface)
1357
 
                        (types.FunctionType(attribute.func_code,
1358
 
                                            attribute.func_globals,
1359
 
                                            attribute.func_name,
1360
 
                                            attribute.func_defaults,
1361
 
                                            attribute.func_closure)))
 
1644
                        (copy_function(attribute)))
1362
1645
            if deprecate:
1363
1646
                # Deprecate all alternate interfaces
1364
1647
                iname="_AlternateDBusNames_interface_annotation{}"
1377
1660
            if interface_names:
1378
1661
                # Replace the class with a new subclass of it with
1379
1662
                # methods, signals, etc. as created above.
1380
 
                cls = type(b"{}Alternate".format(cls.__name__),
1381
 
                           (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)
1382
1669
        return cls
1383
1670
    
1384
1671
    return wrapper
1542
1829
    
1543
1830
    def approve(self, value=True):
1544
1831
        self.approved = value
1545
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1546
 
                                * 1000), self._reset_approved)
 
1832
        GLib.timeout_add(int(self.approval_duration.total_seconds()
 
1833
                             * 1000), self._reset_approved)
1547
1834
        self.send_changedstate()
1548
1835
    
1549
1836
    ## D-Bus methods, signals & properties
1759
2046
                if (getattr(self, "disable_initiator_tag", None)
1760
2047
                    is None):
1761
2048
                    return
1762
 
                gobject.source_remove(self.disable_initiator_tag)
1763
 
                self.disable_initiator_tag = gobject.timeout_add(
 
2049
                GLib.source_remove(self.disable_initiator_tag)
 
2050
                self.disable_initiator_tag = GLib.timeout_add(
1764
2051
                    int((self.expires - now).total_seconds() * 1000),
1765
2052
                    self.disable)
1766
2053
    
1786
2073
            return
1787
2074
        if self.enabled:
1788
2075
            # Reschedule checker run
1789
 
            gobject.source_remove(self.checker_initiator_tag)
1790
 
            self.checker_initiator_tag = gobject.timeout_add(
 
2076
            GLib.source_remove(self.checker_initiator_tag)
 
2077
            self.checker_initiator_tag = GLib.timeout_add(
1791
2078
                value, self.start_checker)
1792
2079
            self.start_checker() # Start one now, too
1793
2080
    
1875
2162
            logger.debug("Pipe FD: %d",
1876
2163
                         self.server.child_pipe.fileno())
1877
2164
            
1878
 
            session = gnutls.connection.ClientSession(
1879
 
                self.request, gnutls.connection .X509Credentials())
1880
 
            
1881
 
            # Note: gnutls.connection.X509Credentials is really a
1882
 
            # generic GnuTLS certificate credentials object so long as
1883
 
            # no X.509 keys are added to it.  Therefore, we can use it
1884
 
            # here despite using OpenPGP certificates.
 
2165
            session = gnutls.ClientSession(self.request)
1885
2166
            
1886
2167
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1887
2168
            #                      "+AES-256-CBC", "+SHA1",
1891
2172
            priority = self.server.gnutls_priority
1892
2173
            if priority is None:
1893
2174
                priority = "NORMAL"
1894
 
            gnutls.library.functions.gnutls_priority_set_direct(
1895
 
                session._c_object, priority, None)
 
2175
            gnutls.priority_set_direct(session._c_object, priority,
 
2176
                                       None)
1896
2177
            
1897
2178
            # Start communication using the Mandos protocol
1898
2179
            # Get protocol number
1908
2189
            # Start GnuTLS connection
1909
2190
            try:
1910
2191
                session.handshake()
1911
 
            except gnutls.errors.GNUTLSError as error:
 
2192
            except gnutls.Error as error:
1912
2193
                logger.warning("Handshake failed: %s", error)
1913
2194
                # Do not run session.bye() here: the session is not
1914
2195
                # established.  Just abandon the request.
1920
2201
                try:
1921
2202
                    fpr = self.fingerprint(
1922
2203
                        self.peer_certificate(session))
1923
 
                except (TypeError,
1924
 
                        gnutls.errors.GNUTLSError) as error:
 
2204
                except (TypeError, gnutls.Error) as error:
1925
2205
                    logger.warning("Bad certificate: %s", error)
1926
2206
                    return
1927
2207
                logger.debug("Fingerprint: %s", fpr)
1985
2265
                    else:
1986
2266
                        delay -= time2 - time
1987
2267
                
1988
 
                sent_size = 0
1989
 
                while sent_size < len(client.secret):
1990
 
                    try:
1991
 
                        sent = session.send(client.secret[sent_size:])
1992
 
                    except gnutls.errors.GNUTLSError as error:
1993
 
                        logger.warning("gnutls send failed",
1994
 
                                       exc_info=error)
1995
 
                        return
1996
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1997
 
                                 len(client.secret) - (sent_size
1998
 
                                                       + sent))
1999
 
                    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
2000
2274
                
2001
2275
                logger.info("Sending secret to %s", client.name)
2002
2276
                # bump the timeout using extended_timeout
2010
2284
                    client.approvals_pending -= 1
2011
2285
                try:
2012
2286
                    session.bye()
2013
 
                except gnutls.errors.GNUTLSError as error:
 
2287
                except gnutls.Error as error:
2014
2288
                    logger.warning("GnuTLS bye failed",
2015
2289
                                   exc_info=error)
2016
2290
    
2018
2292
    def peer_certificate(session):
2019
2293
        "Return the peer's OpenPGP certificate as a bytestring"
2020
2294
        # If not an OpenPGP certificate...
2021
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
2022
 
                session._c_object)
2023
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
2024
 
            # ...do the normal thing
2025
 
            return session.peer_certificate
 
2295
        if (gnutls.certificate_type_get(session._c_object)
 
2296
            != gnutls.CRT_OPENPGP):
 
2297
            # ...return invalid data
 
2298
            return b""
2026
2299
        list_size = ctypes.c_uint(1)
2027
 
        cert_list = (gnutls.library.functions
2028
 
                     .gnutls_certificate_get_peers
 
2300
        cert_list = (gnutls.certificate_get_peers
2029
2301
                     (session._c_object, ctypes.byref(list_size)))
2030
2302
        if not bool(cert_list) and list_size.value != 0:
2031
 
            raise gnutls.errors.GNUTLSError("error getting peer"
2032
 
                                            " certificate")
 
2303
            raise gnutls.Error("error getting peer certificate")
2033
2304
        if list_size.value == 0:
2034
2305
            return None
2035
2306
        cert = cert_list[0]
2039
2310
    def fingerprint(openpgp):
2040
2311
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2041
2312
        # New GnuTLS "datum" with the OpenPGP public key
2042
 
        datum = gnutls.library.types.gnutls_datum_t(
 
2313
        datum = gnutls.datum_t(
2043
2314
            ctypes.cast(ctypes.c_char_p(openpgp),
2044
2315
                        ctypes.POINTER(ctypes.c_ubyte)),
2045
2316
            ctypes.c_uint(len(openpgp)))
2046
2317
        # New empty GnuTLS certificate
2047
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
2048
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
2049
 
            ctypes.byref(crt))
 
2318
        crt = gnutls.openpgp_crt_t()
 
2319
        gnutls.openpgp_crt_init(ctypes.byref(crt))
2050
2320
        # Import the OpenPGP public key into the certificate
2051
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
2052
 
            crt, ctypes.byref(datum),
2053
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
2321
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2322
                                  gnutls.OPENPGP_FMT_RAW)
2054
2323
        # Verify the self signature in the key
2055
2324
        crtverify = ctypes.c_uint()
2056
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2057
 
            crt, 0, ctypes.byref(crtverify))
 
2325
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2326
                                       ctypes.byref(crtverify))
2058
2327
        if crtverify.value != 0:
2059
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2060
 
            raise gnutls.errors.CertificateSecurityError(
2061
 
                "Verify failed")
 
2328
            gnutls.openpgp_crt_deinit(crt)
 
2329
            raise gnutls.CertificateSecurityError("Verify failed")
2062
2330
        # New buffer for the fingerprint
2063
2331
        buf = ctypes.create_string_buffer(20)
2064
2332
        buf_len = ctypes.c_size_t()
2065
2333
        # Get the fingerprint from the certificate into the buffer
2066
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2067
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
2334
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2335
                                           ctypes.byref(buf_len))
2068
2336
        # Deinit the certificate
2069
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2337
        gnutls.openpgp_crt_deinit(crt)
2070
2338
        # Convert the buffer to a Python bytestring
2071
2339
        fpr = ctypes.string_at(buf, buf_len.value)
2072
2340
        # Convert the bytestring to hexadecimal notation
2216
2484
        gnutls_priority GnuTLS priority string
2217
2485
        use_dbus:       Boolean; to emit D-Bus signals or not
2218
2486
    
2219
 
    Assumes a gobject.MainLoop event loop.
 
2487
    Assumes a GLib.MainLoop event loop.
2220
2488
    """
2221
2489
    
2222
2490
    def __init__(self, server_address, RequestHandlerClass,
2247
2515
    
2248
2516
    def add_pipe(self, parent_pipe, proc):
2249
2517
        # Call "handle_ipc" for both data and EOF events
2250
 
        gobject.io_add_watch(
 
2518
        GLib.io_add_watch(
2251
2519
            parent_pipe.fileno(),
2252
 
            gobject.IO_IN | gobject.IO_HUP,
 
2520
            GLib.IO_IN | GLib.IO_HUP,
2253
2521
            functools.partial(self.handle_ipc,
2254
2522
                              parent_pipe = parent_pipe,
2255
2523
                              proc = proc))
2259
2527
                   proc = None,
2260
2528
                   client_object=None):
2261
2529
        # error, or the other end of multiprocessing.Pipe has closed
2262
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2530
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
2263
2531
            # Wait for other process to exit
2264
2532
            proc.join()
2265
2533
            return False
2272
2540
            fpr = request[1]
2273
2541
            address = request[2]
2274
2542
            
2275
 
            for c in self.clients.itervalues():
 
2543
            for c in self.clients.values():
2276
2544
                if c.fingerprint == fpr:
2277
2545
                    client = c
2278
2546
                    break
2286
2554
                parent_pipe.send(False)
2287
2555
                return False
2288
2556
            
2289
 
            gobject.io_add_watch(
 
2557
            GLib.io_add_watch(
2290
2558
                parent_pipe.fileno(),
2291
 
                gobject.IO_IN | gobject.IO_HUP,
 
2559
                GLib.IO_IN | GLib.IO_HUP,
2292
2560
                functools.partial(self.handle_ipc,
2293
2561
                                  parent_pipe = parent_pipe,
2294
2562
                                  proc = proc,
2676
2944
            logger.error("Could not open file %r", pidfilename,
2677
2945
                         exc_info=e)
2678
2946
    
2679
 
    for name in ("_mandos", "mandos", "nobody"):
 
2947
    for name, group in (("_mandos", "_mandos"),
 
2948
                        ("mandos", "mandos"),
 
2949
                        ("nobody", "nogroup")):
2680
2950
        try:
2681
2951
            uid = pwd.getpwnam(name).pw_uid
2682
 
            gid = pwd.getpwnam(name).pw_gid
 
2952
            gid = pwd.getpwnam(group).pw_gid
2683
2953
            break
2684
2954
        except KeyError:
2685
2955
            continue
2689
2959
    try:
2690
2960
        os.setgid(gid)
2691
2961
        os.setuid(uid)
 
2962
        if debug:
 
2963
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2964
                                                             gid))
2692
2965
    except OSError as error:
 
2966
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
2967
                       .format(uid, gid, os.strerror(error.errno)))
2693
2968
        if error.errno != errno.EPERM:
2694
2969
            raise
2695
2970
    
2698
2973
        
2699
2974
        # "Use a log level over 10 to enable all debugging options."
2700
2975
        # - GnuTLS manual
2701
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2976
        gnutls.global_set_log_level(11)
2702
2977
        
2703
 
        @gnutls.library.types.gnutls_log_func
 
2978
        @gnutls.log_func
2704
2979
        def debug_gnutls(level, string):
2705
2980
            logger.debug("GnuTLS: %s", string[:-1])
2706
2981
        
2707
 
        gnutls.library.functions.gnutls_global_set_log_function(
2708
 
            debug_gnutls)
 
2982
        gnutls.global_set_log_function(debug_gnutls)
2709
2983
        
2710
2984
        # Redirect stdin so all checkers get /dev/null
2711
2985
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2718
2992
        # Close all input and output, do double fork, etc.
2719
2993
        daemon()
2720
2994
    
2721
 
    # multiprocessing will use threads, so before we use gobject we
2722
 
    # need to inform gobject that threads will be used.
2723
 
    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()
2724
2998
    
2725
2999
    global main_loop
2726
3000
    # From the Avahi example code
2727
3001
    DBusGMainLoop(set_as_default=True)
2728
 
    main_loop = gobject.MainLoop()
 
3002
    main_loop = GLib.MainLoop()
2729
3003
    bus = dbus.SystemBus()
2730
3004
    # End of Avahi example code
2731
3005
    if use_dbus:
2775
3049
    if server_settings["restore"]:
2776
3050
        try:
2777
3051
            with open(stored_state_path, "rb") as stored_state:
2778
 
                clients_data, old_client_settings = pickle.load(
2779
 
                    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"))
2780
3097
            os.remove(stored_state_path)
2781
3098
        except IOError as e:
2782
3099
            if e.errno == errno.ENOENT:
2883
3200
        del pidfile
2884
3201
        del pidfilename
2885
3202
    
2886
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2887
 
    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)
2888
3206
    
2889
3207
    if use_dbus:
2890
3208
        
2921
3239
            def GetAllClients(self):
2922
3240
                "D-Bus method"
2923
3241
                return dbus.Array(c.dbus_object_path for c in
2924
 
                                  tcp_server.clients.itervalues())
 
3242
                                  tcp_server.clients.values())
2925
3243
            
2926
3244
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
2927
3245
                               "true"})
2932
3250
                return dbus.Dictionary(
2933
3251
                    { c.dbus_object_path: c.GetAll(
2934
3252
                        "se.recompile.Mandos.Client")
2935
 
                      for c in tcp_server.clients.itervalues() },
 
3253
                      for c in tcp_server.clients.values() },
2936
3254
                    signature="oa{sv}")
2937
3255
            
2938
3256
            @dbus.service.method(_interface, in_signature="o")
2939
3257
            def RemoveClient(self, object_path):
2940
3258
                "D-Bus method"
2941
 
                for c in tcp_server.clients.itervalues():
 
3259
                for c in tcp_server.clients.values():
2942
3260
                    if c.dbus_object_path == object_path:
2943
3261
                        del tcp_server.clients[c.name]
2944
3262
                        c.remove_from_connection()
3004
3322
        # removed/edited, old secret will thus be unrecovable.
3005
3323
        clients = {}
3006
3324
        with PGPEngine() as pgp:
3007
 
            for client in tcp_server.clients.itervalues():
 
3325
            for client in tcp_server.clients.values():
3008
3326
                key = client_settings[client.name]["secret"]
3009
3327
                client.encrypted_secret = pgp.encrypt(client.secret,
3010
3328
                                                      key)
3034
3352
                    prefix='clients-',
3035
3353
                    dir=os.path.dirname(stored_state_path),
3036
3354
                    delete=False) as stored_state:
3037
 
                pickle.dump((clients, client_settings), stored_state)
 
3355
                pickle.dump((clients, client_settings), stored_state,
 
3356
                            protocol = 2)
3038
3357
                tempname = stored_state.name
3039
3358
            os.rename(tempname, stored_state_path)
3040
3359
        except (IOError, OSError) as e:
3059
3378
            # Don't signal the disabling
3060
3379
            client.disable(quiet=True)
3061
3380
            # Emit D-Bus signal for removal
3062
 
            mandos_dbus_service.client_removed_signal(client)
 
3381
            if use_dbus:
 
3382
                mandos_dbus_service.client_removed_signal(client)
3063
3383
        client_settings.clear()
3064
3384
    
3065
3385
    atexit.register(cleanup)
3066
3386
    
3067
 
    for client in tcp_server.clients.itervalues():
 
3387
    for client in tcp_server.clients.values():
3068
3388
        if use_dbus:
3069
3389
            # Emit D-Bus signal for adding
3070
3390
            mandos_dbus_service.client_added_signal(client)
3099
3419
                sys.exit(1)
3100
3420
            # End of Avahi example code
3101
3421
        
3102
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3103
 
                             lambda *args, **kwargs:
3104
 
                             (tcp_server.handle_request
3105
 
                              (*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))
3106
3426
        
3107
3427
        logger.debug("Starting main loop")
3108
3428
        main_loop.run()