/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-23 10:41:35 UTC
  • Revision ID: teddy@recompile.se-20150523104135-s08sbkurj1wf0jrz
mandos-keygen: Update copyright year.

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
 
try:
43
 
    import SocketServer as socketserver
44
 
except ImportError:
45
 
    import socketserver
 
39
import SocketServer as socketserver
46
40
import socket
47
41
import argparse
48
42
import datetime
49
43
import errno
50
 
try:
51
 
    import ConfigParser as configparser
52
 
except ImportError:
53
 
    import configparser
 
44
import gnutls.crypto
 
45
import gnutls.connection
 
46
import gnutls.errors
 
47
import gnutls.library.functions
 
48
import gnutls.library.constants
 
49
import gnutls.library.types
 
50
import ConfigParser as configparser
54
51
import sys
55
52
import re
56
53
import os
65
62
import struct
66
63
import fcntl
67
64
import functools
68
 
try:
69
 
    import cPickle as pickle
70
 
except ImportError:
71
 
    import pickle
 
65
import cPickle as pickle
72
66
import multiprocessing
73
67
import types
74
68
import binascii
75
69
import tempfile
76
70
import itertools
77
71
import collections
78
 
import codecs
79
72
 
80
73
import dbus
81
74
import dbus.service
82
 
from gi.repository import GLib
 
75
import gobject
 
76
import avahi
83
77
from dbus.mainloop.glib import DBusGMainLoop
84
78
import ctypes
85
79
import ctypes.util
97
91
if sys.version_info.major == 2:
98
92
    str = unicode
99
93
 
100
 
version = "1.7.5"
 
94
version = "1.6.9"
101
95
stored_state_file = "clients.pickle"
102
96
 
103
97
logger = logging.getLogger()
118
112
        return interface_index
119
113
 
120
114
 
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
115
def initlogger(debug, level=logging.WARNING):
138
116
    """init logger and add loglevel"""
139
117
    
166
144
    
167
145
    def __init__(self):
168
146
        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
147
        self.gnupgargs = ['--batch',
181
 
                          '--homedir', self.tempdir,
 
148
                          '--home', self.tempdir,
182
149
                          '--force-mdc',
183
150
                          '--quiet',
184
151
                          '--no-use-agent']
223
190
                dir=self.tempdir) as passfile:
224
191
            passfile.write(passphrase)
225
192
            passfile.flush()
226
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
193
            proc = subprocess.Popen(['gpg', '--symmetric',
227
194
                                     '--passphrase-file',
228
195
                                     passfile.name]
229
196
                                    + self.gnupgargs,
241
208
                dir = self.tempdir) as passfile:
242
209
            passfile.write(passphrase)
243
210
            passfile.flush()
244
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
211
            proc = subprocess.Popen(['gpg', '--decrypt',
245
212
                                     '--passphrase-file',
246
213
                                     passfile.name]
247
214
                                    + self.gnupgargs,
253
220
            raise PGPError(err)
254
221
        return decrypted_plaintext
255
222
 
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
223
 
281
224
class AvahiError(Exception):
282
225
    def __init__(self, value, *args, **kwargs):
439
382
                    logger.error(bad_states[state] + ": %r", error)
440
383
            self.cleanup()
441
384
        elif state == avahi.SERVER_RUNNING:
442
 
            try:
443
 
                self.add()
444
 
            except dbus.exceptions.DBusException as error:
445
 
                if (error.get_dbus_name()
446
 
                    == "org.freedesktop.Avahi.CollisionError"):
447
 
                    logger.info("Local Zeroconf service name"
448
 
                                " collision.")
449
 
                    return self.rename(remove=False)
450
 
                else:
451
 
                    logger.critical("D-Bus Exception", exc_info=error)
452
 
                    self.cleanup()
453
 
                    os._exit(1)
 
385
            self.add()
454
386
        else:
455
387
            if error is None:
456
388
                logger.debug("Unknown state: %r", state)
479
411
            .format(self.name)))
480
412
        return ret
481
413
 
482
 
# Pretend that we have a GnuTLS module
483
 
class GnuTLS(object):
484
 
    """This isn't so much a class as it is a module-like namespace.
485
 
    It is instantiated once, and simulates having a GnuTLS module."""
486
 
    
487
 
    _library = ctypes.cdll.LoadLibrary(
488
 
        ctypes.util.find_library("gnutls"))
489
 
    _need_version = b"3.3.0"
490
 
    def __init__(self):
491
 
        # Need to use class name "GnuTLS" here, since this method is
492
 
        # called before the assignment to the "gnutls" global variable
493
 
        # happens.
494
 
        if GnuTLS.check_version(self._need_version) is None:
495
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
496
 
                               .format(self._need_version))
497
 
    
498
 
    # Unless otherwise indicated, the constants and types below are
499
 
    # all from the gnutls/gnutls.h C header file.
500
 
    
501
 
    # Constants
502
 
    E_SUCCESS = 0
503
 
    E_INTERRUPTED = -52
504
 
    E_AGAIN = -28
505
 
    CRT_OPENPGP = 2
506
 
    CLIENT = 2
507
 
    SHUT_RDWR = 0
508
 
    CRD_CERTIFICATE = 1
509
 
    E_NO_CERTIFICATE_FOUND = -49
510
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
511
 
    
512
 
    # Types
513
 
    class session_int(ctypes.Structure):
514
 
        _fields_ = []
515
 
    session_t = ctypes.POINTER(session_int)
516
 
    class certificate_credentials_st(ctypes.Structure):
517
 
        _fields_ = []
518
 
    certificate_credentials_t = ctypes.POINTER(
519
 
        certificate_credentials_st)
520
 
    certificate_type_t = ctypes.c_int
521
 
    class datum_t(ctypes.Structure):
522
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
523
 
                    ('size', ctypes.c_uint)]
524
 
    class openpgp_crt_int(ctypes.Structure):
525
 
        _fields_ = []
526
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
527
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
528
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
529
 
    credentials_type_t = ctypes.c_int
530
 
    transport_ptr_t = ctypes.c_void_p
531
 
    close_request_t = ctypes.c_int
532
 
    
533
 
    # Exceptions
534
 
    class Error(Exception):
535
 
        # We need to use the class name "GnuTLS" here, since this
536
 
        # exception might be raised from within GnuTLS.__init__,
537
 
        # which is called before the assignment to the "gnutls"
538
 
        # global variable has happened.
539
 
        def __init__(self, message = None, code = None, args=()):
540
 
            # Default usage is by a message string, but if a return
541
 
            # code is passed, convert it to a string with
542
 
            # gnutls.strerror()
543
 
            self.code = code
544
 
            if message is None and code is not None:
545
 
                message = GnuTLS.strerror(code)
546
 
            return super(GnuTLS.Error, self).__init__(
547
 
                message, *args)
548
 
    
549
 
    class CertificateSecurityError(Error):
550
 
        pass
551
 
    
552
 
    # Classes
553
 
    class Credentials(object):
554
 
        def __init__(self):
555
 
            self._c_object = gnutls.certificate_credentials_t()
556
 
            gnutls.certificate_allocate_credentials(
557
 
                ctypes.byref(self._c_object))
558
 
            self.type = gnutls.CRD_CERTIFICATE
559
 
        
560
 
        def __del__(self):
561
 
            gnutls.certificate_free_credentials(self._c_object)
562
 
    
563
 
    class ClientSession(object):
564
 
        def __init__(self, socket, credentials = None):
565
 
            self._c_object = gnutls.session_t()
566
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
567
 
            gnutls.set_default_priority(self._c_object)
568
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
569
 
            gnutls.handshake_set_private_extensions(self._c_object,
570
 
                                                    True)
571
 
            self.socket = socket
572
 
            if credentials is None:
573
 
                credentials = gnutls.Credentials()
