/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-03-05 20:11:10 UTC
  • Revision ID: teddy@recompile.se-20160305201110-6f7nws77k1h96e8k
errno is of type int, not error_t

* plugins.d/mandos-client.c (raise_privileges,
  raise_privileges_permanently, lower_privileges,
  lower_privileges_permanently, bring_up_interface,
  take_down_interface, ): Change return type and all errno-containing
  variables to type "int".
  (get_flags): Change all errno-containing variables to type "int".
  (main): Change all errno-containing variables to type "int", except
          for values which are explicitly of type error_t.

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
44
44
import argparse
45
45
import datetime
46
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
53
47
try:
54
48
    import ConfigParser as configparser
55
49
except ImportError:
78
72
import tempfile
79
73
import itertools
80
74
import collections
 
75
import codecs
81
76
 
82
77
import dbus
83
78
import dbus.service
103
98
if sys.version_info.major == 2:
104
99
    str = unicode
105
100
 
106
 
version = "1.6.9"
 
101
version = "1.7.3"
107
102
stored_state_file = "clients.pickle"
108
103
 
109
104
logger = logging.getLogger()
156
151
    
157
152
    def __init__(self):
158
153
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
154
        self.gpg = "gpg"
 
155
        try:
 
156
            output = subprocess.check_output(["gpgconf"])
 
157
            for line in output.splitlines():
 
158
                name, text, path = line.split(":")
 
159
                if name == "gpg":
 
160
                    self.gpg = path
 
161
                    break
 
162
        except OSError as e:
 
163
            if e.errno != errno.ENOENT:
 
164
                raise
159
165
        self.gnupgargs = ['--batch',
160
 
                          '--home', self.tempdir,
 
166
                          '--homedir', self.tempdir,
161
167
                          '--force-mdc',
162
168
                          '--quiet',
163
169
                          '--no-use-agent']
202
208
                dir=self.tempdir) as passfile:
203
209
            passfile.write(passphrase)
204
210
            passfile.flush()
205
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
211
            proc = subprocess.Popen([self.gpg, '--symmetric',
206
212
                                     '--passphrase-file',
207
213
                                     passfile.name]
208
214
                                    + self.gnupgargs,
220
226
                dir = self.tempdir) as passfile:
221
227
            passfile.write(passphrase)
222
228
            passfile.flush()
223
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
229
            proc = subprocess.Popen([self.gpg, '--decrypt',
224
230
                                     '--passphrase-file',
225
231
                                     passfile.name]
226
232
                                    + self.gnupgargs,
394
400
                    logger.error(bad_states[state] + ": %r", error)
395
401
            self.cleanup()
396
402
        elif state == avahi.SERVER_RUNNING:
397
 
            self.add()
 
403
            try:
 
404
                self.add()
 
405
            except dbus.exceptions.DBusException as error:
 
406
                if (error.get_dbus_name()
 
407
                    == "org.freedesktop.Avahi.CollisionError"):
 
408
                    logger.info("Local Zeroconf service name"
 
409
                                " collision.")
 
410
                    return self.rename(remove=False)
 
411
                else:
 
412
                    logger.critical("D-Bus Exception", exc_info=error)
 
413
                    self.cleanup()
 
414
                    os._exit(1)
398
415
        else:
399
416
            if error is None:
400
417
                logger.debug("Unknown state: %r", state)
423
440
            .format(self.name)))
424
441
        return ret
425
442
 
426
 
def subprocess_call_pipe(connection, # : multiprocessing.Connection
427
 
                         *args, **kwargs):
 
443
# Pretend that we have a GnuTLS module
 
444
class GnuTLS(object):
 
445
    """This isn't so much a class as it is a module-like namespace.
 
446
    It is instantiated once, and simulates having a GnuTLS module."""
 
447
    
 
448
    _library = ctypes.cdll.LoadLibrary(
 
449
        ctypes.util.find_library("gnutls"))
 
450
    _need_version = "3.3.0"
 
451
    def __init__(self):
 
452
        # Need to use class name "GnuTLS" here, since this method is
 
453
        # called before the assignment to the "gnutls" global variable
 
454
        # happens.
 
455
        if GnuTLS.check_version(self._need_version) is None:
 
456
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
457
                               .format(self._need_version))
 
458
    
 
459
    # Unless otherwise indicated, the constants and types below are
 
460
    # all from the gnutls/gnutls.h C header file.
 
461
    
 
462
    # Constants
 
463
    E_SUCCESS = 0
 
464
    E_INTERRUPTED = -52
 
465
    E_AGAIN = -28
 
466
    CRT_OPENPGP = 2
 
467
    CLIENT = 2
 
468
    SHUT_RDWR = 0
 
469
    CRD_CERTIFICATE = 1
 
470
    E_NO_CERTIFICATE_FOUND = -49
 
471
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
472
    
 
473
    # Types
 
474
    class session_int(ctypes.Structure):
 
475
        _fields_ = []
 
476
    session_t = ctypes.POINTER(session_int)
 
477
    class certificate_credentials_st(ctypes.Structure):
 
478
        _fields_ = []
 
479
    certificate_credentials_t = ctypes.POINTER(
 
480
        certificate_credentials_st)
 
481
    certificate_type_t = ctypes.c_int
 
482
    class datum_t(ctypes.Structure):
 
483
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
484
                    ('size', ctypes.c_uint)]
 
485
    class openpgp_crt_int(ctypes.Structure):
 
486
        _fields_ = []
 
487
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
488
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
 
489
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
490
    credentials_type_t = ctypes.c_int # 
 
491
    transport_ptr_t = ctypes.c_void_p
 
492
    close_request_t = ctypes.c_int
 
493
    
 
494
    # Exceptions
 
495
    class Error(Exception):
 
496
        # We need to use the class name "GnuTLS" here, since this
 
497
        # exception might be raised from within GnuTLS.__init__,
 
498
        # which is called before the assignment to the "gnutls"
 
499
        # global variable has happened.
 
500
        def __init__(self, message = None, code = None, args=()):
 
501
            # Default usage is by a message string, but if a return
 
502
            # code is passed, convert it to a string with
 
503
            # gnutls.strerror()
 
504
            self.code = code
 
505
            if message is None and code is not None:
 
506
                message = GnuTLS.strerror(code)
 
507
            return super(GnuTLS.Error, self).__init__(
 
508
                message, *args)
 
509
    
 
510
    class CertificateSecurityError(Error):
 
511
        pass
 
