/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2016 Teddy Hogeborn
15
 
# Copyright © 2008-2016 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
try:
38
 
    from future_builtins import *
39
 
except ImportError:
40
 
    pass
 
37
from future_builtins import *
41
38
 
42
39
try:
43
40
    import SocketServer as socketserver
47
44
import argparse
48
45
import datetime
49
46
import errno
 
47
import gnutls.crypto
 
48
import gnutls.connection
 
49
import gnutls.errors
 
50
import gnutls.library.functions
 
51
import gnutls.library.constants
 
52
import gnutls.library.types
50
53
try:
51
54
    import ConfigParser as configparser
52
55
except ImportError:
79
82
 
80
83
import dbus
81
84
import dbus.service
82
 
from gi.repository import GLib
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
 
89
import avahi
83
90
from dbus.mainloop.glib import DBusGMainLoop
84
91
import ctypes
85
92
import ctypes.util
97
104
if sys.version_info.major == 2:
98
105
    str = unicode
99
106
 
100
 
version = "1.7.7"
 
107
version = "1.6.9"
101
108
stored_state_file = "clients.pickle"
102
109
 
103
110
logger = logging.getLogger()
118
125
        return interface_index
119
126
 
120
127
 
121
 
def copy_function(func):
122
 
    """Make a copy of a function"""
123
 
    if sys.version_info.major == 2:
124
 
        return types.FunctionType(func.func_code,
125
 
                                  func.func_globals,
126
 
                                  func.func_name,
127
 
                                  func.func_defaults,
128
 
                                  func.func_closure)
129
 
    else:
130
 
        return types.FunctionType(func.__code__,
131
 
                                  func.__globals__,
132
 
                                  func.__name__,
133
 
                                  func.__defaults__,
134
 
                                  func.__closure__)
135
 
 
136
 
 
137
128
def initlogger(debug, level=logging.WARNING):
138
129
    """init logger and add loglevel"""
139
130
    
166
157
    
167
158
    def __init__(self):
168
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
169
 
        self.gpg = "gpg"
170
 
        try:
171
 
            output = subprocess.check_output(["gpgconf"])
172
 
            for line in output.splitlines():
173
 
                name, text, path = line.split(b":")
174
 
                if name == "gpg":
175
 
                    self.gpg = path
176
 
                    break
177
 
        except OSError as e:
178
 
            if e.errno != errno.ENOENT:
179
 
                raise
180
160
        self.gnupgargs = ['--batch',
181
 
                          '--homedir', self.tempdir,
 
161
                          '--home', self.tempdir,
182
162
                          '--force-mdc',
183
163
                          '--quiet',
184
164
                          '--no-use-agent']
223
203
                dir=self.tempdir) as passfile:
224
204
            passfile.write(passphrase)
225
205
            passfile.flush()
226
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
206
            proc = subprocess.Popen(['gpg', '--symmetric',
227
207
                                     '--passphrase-file',
228
208
                                     passfile.name]
229
209
                                    + self.gnupgargs,
241
221
                dir = self.tempdir) as passfile:
242
222
            passfile.write(passphrase)
243
223
            passfile.flush()
244
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
224
            proc = subprocess.Popen(['gpg', '--decrypt',
245
225
                                     '--passphrase-file',
246
226
                                     passfile.name]
247
227
                                    + self.gnupgargs,
253
233
            raise PGPError(err)
254
234
        return decrypted_plaintext
255
235
 
256
 
# Pretend that we have an Avahi module
257
 
class Avahi(object):
258
 
    """This isn't so much a class as it is a module-like namespace.
259
 
    It is instantiated once, and simulates having an Avahi module."""
260
 
    IF_UNSPEC = -1              # avahi-common/address.h
261
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
262
 
    PROTO_INET = 0              # avahi-common/address.h
263
 
    PROTO_INET6 = 1             # avahi-common/address.h
264
 
    DBUS_NAME = "org.freedesktop.Avahi"
265
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
266
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
267
 
    DBUS_PATH_SERVER = "/"
268
 
    def string_array_to_txt_array(self, t):
269
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
270
 
                           for s in t), signature="ay")
271
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
272
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
273
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
274
 
    SERVER_INVALID = 0          # avahi-common/defs.h
275
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
276
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
277
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
278
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
279
 
avahi = Avahi()
280
236
 
281
237
class AvahiError(Exception):
282
238
    def __init__(self, value, *args, **kwargs):
479
435
            .format(self.name)))
480
436
        return ret
481
437
 
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
438
def call_pipe(connection,       # : multiprocessing.Connection
738
439
              func, *args, **kwargs):