574
 
            gnutls.credentials_set(self._c_object, credentials.type,
575
 
                                   ctypes.cast(credentials._c_object,
576
 
                                               ctypes.c_void_p))
577
 
            self.credentials = credentials
578
 
        
579
 
        def __del__(self):
580
 
            gnutls.deinit(self._c_object)
581
 
        
582
 
        def handshake(self):
583
 
            return gnutls.handshake(self._c_object)
584
 
        
585
 
        def send(self, data):
586
 
            data = bytes(data)
587
 
            data_len = len(data)
588
 
            while data_len > 0:
589
 
                data_len -= gnutls.record_send(self._c_object,
590
 
                                               data[-data_len:],
591
 
                                               data_len)
592
 
        
593
 
        def bye(self):
594
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
595
 
    
596
 
    # Error handling functions
597
 
    def _error_code(result):
598
 
        """A function to raise exceptions on errors, suitable
599
 
        for the 'restype' attribute on ctypes functions"""
600
 
        if result >= 0:
601
 
            return result
602
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
603
 
            raise gnutls.CertificateSecurityError(code = result)
604
 
        raise gnutls.Error(code = result)
605
 
    
606
 
    def _retry_on_error(result, func, arguments):
607
 
        """A function to retry on some errors, suitable
608
 
        for the 'errcheck' attribute on ctypes functions"""
609
 
        while result < 0:
610
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
611
 
                return _error_code(result)
612
 
            result = func(*arguments)
613
 
        return result
614
 
    
615
 
    # Unless otherwise indicated, the function declarations below are
616
 
    # all from the gnutls/gnutls.h C header file.
617
 
    
618
 
    # Functions
619
 
    priority_set_direct = _library.gnutls_priority_set_direct
620
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
621
 
                                    ctypes.POINTER(ctypes.c_char_p)]
622
 
    priority_set_direct.restype = _error_code
623
 
    
624
 
    init = _library.gnutls_init
625
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
626
 
    init.restype = _error_code
627
 
    
628
 
    set_default_priority = _library.gnutls_set_default_priority
629
 
    set_default_priority.argtypes = [session_t]
630
 
    set_default_priority.restype = _error_code
631
 
    
632
 
    record_send = _library.gnutls_record_send
633
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
634
 
                            ctypes.c_size_t]
635
 
    record_send.restype = ctypes.c_ssize_t
636
 
    record_send.errcheck = _retry_on_error
637
 
    
638
 
    certificate_allocate_credentials = (
639
 
        _library.gnutls_certificate_allocate_credentials)
640
 
    certificate_allocate_credentials.argtypes = [
641
 
        ctypes.POINTER(certificate_credentials_t)]
642
 
    certificate_allocate_credentials.restype = _error_code
643
 
    
644
 
    certificate_free_credentials = (
645
 
        _library.gnutls_certificate_free_credentials)
646
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
647
 
    certificate_free_credentials.restype = None
648
 
    
649
 
    handshake_set_private_extensions = (
650
 
        _library.gnutls_handshake_set_private_extensions)
651
 
    handshake_set_private_extensions.argtypes = [session_t,
652
 
                                                 ctypes.c_int]
653
 
    handshake_set_private_extensions.restype = None
654
 
    
655
 
    credentials_set = _library.gnutls_credentials_set
656
 
    credentials_set.argtypes = [session_t, credentials_type_t,
657
 
                                ctypes.c_void_p]
658
 
    credentials_set.restype = _error_code
659
 
    
660
 
    strerror = _library.gnutls_strerror
661
 
    strerror.argtypes = [ctypes.c_int]
662
 
    strerror.restype = ctypes.c_char_p
663
 
    
664
 
    certificate_type_get = _library.gnutls_certificate_type_get
665
 
    certificate_type_get.argtypes = [session_t]
666
 
    certificate_type_get.restype = _error_code
667
 
    
668
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
669
 
    certificate_get_peers.argtypes = [session_t,
670
 
                                      ctypes.POINTER(ctypes.c_uint)]
671
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
672
 
    
673
 
    global_set_log_level = _library.gnutls_global_set_log_level
674
 
    global_set_log_level.argtypes = [ctypes.c_int]
675
 
    global_set_log_level.restype = None
676
 
    
677
 
    global_set_log_function = _library.gnutls_global_set_log_function
678
 
    global_set_log_function.argtypes = [log_func]
679
 
    global_set_log_function.restype = None
680
 
    
681
 
    deinit = _library.gnutls_deinit
682
 
    deinit.argtypes = [session_t]
683
 
    deinit.restype = None
684
 
    
685
 
    handshake = _library.gnutls_handshake
686
 
    handshake.argtypes = [session_t]
687
 
    handshake.restype = _error_code
688
 
    handshake.errcheck = _retry_on_error
689
 
    
690
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
691
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
692
 
    transport_set_ptr.restype = None
693
 
    
694
 
    bye = _library.gnutls_bye
695
 
    bye.argtypes = [session_t, close_request_t]
696
 
    bye.restype = _error_code
697
 
    bye.errcheck = _retry_on_error
698
 
    
699
 
    check_version = _library.gnutls_check_version
700
 
    check_version.argtypes = [ctypes.c_char_p]
701
 
    check_version.restype = ctypes.c_char_p
702
 
    
703
 
    # All the function declarations below are from gnutls/openpgp.h
704
 
    
705
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
706
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
707
 
    openpgp_crt_init.restype = _error_code
708
 
    
709
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
710
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
711
 
                                   ctypes.POINTER(datum_t),
712
 
                                   openpgp_crt_fmt_t]
713
 
    openpgp_crt_import.restype = _error_code
714
 
    
715
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
716
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
717
 
                                        ctypes.POINTER(ctypes.c_uint)]
718
 
    openpgp_crt_verify_self.restype = _error_code
719
 
    
720
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
721
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
722
 
    openpgp_crt_deinit.restype = None
723
 
    
724
 
    openpgp_crt_get_fingerprint = (
725
 
        _library.gnutls_openpgp_crt_get_fingerprint)
726
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
727
 
                                            ctypes.c_void_p,
728
 
                                            ctypes.POINTER(
729
 
                                                ctypes.c_size_t)]
730
 
    openpgp_crt_get_fingerprint.restype = _error_code
731
 
    
732
 
    # Remove non-public functions
733
 
    del _error_code, _retry_on_error
734
 
# Create the global "gnutls" object, simulating a module
735
 
gnutls = GnuTLS()
736
 
 
737
 
def call_pipe(connection,       # : multiprocessing.Connection
738
 
              func, *args, **kwargs):
739
 
    """This function is meant to be called by multiprocessing.Process
740
 
    
741
 
    This function runs func(*args, **kwargs), and writes the resulting
742
 
    return value on the provided multiprocessing.Connection.
743
 
    """
744
 
    connection.send(func(*args, **kwargs))
745
 
    connection.close()
746
414
 