512
    
 
513
    # Classes
 
514
    class Credentials(object):
 
515
        def __init__(self):
 
516
            self._c_object = gnutls.certificate_credentials_t()
 
517
            gnutls.certificate_allocate_credentials(
 
518
                ctypes.byref(self._c_object))
 
519
            self.type = gnutls.CRD_CERTIFICATE
 
520
        
 
521
        def __del__(self):
 
522
            gnutls.certificate_free_credentials(self._c_object)
 
523
    
 
524
    class ClientSession(object):
 
525
        def __init__(self, socket, credentials = None):
 
526
            self._c_object = gnutls.session_t()
 
527
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
 
528
            gnutls.set_default_priority(self._c_object)
 
529
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
530
            gnutls.handshake_set_private_extensions(self._c_object,
 
531
                                                    True)
 
532
            self.socket = socket
 
533
            if credentials is None:
 
534
                credentials = gnutls.Credentials()
 
535
            gnutls.credentials_set(self._c_object, credentials.type,
 
536
                                   ctypes.cast(credentials._c_object,
 
537
                                               ctypes.c_void_p))
 
538
            self.credentials = credentials
 
539
        
 
540
        def __del__(self):
 
541
            gnutls.deinit(self._c_object)
 
542
        
 
543
        def handshake(self):
 
544
            return gnutls.handshake(self._c_object)
 
545
        
 
546
        def send(self, data):
 
547
            data = bytes(data)
 
548
            data_len = len(data)
 
549
            while data_len > 0:
 
550
                data_len -= gnutls.record_send(self._c_object,
 
551
                                               data[-data_len:],
 
552
                                               data_len)
 
553
        
 
554
        def bye(self):
 
555
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
556
    
 
557
    # Error handling functions
 
558
    def _error_code(result):
 
559
        """A function to raise exceptions on errors, suitable
 
560
        for the 'restype' attribute on ctypes functions"""
 
561
        if result >= 0:
 
562
            return result
 
563
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
564
            raise gnutls.CertificateSecurityError(code = result)
 
565
        raise gnutls.Error(code = result)
 
566
    
 
567
    def _retry_on_error(result, func, arguments):
 
568
        """A function to retry on some errors, suitable
 
569
        for the 'errcheck' attribute on ctypes functions"""
 
570
        while result < 0:
 
571
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
572
                return _error_code(result)
 
573
            result = func(*arguments)
 
574
        return result
 
575
    
 
576
    # Unless otherwise indicated, the function declarations below are
 
577
    # all from the gnutls/gnutls.h C header file.
 
578
    
 
579
    # Functions
 
580
    priority_set_direct = _library.gnutls_priority_set_direct
 
581
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
582
                                    ctypes.POINTER(ctypes.c_char_p)]
 
583
    priority_set_direct.restype = _error_code
 
584
    
 
585
    init = _library.gnutls_init
 
586
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
587
    init.restype = _error_code
 
588
    
 
589
    set_default_priority = _library.gnutls_set_default_priority
 
590
    set_default_priority.argtypes = [session_t]
 
591
    set_default_priority.restype = _error_code
 
592
    
 
593
    record_send = _library.gnutls_record_send
 
594
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
595
                            ctypes.c_size_t]
 
596
    record_send.restype = ctypes.c_ssize_t
 
597
    record_send.errcheck = _retry_on_error
 
598
    
 
599
    certificate_allocate_credentials = (
 
600
        _library.gnutls_certificate_allocate_credentials)
 
601
    certificate_allocate_credentials.argtypes = [
 
602
        ctypes.POINTER(certificate_credentials_t)]
 
603
    certificate_allocate_credentials.restype = _error_code
 
604
    
 
605
    certificate_free_credentials = (
 
606
        _library.gnutls_certificate_free_credentials)
 
607
    certificate_free_credentials.argtypes = [certificate_credentials_t]
 
608
    certificate_free_credentials.restype = None
 
609
    
 
610
    handshake_set_private_extensions = (
 
611
        _library.gnutls_handshake_set_private_extensions)
 
612
    handshake_set_private_extensions.argtypes = [session_t,
 
613
                                                 ctypes.c_int]
 
614
    handshake_set_private_extensions.restype = None
 
615
    
 
616
    credentials_set = _library.gnutls_credentials_set
 
617
    credentials_set.argtypes = [session_t, credentials_type_t,
 
618
                                ctypes.c_void_p]
 
619
    credentials_set.restype = _error_code
 
620
    
 
621
    strerror = _library.gnutls_strerror
 
622
    strerror.argtypes = [ctypes.c_int]
 
623
    strerror.restype = ctypes.c_char_p
 
624
    
 
625
    certificate_type_get = _library.gnutls_certificate_type_get
 
626
    certificate_type_get.argtypes = [session_t]
 
627
    certificate_type_get.restype = _error_code
 
628
    
 
629
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
630
    certificate_get_peers.argtypes = [session_t,
 
631
                                      ctypes.POINTER(ctypes.c_uint)]
 
632
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
633
    
 
634
    global_set_log_level = _library.gnutls_global_set_log_level
 
635
    global_set_log_level.argtypes = [ctypes.c_int]
 
636
    global_set_log_level.restype = None
 
637
    
 
638
    global_set_log_function = _library.gnutls_global_set_log_function
 
639
    global_set_log_function.argtypes = [log_func]
 
640
    global_set_log_function.restype = None
 
641
    
 
642
    deinit = _library.gnutls_deinit
 
643
    deinit.argtypes = [session_t]
 
644
    deinit.restype = None
 
645
    
 
646
    handshake = _library.gnutls_handshake
 
647
    handshake.argtypes = [session_t]
 
648
    handshake.restype = _error_code
 
649
    handshake.errcheck = _retry_on_error
 
650
    
 
651
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
652
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
653
    transport_set_ptr.restype = None
 
654
    
 
655
    bye = _library.gnutls_bye
 
656
    bye.argtypes = [session_t, close_request_t]
 
657
    bye.restype = _error_code
 
658
    bye.errcheck = _retry_on_error
 
659
    
 
660
    check_version = _library.gnutls_check_version
 
661
    check_version.argtypes = [ctypes.c_char_p]
 
662
    check_version.restype = ctypes.c_char_p
 
663
    
 
664
    # All the function declarations below are from gnutls/openpgp.h
 
665
    
 
666
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
667
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
668
    openpgp_crt_init.restype = _error_code
 