739
440
    """This function is meant to be called by multiprocessing.Process
754
455
    checker:    subprocess.Popen(); a running checker process used
755
456
                                    to see if the client lives.
756
457
                                    'None' if no process is running.
757
 
    checker_callback_tag: a GLib event source tag, or None
 
458
    checker_callback_tag: a gobject event source tag, or None
758
459
    checker_command: string; External command which is run to check
759
460
                     if client lives.  %() expansions are done at
760
461
                     runtime with vars(self) as dict, so that for
761
462
                     instance %(name)s can be used in the command.
762
 
    checker_initiator_tag: a GLib event source tag, or None
 
463
    checker_initiator_tag: a gobject event source tag, or None
763
464
    created:    datetime.datetime(); (UTC) object creation
764
465
    client_structure: Object describing what attributes a client has
765
466
                      and is used for storing the client at exit
766
467
    current_checker_command: string; current running checker_command
767
 
    disable_initiator_tag: a GLib event source tag, or None
 
468
    disable_initiator_tag: a gobject event source tag, or None
768
469
    enabled:    bool()
769
470
    fingerprint: string (40 or 32 hexadecimal digits); used to
770
471
                 uniquely identify the client
833
534
            client["fingerprint"] = (section["fingerprint"].upper()
834
535
                                     .replace(" ", ""))
835
536
            if "secret" in section:
836
 
                client["secret"] = codecs.decode(section["secret"]
837
 
                                                 .encode("utf-8"),
838
 
                                                 "base64")
 
537
                client["secret"] = section["secret"].decode("base64")
839
538
            elif "secfile" in section:
840
539
                with open(os.path.expanduser(os.path.expandvars
841
540
                                             (section["secfile"])),
894
593
        self.changedstate = multiprocessing_manager.Condition(
895
594
            multiprocessing_manager.Lock())
896
595
        self.client_structure = [attr
897
 
                                 for attr in self.__dict__.keys()
 
596
                                 for attr in self.__dict__.iterkeys()
898
597
                                 if not attr.startswith("_")]
899
598
        self.client_structure.append("client_structure")
900
599
        
926
625
        if not quiet:
927
626
            logger.info("Disabling client %s", self.name)
928
627
        if getattr(self, "disable_initiator_tag", None) is not None:
929
 
            GLib.source_remove(self.disable_initiator_tag)
 
628
            gobject.source_remove(self.disable_initiator_tag)
930
629
            self.disable_initiator_tag = None
931
630
        self.expires = None
932
631
        if getattr(self, "checker_initiator_tag", None) is not None:
933
 
            GLib.source_remove(self.checker_initiator_tag)
 
632
            gobject.source_remove(self.checker_initiator_tag)
934
633
            self.checker_initiator_tag = None
935
634
        self.stop_checker()
936
635
        self.enabled = False
937
636
        if not quiet:
938
637
            self.send_changedstate()
939
 
        # Do not run this again if called by a GLib.timeout_add
 
638
        # Do not run this again if called by a gobject.timeout_add
940
639
        return False
941
640
    
942
641
    def __del__(self):
946
645
        # Schedule a new checker to be started an 'interval' from now,
947
646
        # and every interval from then on.
948
647
        if self.checker_initiator_tag is not None:
949
 
            GLib.source_remove(self.checker_initiator_tag)
950
 
        self.checker_initiator_tag = GLib.timeout_add(
 
648
            gobject.source_remove(self.checker_initiator_tag)
 
649
        self.checker_initiator_tag = gobject.timeout_add(
951
650
            int(self.interval.total_seconds() * 1000),
952
651
            self.start_checker)
953
652
        # Schedule a disable() when 'timeout' has passed
954
653
        if self.disable_initiator_tag is not None:
955
 
            GLib.source_remove(self.disable_initiator_tag)
956
 
        self.disable_initiator_tag = GLib.timeout_add(
 
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
        self.disable_initiator_tag = gobject.timeout_add(
957
656
            int(self.timeout.total_seconds() * 1000), self.disable)
958
657
        # Also start a new checker *right now*.
959
658
        self.start_checker()
995
694
        if timeout is None:
996
695
            timeout = self.timeout
997
696
        if self.disable_initiator_tag is not None:
998
 
            GLib.source_remove(self.disable_initiator_tag)
 
697
            gobject.source_remove(self.disable_initiator_tag)
999
698
            self.disable_initiator_tag = None
1000
699
        if getattr(self, "enabled", False):
1001
 
            self.disable_initiator_tag = GLib.timeout_add(
 
700
            self.disable_initiator_tag = gobject.timeout_add(
1002
701
                int(timeout.total_seconds() * 1000), self.disable)
1003
702
            self.expires = datetime.datetime.utcnow() + timeout
1004
703
    
1059
758
                args = (pipe[1], subprocess.call, command),
1060
759
                kwargs = popen_args)
1061
760
            self.checker.start()
1062
 
            self.checker_callback_tag = GLib.io_add_watch(
1063
 
                pipe[0].fileno(), GLib.IO_IN,
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
1064
763
                self.checker_callback, pipe[0], command)
1065
 
        # Re-run this periodically if run by GLib.timeout_add
 
764
        # Re-run this periodically if run by gobject.timeout_add
1066
765
        return True
1067
766
    
1068
767
    def stop_checker(self):
1069
768
        """Force the checker process, if any, to stop."""
1070
769
        if self.checker_callback_tag:
1071
 
            GLib.source_remove(self.checker_callback_tag)
 
770
            gobject.source_remove(self.checker_callback_tag)
1072
771
            self.checker_callback_tag = None
1073
772
        if getattr(self, "checker", None) is None:
1074
773
            return
1143
842
                           access="r")
1144
843
    def Property_dbus_property(self):
1145
844
        return dbus.Boolean(False)
1146
 
    
1147
 
    See also the DBusObjectWithAnnotations class.
1148
845
    """