747
415
class Client(object):
748
416
    """A representation of a client host served by this server.
754
422
    checker:    subprocess.Popen(); a running checker process used
755
423
                                    to see if the client lives.
756
424
                                    'None' if no process is running.
757
 
    checker_callback_tag: a GLib event source tag, or None
 
425
    checker_callback_tag: a gobject event source tag, or None
758
426
    checker_command: string; External command which is run to check
759
427
                     if client lives.  %() expansions are done at
760
428
                     runtime with vars(self) as dict, so that for
761
429
                     instance %(name)s can be used in the command.
762
 
    checker_initiator_tag: a GLib event source tag, or None
 
430
    checker_initiator_tag: a gobject event source tag, or None
763
431
    created:    datetime.datetime(); (UTC) object creation
764
432
    client_structure: Object describing what attributes a client has
765
433
                      and is used for storing the client at exit
766
434
    current_checker_command: string; current running checker_command
767
 
    disable_initiator_tag: a GLib event source tag, or None
 
435
    disable_initiator_tag: a gobject event source tag, or None
768
436
    enabled:    bool()
769
437
    fingerprint: string (40 or 32 hexadecimal digits); used to
770
438
                 uniquely identify the client
775
443
    last_checker_status: integer between 0 and 255 reflecting exit
776
444
                         status of last checker. -1 reflects crashed
777
445
                         checker, -2 means no checker completed yet.
778
 
    last_checker_signal: The signal which killed the last checker, if
779
 
                         last_checker_status is -1
780
446
    last_enabled: datetime.datetime(); (UTC) or None
781
447
    name:       string; from the config file, used in log messages and
782
448
                        D-Bus identifiers
833
499
            client["fingerprint"] = (section["fingerprint"].upper()
834
500
                                     .replace(" ", ""))
835
501
            if "secret" in section:
836
 
                client["secret"] = codecs.decode(section["secret"]
837
 
                                                 .encode("utf-8"),
838
 
                                                 "base64")
 
502
                client["secret"] = section["secret"].decode("base64")
839
503
            elif "secfile" in section:
840
504
                with open(os.path.expanduser(os.path.expandvars
841
505
                                             (section["secfile"])),
894
558
        self.changedstate = multiprocessing_manager.Condition(
895
559
            multiprocessing_manager.Lock())
896
560
        self.client_structure = [attr
897
 
                                 for attr in self.__dict__.keys()
 
561
                                 for attr in self.__dict__.iterkeys()
898
562
                                 if not attr.startswith("_")]
899
563
        self.client_structure.append("client_structure")
900
564
        
926
590
        if not quiet:
927
591
            logger.info("Disabling client %s", self.name)
928
592
        if getattr(self, "disable_initiator_tag", None) is not None:
929
 
            GLib.source_remove(self.disable_initiator_tag)
 
593
            gobject.source_remove(self.disable_initiator_tag)
930
594
            self.disable_initiator_tag = None
931
595
        self.expires = None
932
596
        if getattr(self, "checker_initiator_tag", None) is not None:
933
 
            GLib.source_remove(self.checker_initiator_tag)
 
597
            gobject.source_remove(self.checker_initiator_tag)
934
598
            self.checker_initiator_tag = None
935
599
        self.stop_checker()
936
600
        self.enabled = False
937
601
        if not quiet:
938
602
            self.send_changedstate()
939
 
        # Do not run this again if called by a GLib.timeout_add
 
603
        # Do not run this again if called by a gobject.timeout_add
940
604
        return False
941
605
    
942
606
    def __del__(self):
946
610
        # Schedule a new checker to be started an 'interval' from now,
947
611
        # and every interval from then on.
948
612
        if self.checker_initiator_tag is not None:
949
 
            GLib.source_remove(self.checker_initiator_tag)
950
 
        self.checker_initiator_tag = GLib.timeout_add(
 
613
            gobject.source_remove(self.checker_initiator_tag)
 
614
        self.checker_initiator_tag = gobject.timeout_add(
951
615
            int(self.interval.total_seconds() * 1000),
952
616
            self.start_checker)
953
617
        # Schedule a disable() when 'timeout' has passed
954
618
        if self.disable_initiator_tag is not None:
955
 
            GLib.source_remove(self.disable_initiator_tag)
956
 
        self.disable_initiator_tag = GLib.timeout_add(
 
619
            gobject.source_remove(self.disable_initiator_tag)
 
620
        self.disable_initiator_tag = gobject.timeout_add(
957
621
            int(self.timeout.total_seconds() * 1000), self.disable)
958
622
        # Also start a new checker *right now*.
959
623
        self.start_checker()
960
624
    
961
 
    def checker_callback(self, source, condition, connection,
962
 
                         command):
 
625
    def checker_callback(self, pid, condition, command):
963
626
        """The checker has completed, so take appropriate actions."""
964
627
        self.checker_callback_tag = None
965
628
        self.checker = None
966
 
        # Read return code from connection (see call_pipe)
967
 
        returncode = connection.recv()
968
 
        connection.close()
969
 
        
970
 
        if returncode >= 0:
971
 
            self.last_checker_status = returncode
972
 
            self.last_checker_signal = None
 
629
        if os.WIFEXITED(condition):
 
630
            self.last_checker_status = os.WEXITSTATUS(condition)
973
631
            if self.last_checker_status == 0:
974
632
                logger.info("Checker for %(name)s succeeded",
975
633
                            vars(self))
978
636
                logger.info("Checker for %(name)s failed", vars(self))
979
637
        else:
980
638
            self.last_checker_status = -1
981
 
            self.last_checker_signal = -returncode
982
639
            logger.warning("Checker for %(name)s crashed?",
983
640
                           vars(self))
984
 
        return False
985
641
    
986
642
    def checked_ok(self):
987
643
        """Assert that the client has been seen, alive and well."""
988
644
        self.last_checked_ok = datetime.datetime.utcnow()
989
645
        self.last_checker_status = 0
990
 
        self.last_checker_signal = None
991
646
        self.bump_timeout()
992
647
    
993
648
    def bump_timeout(self, timeout=None):
995
650
        if timeout is None:
996
651
            timeout = self.timeout
997
652
        if self.disable_initiator_tag is not None:
998
 
            GLib.source_remove(self.disable_initiator_tag)
 
653
            gobject.source_remove(self.disable_initiator_tag)
999
654
            self.disable_initiator_tag = None
1000
655
        if getattr(self, "enabled", False):
1001
 
            self.disable_initiator_tag = GLib.timeout_add(
 
656
            self.disable_initiator_tag = gobject.timeout_add(
1002
657
                int(timeout.total_seconds() * 1000), self.disable)
1003
658
            self.expires = datetime.datetime.utcnow() + timeout
1004
659
    
1019
674
        # than 'timeout' for the client to be disabled, which is as it
1020
675
        # should be.
1021
676
        
1022
 
        if self.checker is not None and not self.checker.is_alive():
1023
 
            logger.warning("Checker was not alive; joining")
1024
 
            self.checker.join()
1025
 
            self.checker = None
 
677
        # If a checker exists, make sure it is not a zombie
 
678
        try:
 
679
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
680
        except AttributeError:
 
681
            pass
 
682
        except OSError as error:
 
683
            if error.errno != errno.ECHILD:
 
684
                raise
 
685
        else:
 
686
            if pid:
 
687
                logger.warning("Checker was a zombie")
 
688
                gobject.source_remove(self.checker_callback_tag)
 
689
                self.checker_callback(pid, status,
 
690
                                      self.current_checker_command)
1026
691
        # Start a new checker if needed
1027
692
        if self.checker is None:
1028
693
            # Escape attributes for the shell
1037
702
                             exc_info=error)
1038
703
                return True     # Try again later
1039
704
            self.current_checker_command = command
1040
 
            logger.info("Starting checker %r for %s", command,
1041
 
                        self.name)
1042
 
            # We don't need to redirect stdout and stderr, since
1043
 
            # in normal mode, that is already done by daemon(),
1044
 
            # and in debug mode we don't want to.  (Stdin is
1045
 
            # always replaced by /dev/null.)
1046
 
            # The exception is when not debugging but nevertheless
1047
 
            # running in the foreground; use the previously
1048
 
            # created wnull.
1049
 
            popen_args = { "close_fds": True,
1050
 
                           "shell": True,
1051
 
                           "cwd": "/" }
1052
 
            if (not self.server_settings["debug"]
1053
 
                and self.server_settings["foreground"]):
1054
 
                popen_args.update({"stdout": wnull,
1055
 
                                   "stderr": wnull })
1056
 
            pipe = multiprocessing.Pipe(duplex = False)
1057
 
            self.checker = multiprocessing.Process(
1058
 
                target = call_pipe,
1059
 
                args = (pipe[1], subprocess.call, command),
1060
 
                kwargs = popen_args)
1061
 
            self.checker.start()
1062
 
            self.checker_callback_tag = GLib.io_add_watch(
1063
 
                pipe[0].fileno(), GLib.IO_IN,
1064
 
                self.checker_callback, pipe[0], command)
1065
 
        # Re-run this periodically if run by GLib.timeout_add
 
705
            try:
 
706
                logger.info("Starting checker %r for %s", command,
 
707
                            self.name)
 
708
                # We don't need to redirect stdout and stderr, since
 
709
                # in normal mode, that is already done by daemon(),
 
710
                # and in debug mode we don't want to.  (Stdin is
 
711
                # always replaced by /dev/null.)
 
712
                # The exception is when not debugging but nevertheless
 
713
                # running in the foreground; use the previously
 
714
                # created wnull.
 
715
                popen_args = {}
 
716
                if (not self.server_settings["debug"]
 
717
                    and self.server_settings["foreground"]):
 
718
                    popen_args.update({"stdout": wnull,
 
719
                                       "stderr": wnull })
 
720
                self.checker = subprocess.Popen(command,
 
721
                                                close_fds=True,
 
722
                                                shell=True,
 
723
                                                cwd="/",
 
724
                                                **popen_args)
 
725
            except OSError as error:
 
726
                logger.error("Failed to start subprocess",
 
727
                             exc_info=error)
 
728
                return True
 
729
            self.checker_callback_tag = gobject.child_watch_add(
 
730
                self.checker.pid, self.checker_callback, data=command)
 
731
            # The checker may have completed before the gobject
 
732
            # watch was added.  Check for this.
 
733
            try:
 
734
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
735
            except OSError as error:
 
736
                if error.errno == errno.ECHILD:
 
737
                    # This should never happen
 
738
                    logger.error("Child process vanished",
 
739
                                 exc_info=error)
 
740
                    return True
 
741
                raise
 
742
            if pid:
 
743
                gobject.source_remove(self.checker_callback_tag)
 
744
                self.checker_callback(pid, status, command)
 
745
        # Re-run this periodically if run by gobject.timeout_add
1066
746
        return True
1067
747
    
1068
748
    def stop_checker(self):
1069
749
        """Force the checker process, if any, to stop."""
1070
750
        if self.checker_callback_tag:
1071
 
            GLib.source_remove(self.checker_callback_tag)
 
751
            gobject.source_remove(self.checker_callback_tag)
1072
752
            self.checker_callback_tag = None
1073
753
        if getattr(self, "checker", None) is None:
1074
754
            return
1075
755
        logger.debug("Stopping checker for %(name)s", vars(self))
1076
 
        self.checker.terminate()
 
756
        try:
 
757
            self.checker.terminate()
 
758
            #time.sleep(0.5)
 
759
            #if self.checker.poll() is None:
 
760
            #    self.checker.kill()
 
761
        except OSError as error:
 
762
            if error.errno != errno.ESRCH: # No such process
 
763
                raise
1077
764
        self.checker = None
1078
765
 
1079
766
 
1143
830
                           access="r")
1144
831
    def Property_dbus_property(self):
1145
832
        return dbus.Boolean(False)
1146
 
    
1147
 
    See also the DBusObjectWithAnnotations class.
1148
833
    """