669
    
 
670
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
671
    openpgp_crt_import.argtypes = [openpgp_crt_t,
 
672
                                   ctypes.POINTER(datum_t),
 
673
                                   openpgp_crt_fmt_t]
 
674
    openpgp_crt_import.restype = _error_code
 
675
    
 
676
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
677
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
678
                                        ctypes.POINTER(ctypes.c_uint)]
 
679
    openpgp_crt_verify_self.restype = _error_code
 
680
    
 
681
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
682
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
683
    openpgp_crt_deinit.restype = None
 
684
    
 
685
    openpgp_crt_get_fingerprint = (
 
686
        _library.gnutls_openpgp_crt_get_fingerprint)
 
687
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
688
                                            ctypes.c_void_p,
 
689
                                            ctypes.POINTER(
 
690
                                                ctypes.c_size_t)]
 
691
    openpgp_crt_get_fingerprint.restype = _error_code
 
692
    
 
693
    # Remove non-public functions
 
694
    del _error_code, _retry_on_error
 
695
# Create the global "gnutls" object, simulating a module
 
696
gnutls = GnuTLS()
 
697
 
 
698
def call_pipe(connection,       # : multiprocessing.Connection
 
699
              func, *args, **kwargs):
428
700
    """This function is meant to be called by multiprocessing.Process
429
701
    
430
 
    This function runs a synchronous subprocess.call(), and writes the
431
 
    resulting return code on the provided multiprocessing.Connection.
 
702
    This function runs func(*args, **kwargs), and writes the resulting
 
703
    return value on the provided multiprocessing.Connection.
432
704
    """
433
 
    connection.send(subprocess.call(*args, **kwargs))
 
705
    connection.send(func(*args, **kwargs))
434
706
    connection.close()
435
707
 
436
708
class Client(object):
645
917
        # Also start a new checker *right now*.
646
918
        self.start_checker()
647
919
    
648
 
    def checker_callback(self, source, condition,
649
 
                         (connection, command)):
 
920
    def checker_callback(self, source, condition, connection,
 
921
                         command):
650
922
        """The checker has completed, so take appropriate actions."""
651
923
        self.checker_callback_tag = None
652
924
        self.checker = None
653
 
        # Read return code from connection (see subprocess_call_pipe)
 
925
        # Read return code from connection (see call_pipe)
654
926
        returncode = connection.recv()
655
927
        connection.close()
656
928
        
740
1012
                and self.server_settings["foreground"]):
741
1013
                popen_args.update({"stdout": wnull,
742
1014
                                   "stderr": wnull })
743
 
            pipe = multiprocessing.Pipe(duplex=False)
 
1015
            pipe = multiprocessing.Pipe(duplex = False)
744
1016
            self.checker = multiprocessing.Process(
745
 
                target=subprocess_call_pipe, args=(pipe[1], command),
746
 
                kwargs=popen_args)
 
1017
                target = call_pipe,
 
1018
                args = (pipe[1], subprocess.call, command),
 
1019
                kwargs = popen_args)
747
1020
            self.checker.start()
748
1021
            self.checker_callback_tag = gobject.io_add_watch(
749
1022
                pipe[0].fileno(), gobject.IO_IN,
750
 
                self.checker_callback, (pipe[0], command))
 
1023
                self.checker_callback, pipe[0], command)
751
1024
        # Re-run this periodically if run by gobject.timeout_add
752
1025
        return True
753
1026
    
829
1102
                           access="r")
830
1103
    def Property_dbus_property(self):
831
1104
        return dbus.Boolean(False)
 
1105
    
 
1106
    See also the DBusObjectWithAnnotations class.
832
1107
    """
833
1108
    
834
1109
    def decorator(func):
856
1131
    pass
857
1132
 
858
1133
 
859
 
class DBusObjectWithProperties(dbus.service.Object):
860
 
    """A D-Bus object with properties.
 
1134
class DBusObjectWithAnnotations(dbus.service.Object):
 
1135
    """A D-Bus object with annotations.
861
1136
    
862
 
    Classes inheriting from this can use the dbus_service_property
863
 
    decorator to expose methods as D-Bus properties.  It exposes the
864
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
1137
    Classes inheriting from this can use the dbus_annotations
 
1138
    decorator to add annotations to methods or signals.
865
1139
    """
866
1140
    
867
1141
    @staticmethod
883
1157
                for name, athing in
884
1158
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
885
1159
    
 
1160
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1161
                         out_signature = "s",
 
1162
                         path_keyword = 'object_path',
 
1163
                         connection_keyword = 'connection')
 
1164
    def Introspect(self, object_path, connection):
 
1165
        """Overloading of standard D-Bus method.
 
1166
        
 
1167
        Inserts annotation tags on methods and signals.
 
1168
        """
 
1169
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
1170
                                                   connection)
 
1171
        try:
 
1172
            document = xml.dom.minidom.parseString(xmlstring)
 
1173
            
 
1174
            for if_tag in document.getElementsByTagName("interface"):
 
1175
                # Add annotation tags
 
1176
                for typ in ("method", "signal"):
 
1177
                    for tag in if_tag.getElementsByTagName(typ):
 
1178
                        annots = dict()
 
1179
                        for name, prop in (self.
 
1180
                                           _get_all_dbus_things(typ)):
 
1181
                            if (name == tag.getAttribute("name")
 
1182
                                and prop._dbus_interface
 
1183
                                == if_tag.getAttribute("name")):
 
1184
                                annots.update(getattr(
 
1185
                                    prop, "_dbus_annotations", {}))
 
1186
                        for name, value in annots.items():
 
1187
                            ann_tag = document.createElement(
 
1188
                                "annotation")
 
1189
                            ann_tag.setAttribute("name", name)
 
1190
                            ann_tag.setAttribute("value", value)
 
1191
                            tag.appendChild(ann_tag)
 
1192
                # Add interface annotation tags
 
1193
                for annotation, value in dict(
 
1194
                    itertools.chain.from_iterable(
 
1195
                        annotations().items()
 
1196
                        for name, annotations
 
1197
                        in self._get_all_dbus_things("interface")
 
1198
                        if name == if_tag.getAttribute("name")
 
1199
                        )).items():
 
1200
                    ann_tag = document.createElement("annotation")
 
1201
                    ann_tag.setAttribute("name", annotation)
 
1202
                    ann_tag.setAttribute("value", value)
 
1203
                    if_tag.appendChild(ann_tag)
 
1204
                # Fix argument name for the Introspect method itself
 