1149
846
    
1150
847
    def decorator(func):
1172
869
    pass
1173
870
 
1174
871
 
1175
 
class DBusObjectWithAnnotations(dbus.service.Object):
1176
 
    """A D-Bus object with annotations.
 
872
class DBusObjectWithProperties(dbus.service.Object):
 
873
    """A D-Bus object with properties.
1177
874
    
1178
 
    Classes inheriting from this can use the dbus_annotations
1179
 
    decorator to add annotations to methods or signals.
 
875
    Classes inheriting from this can use the dbus_service_property
 
876
    decorator to expose methods as D-Bus properties.  It exposes the
 
877
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1180
878
    """
1181
879
    
1182
880
    @staticmethod
1198
896
                for name, athing in
1199
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
1200
898
    
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
 
    
1272
899
    def _get_dbus_property(self, interface_name, property_name):
1273
900
        """Returns a bound method if one exists which is a D-Bus
1274
901
        property with the specified name and interface.
1284
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
1285
912
            self.dbus_object_path, interface_name, property_name))
1286
913
    
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
 
    
1296
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1297
915
                         in_signature="ss",
1298
916
                         out_signature="v")
1368
986
        
1369
987
        Inserts property tags and interface annotation tags.
1370
988
        """
1371
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1372
 
                                                         object_path,
1373
 
                                                         connection)
 
989
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
990
                                                   connection)
1374
991
        try:
1375
992
            document = xml.dom.minidom.parseString(xmlstring)
1376
993
            
1389
1006
                            if prop._dbus_interface
1390
1007
                            == if_tag.getAttribute("name")):
1391
1008
                    if_tag.appendChild(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)
 
1009
                # Add annotation tags
 
1010
                for typ in ("method", "signal", "property"):
 
1011
                    for tag in if_tag.getElementsByTagName(typ):
 
1012
                        annots = dict()
 
1013
                        for name, prop in (self.
 
1014
                                           _get_all_dbus_things(typ)):
 
1015
                            if (name == tag.getAttribute("name")
 
1016
                                and prop._dbus_interface
 
1017
                                == if_tag.getAttribute("name")):
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
 
1021
                            ann_tag = document.createElement(
 
1022
                                "annotation")
 
1023
                            ann_tag.setAttribute("name", name)
 
1024
                            ann_tag.setAttribute("value", value)
 
1025
                            tag.appendChild(ann_tag)
 
1026
                # Add interface annotation tags
 
1027
                for annotation, value in dict(
 
1028
                    itertools.chain.from_iterable(
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
 
1032
                        if name == if_tag.getAttribute("name")
 
1033
                        )).items():
 
1034
                    ann_tag = document.createElement("annotation")
 
1035
                    ann_tag.setAttribute("name", annotation)
 
1036
                    ann_tag.setAttribute("value", value)
 
1037
                    if_tag.appendChild(ann_tag)
1408
1038
                # Add the names to the return values for the
1409
1039
                # "org.freedesktop.DBus.Properties" methods
1410
1040
                if (if_tag.getAttribute("name")
1428
1058
                         exc_info=error)
1429
1059
        return xmlstring
1430
1060
 
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
1499
1061
 
1500
1062
def datetime_to_dbus(dt, variant_level=0):
1501
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1548
1110
                interface_names.add(alt_interface)
1549
1111
                # Is this a D-Bus signal?
1550
1112
                if getattr(attribute, "_dbus_is_signal", False):
1551
 
                    # Extract the original non-method undecorated
1552
 
                    # function by black magic
1553
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
1554
1116
                        nonmethod_func = (dict(
1555
1117
                            zip(attribute.func_code.co_freevars,
1556
1118
                                attribute.__closure__))
1557
1119
                                          ["func"].cell_contents)
1558
1120
                    else:
1559
 
                        nonmethod_func = (dict(
1560
 
                            zip(attribute.__code__.co_freevars,
1561
 
                                attribute.__closure__))
1562
 
                                          ["func"].cell_contents)
 
1121
                        nonmethod_func = attribute
1563
1122
                    # Create a new, but exactly alike, function
1564
1123
                    # object, and decorate it to be a new D-Bus signal
1565
1124
                    # with the alternate D-Bus interface name
1566
 
                    new_function = copy_function(nonmethod_func)
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
1567
1139
                    new_function = (dbus.service.signal(
1568
1140
                        alt_interface,
1569
1141
                        attribute._dbus_signature)(new_function))
1582
1154
                        func1 and func2 to the "call_both" function
1583
1155
                        outside of its arguments"""