1149
834
    
1150
835
    def decorator(func):
1172
857
    pass
1173
858
 
1174
859
 
1175
 
class DBusObjectWithAnnotations(dbus.service.Object):
1176
 
    """A D-Bus object with annotations.
 
860
class DBusObjectWithProperties(dbus.service.Object):
 
861
    """A D-Bus object with properties.
1177
862
    
1178
 
    Classes inheriting from this can use the dbus_annotations
1179
 
    decorator to add annotations to methods or signals.
 
863
    Classes inheriting from this can use the dbus_service_property
 
864
    decorator to expose methods as D-Bus properties.  It exposes the
 
865
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1180
866
    """
1181
867
    
1182
868
    @staticmethod
1198
884
                for name, athing in
1199
885
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
1200
886
    
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
887
    def _get_dbus_property(self, interface_name, property_name):
1273
888
        """Returns a bound method if one exists which is a D-Bus
1274
889
        property with the specified name and interface.
1284
899
        raise DBusPropertyNotFound("{}:{}.{}".format(
1285
900
            self.dbus_object_path, interface_name, property_name))
1286
901
    
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
902
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1297
903
                         in_signature="ss",
1298
904
                         out_signature="v")
1368
974
        
1369
975
        Inserts property tags and interface annotation tags.
1370
976
        """
1371
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1372
 
                                                         object_path,
1373
 
                                                         connection)
 
977
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
978
                                                   connection)
1374
979
        try:
1375
980
            document = xml.dom.minidom.parseString(xmlstring)
1376
981
            
1389
994
                            if prop._dbus_interface
1390
995
                            == if_tag.getAttribute("name")):
1391
996
                    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)
 
997
                # Add annotation tags
 
998
                for typ in ("method", "signal", "property"):
 
999
                    for tag in if_tag.getElementsByTagName(typ):
 
1000
                        annots = dict()
 
1001
                        for name, prop in (self.
 
1002
                                           _get_all_dbus_things(typ)):
 
1003
                            if (name == tag.getAttribute("name")
 
1004
                                and prop._dbus_interface
 
1005
                                == if_tag.getAttribute("name")):
 
1006
                                annots.update(getattr(
 
1007
                                    prop, "_dbus_annotations", {}))
 
1008
                        for name, value in annots.items():
 
1009
                            ann_tag = document.createElement(
 
1010
                                "annotation")
 
1011
                            ann_tag.setAttribute("name", name)
 
1012
                            ann_tag.setAttribute("value", value)
 
1013
                            tag.appendChild(ann_tag)
 
1014
                # Add interface annotation tags
 
1015
                for annotation, value in dict(
 
1016
                    itertools.chain.from_iterable(
 
1017
                        annotations().items()
 
1018
                        for name, annotations
 
1019
                        in self._get_all_dbus_things("interface")
 
1020
                        if name == if_tag.getAttribute("name")
 
1021
                        )).items():
 
1022
                    ann_tag = document.createElement("annotation")
 
1023
                    ann_tag.setAttribute("name", annotation)
 
1024
                    ann_tag.setAttribute("value", value)
 
1025
                    if_tag.appendChild(ann_tag)
1408
1026
                # Add the names to the return values for the
1409
1027
                # "org.freedesktop.DBus.Properties" methods
1410
1028
                if (if_tag.getAttribute("name")
1428
1046
                         exc_info=error)
1429
1047
        return xmlstring
1430
1048
 
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
1049
 
1500
1050
def datetime_to_dbus(dt, variant_level=0):
1501
1051
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1550
1100
                if getattr(attribute, "_dbus_is_signal", False):
1551
1101
                    # Extract the original non-method undecorated
1552
1102
                    # function by black magic
1553
 
                    if sys.version_info.major == 2:
1554
 
                        nonmethod_func = (dict(
1555
 
                            zip(attribute.func_code.co_freevars,
1556
 
                                attribute.__closure__))
1557
 
                                          ["func"].cell_contents)
1558
 
                    else:
1559
 
                        nonmethod_func = (dict(
1560
 
                            zip(attribute.__code__.co_freevars,
1561
 
                                attribute.__closure__))
1562
 
                                          ["func"].cell_contents)
 
1103
                    nonmethod_func = (dict(
 
1104
                        zip(attribute.func_code.co_freevars,
 
1105
                            attribute.__closure__))
 
1106
                                      ["func"].cell_contents)
1563
1107
                    # Create a new, but exactly alike, function
1564
1108
                    # object, and decorate it to be a new D-Bus signal
1565
1109
                    # with the alternate D-Bus interface name
1566
 
                    new_function = copy_function(nonmethod_func)
1567
1110
                    new_function = (dbus.service.signal(
1568
 
                        alt_interface,
1569
 
                        attribute._dbus_signature)(new_function))
 
1111
                        alt_interface, attribute._dbus_signature)
 
1112
                                    (types.FunctionType(
 
1113
                                        nonmethod_func.func_code,
 
1114
                                        nonmethod_func.func_globals,
 
1115
                                        nonmethod_func.func_name,
 
1116
                                        nonmethod_func.func_defaults,
 
1117
                                        nonmethod_func.func_closure)))
1570
1118
                    # Copy annotations, if any
1571
1119
                    try:
1572
1120
                        new_function._dbus_annotations = dict(
1582
1130
                        func1 and func2 to the "call_both" function
1583
1131
                        outside of its arguments"""