1205
                if (if_tag.getAttribute("name")
 
1206
                                == dbus.INTROSPECTABLE_IFACE):
 
1207
                    for cn in if_tag.getElementsByTagName("method"):
 
1208
                        if cn.getAttribute("name") == "Introspect":
 
1209
                            for arg in cn.getElementsByTagName("arg"):
 
1210
                                if (arg.getAttribute("direction")
 
1211
                                    == "out"):
 
1212
                                    arg.setAttribute("name",
 
1213
                                                     "xml_data")
 
1214
            xmlstring = document.toxml("utf-8")
 
1215
            document.unlink()
 
1216
        except (AttributeError, xml.dom.DOMException,
 
1217
                xml.parsers.expat.ExpatError) as error:
 
1218
            logger.error("Failed to override Introspection method",
 
1219
                         exc_info=error)
 
1220
        return xmlstring
 
1221
 
 
1222
 
 
1223
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
1224
    """A D-Bus object with properties.
 
1225
    
 
1226
    Classes inheriting from this can use the dbus_service_property
 
1227
    decorator to expose methods as D-Bus properties.  It exposes the
 
1228
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
1229
    """
 
1230
    
886
1231
    def _get_dbus_property(self, interface_name, property_name):
887
1232
        """Returns a bound method if one exists which is a D-Bus
888
1233
        property with the specified name and interface.
898
1243
        raise DBusPropertyNotFound("{}:{}.{}".format(
899
1244
            self.dbus_object_path, interface_name, property_name))
900
1245
    
 
1246
    @classmethod
 
1247
    def _get_all_interface_names(cls):
 
1248
        """Get a sequence of all interfaces supported by an object"""
 
1249
        return (name for name in set(getattr(getattr(x, attr),
 
1250
                                             "_dbus_interface", None)
 
1251
                                     for x in (inspect.getmro(cls))
 
1252
                                     for attr in dir(x))
 
1253
                if name is not None)
 
1254
    
901
1255
    @dbus.service.method(dbus.PROPERTIES_IFACE,
902
1256
                         in_signature="ss",
903
1257
                         out_signature="v")
973
1327
        
974
1328
        Inserts property tags and interface annotation tags.
975
1329
        """
976
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
977
 
                                                   connection)
 
1330
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1331
                                                         object_path,
 
1332
                                                         connection)
978
1333
        try:
979
1334
            document = xml.dom.minidom.parseString(xmlstring)
980
1335
            
993
1348
                            if prop._dbus_interface
994
1349
                            == if_tag.getAttribute("name")):
995
1350
                    if_tag.appendChild(tag)
996
 
                # Add annotation tags
997
 
                for typ in ("method", "signal", "property"):
998
 
                    for tag in if_tag.getElementsByTagName(typ):
999
 
                        annots = dict()
1000
 
                        for name, prop in (self.
1001
 
                                           _get_all_dbus_things(typ)):
1002
 
                            if (name == tag.getAttribute("name")
1003
 
                                and prop._dbus_interface
1004
 
                                == if_tag.getAttribute("name")):
1005
 
                                annots.update(getattr(
1006
 
                                    prop, "_dbus_annotations", {}))
1007
 
                        for name, value in annots.items():
1008
 
                            ann_tag = document.createElement(
1009
 
                                "annotation")
1010
 
                            ann_tag.setAttribute("name", name)
1011
 
                            ann_tag.setAttribute("value", value)
1012
 
                            tag.appendChild(ann_tag)
1013
 
                # Add interface annotation tags
1014
 
                for annotation, value in dict(
1015
 
                    itertools.chain.from_iterable(
1016
 
                        annotations().items()
1017
 
                        for name, annotations
1018
 
                        in self._get_all_dbus_things("interface")
1019
 
                        if name == if_tag.getAttribute("name")
1020
 
                        )).items():
1021
 
                    ann_tag = document.createElement("annotation")
1022
 
                    ann_tag.setAttribute("name", annotation)
1023
 
                    ann_tag.setAttribute("value", value)
1024
 
                    if_tag.appendChild(ann_tag)
 
1351
                # Add annotation tags for properties
 
1352
                for tag in if_tag.getElementsByTagName("property"):
 
1353
                    annots = dict()
 
1354
                    for name, prop in self._get_all_dbus_things(
 
1355
                            "property"):
 
1356
                        if (name == tag.getAttribute("name")
 
1357
                            and prop._dbus_interface
 
1358
                            == if_tag.getAttribute("name")):
 
1359
                            annots.update(getattr(
 
1360
                                prop, "_dbus_annotations", {}))
 
1361
                    for name, value in annots.items():
 
1362
                        ann_tag = document.createElement(
 
1363
                            "annotation")
 
1364
                        ann_tag.setAttribute("name", name)
 
1365
                        ann_tag.setAttribute("value", value)
 
1366
                        tag.appendChild(ann_tag)
1025
1367
                # Add the names to the return values for the
1026
1368
                # "org.freedesktop.DBus.Properties" methods
1027
1369
                if (if_tag.getAttribute("name")
1045
1387
                         exc_info=error)
1046
1388
        return xmlstring
1047
1389
 
 
1390
try:
 
1391
    dbus.OBJECT_MANAGER_IFACE
 
1392
except AttributeError:
 
1393
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
1394
 
 
1395
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
1396
    """A D-Bus object with an ObjectManager.
 
1397
    
 
1398
    Classes inheriting from this exposes the standard
 
1399
    GetManagedObjects call and the InterfacesAdded and
 
1400
    InterfacesRemoved signals on the standard
 
1401
    "org.freedesktop.DBus.ObjectManager" interface.
 
1402
    
 
1403
    Note: No signals are sent automatically; they must be sent
 
1404
    manually.
 
1405
    """
 
1406
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
1407
                         out_signature = "a{oa{sa{sv}}}")
 
1408
    def GetManagedObjects(self):
 
1409
        """This function must be overridden"""
 
1410
        raise NotImplementedError()
 
1411
    
 
1412
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
1413
                         signature = "oa{sa{sv}}")
 
1414
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
1415
        pass
 
1416
    
 
1417
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
 
1418
    def InterfacesRemoved(self, object_path, interfaces):
 
1419
        pass
 
1420
    
 
1421
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
1422
                         out_signature = "s",
 
1423
                         path_keyword = 'object_path',
 
1424
                         connection_keyword = 'connection')
 
1425
    def Introspect(self, object_path, connection):
 