1584
1156
                        
1585
 
                        @functools.wraps(func2)
1586
1157
                        def call_both(*args, **kwargs):
1587
1158
                            """This function will emit two D-Bus
1588
1159
                            signals by calling func1 and func2"""
1589
1160
                            func1(*args, **kwargs)
1590
1161
                            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)
1595
1162
                        
1596
1163
                        return call_both
1597
1164
                    # Create the "call_both" function and add it to
1608
1175
                            alt_interface,
1609
1176
                            attribute._dbus_in_signature,
1610
1177
                            attribute._dbus_out_signature)
1611
 
                        (copy_function(attribute)))
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
1612
1183
                    # Copy annotations, if any
1613
1184
                    try:
1614
1185
                        attr[attrname]._dbus_annotations = dict(
1626
1197
                        attribute._dbus_access,
1627
1198
                        attribute._dbus_get_args_options
1628
1199
                        ["byte_arrays"])
1629
 
                                      (copy_function(attribute)))
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
1630
1206
                    # Copy annotations, if any
1631
1207
                    try:
1632
1208
                        attr[attrname]._dbus_annotations = dict(
1641
1217
                    # to the class.
1642
1218
                    attr[attrname] = (
1643
1219
                        dbus_interface_annotations(alt_interface)
1644
 
                        (copy_function(attribute)))
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
1645
1225
            if deprecate:
1646
1226
                # Deprecate all alternate interfaces
1647
1227
                iname="_AlternateDBusNames_interface_annotation{}"
1660
1240
            if interface_names:
1661
1241
                # Replace the class with a new subclass of it with
1662
1242
                # methods, signals, etc. as created above.
1663
 
                if sys.version_info.major == 2:
1664
 
                    cls = type(b"{}Alternate".format(cls.__name__),
1665
 
                               (cls, ), attr)
1666
 
                else:
1667
 
                    cls = type("{}Alternate".format(cls.__name__),
1668
 
                               (cls, ), attr)
 
1243
                cls = type(b"{}Alternate".format(cls.__name__),
 
1244
                           (cls, ), attr)
1669
1245
        return cls
1670
1246
    
1671
1247
    return wrapper
1800
1376
        if exitstatus >= 0:
1801
1377
            # Emit D-Bus signal
1802
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1803
 
                                  # This is specific to GNU libC
1804
 
                                  dbus.Int64(exitstatus << 8),
 
1379
                                  dbus.Int64(0),
1805
1380
                                  dbus.String(command))
1806
1381
        else:
1807
1382
            # Emit D-Bus signal
1808
1383
            self.CheckerCompleted(dbus.Int16(-1),
1809
1384
                                  dbus.Int64(
1810
 
                                      # This is specific to GNU libC
1811
 
                                      (exitstatus << 8)
1812
 
                                      | self.last_checker_signal),
 
1385
                                      self.last_checker_signal),
1813
1386
                                  dbus.String(command))
1814
1387
        return ret
1815
1388
    
1829
1402
    
1830
1403
    def approve(self, value=True):
1831
1404
        self.approved = value
1832
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1833
 
                             * 1000), self._reset_approved)
 
1405
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1406
                                * 1000), self._reset_approved)
1834
1407
        self.send_changedstate()
1835
1408
    
1836
1409
    ## D-Bus methods, signals & properties
1892
1465
        self.checked_ok()
1893
1466
    
1894
1467
    # Enable - method
1895
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1896
1468
    @dbus.service.method(_interface)
1897
1469
    def Enable(self):
1898
1470
        "D-Bus method"
1899
1471
        self.enable()
1900
1472
    
1901
1473
    # StartChecker - method
1902
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1903
1474
    @dbus.service.method(_interface)
1904
1475
    def StartChecker(self):
1905
1476
        "D-Bus method"
1906
1477
        self.start_checker()
1907
1478
    
1908
1479
    # Disable - method
1909
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1910
1480
    @dbus.service.method(_interface)
1911
1481
    def Disable(self):
1912
1482
        "D-Bus method"
1913
1483
        self.disable()
1914
1484
    
1915
1485
    # StopChecker - method
1916
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1917
1486
    @dbus.service.method(_interface)
1918
1487
    def StopChecker(self):
1919
1488
        self.stop_checker()
1955
1524
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1956
1525
    
1957
1526
    # Name - property