1584
1132
                        
1585
 
                        @functools.wraps(func2)
1586
1133
                        def call_both(*args, **kwargs):
1587
1134
                            """This function will emit two D-Bus
1588
1135
                            signals by calling func1 and func2"""
1589
1136
                            func1(*args, **kwargs)
1590
1137
                            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
1138
                        
1596
1139
                        return call_both
1597
1140
                    # Create the "call_both" function and add it to
1608
1151
                            alt_interface,
1609
1152
                            attribute._dbus_in_signature,
1610
1153
                            attribute._dbus_out_signature)
1611
 
                        (copy_function(attribute)))
 
1154
                        (types.FunctionType(attribute.func_code,
 
1155
                                            attribute.func_globals,
 
1156
                                            attribute.func_name,
 
1157
                                            attribute.func_defaults,
 
1158
                                            attribute.func_closure)))
1612
1159
                    # Copy annotations, if any
1613
1160
                    try:
1614
1161
                        attr[attrname]._dbus_annotations = dict(
1626
1173
                        attribute._dbus_access,
1627
1174
                        attribute._dbus_get_args_options
1628
1175
                        ["byte_arrays"])
1629
 
                                      (copy_function(attribute)))
 
1176
                                      (types.FunctionType(
 
1177
                                          attribute.func_code,
 
1178
                                          attribute.func_globals,
 
1179
                                          attribute.func_name,
 
1180
                                          attribute.func_defaults,
 
1181
                                          attribute.func_closure)))
1630
1182
                    # Copy annotations, if any
1631
1183
                    try:
1632
1184
                        attr[attrname]._dbus_annotations = dict(
1641
1193
                    # to the class.
1642
1194
                    attr[attrname] = (
1643
1195
                        dbus_interface_annotations(alt_interface)
1644
 
                        (copy_function(attribute)))
 
1196
                        (types.FunctionType(attribute.func_code,
 
1197
                                            attribute.func_globals,
 
1198
                                            attribute.func_name,
 
1199
                                            attribute.func_defaults,
 
1200
                                            attribute.func_closure)))
1645
1201
            if deprecate:
1646
1202
                # Deprecate all alternate interfaces
1647
1203
                iname="_AlternateDBusNames_interface_annotation{}"
1660
1216
            if interface_names:
1661
1217
                # Replace the class with a new subclass of it with
1662
1218
                # 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)
 
1219
                cls = type(b"{}Alternate".format(cls.__name__),
 
1220
                           (cls, ), attr)
1669
1221
        return cls
1670
1222
    
1671
1223
    return wrapper
1791
1343
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1792
1344
        Client.__del__(self, *args, **kwargs)
1793
1345
    
1794
 
    def checker_callback(self, source, condition,
1795
 
                         connection, command, *args, **kwargs):
1796
 
        ret = Client.checker_callback(self, source, condition,
1797
 
                                      connection, command, *args,
1798
 
                                      **kwargs)
1799
 
        exitstatus = self.last_checker_status
1800
 
        if exitstatus >= 0:
 
1346
    def checker_callback(self, pid, condition, command,
 
1347
                         *args, **kwargs):
 
1348
        self.checker_callback_tag = None
 
1349
        self.checker = None
 
1350
        if os.WIFEXITED(condition):
 
1351
            exitstatus = os.WEXITSTATUS(condition)
1801
1352
            # Emit D-Bus signal
1802
1353
            self.CheckerCompleted(dbus.Int16(exitstatus),
1803
 
                                  # This is specific to GNU libC
1804
 
                                  dbus.Int64(exitstatus << 8),
 
1354
                                  dbus.Int64(condition),
1805
1355
                                  dbus.String(command))
1806
1356
        else:
1807
1357
            # Emit D-Bus signal
1808
1358
            self.CheckerCompleted(dbus.Int16(-1),
1809
 
                                  dbus.Int64(
1810
 
                                      # This is specific to GNU libC
1811
 
                                      (exitstatus << 8)
1812
 
                                      | self.last_checker_signal),
 
1359
                                  dbus.Int64(condition),
1813
1360
                                  dbus.String(command))
1814
 
        return ret
 
1361
        
 
1362
        return Client.checker_callback(self, pid, condition, command,
 
1363
                                       *args, **kwargs)
1815
1364
    
1816
1365
    def start_checker(self, *args, **kwargs):
1817
1366
        old_checker_pid = getattr(self.checker, "pid", None)
1829
1378
    
1830
1379
    def approve(self, value=True):
1831
1380
        self.approved = value
1832
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1833
 
                             * 1000), self._reset_approved)
 
1381
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1382
                                * 1000), self._reset_approved)
1834
1383
        self.send_changedstate()
1835
1384
    
1836
1385
    ## D-Bus methods, signals & properties
1892
1441
        self.checked_ok()
1893
1442
    
1894
1443
    # Enable - method
1895
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1896
1444
    @dbus.service.method(_interface)
1897
1445
    def Enable(self):
1898
1446
        "D-Bus method"
1899
1447
        self.enable()
1900
1448
    
1901
1449
    # StartChecker - method
1902
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1903
1450
    @dbus.service.method(_interface)
1904
1451
    def StartChecker(self):
1905
1452
        "D-Bus method"
1906
1453
        self.start_checker()
1907
1454
    
1908
1455
    # Disable - method
1909
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1910
1456
    @dbus.service.method(_interface)
1911
1457
    def Disable(self):
1912
1458
        "D-Bus method"
1913
1459
        self.disable()
1914
1460
    
1915
1461
    # StopChecker - method
1916
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1917
1462
    @dbus.service.method(_interface)
1918
1463
    def StopChecker(self):
1919
1464
        self.stop_checker()
1955
1500
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1956
1501
    
1957
1502
    # Name - property