1426
        """Overloading of standard D-Bus method.
 
1427
        
 
1428
        Override return argument name of GetManagedObjects to be
 
1429
        "objpath_interfaces_and_properties"
 
1430
        """
 
1431
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1432
                                                         object_path,
 
1433
                                                         connection)
 
1434
        try:
 
1435
            document = xml.dom.minidom.parseString(xmlstring)
 
1436
            
 
1437
            for if_tag in document.getElementsByTagName("interface"):
 
1438
                # Fix argument name for the GetManagedObjects method
 
1439
                if (if_tag.getAttribute("name")
 
1440
                                == dbus.OBJECT_MANAGER_IFACE):
 
1441
                    for cn in if_tag.getElementsByTagName("method"):
 
1442
                        if (cn.getAttribute("name")
 
1443
                            == "GetManagedObjects"):
 
1444
                            for arg in cn.getElementsByTagName("arg"):
 
1445
                                if (arg.getAttribute("direction")
 
1446
                                    == "out"):
 
1447
                                    arg.setAttribute(
 
1448
                                        "name",
 
1449
                                        "objpath_interfaces"
 
1450
                                        "_and_properties")
 
1451
            xmlstring = document.toxml("utf-8")
 
1452
            document.unlink()
 
1453
        except (AttributeError, xml.dom.DOMException,
 
1454
                xml.parsers.expat.ExpatError) as error:
 
1455
            logger.error("Failed to override Introspection method",
 
1456
                         exc_info = error)
 
1457
        return xmlstring
1048
1458
 
1049
1459
def datetime_to_dbus(dt, variant_level=0):
1050
1460
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1097
1507
                interface_names.add(alt_interface)
1098
1508
                # Is this a D-Bus signal?
1099
1509
                if getattr(attribute, "_dbus_is_signal", False):
1100
 
                    # Extract the original non-method undecorated
1101
 
                    # function by black magic
1102
 
                    nonmethod_func = (dict(
1103
 
                        zip(attribute.func_code.co_freevars,
1104
 
                            attribute.__closure__))
1105
 
                                      ["func"].cell_contents)
 
1510
                    if sys.version_info.major == 2:
 
1511
                        # Extract the original non-method undecorated
 
1512
                        # function by black magic
 
1513
                        nonmethod_func = (dict(
 
1514
                            zip(attribute.func_code.co_freevars,
 
1515
                                attribute.__closure__))
 
1516
                                          ["func"].cell_contents)
 
1517
                    else:
 
1518
                        nonmethod_func = attribute
1106
1519
                    # Create a new, but exactly alike, function
1107
1520
                    # object, and decorate it to be a new D-Bus signal
1108
1521
                    # with the alternate D-Bus interface name
 
1522
                    if sys.version_info.major == 2:
 
1523
                        new_function = types.FunctionType(
 
1524
                            nonmethod_func.func_code,
 
1525
                            nonmethod_func.func_globals,
 
1526
                            nonmethod_func.func_name,
 
1527
                            nonmethod_func.func_defaults,
 
1528
                            nonmethod_func.func_closure)
 
1529
                    else:
 
1530
                        new_function = types.FunctionType(
 
1531
                            nonmethod_func.__code__,
 
1532
                            nonmethod_func.__globals__,
 
1533
                            nonmethod_func.__name__,
 
1534
                            nonmethod_func.__defaults__,
 
1535
                            nonmethod_func.__closure__)
1109
1536
                    new_function = (dbus.service.signal(
1110
 
                        alt_interface, attribute._dbus_signature)
1111
 
                                    (types.FunctionType(
1112
 
                                        nonmethod_func.func_code,
1113
 
                                        nonmethod_func.func_globals,
1114
 
                                        nonmethod_func.func_name,
1115
 
                                        nonmethod_func.func_defaults,
1116
 
                                        nonmethod_func.func_closure)))
 
1537
                        alt_interface,
 
1538
                        attribute._dbus_signature)(new_function))
1117
1539
                    # Copy annotations, if any
1118
1540
                    try:
1119
1541
                        new_function._dbus_annotations = dict(
1129
1551
                        func1 and func2 to the "call_both" function
1130
1552
                        outside of its arguments"""
1131
1553
                        
 
1554
                        @functools.wraps(func2)
1132
1555
                        def call_both(*args, **kwargs):
1133
1556
                            """This function will emit two D-Bus
1134
1557
                            signals by calling func1 and func2"""
1135
1558
                            func1(*args, **kwargs)
1136
1559
                            func2(*args, **kwargs)
 
1560
                        # Make wrapper function look like a D-Bus signal
 
1561
                        for name, attr in inspect.getmembers(func2):
 
1562
                            if name.startswith("_dbus_"):
 
1563
                                setattr(call_both, name, attr)
1137
1564
                        
1138
1565
                        return call_both
1139
1566
                    # Create the "call_both" function and add it to
1343
1770
        Client.__del__(self, *args, **kwargs)
1344
1771
    
1345
1772
    def checker_callback(self, source, condition,
1346
 
                         (connection, command), *args, **kwargs):
 
1773
                         connection, command, *args, **kwargs):
1347
1774
        ret = Client.checker_callback(self, source, condition,
1348
 
                                      (connection, command), *args,
 
1775
                                      connection, command, *args,
1349
1776
                                      **kwargs)
1350
1777
        exitstatus = self.last_checker_status
1351
1778
        if exitstatus >= 0:
1352
1779
            # Emit D-Bus signal
1353
1780
            self.CheckerCompleted(dbus.Int16(exitstatus),
1354
 
                                  dbus.Int64(0),
 
1781
                                  # This is specific to GNU libC
 
1782
                                  dbus.Int64(exitstatus << 8),
1355
1783
                                  dbus.String(command))
1356
1784
        else:
1357
1785
            # Emit D-Bus signal
1358
1786
            self.CheckerCompleted(dbus.Int16(-1),
1359
1787
                                  dbus.Int64(
1360
 
                                      self.last_checker_signal),
 
1788
                                      # This is specific to GNU libC
 
1789
                                      (exitstatus << 8)
 
1790
                                      | self.last_checker_signal),
1361
1791
                                  dbus.String(command))
1362
1792
        return ret
1363
1793
    
1440
1870
        self.checked_ok()
1441
1871
    
1442
1872
    # Enable - method
 
1873
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1443
1874
    @dbus.service.method(_interface)
1444
1875
    def Enable(self):
1445
1876
        "D-Bus method"
1446
1877
        self.enable()
1447
1878
    
1448
1879
    # StartChecker - method
 
1880
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1449
1881
    @dbus.service.method(_interface)
1450
1882
    def StartChecker(self):
1451
1883
        "D-Bus method"
1452
1884
        self.start_checker()
1453
1885
    
1454
1886
    # Disable - method
 
1887
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1455
1888
    @dbus.service.method(_interface)
1456
1889
    def Disable(self):
1457
1890
        "D-Bus method"
1458
1891
        self.disable()
1459
1892
    
1460
1893
    # StopChecker - method
 
1894
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1461
1895
    @dbus.service.method(_interface)
1462
1896
    def StopChecker(self):
1463
1897
        self.stop_checker()
1499
1933
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1500
1934
    
1501
1935
    # Name - property
 
1936
    @dbus_annotations(
 
1937
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1502
1938
    @dbus_service_property(_interface, signature="s", access="read")
1503
1939
    def Name_dbus_property(self):
1504
1940
        return dbus.String(self.name)
1505
1941
    
1506
1942
    # Fingerprint - property
 
1943
    @dbus_annotations(
 
1944
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1507
1945
    @dbus_service_property(_interface, signature="s", access="read")
1508
1946
    def Fingerprint_dbus_property(self):
1509
1947
        return dbus.String(self.fingerprint)
1518
1956
        self.host = str(value)
1519
1957
    
1520
1958
    # Created - property
 
1959
    @dbus_annotations(
 
1960
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1521
1961
    @dbus_service_property(_interface, signature="s", access="read")
1522
1962
    def Created_dbus_property(self):
1523
1963
        return datetime_to_dbus(self.created)
1638
2078
            self.stop_checker()
1639
2079
    
1640
2080
    # ObjectPath - property
 
2081
    @dbus_annotations(
 
2082
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2083
         "org.freedesktop.DBus.Deprecated": "true"})
1641
2084
    @dbus_service_property(_interface, signature="o", access="read")
1642
2085
    def ObjectPath_dbus_property(self):
1643
2086
        return self.dbus_object_path # is already a dbus.ObjectPath
1644
2087
    
1645
2088
    # Secret = property
 
2089
    @dbus_annotations(
 
2090
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2091
         "invalidates"})
1646
2092
    @dbus_service_property(_interface,
1647
2093
                           signature="ay",
1648
2094
                           access="write",
1658
2104
        self._pipe = child_pipe
1659
2105
        self._pipe.send(('init', fpr, address))
1660
2106
        if not self._pipe.recv():
1661
 
            raise KeyError()
 
2107
            raise KeyError(fpr)
1662
2108
    
1663
2109
    def __getattribute__(self, name):
1664
2110
        if name == '_pipe':
1694
2140
            logger.debug("Pipe FD: %d",
1695
2141
                         self.server.child_pipe.fileno())
1696
2142
            
1697
 
            session = gnutls.connection.ClientSession(
1698
 
                self.request, gnutls.connection .X509Credentials())
1699
 
            
1700
 
            # Note: gnutls.connection.X509Credentials is really a
1701
 
            # generic GnuTLS certificate credentials object so long as
1702
 
            # no X.509 keys are added to it.  Therefore, we can use it
1703
 
            # here despite using OpenPGP certificates.
 
2143
            session = gnutls.ClientSession(self.request)
1704
2144
            
1705
2145
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1706
2146
            #                      "+AES-256-CBC", "+SHA1",
1710
2150
            priority = self.server.gnutls_priority
1711
2151
            if priority is None:
1712
2152
                priority = "NORMAL"
1713
 
            gnutls.library.functions.gnutls_priority_set_direct(
1714
 
                session._c_object, priority, None)
 
2153
            gnutls.priority_set_direct(session._c_object, priority,
 
2154
                                       None)
1715
2155
            
1716
2156
            # Start communication using the Mandos protocol
1717
2157
            # Get protocol number
1727
2167
            # Start GnuTLS connection
1728
2168
            try:
1729
2169
                session.handshake()
1730
 
            except gnutls.errors.GNUTLSError as error:
 
2170
            except gnutls.Error as error:
1731
2171
                logger.warning("Handshake failed: %s", error)
1732
2172
                # Do not run session.bye() here: the session is not
1733
2173
                # established.  Just abandon the request.
1739
2179
                try:
1740
2180
                    fpr = self.fingerprint(
1741
2181
                        self.peer_certificate(session))
1742
 
                except (TypeError,
1743
 
                        gnutls.errors.GNUTLSError) as error:
 
2182
                except (TypeError, gnutls.Error) as error:
1744
2183
                    logger.warning("Bad certificate: %s", error)
1745
2184
                    return
1746
2185
                logger.debug("Fingerprint: %s", fpr)
1804
2243
                    else:
1805
2244
                        delay -= time2 - time
1806
2245
                
1807
 
                sent_size = 0
1808
 
                while sent_size < len(client.secret):
1809
 
                    try:
1810
 
                        sent = session.send(client.secret[sent_size:])
1811
 
                    except gnutls.errors.GNUTLSError as error:
1812
 
                        logger.warning("gnutls send failed",
1813
 
                                       exc_info=error)
1814
 
                        return
1815
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1816
 
                                 len(client.secret) - (sent_size
1817
 
                                                       + sent))
1818
 
                    sent_size += sent
 
2246
                try:
 
2247
                    session.send(client.secret)
 
2248
                except gnutls.Error as error:
 
2249
                    logger.warning("gnutls send failed",
 
2250
                                   exc_info = error)
 
2251
                    return
1819
2252
                
1820
2253
                logger.info("Sending secret to %s", client.name)
1821
2254
                # bump the timeout using extended_timeout
1829
2262
                    client.approvals_pending -= 1
1830
2263
                try:
1831
2264
                    session.bye()
1832
 
                except gnutls.errors.GNUTLSError as error:
 
2265
                except gnutls.Error as error:
1833
2266
                    logger.warning("GnuTLS bye failed",
1834
2267
                                   exc_info=error)
1835
2268
    
1837
2270
    def peer_certificate(session):
1838
2271
        "Return the peer's OpenPGP certificate as a bytestring"
1839
2272
        # If not an OpenPGP certificate...
1840
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1841
 
                session._c_object)
1842
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1843
 
            # ...do the normal thing
1844
 
            return session.peer_certificate
 
2273
        if (gnutls.certificate_type_get(session._c_object)
 
2274
            != gnutls.CRT_OPENPGP):
 
2275
            # ...return invalid data
 
2276
            return b""
1845
2277
        list_size = ctypes.c_uint(1)
1846
 
        cert_list = (gnutls.library.functions
1847
 
                     .gnutls_certificate_get_peers
 
2278
        cert_list = (gnutls.certificate_get_peers
1848
2279
                     (session._c_object, ctypes.byref(list_size)))
1849
2280
        if not bool(cert_list) and list_size.value != 0:
1850
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1851
 
                                            " certificate")
 
2281
            raise gnutls.Error("error getting peer certificate")
1852
2282
        if list_size.value == 0:
1853
2283
            return None
1854
2284
        cert = cert_list[0]
1858
2288
    def fingerprint(openpgp):
1859
2289
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1860
2290
        # New GnuTLS "datum" with the OpenPGP public key
1861
 
        datum = gnutls.library.types.gnutls_datum_t(
 
2291
        datum = gnutls.datum_t(
1862
2292
            ctypes.cast(ctypes.c_char_p(openpgp),
1863
2293
                        ctypes.POINTER(ctypes.c_ubyte)),
1864
2294
            ctypes.c_uint(len(openpgp)))
1865
2295
        # New empty GnuTLS certificate
1866
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1867
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1868
 
            ctypes.byref(crt))
 
2296
        crt = gnutls.openpgp_crt_t()
 
2297
        gnutls.openpgp_crt_init(ctypes.byref(crt))
1869
2298
        # Import the OpenPGP public key into the certificate
1870
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1871
 
            crt, ctypes.byref(datum),
1872
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
2299
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2300
                                  gnutls.OPENPGP_FMT_RAW)
1873
2301
        # Verify the self signature in the key
1874
2302
        crtverify = ctypes.c_uint()
1875
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1876
 
            crt, 0, ctypes.byref(crtverify))
 
2303
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2304
                                       ctypes.byref(crtverify))
1877
2305
        if crtverify.value != 0:
1878
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1879
 
            raise gnutls.errors.CertificateSecurityError(
1880
 
                "Verify failed")
 
2306
            gnutls.openpgp_crt_deinit(crt)
 
2307
            raise gnutls.CertificateSecurityError("Verify failed")
1881
2308
        # New buffer for the fingerprint
1882
2309
        buf = ctypes.create_string_buffer(20)
1883
2310
        buf_len = ctypes.c_size_t()
1884
2311
        # Get the fingerprint from the certificate into the buffer
1885
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1886
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
2312
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2313
                                           ctypes.byref(buf_len))
1887
2314
        # Deinit the certificate
1888
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2315
        gnutls.openpgp_crt_deinit(crt)
1889
2316
        # Convert the buffer to a Python bytestring
1890
2317
        fpr = ctypes.string_at(buf, buf_len.value)
1891
2318
        # Convert the bytestring to hexadecimal notation
2127
2554
        
2128
2555
        if command == 'getattr':
2129
2556
            attrname = request[1]
2130
 
            if callable(client_object.__getattribute__(attrname)):
 
2557
            if isinstance(client_object.__getattribute__(attrname),
 
2558
                          collections.Callable):
2131
2559
                parent_pipe.send(('function', ))
2132
2560
            else:
2133
2561
                parent_pipe.send((
2168
2596
    # avoid excessive use of external libraries.
2169
2597
    
2170
2598
    # New type for defining tokens, syntax, and semantics all-in-one
2171
 
    Token = collections.namedtuple("Token",
2172
 
                                   ("regexp", # To match token; if
2173
 
                                              # "value" is not None,
2174
 
                                              # must have a "group"
2175
 
                                              # containing digits
2176
 
                                    "value",  # datetime.timedelta or
2177
 
                                              # None
2178
 
                                    "followers")) # Tokens valid after
2179
 
                                                  # this token
2180
2599
    Token = collections.namedtuple("Token", (
2181
2600
        "regexp",  # To match token; if "value" is not None, must have
2182
2601
                   # a "group" containing digits
2217
2636
    # Define starting values
2218
2637
    value = datetime.timedelta() # Value so far
2219
2638
    found_token = None
2220
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2639
    followers = frozenset((token_duration, )) # Following valid tokens
2221
2640
    s = duration                # String left to parse
2222
2641
    # Loop until end token is found
2223
2642
    while found_token is not token_end:
2240
2659
                break
2241
2660
        else:
2242
2661
            # No currently valid tokens were found
2243
 
            raise ValueError("Invalid RFC 3339 duration")
 
2662
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2663
                             .format(duration))
2244
2664
    # End token found
2245
2665
    return value
2246
2666
 
2379
2799
                        "debug": "False",
2380
2800
                        "priority":
2381
2801
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2382
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2802
                        ":+SIGN-DSA-SHA256",
2383
2803
                        "servicename": "Mandos",
2384
2804
                        "use_dbus": "True",
2385
2805
                        "use_ipv6": "True",
2497
2917
            pidfilename = "/var/run/mandos.pid"
2498
2918
        pidfile = None
2499
2919
        try:
2500
 
            pidfile = open(pidfilename, "w")
 
2920
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2501
2921
        except IOError as e:
2502
2922
            logger.error("Could not open file %r", pidfilename,
2503
2923
                         exc_info=e)
2504
2924
    
2505
 
    for name in ("_mandos", "mandos", "nobody"):
 
2925
    for name, group in (("_mandos", "_mandos"),
 
2926
                        ("mandos", "mandos"),
 
2927
                        ("nobody", "nogroup")):
2506
2928
        try:
2507
2929
            uid = pwd.getpwnam(name).pw_uid
2508
 
            gid = pwd.getpwnam(name).pw_gid
 
2930
            gid = pwd.getpwnam(group).pw_gid
2509
2931
            break
2510
2932
        except KeyError:
2511
2933
            continue
2524
2946
        
2525
2947
        # "Use a log level over 10 to enable all debugging options."
2526
2948
        # - GnuTLS manual
2527
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2949
        gnutls.global_set_log_level(11)
2528
2950
        
2529
 
        @gnutls.library.types.gnutls_log_func
 
2951
        @gnutls.log_func
2530
2952
        def debug_gnutls(level, string):
2531
2953
            logger.debug("GnuTLS: %s", string[:-1])
2532
2954
        
2533
 
        gnutls.library.functions.gnutls_global_set_log_function(
2534
 
            debug_gnutls)
 
2955
        gnutls.global_set_log_function(debug_gnutls)
2535
2956
        
2536
2957
        # Redirect stdin so all checkers get /dev/null
2537
2958
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2562
2983
            old_bus_name = dbus.service.BusName(
2563
2984
                "se.bsnet.fukt.Mandos", bus,
2564
2985
                do_not_queue=True)
2565
 
        except dbus.exceptions.NameExistsException as e:
 
2986
        except dbus.exceptions.DBusException as e:
2566
2987
            logger.error("Disabling D-Bus:", exc_info=e)
2567
2988
            use_dbus = False
2568
2989
            server_settings["use_dbus"] = False
2699
3120
    
2700
3121
    if not foreground:
2701
3122
        if pidfile is not None:
 
3123
            pid = os.getpid()
2702
3124
            try:
2703
3125
                with pidfile:
2704
 
                    pid = os.getpid()
2705
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
3126
                    print(pid, file=pidfile)
2706
3127
            except IOError:
2707
3128
                logger.error("Could not write to file %r with PID %d",
2708
3129
                             pidfilename, pid)
2716
3137
        
2717
3138
        @alternate_dbus_interfaces(
2718
3139
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2719
 
        class MandosDBusService(DBusObjectWithProperties):
 
3140
        class MandosDBusService(DBusObjectWithObjectManager):
2720
3141
            """A D-Bus proxy object"""
2721
3142
            
2722
3143
            def __init__(self):
2724
3145
            
2725
3146
            _interface = "se.recompile.Mandos"
2726
3147
            
2727
 
            @dbus_interface_annotations(_interface)
2728
 
            def _foo(self):
2729
 
                return {
2730
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2731
 
                    "false" }
2732
 
            
2733
3148
            @dbus.service.signal(_interface, signature="o")
2734
3149
            def ClientAdded(self, objpath):
2735
3150
                "D-Bus signal"
2740
3155
                "D-Bus signal"
2741
3156
                pass
2742
3157
            
 
3158
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3159
                               "true"})
2743
3160
            @dbus.service.signal(_interface, signature="os")
2744
3161
            def ClientRemoved(self, objpath, name):
2745
3162
                "D-Bus signal"
2746
3163
                pass
2747
3164
            
 
3165
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3166
                               "true"})
2748
3167
            @dbus.service.method(_interface, out_signature="ao")
2749
3168
            def GetAllClients(self):
2750
3169
                "D-Bus method"
2751
3170
                return dbus.Array(c.dbus_object_path for c in
2752
3171
                                  tcp_server.clients.itervalues())
2753
3172
            
 
3173
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3174
                               "true"})
2754
3175
            @dbus.service.method(_interface,
2755
3176
                                 out_signature="a{oa{sv}}")
2756
3177
            def GetAllClientsWithProperties(self):
2757
3178
                "D-Bus method"
2758
3179
                return dbus.Dictionary(
2759
 
                    { c.dbus_object_path: c.GetAll("")
 
3180
                    { c.dbus_object_path: c.GetAll(
 
3181
                        "se.recompile.Mandos.Client")
2760
3182
                      for c in tcp_server.clients.itervalues() },
2761
3183
                    signature="oa{sv}")
2762
3184
            
2767
3189
                    if c.dbus_object_path == object_path:
2768
3190
                        del tcp_server.clients[c.name]
2769
3191
                        c.remove_from_connection()
2770
 
                        # Don't signal anything except ClientRemoved
 
3192
                        # Don't signal the disabling
2771
3193
                        c.disable(quiet=True)
2772
 
                        # Emit D-Bus signal
2773
 
                        self.ClientRemoved(object_path, c.name)
 
3194
                        # Emit D-Bus signal for removal
 
3195
                        self.client_removed_signal(c)
2774
3196
                        return
2775
3197
                raise KeyError(object_path)
2776
3198
            
2777
3199
            del _interface
 
3200
            
 
3201
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
3202
                                 out_signature = "a{oa{sa{sv}}}")
 
3203
            def GetManagedObjects(self):
 
3204
                """D-Bus method"""
 
3205
                return dbus.Dictionary(
 
3206
                    { client.dbus_object_path:
 
3207
                      dbus.Dictionary(
 
3208
                          { interface: client.GetAll(interface)
 
3209
                            for interface in
 
3210
                                 client._get_all_interface_names()})
 
3211
                      for client in tcp_server.clients.values()})
 
3212
            
 
3213
            def client_added_signal(self, client):
 
3214
                """Send the new standard signal and the old signal"""
 
3215
                if use_dbus:
 
3216
                    # New standard signal
 
3217
                    self.InterfacesAdded(
 
3218
                        client.dbus_object_path,
 
3219
                        dbus.Dictionary(
 
3220
                            { interface: client.GetAll(interface)
 
3221
                              for interface in
 
3222
                              client._get_all_interface_names()}))
 
3223
                    # Old signal
 
3224
                    self.ClientAdded(client.dbus_object_path)
 
3225
            
 
3226
            def client_removed_signal(self, client):
 
3227
                """Send the new standard signal and the old signal"""
 
3228
                if use_dbus:
 
3229
                    # New standard signal
 
3230
                    self.InterfacesRemoved(
 
3231
                        client.dbus_object_path,
 
3232
                        client._get_all_interface_names())
 
3233
                    # Old signal
 
3234
                    self.ClientRemoved(client.dbus_object_path,
 
3235
                                       client.name)
2778
3236
        
2779
3237
        mandos_dbus_service = MandosDBusService()
2780
3238
    
2845
3303
            name, client = tcp_server.clients.popitem()
2846
3304
            if use_dbus:
2847
3305
                client.remove_from_connection()
2848
 
            # Don't signal anything except ClientRemoved
 
3306
            # Don't signal the disabling
2849
3307
            client.disable(quiet=True)
 
3308
            # Emit D-Bus signal for removal
2850
3309
            if use_dbus:
2851
 
                # Emit D-Bus signal
2852
 
                mandos_dbus_service.ClientRemoved(
2853
 
                    client.dbus_object_path, client.name)
 
3310
                mandos_dbus_service.client_removed_signal(client)
2854
3311
        client_settings.clear()
2855
3312
    
2856
3313
    atexit.register(cleanup)
2857
3314
    
2858
3315
    for client in tcp_server.clients.itervalues():
2859
3316
        if use_dbus:
2860
 
            # Emit D-Bus signal
2861
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3317
            # Emit D-Bus signal for adding
 
3318
            mandos_dbus_service.client_added_signal(client)
2862
3319
        # Need to initiate checking of clients
2863
3320
        if client.enabled:
2864
3321
            client.init_checker()