1958
 
    @dbus_annotations(
1959
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1960
1527
    @dbus_service_property(_interface, signature="s", access="read")
1961
1528
    def Name_dbus_property(self):
1962
1529
        return dbus.String(self.name)
1963
1530
    
1964
1531
    # Fingerprint - property
1965
 
    @dbus_annotations(
1966
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1967
1532
    @dbus_service_property(_interface, signature="s", access="read")
1968
1533
    def Fingerprint_dbus_property(self):
1969
1534
        return dbus.String(self.fingerprint)
1978
1543
        self.host = str(value)
1979
1544
    
1980
1545
    # Created - property
1981
 
    @dbus_annotations(
1982
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1983
1546
    @dbus_service_property(_interface, signature="s", access="read")
1984
1547
    def Created_dbus_property(self):
1985
1548
        return datetime_to_dbus(self.created)
2046
1609
                if (getattr(self, "disable_initiator_tag", None)
2047
1610
                    is None):
2048
1611
                    return
2049
 
                GLib.source_remove(self.disable_initiator_tag)
2050
 
                self.disable_initiator_tag = GLib.timeout_add(
 
1612
                gobject.source_remove(self.disable_initiator_tag)
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
2051
1614
                    int((self.expires - now).total_seconds() * 1000),
2052
1615
                    self.disable)
2053
1616
    
2073
1636
            return
2074
1637
        if self.enabled:
2075
1638
            # Reschedule checker run
2076
 
            GLib.source_remove(self.checker_initiator_tag)
2077
 
            self.checker_initiator_tag = GLib.timeout_add(
 
1639
            gobject.source_remove(self.checker_initiator_tag)
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
2078
1641
                value, self.start_checker)
2079
1642
            self.start_checker() # Start one now, too
2080
1643
    
2100
1663
            self.stop_checker()
2101
1664
    
2102
1665
    # ObjectPath - property
2103
 
    @dbus_annotations(
2104
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2105
 
         "org.freedesktop.DBus.Deprecated": "true"})
2106
1666
    @dbus_service_property(_interface, signature="o", access="read")
2107
1667
    def ObjectPath_dbus_property(self):
2108
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
2109
1669
    
2110
1670
    # Secret = property
2111
 
    @dbus_annotations(
2112
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2113
 
         "invalidates"})
2114
1671
    @dbus_service_property(_interface,
2115
1672
                           signature="ay",
2116
1673
                           access="write",
2162
1719
            logger.debug("Pipe FD: %d",
2163
1720
                         self.server.child_pipe.fileno())
2164
1721
            
2165
 
            session = gnutls.ClientSession(self.request)
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
 
1724
            
 
1725
            # Note: gnutls.connection.X509Credentials is really a
 
1726
            # generic GnuTLS certificate credentials object so long as
 
1727
            # no X.509 keys are added to it.  Therefore, we can use it
 
1728
            # here despite using OpenPGP certificates.
2166
1729
            
2167
1730
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2168
1731
            #                      "+AES-256-CBC", "+SHA1",
2172
1735
            priority = self.server.gnutls_priority
2173
1736
            if priority is None:
2174
1737
                priority = "NORMAL"
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
2176
 
                                       None)
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
2177
1740
            
2178
1741
            # Start communication using the Mandos protocol
2179
1742
            # Get protocol number
2189
1752
            # Start GnuTLS connection
2190
1753
            try:
2191
1754
                session.handshake()
2192
 
            except gnutls.Error as error:
 
1755
            except gnutls.errors.GNUTLSError as error:
2193
1756
                logger.warning("Handshake failed: %s", error)
2194
1757
                # Do not run session.bye() here: the session is not
2195
1758
                # established.  Just abandon the request.
2201
1764
                try:
2202
1765
                    fpr = self.fingerprint(
2203
1766
                        self.peer_certificate(session))
2204
 
                except (TypeError, gnutls.Error) as error:
 
1767
                except (TypeError,
 
1768
                        gnutls.errors.GNUTLSError) as error:
2205
1769
                    logger.warning("Bad certificate: %s", error)
2206
1770
                    return
2207
1771
                logger.debug("Fingerprint: %s", fpr)
2265
1829
                    else:
2266
1830
                        delay -= time2 - time
2267
1831
                
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
 
1832
                sent_size = 0
 
1833
                while sent_size < len(client.secret):
 
1834
                    try:
 
1835
                        sent = session.send(client.secret[sent_size:])
 
1836
                    except gnutls.errors.GNUTLSError as error:
 
1837
                        logger.warning("gnutls send failed",
 
1838
                                       exc_info=error)
 
1839
                        return
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
 
1843
                    sent_size += sent
2274
1844
                
2275
1845
                logger.info("Sending secret to %s", client.name)
2276
1846
                # bump the timeout using extended_timeout
2284
1854
                    client.approvals_pending -= 1
2285
1855
                try:
2286
1856
                    session.bye()
2287
 
                except gnutls.Error as error:
 
1857
                except gnutls.errors.GNUTLSError as error:
2288
1858
                    logger.warning("GnuTLS bye failed",
2289
1859
                                   exc_info=error)
2290
1860
    
2292
1862
    def peer_certificate(session):
2293
1863
        "Return the peer's OpenPGP certificate as a bytestring"
2294
1864
        # If not an OpenPGP certificate...
2295
 
        if (gnutls.certificate_type_get(session._c_object)
2296
 
            != gnutls.CRT_OPENPGP):
2297
 
            # ...return invalid data
2298
 
            return b""
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
 
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1868
            # ...do the normal thing
 
1869
            return session.peer_certificate
2299
1870
        list_size = ctypes.c_uint(1)
2300
 
        cert_list = (gnutls.certificate_get_peers
 
1871
        cert_list = (gnutls.library.functions
 
1872
                     .gnutls_certificate_get_peers
2301
1873
                     (session._c_object, ctypes.byref(list_size)))
2302
1874
        if not bool(cert_list) and list_size.value != 0:
2303
 
            raise gnutls.Error("error getting peer certificate")
 
1875
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1876
                                            " certificate")
2304
1877
        if list_size.value == 0:
2305
1878
            return None
2306
1879
        cert = cert_list[0]
2310
1883
    def fingerprint(openpgp):
2311
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2312
1885
        # New GnuTLS "datum" with the OpenPGP public key
2313
 
        datum = gnutls.datum_t(
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
2314
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
2315
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
2316
1889
            ctypes.c_uint(len(openpgp)))
2317
1890
        # New empty GnuTLS certificate
2318
 
        crt = gnutls.openpgp_crt_t()
2319
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
2320
1894
        # Import the OpenPGP public key into the certificate
2321
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2322
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2323
1898
        # Verify the self signature in the key
2324
1899
        crtverify = ctypes.c_uint()
2325
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2326
 
                                       ctypes.byref(crtverify))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