1958
 
    @dbus_annotations(
1959
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1960
1503
    @dbus_service_property(_interface, signature="s", access="read")
1961
1504
    def Name_dbus_property(self):
1962
1505
        return dbus.String(self.name)
1963
1506
    
1964
1507
    # Fingerprint - property
1965
 
    @dbus_annotations(
1966
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1967
1508
    @dbus_service_property(_interface, signature="s", access="read")
1968
1509
    def Fingerprint_dbus_property(self):
1969
1510
        return dbus.String(self.fingerprint)
1978
1519
        self.host = str(value)
1979
1520
    
1980
1521
    # Created - property
1981
 
    @dbus_annotations(
1982
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1983
1522
    @dbus_service_property(_interface, signature="s", access="read")
1984
1523
    def Created_dbus_property(self):
1985
1524
        return datetime_to_dbus(self.created)
2046
1585
                if (getattr(self, "disable_initiator_tag", None)
2047
1586
                    is None):
2048
1587
                    return
2049
 
                GLib.source_remove(self.disable_initiator_tag)
2050
 
                self.disable_initiator_tag = GLib.timeout_add(
 
1588
                gobject.source_remove(self.disable_initiator_tag)
 
1589
                self.disable_initiator_tag = gobject.timeout_add(
2051
1590
                    int((self.expires - now).total_seconds() * 1000),
2052
1591
                    self.disable)
2053
1592
    
2073
1612
            return
2074
1613
        if self.enabled:
2075
1614
            # Reschedule checker run
2076
 
            GLib.source_remove(self.checker_initiator_tag)
2077
 
            self.checker_initiator_tag = GLib.timeout_add(
 
1615
            gobject.source_remove(self.checker_initiator_tag)
 
1616
            self.checker_initiator_tag = gobject.timeout_add(
2078
1617
                value, self.start_checker)
2079
1618
            self.start_checker() # Start one now, too
2080
1619
    
2100
1639
            self.stop_checker()
2101
1640
    
2102
1641
    # ObjectPath - property
2103
 
    @dbus_annotations(
2104
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2105
 
         "org.freedesktop.DBus.Deprecated": "true"})
2106
1642
    @dbus_service_property(_interface, signature="o", access="read")
2107
1643
    def ObjectPath_dbus_property(self):
2108
1644
        return self.dbus_object_path # is already a dbus.ObjectPath
2109
1645
    
2110
1646
    # Secret = property
2111
 
    @dbus_annotations(
2112
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2113
 
         "invalidates"})
2114
1647
    @dbus_service_property(_interface,
2115
1648
                           signature="ay",
2116
1649
                           access="write",
2126
1659
        self._pipe = child_pipe
2127
1660
        self._pipe.send(('init', fpr, address))
2128
1661
        if not self._pipe.recv():
2129
 
            raise KeyError(fpr)
 
1662
            raise KeyError()
2130
1663
    
2131
1664
    def __getattribute__(self, name):
2132
1665
        if name == '_pipe':
2162
1695
            logger.debug("Pipe FD: %d",
2163
1696
                         self.server.child_pipe.fileno())
2164
1697
            
2165
 
            session = gnutls.ClientSession(self.request)
 
1698
            session = gnutls.connection.ClientSession(
 
1699
                self.request, gnutls.connection .X509Credentials())
 
1700
            
 
1701
            # Note: gnutls.connection.X509Credentials is really a
 
1702
            # generic GnuTLS certificate credentials object so long as
 
1703
            # no X.509 keys are added to it.  Therefore, we can use it
 
1704
            # here despite using OpenPGP certificates.
2166
1705
            
2167
1706
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2168
1707
            #                      "+AES-256-CBC", "+SHA1",
2172
1711
            priority = self.server.gnutls_priority
2173
1712
            if priority is None:
2174
1713
                priority = "NORMAL"
2175
 
            gnutls.priority_set_direct(session._c_object, priority,
2176
 
                                       None)
 
1714
            gnutls.library.functions.gnutls_priority_set_direct(
 
1715
                session._c_object, priority, None)
2177
1716
            
2178
1717
            # Start communication using the Mandos protocol
2179
1718
            # Get protocol number
2189
1728
            # Start GnuTLS connection
2190
1729
            try:
2191
1730
                session.handshake()
2192
 
            except gnutls.Error as error:
 
1731
            except gnutls.errors.GNUTLSError as error:
2193
1732
                logger.warning("Handshake failed: %s", error)
2194
1733
                # Do not run session.bye() here: the session is not
2195
1734
                # established.  Just abandon the request.
2201
1740
                try:
2202
1741
                    fpr = self.fingerprint(
2203
1742
                        self.peer_certificate(session))
2204
 
                except (TypeError, gnutls.Error) as error:
 
1743
                except (TypeError,
 
1744
                        gnutls.errors.GNUTLSError) as error:
2205
1745
                    logger.warning("Bad certificate: %s", error)
2206
1746
                    return
2207
1747
                logger.debug("Fingerprint: %s", fpr)
2265
1805
                    else:
2266
1806
                        delay -= time2 - time
2267
1807
                
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
 
1808
                sent_size = 0
 
1809
                while sent_size < len(client.secret):
 
1810
                    try:
 
1811
                        sent = session.send(client.secret[sent_size:])
 
1812
                    except gnutls.errors.GNUTLSError as error:
 
1813
                        logger.warning("gnutls send failed",
 
1814
                                       exc_info=error)
 
1815
                        return
 
1816
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1817
                                 len(client.secret) - (sent_size
 
1818
                                                       + sent))
 
1819
                    sent_size += sent
2274
1820
                
2275
1821
                logger.info("Sending secret to %s", client.name)
2276
1822
                # bump the timeout using extended_timeout
2284
1830
                    client.approvals_pending -= 1
2285
1831
                try:
2286
1832
                    session.bye()
2287
 
                except gnutls.Error as error:
 
1833
                except gnutls.errors.GNUTLSError as error:
2288
1834
                    logger.warning("GnuTLS bye failed",
2289
1835
                                   exc_info=error)
2290
1836
    
2292
1838
    def peer_certificate(session):
2293
1839
        "Return the peer's OpenPGP certificate as a bytestring"
2294
1840
        # 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""
 
1841
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1842
                session._c_object)
 
1843
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1844
            # ...do the normal thing
 
1845
            return session.peer_certificate
2299
1846
        list_size = ctypes.c_uint(1)
2300
 
        cert_list = (gnutls.certificate_get_peers
 
1847
        cert_list = (gnutls.library.functions
 
1848
                     .gnutls_certificate_get_peers
2301
1849
                     (session._c_object, ctypes.byref(list_size)))
2302
1850
        if not bool(cert_list) and list_size.value != 0:
2303
 
            raise gnutls.Error("error getting peer certificate")
 
1851
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1852
                                            " certificate")
2304
1853
        if list_size.value == 0:
2305
1854
            return None
2306
1855
        cert = cert_list[0]
2310
1859
    def fingerprint(openpgp):
2311
1860
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2312
1861
        # New GnuTLS "datum" with the OpenPGP public key
2313
 
        datum = gnutls.datum_t(
 
1862
        datum = gnutls.library.types.gnutls_datum_t(
2314
1863
            ctypes.cast(ctypes.c_char_p(openpgp),
2315
1864
                        ctypes.POINTER(ctypes.c_ubyte)),
2316
1865
            ctypes.c_uint(len(openpgp)))
2317
1866
        # New empty GnuTLS certificate
2318
 
        crt = gnutls.openpgp_crt_t()
2319
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1867
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1868
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1869
            ctypes.byref(crt))
2320
1870
        # Import the OpenPGP public key into the certificate
2321
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2322
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1871
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1872
            crt, ctypes.byref(datum),
 
1873
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2323
1874
        # Verify the self signature in the key
2324
1875
        crtverify = ctypes.c_uint()
2325
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2326
 
                                       ctypes.byref(crtverify))
 
1876
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1877
            crt, 0, ctypes.byref(crtverify))
2327
1878
        if crtverify.value != 0:
2328
 
            gnutls.openpgp_crt_deinit(crt)
2329
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1879
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1880
            raise gnutls.errors.CertificateSecurityError(
 
1881
                "Verify failed")
2330
1882
        # New buffer for the fingerprint
2331
1883
        buf = ctypes.create_string_buffer(20)
2332
1884
        buf_len = ctypes.c_size_t()
2333
1885
        # Get the fingerprint from the certificate into the buffer
2334
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2335
 
                                           ctypes.byref(buf_len))
 
1886
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1887
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
2336
1888
        # Deinit the certificate
2337
 
        gnutls.openpgp_crt_deinit(crt)
 
1889
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2338
1890
        # Convert the buffer to a Python bytestring
2339
1891
        fpr = ctypes.string_at(buf, buf_len.value)
2340
1892
        # Convert the bytestring to hexadecimal notation
2484
2036
        gnutls_priority GnuTLS priority string
2485
2037
        use_dbus:       Boolean; to emit D-Bus signals or not
2486
2038
    
2487
 
    Assumes a GLib.MainLoop event loop.
 
2039
    Assumes a gobject.MainLoop event loop.
2488
2040
    """
2489
2041
    
2490
2042
    def __init__(self, server_address, RequestHandlerClass,
2515
2067
    
2516
2068
    def add_pipe(self, parent_pipe, proc):
2517
2069
        # Call "handle_ipc" for both data and EOF events
2518
 
        GLib.io_add_watch(
 
2070
        gobject.io_add_watch(
2519
2071
            parent_pipe.fileno(),
2520
 
            GLib.IO_IN | GLib.IO_HUP,
 
2072
            gobject.IO_IN | gobject.IO_HUP,
2521
2073
            functools.partial(self.handle_ipc,
2522
2074
                              parent_pipe = parent_pipe,
2523
2075
                              proc = proc))
2527
2079
                   proc = None,
2528
2080
                   client_object=None):
2529
2081
        # error, or the other end of multiprocessing.Pipe has closed
2530
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2082
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2531
2083
            # Wait for other process to exit
2532
2084
            proc.join()
2533
2085
            return False
2540
2092
            fpr = request[1]
2541
2093
            address = request[2]
2542
2094
            
2543
 
            for c in self.clients.values():
 
2095
            for c in self.clients.itervalues():
2544
2096
                if c.fingerprint == fpr:
2545
2097
                    client = c
2546
2098
                    break
2554
2106
                parent_pipe.send(False)
2555
2107
                return False
2556
2108
            
2557
 
            GLib.io_add_watch(
 
2109
            gobject.io_add_watch(
2558
2110
                parent_pipe.fileno(),
2559
 
                GLib.IO_IN | GLib.IO_HUP,
 
2111
                gobject.IO_IN | gobject.IO_HUP,
2560
2112
                functools.partial(self.handle_ipc,
2561
2113
                                  parent_pipe = parent_pipe,
2562
2114
                                  proc = proc,
2576
2128
        
2577
2129
        if command == 'getattr':
2578
2130
            attrname = request[1]
2579
 
            if isinstance(client_object.__getattribute__(attrname),
2580
 
                          collections.Callable):
 
2131
            if callable(client_object.__getattribute__(attrname)):
2581
2132
                parent_pipe.send(('function', ))
2582
2133
            else:
2583
2134
                parent_pipe.send((
2618
2169
    # avoid excessive use of external libraries.
2619
2170
    
2620
2171
    # New type for defining tokens, syntax, and semantics all-in-one
 
2172
    Token = collections.namedtuple("Token",
 
2173
                                   ("regexp", # To match token; if
 
2174
                                              # "value" is not None,
 
2175
                                              # must have a "group"
 
2176
                                              # containing digits
 
2177
                                    "value",  # datetime.timedelta or
 
2178
                                              # None
 
2179
                                    "followers")) # Tokens valid after
 
2180
                                                  # this token
2621
2181
    Token = collections.namedtuple("Token", (
2622
2182
        "regexp",  # To match token; if "value" is not None, must have
2623
2183
                   # a "group" containing digits
2658
2218
    # Define starting values
2659
2219
    value = datetime.timedelta() # Value so far
2660
2220
    found_token = None
2661
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2221
    followers = frozenset((token_duration,)) # Following valid tokens
2662
2222
    s = duration                # String left to parse
2663
2223
    # Loop until end token is found
2664
2224
    while found_token is not token_end:
2681
2241
                break
2682
2242
        else:
2683
2243
            # No currently valid tokens were found
2684
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2685
 
                             .format(duration))
 
2244
            raise ValueError("Invalid RFC 3339 duration")
2686
2245
    # End token found
2687
2246
    return value
2688
2247
 
2821
2380
                        "debug": "False",
2822
2381
                        "priority":
2823
2382
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2824
 
                        ":+SIGN-DSA-SHA256",
 
2383
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2825
2384
                        "servicename": "Mandos",
2826
2385
                        "use_dbus": "True",
2827
2386
                        "use_ipv6": "True",
2939
2498
            pidfilename = "/var/run/mandos.pid"
2940
2499
        pidfile = None
2941
2500
        try:
2942
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2501
            pidfile = open(pidfilename, "w")
2943
2502
        except IOError as e:
2944
2503
            logger.error("Could not open file %r", pidfilename,
2945
2504
                         exc_info=e)
2946
2505
    
2947
 
    for name, group in (("_mandos", "_mandos"),
2948
 
                        ("mandos", "mandos"),
2949
 
                        ("nobody", "nogroup")):
 
2506
    for name in ("_mandos", "mandos", "nobody"):
2950
2507
        try:
2951
2508
            uid = pwd.getpwnam(name).pw_uid
2952
 
            gid = pwd.getpwnam(group).pw_gid
 
2509
            gid = pwd.getpwnam(name).pw_gid
2953
2510
            break
2954
2511
        except KeyError:
2955
2512
            continue
2959
2516
    try:
2960
2517
        os.setgid(gid)
2961
2518
        os.setuid(uid)
2962
 
        if debug:
2963
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2964
 
                                                             gid))
2965
2519
    except OSError as error:
2966
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2967
 
                       .format(uid, gid, os.strerror(error.errno)))
2968
2520
        if error.errno != errno.EPERM:
2969
2521
            raise
2970
2522
    
2973
2525
        
2974
2526
        # "Use a log level over 10 to enable all debugging options."
2975
2527
        # - GnuTLS manual
2976
 
        gnutls.global_set_log_level(11)
 
2528
        gnutls.library.functions.gnutls_global_set_log_level(11)
2977
2529
        
2978
 
        @gnutls.log_func
 
2530
        @gnutls.library.types.gnutls_log_func
2979
2531
        def debug_gnutls(level, string):
2980
2532
            logger.debug("GnuTLS: %s", string[:-1])
2981
2533
        
2982
 
        gnutls.global_set_log_function(debug_gnutls)
 
2534
        gnutls.library.functions.gnutls_global_set_log_function(
 
2535
            debug_gnutls)
2983
2536
        
2984
2537
        # Redirect stdin so all checkers get /dev/null
2985
2538
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2992
2545
        # Close all input and output, do double fork, etc.
2993
2546
        daemon()
2994
2547
    
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()
 
2548
    # multiprocessing will use threads, so before we use gobject we
 
2549
    # need to inform gobject that threads will be used.
 
2550
    gobject.threads_init()
2998
2551
    
2999
2552
    global main_loop
3000
2553
    # From the Avahi example code
3001
2554
    DBusGMainLoop(set_as_default=True)
3002
 
    main_loop = GLib.MainLoop()
 
2555
    main_loop = gobject.MainLoop()
3003
2556
    bus = dbus.SystemBus()
3004
2557
    # End of Avahi example code
3005
2558
    if use_dbus:
3010
2563
            old_bus_name = dbus.service.BusName(
3011
2564
                "se.bsnet.fukt.Mandos", bus,
3012
2565
                do_not_queue=True)
3013
 
        except dbus.exceptions.DBusException as e:
 
2566
        except dbus.exceptions.NameExistsException as e:
3014
2567
            logger.error("Disabling D-Bus:", exc_info=e)
3015
2568
            use_dbus = False
3016
2569
            server_settings["use_dbus"] = False
3049
2602
    if server_settings["restore"]:
3050
2603
        try:
3051
2604
            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"))
 
2605
                clients_data, old_client_settings = pickle.load(
 
2606
                    stored_state)
3097
2607
            os.remove(stored_state_path)
3098
2608
        except IOError as e:
3099
2609
            if e.errno == errno.ENOENT:
3132
2642
                    pass
3133
2643
            
3134
2644
            # Clients who has passed its expire date can still be
3135
 
            # enabled if its last checker was successful.  A Client
 
2645
            # enabled if its last checker was successful.  Clients
3136
2646
            # whose checker succeeded before we stored its state is
3137
2647
            # assumed to have successfully run all checkers during
3138
2648
            # downtime.
3190
2700
    
3191
2701
    if not foreground:
3192
2702
        if pidfile is not None:
3193
 
            pid = os.getpid()
3194
2703
            try:
3195
2704
                with pidfile:
3196
 
                    print(pid, file=pidfile)
 
2705
                    pid = os.getpid()
 
2706
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
3197
2707
            except IOError:
3198
2708
                logger.error("Could not write to file %r with PID %d",
3199
2709
                             pidfilename, pid)
3207
2717
        
3208
2718
        @alternate_dbus_interfaces(
3209
2719
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3210
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2720
        class MandosDBusService(DBusObjectWithProperties):
3211
2721
            """A D-Bus proxy object"""
3212
2722
            
3213
2723
            def __init__(self):
3215
2725
            
3216
2726
            _interface = "se.recompile.Mandos"
3217
2727
            
 
2728
            @dbus_interface_annotations(_interface)
 
2729
            def _foo(self):
 
2730
                return {
 
2731
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2732
                    "false" }
 
2733
            
3218
2734
            @dbus.service.signal(_interface, signature="o")
3219
2735
            def ClientAdded(self, objpath):
3220
2736
                "D-Bus signal"
3225
2741
                "D-Bus signal"
3226
2742
                pass
3227
2743
            
3228
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3229
 
                               "true"})
3230
2744
            @dbus.service.signal(_interface, signature="os")
3231
2745
            def ClientRemoved(self, objpath, name):
3232
2746
                "D-Bus signal"
3233
2747
                pass
3234
2748
            
3235
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3236
 
                               "true"})
3237
2749
            @dbus.service.method(_interface, out_signature="ao")
3238
2750
            def GetAllClients(self):
3239
2751
                "D-Bus method"
3240
2752
                return dbus.Array(c.dbus_object_path for c in
3241
 
                                  tcp_server.clients.values())
 
2753
                                  tcp_server.clients.itervalues())
3242
2754
            
3243
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3244
 
                               "true"})
3245
2755
            @dbus.service.method(_interface,
3246
2756
                                 out_signature="a{oa{sv}}")
3247
2757
            def GetAllClientsWithProperties(self):
3248
2758
                "D-Bus method"
3249
2759
                return dbus.Dictionary(
3250
 
                    { c.dbus_object_path: c.GetAll(
3251
 
                        "se.recompile.Mandos.Client")
3252
 
                      for c in tcp_server.clients.values() },
 
2760
                    { c.dbus_object_path: c.GetAll("")
 
2761
                      for c in tcp_server.clients.itervalues() },
3253
2762
                    signature="oa{sv}")
3254
2763
            
3255
2764
            @dbus.service.method(_interface, in_signature="o")
3256
2765
            def RemoveClient(self, object_path):
3257
2766
                "D-Bus method"
3258
 
                for c in tcp_server.clients.values():
 
2767
                for c in tcp_server.clients.itervalues():
3259
2768
                    if c.dbus_object_path == object_path:
3260
2769
                        del tcp_server.clients[c.name]
3261
2770
                        c.remove_from_connection()
3262
 
                        # Don't signal the disabling
 
2771
                        # Don't signal anything except ClientRemoved
3263
2772
                        c.disable(quiet=True)
3264
 
                        # Emit D-Bus signal for removal
3265
 
                        self.client_removed_signal(c)
 
2773
                        # Emit D-Bus signal
 
2774
                        self.ClientRemoved(object_path, c.name)
3266
2775
                        return
3267
2776
                raise KeyError(object_path)
3268
2777
            
3269
2778
            del _interface
3270
 
            
3271
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3272
 
                                 out_signature = "a{oa{sa{sv}}}")
3273
 
            def GetManagedObjects(self):
3274
 
                """D-Bus method"""
3275
 
                return dbus.Dictionary(
3276
 
                    { client.dbus_object_path:
3277
 
                      dbus.Dictionary(
3278
 
                          { interface: client.GetAll(interface)
3279
 
                            for interface in
3280
 
                                 client._get_all_interface_names()})
3281
 
                      for client in tcp_server.clients.values()})
3282
 
            
3283
 
            def client_added_signal(self, client):
3284
 
                """Send the new standard signal and the old signal"""
3285
 
                if use_dbus:
3286
 
                    # New standard signal
3287
 
                    self.InterfacesAdded(
3288
 
                        client.dbus_object_path,
3289
 
                        dbus.Dictionary(
3290
 
                            { interface: client.GetAll(interface)
3291
 
                              for interface in
3292
 
                              client._get_all_interface_names()}))
3293
 
                    # Old signal
3294
 
                    self.ClientAdded(client.dbus_object_path)
3295
 
            
3296
 
            def client_removed_signal(self, client):
3297
 
                """Send the new standard signal and the old signal"""
3298
 
                if use_dbus:
3299
 
                    # New standard signal
3300
 
                    self.InterfacesRemoved(
3301
 
                        client.dbus_object_path,
3302
 
                        client._get_all_interface_names())
3303
 
                    # Old signal
3304
 
                    self.ClientRemoved(client.dbus_object_path,
3305
 
                                       client.name)
3306
2779
        
3307
2780
        mandos_dbus_service = MandosDBusService()
3308
2781
    
3321
2794
        # removed/edited, old secret will thus be unrecovable.
3322
2795
        clients = {}
3323
2796
        with PGPEngine() as pgp:
3324
 
            for client in tcp_server.clients.values():
 
2797
            for client in tcp_server.clients.itervalues():
3325
2798
                key = client_settings[client.name]["secret"]
3326
2799
                client.encrypted_secret = pgp.encrypt(client.secret,
3327
2800
                                                      key)
3351
2824
                    prefix='clients-',
3352
2825
                    dir=os.path.dirname(stored_state_path),
3353
2826
                    delete=False) as stored_state:
3354
 
                pickle.dump((clients, client_settings), stored_state,
3355
 
                            protocol = 2)
 
2827
                pickle.dump((clients, client_settings), stored_state)
3356
2828
                tempname = stored_state.name
3357
2829
            os.rename(tempname, stored_state_path)
3358
2830
        except (IOError, OSError) as e:
3374
2846
            name, client = tcp_server.clients.popitem()
3375
2847
            if use_dbus:
3376
2848
                client.remove_from_connection()
3377
 
            # Don't signal the disabling
 
2849
            # Don't signal anything except ClientRemoved
3378
2850
            client.disable(quiet=True)
3379
 
            # Emit D-Bus signal for removal
3380
2851
            if use_dbus:
3381
 
                mandos_dbus_service.client_removed_signal(client)
 
2852
                # Emit D-Bus signal
 
2853
                mandos_dbus_service.ClientRemoved(
 
2854
                    client.dbus_object_path, client.name)
3382
2855
        client_settings.clear()
3383
2856
    
3384
2857
    atexit.register(cleanup)
3385
2858
    
3386
 
    for client in tcp_server.clients.values():
 
2859
    for client in tcp_server.clients.itervalues():
3387
2860
        if use_dbus:
3388
 
            # Emit D-Bus signal for adding
3389
 
            mandos_dbus_service.client_added_signal(client)
 
2861
            # Emit D-Bus signal
 
2862
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3390
2863
        # Need to initiate checking of clients
3391
2864
        if client.enabled:
3392
2865
            client.init_checker()
3418
2891
                sys.exit(1)
3419
2892
            # End of Avahi example code
3420
2893
        
3421
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3422
 
                          lambda *args, **kwargs:
3423
 
                          (tcp_server.handle_request
3424
 
                           (*args[2:], **kwargs) or True))
 
2894
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2895
                             lambda *args, **kwargs:
 
2896
                             (tcp_server.handle_request
 
2897
                              (*args[2:], **kwargs) or True))
3425
2898
        
3426
2899
        logger.debug("Starting main loop")
3427
2900
        main_loop.run()