2327
1902
        if crtverify.value != 0:
2328
 
            gnutls.openpgp_crt_deinit(crt)
2329
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
2330
1906
        # New buffer for the fingerprint
2331
1907
        buf = ctypes.create_string_buffer(20)
2332
1908
        buf_len = ctypes.c_size_t()
2333
1909
        # Get the fingerprint from the certificate into the buffer
2334
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2335
 
                                           ctypes.byref(buf_len))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
2336
1912
        # Deinit the certificate
2337
 
        gnutls.openpgp_crt_deinit(crt)
 
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2338
1914
        # Convert the buffer to a Python bytestring
2339
1915
        fpr = ctypes.string_at(buf, buf_len.value)
2340
1916
        # Convert the bytestring to hexadecimal notation
2484
2060
        gnutls_priority GnuTLS priority string
2485
2061
        use_dbus:       Boolean; to emit D-Bus signals or not
2486
2062
    
2487
 
    Assumes a GLib.MainLoop event loop.
 
2063
    Assumes a gobject.MainLoop event loop.
2488
2064
    """
2489
2065
    
2490
2066
    def __init__(self, server_address, RequestHandlerClass,
2515
2091
    
2516
2092
    def add_pipe(self, parent_pipe, proc):
2517
2093
        # Call "handle_ipc" for both data and EOF events
2518
 
        GLib.io_add_watch(
 
2094
        gobject.io_add_watch(
2519
2095
            parent_pipe.fileno(),
2520
 
            GLib.IO_IN | GLib.IO_HUP,
 
2096
            gobject.IO_IN | gobject.IO_HUP,
2521
2097
            functools.partial(self.handle_ipc,
2522
2098
                              parent_pipe = parent_pipe,
2523
2099
                              proc = proc))
2527
2103
                   proc = None,
2528
2104
                   client_object=None):
2529
2105
        # error, or the other end of multiprocessing.Pipe has closed
2530
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2531
2107
            # Wait for other process to exit
2532
2108
            proc.join()
2533
2109
            return False
2540
2116
            fpr = request[1]
2541
2117
            address = request[2]
2542
2118
            
2543
 
            for c in self.clients.values():
 
2119
            for c in self.clients.itervalues():
2544
2120
                if c.fingerprint == fpr:
2545
2121
                    client = c
2546
2122
                    break
2554
2130
                parent_pipe.send(False)
2555
2131
                return False
2556
2132
            
2557
 
            GLib.io_add_watch(
 
2133
            gobject.io_add_watch(
2558
2134
                parent_pipe.fileno(),
2559
 
                GLib.IO_IN | GLib.IO_HUP,
 
2135
                gobject.IO_IN | gobject.IO_HUP,
2560
2136
                functools.partial(self.handle_ipc,
2561
2137
                                  parent_pipe = parent_pipe,
2562
2138
                                  proc = proc,
2944
2520
            logger.error("Could not open file %r", pidfilename,
2945
2521
                         exc_info=e)
2946
2522
    
2947
 
    for name, group in (("_mandos", "_mandos"),
2948
 
                        ("mandos", "mandos"),
2949
 
                        ("nobody", "nogroup")):
 
2523
    for name in ("_mandos", "mandos", "nobody"):
2950
2524
        try:
2951
2525
            uid = pwd.getpwnam(name).pw_uid
2952
 
            gid = pwd.getpwnam(group).pw_gid
 
2526
            gid = pwd.getpwnam(name).pw_gid
2953
2527
            break
2954
2528
        except KeyError:
2955
2529
            continue
2959
2533
    try:
2960
2534
        os.setgid(gid)
2961
2535
        os.setuid(uid)
2962
 
        if debug:
2963
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2964
 
                                                             gid))
2965
2536
    except OSError as error:
2966
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2967
 
                       .format(uid, gid, os.strerror(error.errno)))
2968
2537
        if error.errno != errno.EPERM:
2969
2538
            raise
2970
2539
    
2973
2542
        
2974
2543
        # "Use a log level over 10 to enable all debugging options."
2975
2544
        # - GnuTLS manual
2976
 
        gnutls.global_set_log_level(11)
 
2545
        gnutls.library.functions.gnutls_global_set_log_level(11)
2977
2546
        
2978
 
        @gnutls.log_func
 
2547
        @gnutls.library.types.gnutls_log_func
2979
2548
        def debug_gnutls(level, string):
2980
2549
            logger.debug("GnuTLS: %s", string[:-1])
2981
2550
        
2982
 
        gnutls.global_set_log_function(debug_gnutls)
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2983
2553
        
2984
2554
        # Redirect stdin so all checkers get /dev/null
2985
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2992
2562
        # Close all input and output, do double fork, etc.
2993
2563
        daemon()
2994
2564
    
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()
 
2565
    # multiprocessing will use threads, so before we use gobject we
 
2566
    # need to inform gobject that threads will be used.
 
2567
    gobject.threads_init()
2998
2568
    
2999
2569
    global main_loop
3000
2570
    # From the Avahi example code
3001
2571
    DBusGMainLoop(set_as_default=True)
3002
 
    main_loop = GLib.MainLoop()
 
2572
    main_loop = gobject.MainLoop()
3003
2573
    bus = dbus.SystemBus()
3004
2574
    # End of Avahi example code
3005
2575
    if use_dbus:
3049
2619
    if server_settings["restore"]:
3050
2620
        try:
3051
2621
            with open(stored_state_path, "rb") as stored_state:
3052
 
                if sys.version_info.major == 2:                
3053
 
                    clients_data, old_client_settings = pickle.load(
3054
 
                        stored_state)
3055
 
                else:
3056
 
                    bytes_clients_data, bytes_old_client_settings = (
3057
 
                        pickle.load(stored_state, encoding = "bytes"))
3058
 
                    ### Fix bytes to strings
3059
 
                    ## clients_data
3060
 
                    # .keys()
3061
 
                    clients_data = { (key.decode("utf-8")
3062
 
                                      if isinstance(key, bytes)
3063
 
                                      else key): value
3064
 
                                     for key, value in
3065
 
                                     bytes_clients_data.items() }
3066
 
                    del bytes_clients_data
3067
 
                    for key in clients_data:
3068
 
                        value = { (k.decode("utf-8")
3069
 
                                   if isinstance(k, bytes) else k): v
3070
 
                                  for k, v in
3071
 
                                  clients_data[key].items() }
3072
 
                        clients_data[key] = value
3073
 
                        # .client_structure
3074
 
                        value["client_structure"] = [
3075
 
                            (s.decode("utf-8")
3076
 
                             if isinstance(s, bytes)
3077
 
                             else s) for s in
3078
 
                            value["client_structure"] ]
3079
 
                        # .name & .host
3080
 
                        for k in ("name", "host"):
3081
 
                            if isinstance(value[k], bytes):
3082
 
                                value[k] = value[k].decode("utf-8")
3083
 
                    ## old_client_settings
3084
 
                    # .keys()
3085
 
                    old_client_settings = {
3086
 
                        (key.decode("utf-8")
3087
 
                         if isinstance(key, bytes)
3088
 
                         else key): value
3089
 
                        for key, value in
3090
 
                        bytes_old_client_settings.items() }
3091
 
                    del bytes_old_client_settings
3092
 
                    # .host
3093
 
                    for value in old_client_settings.values():
3094
 
                        if isinstance(value["host"], bytes):
3095
 
                            value["host"] = (value["host"]
3096
 
                                             .decode("utf-8"))
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
3097
2624
            os.remove(stored_state_path)
3098
2625
        except IOError as e:
3099
2626
            if e.errno == errno.ENOENT:
3200
2727
        del pidfile
3201
2728
        del pidfilename
3202
2729
    
3203
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3204
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3205
 
                             lambda: main_loop.quit() and False)
 
2730
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3206
2732
    
3207
2733
    if use_dbus:
3208
2734
        
3209
2735
        @alternate_dbus_interfaces(
3210
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3211
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2737
        class MandosDBusService(DBusObjectWithProperties):
3212
2738
            """A D-Bus proxy object"""
3213
2739
            
3214
2740
            def __init__(self):
3216
2742
            
3217
2743
            _interface = "se.recompile.Mandos"
3218
2744
            
 
2745
            @dbus_interface_annotations(_interface)
 
2746
            def _foo(self):
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
 
2750
            
3219
2751
            @dbus.service.signal(_interface, signature="o")
3220
2752
            def ClientAdded(self, objpath):
3221
2753
                "D-Bus signal"
3226
2758
                "D-Bus signal"
3227
2759
                pass
3228
2760
            
3229
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3230
 
                               "true"})
3231
2761
            @dbus.service.signal(_interface, signature="os")
3232
2762
            def ClientRemoved(self, objpath, name):
3233
2763
                "D-Bus signal"
3234
2764
                pass
3235
2765
            
3236
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3237
 
                               "true"})
3238
2766
            @dbus.service.method(_interface, out_signature="ao")
3239
2767
            def GetAllClients(self):
3240
2768
                "D-Bus method"
3241
2769
                return dbus.Array(c.dbus_object_path for c in
3242
 
                                  tcp_server.clients.values())
 
2770
                                  tcp_server.clients.itervalues())
3243
2771
            
3244
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3245
 
                               "true"})
3246
2772
            @dbus.service.method(_interface,
3247
2773
                                 out_signature="a{oa{sv}}")
3248
2774
            def GetAllClientsWithProperties(self):
3249
2775
                "D-Bus method"
3250
2776
                return dbus.Dictionary(
3251
 
                    { c.dbus_object_path: c.GetAll(
3252
 
                        "se.recompile.Mandos.Client")
3253
 
                      for c in tcp_server.clients.values() },
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
3254
2779
                    signature="oa{sv}")
3255
2780
            
3256
2781
            @dbus.service.method(_interface, in_signature="o")
3257
2782
            def RemoveClient(self, object_path):
3258
2783
                "D-Bus method"
3259
 
                for c in tcp_server.clients.values():
 
2784
                for c in tcp_server.clients.itervalues():
3260
2785
                    if c.dbus_object_path == object_path:
3261
2786
                        del tcp_server.clients[c.name]
3262
2787
                        c.remove_from_connection()
3263
 
                        # Don't signal the disabling
 
2788
                        # Don't signal anything except ClientRemoved
3264
2789
                        c.disable(quiet=True)
3265
 
                        # Emit D-Bus signal for removal
3266
 
                        self.client_removed_signal(c)
 
2790
                        # Emit D-Bus signal
 
2791
                        self.ClientRemoved(object_path, c.name)
3267
2792
                        return
3268
2793
                raise KeyError(object_path)
3269
2794
            
3270
2795
            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)
3307
2796
        
3308
2797
        mandos_dbus_service = MandosDBusService()
3309
2798
    
3322
2811
        # removed/edited, old secret will thus be unrecovable.
3323
2812
        clients = {}
3324
2813
        with PGPEngine() as pgp:
3325
 
            for client in tcp_server.clients.values():
 
2814
            for client in tcp_server.clients.itervalues():
3326
2815
                key = client_settings[client.name]["secret"]
3327
2816
                client.encrypted_secret = pgp.encrypt(client.secret,
3328
2817
                                                      key)
3352
2841
                    prefix='clients-',
3353
2842
                    dir=os.path.dirname(stored_state_path),
3354
2843
                    delete=False) as stored_state:
3355
 
                pickle.dump((clients, client_settings), stored_state,
3356
 
                            protocol = 2)
 
2844
                pickle.dump((clients, client_settings), stored_state)
3357
2845
                tempname = stored_state.name
3358
2846
            os.rename(tempname, stored_state_path)
3359
2847
        except (IOError, OSError) as e:
3375
2863
            name, client = tcp_server.clients.popitem()
3376
2864
            if use_dbus:
3377
2865
                client.remove_from_connection()
3378
 
            # Don't signal the disabling
 
2866
            # Don't signal anything except ClientRemoved
3379
2867
            client.disable(quiet=True)
3380
 
            # Emit D-Bus signal for removal
3381
2868
            if use_dbus:
3382
 
                mandos_dbus_service.client_removed_signal(client)
 
2869
                # Emit D-Bus signal
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
3383
2872
        client_settings.clear()
3384
2873
    
3385
2874
    atexit.register(cleanup)
3386
2875
    
3387
 
    for client in tcp_server.clients.values():
 
2876
    for client in tcp_server.clients.itervalues():
3388
2877
        if use_dbus:
3389
 
            # Emit D-Bus signal for adding
3390
 
            mandos_dbus_service.client_added_signal(client)
 
2878
            # Emit D-Bus signal
 
2879
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3391
2880
        # Need to initiate checking of clients
3392
2881
        if client.enabled:
3393
2882
            client.init_checker()
3419
2908
                sys.exit(1)
3420
2909
            # End of Avahi example code
3421
2910
        
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))
 
2911
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2912
                             lambda *args, **kwargs:
 
2913
                             (tcp_server.handle_request
 
2914
                              (*args[2:], **kwargs) or True))
3426
2915
        
3427
2916
        logger.debug("Starting main loop")
3428
2917
        main_loop.run()