/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-10-28 20:08:32 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131028200832-80d1k8c5e8mugpkx
Syntax fix; use "raise" better in Mandos server.

* mandos: Syntax fix; use "raise" better in Mandos server; Always
          raise instances, not classes, skip argument when re-raising,
          etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 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
86
80
import xml.dom.minidom
87
81
import inspect
88
82
 
89
 
# Try to find the value of SO_BINDTODEVICE:
90
83
try:
91
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
 
    # newer, and it is also the most natural place for it:
93
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
85
except AttributeError:
95
86
    try:
96
 
        # This is where SO_BINDTODEVICE was up to and including Python
97
 
        # 2.6, and also 3.2:
98
87
        from IN import SO_BINDTODEVICE
99
88
    except ImportError:
100
 
        # In Python 2.7 it seems to have been removed entirely.
101
 
        # Try running the C preprocessor:
102
 
        try:
103
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
104
 
                                   "/dev/stdin"],
105
 
                                  stdin=subprocess.PIPE,
106
 
                                  stdout=subprocess.PIPE)
107
 
            stdout = cc.communicate(
108
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
 
        except (OSError, ValueError, IndexError):
111
 
            # No value found
112
 
            SO_BINDTODEVICE = None
113
 
 
114
 
if sys.version_info.major == 2:
115
 
    str = unicode
116
 
 
117
 
version = "1.7.10"
 
89
        SO_BINDTODEVICE = None
 
90
 
 
91
version = "1.6.2"
118
92
stored_state_file = "clients.pickle"
119
93
 
120
94
logger = logging.getLogger()
121
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
122
98
 
123
99
try:
124
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
125
 
        ctypes.util.find_library("c")).if_nametoindex
 
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
                      (ctypes.util.find_library("c"))
 
102
                      .if_nametoindex)
126
103
except (OSError, AttributeError):
127
 
    
128
104
    def if_nametoindex(interface):
129
105
        "Get an interface index the hard way, i.e. using fcntl()"
130
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
131
107
        with contextlib.closing(socket.socket()) as s:
132
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
 
                                struct.pack(b"16s16x", interface))
134
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
135
113
        return interface_index
136
114
 
137
115
 
138
 
def copy_function(func):
139
 
    """Make a copy of a function"""
140
 
    if sys.version_info.major == 2:
141
 
        return types.FunctionType(func.func_code,
142
 
                                  func.func_globals,
143
 
                                  func.func_name,
144
 
                                  func.func_defaults,
145
 
                                  func.func_closure)
146
 
    else:
147
 
        return types.FunctionType(func.__code__,
148
 
                                  func.__globals__,
149
 
                                  func.__name__,
150
 
                                  func.__defaults__,
151
 
                                  func.__closure__)
152
 
 
153
 
 
154
116
def initlogger(debug, level=logging.WARNING):
155
117
    """init logger and add loglevel"""
156
118
    
157
 
    global syslogger
158
 
    syslogger = (logging.handlers.SysLogHandler(
159
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
160
 
        address = "/dev/log"))
161
119
    syslogger.setFormatter(logging.Formatter
162
120
                           ('Mandos [%(process)d]: %(levelname)s:'
163
121
                            ' %(message)s'))
180
138
 
181
139
class PGPEngine(object):
182
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
183
 
    
184
141
    def __init__(self):
185
142
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
186
 
        self.gpg = "gpg"
187
 
        try:
188
 
            output = subprocess.check_output(["gpgconf"])
189
 
            for line in output.splitlines():
190
 
                name, text, path = line.split(b":")
191
 
                if name == "gpg":
192
 
                    self.gpg = path
193
 
                    break
194
 
        except OSError as e:
195
 
            if e.errno != errno.ENOENT:
196
 
                raise
197
143
        self.gnupgargs = ['--batch',
198
 
                          '--homedir', self.tempdir,
 
144
                          '--home', self.tempdir,
199
145
                          '--force-mdc',
200
 
                          '--quiet']
201
 
        # Only GPG version 1 has the --no-use-agent option.
202
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
203
 
            self.gnupgargs.append("--no-use-agent")
 
146
                          '--quiet',
 
147
                          '--no-use-agent']
204
148
    
205
149
    def __enter__(self):
206
150
        return self
238
182
    
239
183
    def encrypt(self, data, password):
240
184
        passphrase = self.password_encode(password)
241
 
        with tempfile.NamedTemporaryFile(
242
 
                dir=self.tempdir) as passfile:
 
185
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
186
                                         ) as passfile:
243
187
            passfile.write(passphrase)
244
188
            passfile.flush()
245
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
189
            proc = subprocess.Popen(['gpg', '--symmetric',
246
190
                                     '--passphrase-file',
247
191
                                     passfile.name]
248
192
                                    + self.gnupgargs,
256
200
    
257
201
    def decrypt(self, data, password):
258
202
        passphrase = self.password_encode(password)
259
 
        with tempfile.NamedTemporaryFile(
260
 
                dir = self.tempdir) as passfile:
 
203
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
204
                                         ) as passfile:
261
205
            passfile.write(passphrase)
262
206
            passfile.flush()
263
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
207
            proc = subprocess.Popen(['gpg', '--decrypt',
264
208
                                     '--passphrase-file',
265
209
                                     passfile.name]
266
210
                                    + self.gnupgargs,
267
211
                                    stdin = subprocess.PIPE,
268
212
                                    stdout = subprocess.PIPE,
269
213
                                    stderr = subprocess.PIPE)
270
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
214
            decrypted_plaintext, err = proc.communicate(input
 
215
                                                        = data)
271
216
        if proc.returncode != 0:
272
217
            raise PGPError(err)
273
218
        return decrypted_plaintext
274
219
 
275
 
# Pretend that we have an Avahi module
276
 
class Avahi(object):
277
 
    """This isn't so much a class as it is a module-like namespace.
278
 
    It is instantiated once, and simulates having an Avahi module."""
279
 
    IF_UNSPEC = -1              # avahi-common/address.h
280
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
281
 
    PROTO_INET = 0              # avahi-common/address.h
282
 
    PROTO_INET6 = 1             # avahi-common/address.h
283
 
    DBUS_NAME = "org.freedesktop.Avahi"
284
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
285
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
286
 
    DBUS_PATH_SERVER = "/"
287
 
    def string_array_to_txt_array(self, t):
288
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
289
 
                           for s in t), signature="ay")
290
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
291
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
292
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
293
 
    SERVER_INVALID = 0          # avahi-common/defs.h
294
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
295
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
296
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
297
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
298
 
avahi = Avahi()
299
220
 
300
221
class AvahiError(Exception):
301
222
    def __init__(self, value, *args, **kwargs):
302
223
        self.value = value
303
 
        return super(AvahiError, self).__init__(value, *args,
304
 
                                                **kwargs)
305
 
 
 
224
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
225
    def __unicode__(self):
 
226
        return unicode(repr(self.value))
306
227
 
307
228
class AvahiServiceError(AvahiError):
308
229
    pass
309
230
 
310
 
 
311
231
class AvahiGroupError(AvahiError):
312
232
    pass
313
233
 
333
253
    bus: dbus.SystemBus()
334
254
    """
335
255
    
336
 
    def __init__(self,
337
 
                 interface = avahi.IF_UNSPEC,
338
 
                 name = None,
339
 
                 servicetype = None,
340
 
                 port = None,
341
 
                 TXT = None,
342
 
                 domain = "",
343
 
                 host = "",
344
 
                 max_renames = 32768,
345
 
                 protocol = avahi.PROTO_UNSPEC,
346
 
                 bus = None):
 
256
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
257
                 servicetype = None, port = None, TXT = None,
 
258
                 domain = "", host = "", max_renames = 32768,
 
259
                 protocol = avahi.PROTO_UNSPEC, bus = None):
347
260
        self.interface = interface
348
261
        self.name = name
349
262
        self.type = servicetype
359
272
        self.bus = bus
360
273
        self.entry_group_state_changed_match = None
361
274
    
362
 
    def rename(self, remove=True):
 
275
    def rename(self):
363
276
        """Derived from the Avahi example code"""
364
277
        if self.rename_count >= self.max_renames:
365
278
            logger.critical("No suitable Zeroconf service name found"
366
279
                            " after %i retries, exiting.",
367
280
                            self.rename_count)
368
281
            raise AvahiServiceError("Too many renames")
369
 
        self.name = str(
370
 
            self.server.GetAlternativeServiceName(self.name))
371
 
        self.rename_count += 1
 
282
        self.name = unicode(self.server
 
283
                            .GetAlternativeServiceName(self.name))
372
284
        logger.info("Changing Zeroconf service name to %r ...",
373
285
                    self.name)
374
 
        if remove:
375
 
            self.remove()
 
286
        self.remove()
376
287
        try:
377
288
            self.add()
378
289
        except dbus.exceptions.DBusException as error:
379
 
            if (error.get_dbus_name()
380
 
                == "org.freedesktop.Avahi.CollisionError"):
381
 
                logger.info("Local Zeroconf service name collision.")
382
 
                return self.rename(remove=False)
383
 
            else:
384
 
                logger.critical("D-Bus Exception", exc_info=error)
385
 
                self.cleanup()
386
 
                os._exit(1)
 
290
            logger.critical("D-Bus Exception", exc_info=error)
 
291
            self.cleanup()
 
292
            os._exit(1)
 
293
        self.rename_count += 1
387
294
    
388
295
    def remove(self):
389
296
        """Derived from the Avahi example code"""
427
334
            self.rename()
428
335
        elif state == avahi.ENTRY_GROUP_FAILURE:
429
336
            logger.critical("Avahi: Error in group state changed %s",
430
 
                            str(error))
431
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
337
                            unicode(error))
 
338
            raise AvahiGroupError("State changed: {0!s}"
 
339
                                  .format(error))
432
340
    
433
341
    def cleanup(self):
434
342
        """Derived from the Avahi example code"""
444
352
    def server_state_changed(self, state, error=None):
445
353
        """Derived from the Avahi example code"""
446
354
        logger.debug("Avahi server state change: %i", state)
447
 
        bad_states = {
448
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
449
 
            avahi.SERVER_REGISTERING: None,
450
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
451
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
452
 
        }
 
355
        bad_states = { avahi.SERVER_INVALID:
 
356
                           "Zeroconf server invalid",
 
357
                       avahi.SERVER_REGISTERING: None,
 
358
                       avahi.SERVER_COLLISION:
 
359
                           "Zeroconf server name collision",
 
360
                       avahi.SERVER_FAILURE:
 
361
                           "Zeroconf server failure" }
453
362
        if state in bad_states:
454
363
            if bad_states[state] is not None:
455
364
                if error is None:
458
367
                    logger.error(bad_states[state] + ": %r", error)
459
368
            self.cleanup()
460
369
        elif state == avahi.SERVER_RUNNING:
461
 
            try:
462
 
                self.add()
463
 
            except dbus.exceptions.DBusException as error:
464
 
                if (error.get_dbus_name()
465
 
                    == "org.freedesktop.Avahi.CollisionError"):
466
 
                    logger.info("Local Zeroconf service name"
467
 
                                " collision.")
468
 
                    return self.rename(remove=False)
469
 
                else:
470
 
                    logger.critical("D-Bus Exception", exc_info=error)
471
 
                    self.cleanup()
472
 
                    os._exit(1)
 
370
            self.add()
473
371
        else:
474
372
            if error is None:
475
373
                logger.debug("Unknown state: %r", state)
485
383
                                    follow_name_owner_changes=True),
486
384
                avahi.DBUS_INTERFACE_SERVER)
487
385
        self.server.connect_to_signal("StateChanged",
488
 
                                      self.server_state_changed)
 
386
                                 self.server_state_changed)
489
387
        self.server_state_changed(self.server.GetState())
490
388
 
491
389
 
492
390
class AvahiServiceToSyslog(AvahiService):
493
 
    def rename(self, *args, **kwargs):
 
391
    def rename(self):
494
392
        """Add the new name to the syslog messages"""
495
 
        ret = AvahiService.rename(self, *args, **kwargs)
496
 
        syslogger.setFormatter(logging.Formatter(
497
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
498
 
            .format(self.name)))
 
393
        ret = AvahiService.rename(self)
 
394
        syslogger.setFormatter(logging.Formatter
 
395
                               ('Mandos ({0}) [%(process)d]:'
 
396
                                ' %(levelname)s: %(message)s'
 
397
                                .format(self.name)))
499
398
        return ret
500
399
 
501
 
# Pretend that we have a GnuTLS module
502
 
class GnuTLS(object):
503
 
    """This isn't so much a class as it is a module-like namespace.
504
 
    It is instantiated once, and simulates having a GnuTLS module."""
505
 
    
506
 
    _library = ctypes.cdll.LoadLibrary(
507
 
        ctypes.util.find_library("gnutls"))
508
 
    _need_version = b"3.3.0"
509
 
    def __init__(self):
510
 
        # Need to use class name "GnuTLS" here, since this method is
511
 
        # called before the assignment to the "gnutls" global variable
512
 
        # happens.
513
 
        if GnuTLS.check_version(self._need_version) is None:
514
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
515
 
                               .format(self._need_version))
516
 
    
517
 
    # Unless otherwise indicated, the constants and types below are
518
 
    # all from the gnutls/gnutls.h C header file.
519
 
    
520
 
    # Constants
521
 
    E_SUCCESS = 0
522
 
    E_INTERRUPTED = -52
523
 
    E_AGAIN = -28
524
 
    CRT_OPENPGP = 2
525
 
    CLIENT = 2
526
 
    SHUT_RDWR = 0
527
 
    CRD_CERTIFICATE = 1
528
 
    E_NO_CERTIFICATE_FOUND = -49
529
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
530
 
    
531
 
    # Types
532
 
    class session_int(ctypes.Structure):
533
 
        _fields_ = []
534
 
    session_t = ctypes.POINTER(session_int)
535
 
    class certificate_credentials_st(ctypes.Structure):
536
 
        _fields_ = []
537
 
    certificate_credentials_t = ctypes.POINTER(
538
 
        certificate_credentials_st)
539
 
    certificate_type_t = ctypes.c_int
540
 
    class datum_t(ctypes.Structure):
541
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
542
 
                    ('size', ctypes.c_uint)]
543
 
    class openpgp_crt_int(ctypes.Structure):
544
 
        _fields_ = []
545
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
546
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
547
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
548
 
    credentials_type_t = ctypes.c_int
549
 
    transport_ptr_t = ctypes.c_void_p
550
 
    close_request_t = ctypes.c_int
551
 
    
552
 
    # Exceptions
553
 
    class Error(Exception):
554
 
        # We need to use the class name "GnuTLS" here, since this
555
 
        # exception might be raised from within GnuTLS.__init__,
556
 
        # which is called before the assignment to the "gnutls"
557
 
        # global variable has happened.
558
 
        def __init__(self, message = None, code = None, args=()):
559
 
            # Default usage is by a message string, but if a return
560
 
            # code is passed, convert it to a string with
561
 
            # gnutls.strerror()
562
 
            self.code = code
563
 
            if message is None and code is not None:
564
 
                message = GnuTLS.strerror(code)
565
 
            return super(GnuTLS.Error, self).__init__(
566
 
                message, *args)
567
 
    
568
 
    class CertificateSecurityError(Error):
569
 
        pass
570
 
    
571
 
    # Classes
572
 
    class Credentials(object):
573
 
        def __init__(self):
574
 
            self._c_object = gnutls.certificate_credentials_t()
575
 
            gnutls.certificate_allocate_credentials(
576
 
                ctypes.byref(self._c_object))
577
 
            self.type = gnutls.CRD_CERTIFICATE
578
 
        
579
 
        def __del__(self):
580
 
            gnutls.certificate_free_credentials(self._c_object)
581
 
    
582
 
    class ClientSession(object):
583
 
        def __init__(self, socket, credentials = None):
584
 
            self._c_object = gnutls.session_t()
585
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
586
 
            gnutls.set_default_priority(self._c_object)
587
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
588
 
            gnutls.handshake_set_private_extensions(self._c_object,
589
 
                                                    True)
590
 
            self.socket = socket
591
 
            if credentials is None:
592
 
                credentials = gnutls.Credentials()
593
 
            gnutls.credentials_set(self._c_object, credentials.type,
594
 
                                   ctypes.cast(credentials._c_object,
595
 
                                               ctypes.c_void_p))
596
 
            self.credentials = credentials
597
 
        
598
 
        def __del__(self):
599
 
            gnutls.deinit(self._c_object)
600
 
        
601
 
        def handshake(self):
602
 
            return gnutls.handshake(self._c_object)
603
 
        
604
 
        def send(self, data):
605
 
            data = bytes(data)
606
 
            data_len = len(data)
607
 
            while data_len > 0:
608
 
                data_len -= gnutls.record_send(self._c_object,
609
 
                                               data[-data_len:],
610
 
                                               data_len)
611
 
        
612
 
        def bye(self):
613
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
614
 
    
615
 
    # Error handling functions
616
 
    def _error_code(result):
617
 
        """A function to raise exceptions on errors, suitable
618
 
        for the 'restype' attribute on ctypes functions"""
619
 
        if result >= 0:
620
 
            return result
621
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
622
 
            raise gnutls.CertificateSecurityError(code = result)
623
 
        raise gnutls.Error(code = result)
624
 
    
625
 
    def _retry_on_error(result, func, arguments):
626
 
        """A function to retry on some errors, suitable
627
 
        for the 'errcheck' attribute on ctypes functions"""
628
 
        while result < 0:
629
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
630
 
                return _error_code(result)
631
 
            result = func(*arguments)
632
 
        return result
633
 
    
634
 
    # Unless otherwise indicated, the function declarations below are
635
 
    # all from the gnutls/gnutls.h C header file.
636
 
    
637
 
    # Functions
638
 
    priority_set_direct = _library.gnutls_priority_set_direct
639
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
640
 
                                    ctypes.POINTER(ctypes.c_char_p)]
641
 
    priority_set_direct.restype = _error_code
642
 
    
643
 
    init = _library.gnutls_init
644
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
645
 
    init.restype = _error_code
646
 
    
647
 
    set_default_priority = _library.gnutls_set_default_priority
648
 
    set_default_priority.argtypes = [session_t]
649
 
    set_default_priority.restype = _error_code
650
 
    
651
 
    record_send = _library.gnutls_record_send
652
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
653
 
                            ctypes.c_size_t]
654
 
    record_send.restype = ctypes.c_ssize_t
655
 
    record_send.errcheck = _retry_on_error
656
 
    
657
 
    certificate_allocate_credentials = (
658
 
        _library.gnutls_certificate_allocate_credentials)
659
 
    certificate_allocate_credentials.argtypes = [
660
 
        ctypes.POINTER(certificate_credentials_t)]
661
 
    certificate_allocate_credentials.restype = _error_code
662
 
    
663
 
    certificate_free_credentials = (
664
 
        _library.gnutls_certificate_free_credentials)
665
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
666
 
    certificate_free_credentials.restype = None
667
 
    
668
 
    handshake_set_private_extensions = (
669
 
        _library.gnutls_handshake_set_private_extensions)
670
 
    handshake_set_private_extensions.argtypes = [session_t,
671
 
                                                 ctypes.c_int]
672
 
    handshake_set_private_extensions.restype = None
673
 
    
674
 
    credentials_set = _library.gnutls_credentials_set
675
 
    credentials_set.argtypes = [session_t, credentials_type_t,
676
 
                                ctypes.c_void_p]
677
 
    credentials_set.restype = _error_code
678
 
    
679
 
    strerror = _library.gnutls_strerror
680
 
    strerror.argtypes = [ctypes.c_int]
681
 
    strerror.restype = ctypes.c_char_p
682
 
    
683
 
    certificate_type_get = _library.gnutls_certificate_type_get
684
 
    certificate_type_get.argtypes = [session_t]
685
 
    certificate_type_get.restype = _error_code
686
 
    
687
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
688
 
    certificate_get_peers.argtypes = [session_t,
689
 
                                      ctypes.POINTER(ctypes.c_uint)]
690
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
691
 
    
692
 
    global_set_log_level = _library.gnutls_global_set_log_level
693
 
    global_set_log_level.argtypes = [ctypes.c_int]
694
 
    global_set_log_level.restype = None
695
 
    
696
 
    global_set_log_function = _library.gnutls_global_set_log_function
697
 
    global_set_log_function.argtypes = [log_func]
698
 
    global_set_log_function.restype = None
699
 
    
700
 
    deinit = _library.gnutls_deinit
701
 
    deinit.argtypes = [session_t]
702
 
    deinit.restype = None
703
 
    
704
 
    handshake = _library.gnutls_handshake
705
 
    handshake.argtypes = [session_t]
706
 
    handshake.restype = _error_code
707
 
    handshake.errcheck = _retry_on_error
708
 
    
709
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
710
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
711
 
    transport_set_ptr.restype = None
712
 
    
713
 
    bye = _library.gnutls_bye
714
 
    bye.argtypes = [session_t, close_request_t]
715
 
    bye.restype = _error_code
716
 
    bye.errcheck = _retry_on_error
717
 
    
718
 
    check_version = _library.gnutls_check_version
719
 
    check_version.argtypes = [ctypes.c_char_p]
720
 
    check_version.restype = ctypes.c_char_p
721
 
    
722
 
    # All the function declarations below are from gnutls/openpgp.h
723
 
    
724
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
725
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
726
 
    openpgp_crt_init.restype = _error_code
727
 
    
728
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
729
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
730
 
                                   ctypes.POINTER(datum_t),
731
 
                                   openpgp_crt_fmt_t]
732
 
    openpgp_crt_import.restype = _error_code
733
 
    
734
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
735
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
736
 
                                        ctypes.POINTER(ctypes.c_uint)]
737
 
    openpgp_crt_verify_self.restype = _error_code
738
 
    
739
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
740
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
741
 
    openpgp_crt_deinit.restype = None
742
 
    
743
 
    openpgp_crt_get_fingerprint = (
744
 
        _library.gnutls_openpgp_crt_get_fingerprint)
745
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
746
 
                                            ctypes.c_void_p,
747
 
                                            ctypes.POINTER(
748
 
                                                ctypes.c_size_t)]
749
 
    openpgp_crt_get_fingerprint.restype = _error_code
750
 
    
751
 
    # Remove non-public functions
752
 
    del _error_code, _retry_on_error
753
 
# Create the global "gnutls" object, simulating a module
754
 
gnutls = GnuTLS()
755
 
 
756
 
def call_pipe(connection,       # : multiprocessing.Connection
757
 
              func, *args, **kwargs):
758
 
    """This function is meant to be called by multiprocessing.Process
759
 
    
760
 
    This function runs func(*args, **kwargs), and writes the resulting
761
 
    return value on the provided multiprocessing.Connection.
762
 
    """
763
 
    connection.send(func(*args, **kwargs))
764
 
    connection.close()
 
400
 
 
401
def timedelta_to_milliseconds(td):
 
402
    "Convert a datetime.timedelta() to milliseconds"
 
403
    return ((td.days * 24 * 60 * 60 * 1000)
 
404
            + (td.seconds * 1000)
 
405
            + (td.microseconds // 1000))
 
406
 
765
407
 
766
408
class Client(object):
767
409
    """A representation of a client host served by this server.
773
415
    checker:    subprocess.Popen(); a running checker process used
774
416
                                    to see if the client lives.
775
417
                                    'None' if no process is running.
776
 
    checker_callback_tag: a GLib event source tag, or None
 
418
    checker_callback_tag: a gobject event source tag, or None
777
419
    checker_command: string; External command which is run to check
778
420
                     if client lives.  %() expansions are done at
779
421
                     runtime with vars(self) as dict, so that for
780
422
                     instance %(name)s can be used in the command.
781
 
    checker_initiator_tag: a GLib event source tag, or None
 
423
    checker_initiator_tag: a gobject event source tag, or None
782
424
    created:    datetime.datetime(); (UTC) object creation
783
425
    client_structure: Object describing what attributes a client has
784
426
                      and is used for storing the client at exit
785
427
    current_checker_command: string; current running checker_command
786
 
    disable_initiator_tag: a GLib event source tag, or None
 
428
    disable_initiator_tag: a gobject event source tag, or None
787
429
    enabled:    bool()
788
430
    fingerprint: string (40 or 32 hexadecimal digits); used to
789
431
                 uniquely identify the client
794
436
    last_checker_status: integer between 0 and 255 reflecting exit
795
437
                         status of last checker. -1 reflects crashed
796
438
                         checker, -2 means no checker completed yet.
797
 
    last_checker_signal: The signal which killed the last checker, if
798
 
                         last_checker_status is -1
799
439
    last_enabled: datetime.datetime(); (UTC) or None
800
440
    name:       string; from the config file, used in log messages and
801
441
                        D-Bus identifiers
814
454
                          "fingerprint", "host", "interval",
815
455
                          "last_approval_request", "last_checked_ok",
816
456
                          "last_enabled", "name", "timeout")
817
 
    client_defaults = {
818
 
        "timeout": "PT5M",
819
 
        "extended_timeout": "PT15M",
820
 
        "interval": "PT2M",
821
 
        "checker": "fping -q -- %%(host)s",
822
 
        "host": "",
823
 
        "approval_delay": "PT0S",
824
 
        "approval_duration": "PT1S",
825
 
        "approved_by_default": "True",
826
 
        "enabled": "True",
827
 
    }
 
457
    client_defaults = { "timeout": "PT5M",
 
458
                        "extended_timeout": "PT15M",
 
459
                        "interval": "PT2M",
 
460
                        "checker": "fping -q -- %%(host)s",
 
461
                        "host": "",
 
462
                        "approval_delay": "PT0S",
 
463
                        "approval_duration": "PT1S",
 
464
                        "approved_by_default": "True",
 
465
                        "enabled": "True",
 
466
                        }
 
467
    
 
468
    def timeout_milliseconds(self):
 
469
        "Return the 'timeout' attribute in milliseconds"
 
470
        return timedelta_to_milliseconds(self.timeout)
 
471
    
 
472
    def extended_timeout_milliseconds(self):
 
473
        "Return the 'extended_timeout' attribute in milliseconds"
 
474
        return timedelta_to_milliseconds(self.extended_timeout)
 
475
    
 
476
    def interval_milliseconds(self):
 
477
        "Return the 'interval' attribute in milliseconds"
 
478
        return timedelta_to_milliseconds(self.interval)
 
479
    
 
480
    def approval_delay_milliseconds(self):
 
481
        return timedelta_to_milliseconds(self.approval_delay)
828
482
    
829
483
    @staticmethod
830
484
    def config_parser(config):
846
500
            client["enabled"] = config.getboolean(client_name,
847
501
                                                  "enabled")
848
502
            
849
 
            # Uppercase and remove spaces from fingerprint for later
850
 
            # comparison purposes with return value from the
851
 
            # fingerprint() function
852
503
            client["fingerprint"] = (section["fingerprint"].upper()
853
504
                                     .replace(" ", ""))
854
505
            if "secret" in section:
855
 
                client["secret"] = codecs.decode(section["secret"]
856
 
                                                 .encode("utf-8"),
857
 
                                                 "base64")
 
506
                client["secret"] = section["secret"].decode("base64")
858
507
            elif "secfile" in section:
859
508
                with open(os.path.expanduser(os.path.expandvars
860
509
                                             (section["secfile"])),
861
510
                          "rb") as secfile:
862
511
                    client["secret"] = secfile.read()
863
512
            else:
864
 
                raise TypeError("No secret or secfile for section {}"
 
513
                raise TypeError("No secret or secfile for section {0}"
865
514
                                .format(section))
866
515
            client["timeout"] = string_to_delta(section["timeout"])
867
516
            client["extended_timeout"] = string_to_delta(
884
533
            server_settings = {}
885
534
        self.server_settings = server_settings
886
535
        # adding all client settings
887
 
        for setting, value in settings.items():
 
536
        for setting, value in settings.iteritems():
888
537
            setattr(self, setting, value)
889
538
        
890
539
        if self.enabled:
898
547
            self.expires = None
899
548
        
900
549
        logger.debug("Creating client %r", self.name)
 
550
        # Uppercase and remove spaces from fingerprint for later
 
551
        # comparison purposes with return value from the fingerprint()
 
552
        # function
901
553
        logger.debug("  Fingerprint: %s", self.fingerprint)
902
554
        self.created = settings.get("created",
903
555
                                    datetime.datetime.utcnow())
910
562
        self.current_checker_command = None
911
563
        self.approved = None
912
564
        self.approvals_pending = 0
913
 
        self.changedstate = multiprocessing_manager.Condition(
914
 
            multiprocessing_manager.Lock())
915
 
        self.client_structure = [attr
916
 
                                 for attr in self.__dict__.keys()
 
565
        self.changedstate = (multiprocessing_manager
 
566
                             .Condition(multiprocessing_manager
 
567
                                        .Lock()))
 
568
        self.client_structure = [attr for attr in
 
569
                                 self.__dict__.iterkeys()
917
570
                                 if not attr.startswith("_")]
918
571
        self.client_structure.append("client_structure")
919
572
        
920
 
        for name, t in inspect.getmembers(
921
 
                type(self), lambda obj: isinstance(obj, property)):
 
573
        for name, t in inspect.getmembers(type(self),
 
574
                                          lambda obj:
 
575
                                              isinstance(obj,
 
576
                                                         property)):
922
577
            if not name.startswith("_"):
923
578
                self.client_structure.append(name)
924
579
    
945
600
        if not quiet:
946
601
            logger.info("Disabling client %s", self.name)
947
602
        if getattr(self, "disable_initiator_tag", None) is not None:
948
 
            GLib.source_remove(self.disable_initiator_tag)
 
603
            gobject.source_remove(self.disable_initiator_tag)
949
604
            self.disable_initiator_tag = None
950
605
        self.expires = None
951
606
        if getattr(self, "checker_initiator_tag", None) is not None:
952
 
            GLib.source_remove(self.checker_initiator_tag)
 
607
            gobject.source_remove(self.checker_initiator_tag)
953
608
            self.checker_initiator_tag = None
954
609
        self.stop_checker()
955
610
        self.enabled = False
956
611
        if not quiet:
957
612
            self.send_changedstate()
958
 
        # Do not run this again if called by a GLib.timeout_add
 
613
        # Do not run this again if called by a gobject.timeout_add
959
614
        return False
960
615
    
961
616
    def __del__(self):
965
620
        # Schedule a new checker to be started an 'interval' from now,
966
621
        # and every interval from then on.
967
622
        if self.checker_initiator_tag is not None:
968
 
            GLib.source_remove(self.checker_initiator_tag)
969
 
        self.checker_initiator_tag = GLib.timeout_add(
970
 
            int(self.interval.total_seconds() * 1000),
971
 
            self.start_checker)
 
623
            gobject.source_remove(self.checker_initiator_tag)
 
624
        self.checker_initiator_tag = (gobject.timeout_add
 
625
                                      (self.interval_milliseconds(),
 
626
                                       self.start_checker))
972
627
        # Schedule a disable() when 'timeout' has passed
973
628
        if self.disable_initiator_tag is not None:
974
 
            GLib.source_remove(self.disable_initiator_tag)
975
 
        self.disable_initiator_tag = GLib.timeout_add(
976
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
629
            gobject.source_remove(self.disable_initiator_tag)
 
630
        self.disable_initiator_tag = (gobject.timeout_add
 
631
                                   (self.timeout_milliseconds(),
 
632
                                    self.disable))
977
633
        # Also start a new checker *right now*.
978
634
        self.start_checker()
979
635
    
980
 
    def checker_callback(self, source, condition, connection,
981
 
                         command):
 
636
    def checker_callback(self, pid, condition, command):
982
637
        """The checker has completed, so take appropriate actions."""
983
638
        self.checker_callback_tag = None
984
639
        self.checker = None
985
 
        # Read return code from connection (see call_pipe)
986
 
        returncode = connection.recv()
987
 
        connection.close()
988
 
        
989
 
        if returncode >= 0:
990
 
            self.last_checker_status = returncode
991
 
            self.last_checker_signal = None
 
640
        if os.WIFEXITED(condition):
 
641
            self.last_checker_status = os.WEXITSTATUS(condition)
992
642
            if self.last_checker_status == 0:
993
643
                logger.info("Checker for %(name)s succeeded",
994
644
                            vars(self))
995
645
                self.checked_ok()
996
646
            else:
997
 
                logger.info("Checker for %(name)s failed", vars(self))
 
647
                logger.info("Checker for %(name)s failed",
 
648
                            vars(self))
998
649
        else:
999
650
            self.last_checker_status = -1
1000
 
            self.last_checker_signal = -returncode
1001
651
            logger.warning("Checker for %(name)s crashed?",
1002
652
                           vars(self))
1003
 
        return False
1004
653
    
1005
654
    def checked_ok(self):
1006
655
        """Assert that the client has been seen, alive and well."""
1007
656
        self.last_checked_ok = datetime.datetime.utcnow()
1008
657
        self.last_checker_status = 0
1009
 
        self.last_checker_signal = None
1010
658
        self.bump_timeout()
1011
659
    
1012
660
    def bump_timeout(self, timeout=None):
1014
662
        if timeout is None:
1015
663
            timeout = self.timeout
1016
664
        if self.disable_initiator_tag is not None:
1017
 
            GLib.source_remove(self.disable_initiator_tag)
 
665
            gobject.source_remove(self.disable_initiator_tag)
1018
666
            self.disable_initiator_tag = None
1019
667
        if getattr(self, "enabled", False):
1020
 
            self.disable_initiator_tag = GLib.timeout_add(
1021
 
                int(timeout.total_seconds() * 1000), self.disable)
 
668
            self.disable_initiator_tag = (gobject.timeout_add
 
669
                                          (timedelta_to_milliseconds
 
670
                                           (timeout), self.disable))
1022
671
            self.expires = datetime.datetime.utcnow() + timeout
1023
672
    
1024
673
    def need_approval(self):
1038
687
        # than 'timeout' for the client to be disabled, which is as it
1039
688
        # should be.
1040
689
        
1041
 
        if self.checker is not None and not self.checker.is_alive():
1042
 
            logger.warning("Checker was not alive; joining")
1043
 
            self.checker.join()
1044
 
            self.checker = None
 
690
        # If a checker exists, make sure it is not a zombie
 
691
        try:
 
692
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
693
        except AttributeError:
 
694
            pass
 
695
        except OSError as error:
 
696
            if error.errno != errno.ECHILD:
 
697
                raise
 
698
        else:
 
699
            if pid:
 
700
                logger.warning("Checker was a zombie")
 
701
                gobject.source_remove(self.checker_callback_tag)
 
702
                self.checker_callback(pid, status,
 
703
                                      self.current_checker_command)
1045
704
        # Start a new checker if needed
1046
705
        if self.checker is None:
1047
706
            # Escape attributes for the shell
1048
 
            escaped_attrs = {
1049
 
                attr: re.escape(str(getattr(self, attr)))
1050
 
                for attr in self.runtime_expansions }
 
707
            escaped_attrs = dict(
 
708
                (attr, re.escape(unicode(getattr(self, attr))))
 
709
                for attr in
 
710
                self.runtime_expansions)
1051
711
            try:
1052
712
                command = self.checker_command % escaped_attrs
1053
713
            except TypeError as error:
1054
714
                logger.error('Could not format string "%s"',
1055
 
                             self.checker_command,
 
715
                             self.checker_command, exc_info=error)
 
716
                return True # Try again later
 
717
            self.current_checker_command = command
 
718
            try:
 
719
                logger.info("Starting checker %r for %s",
 
720
                            command, self.name)
 
721
                # We don't need to redirect stdout and stderr, since
 
722
                # in normal mode, that is already done by daemon(),
 
723
                # and in debug mode we don't want to.  (Stdin is
 
724
                # always replaced by /dev/null.)
 
725
                # The exception is when not debugging but nevertheless
 
726
                # running in the foreground; use the previously
 
727
                # created wnull.
 
728
                popen_args = {}
 
729
                if (not self.server_settings["debug"]
 
730
                    and self.server_settings["foreground"]):
 
731
                    popen_args.update({"stdout": wnull,
 
732
                                       "stderr": wnull })
 
733
                self.checker = subprocess.Popen(command,
 
734
                                                close_fds=True,
 
735
                                                shell=True, cwd="/",
 
736
                                                **popen_args)
 
737
            except OSError as error:
 
738
                logger.error("Failed to start subprocess",
1056
739
                             exc_info=error)
1057
 
                return True     # Try again later
1058
 
            self.current_checker_command = command
1059
 
            logger.info("Starting checker %r for %s", command,
1060
 
                        self.name)
1061
 
            # We don't need to redirect stdout and stderr, since
1062
 
            # in normal mode, that is already done by daemon(),
1063
 
            # and in debug mode we don't want to.  (Stdin is
1064
 
            # always replaced by /dev/null.)
1065
 
            # The exception is when not debugging but nevertheless
1066
 
            # running in the foreground; use the previously
1067
 
            # created wnull.
1068
 
            popen_args = { "close_fds": True,
1069
 
                           "shell": True,
1070
 
                           "cwd": "/" }
1071
 
            if (not self.server_settings["debug"]
1072
 
                and self.server_settings["foreground"]):
1073
 
                popen_args.update({"stdout": wnull,
1074
 
                                   "stderr": wnull })
1075
 
            pipe = multiprocessing.Pipe(duplex = False)
1076
 
            self.checker = multiprocessing.Process(
1077
 
                target = call_pipe,
1078
 
                args = (pipe[1], subprocess.call, command),
1079
 
                kwargs = popen_args)
1080
 
            self.checker.start()
1081
 
            self.checker_callback_tag = GLib.io_add_watch(
1082
 
                pipe[0].fileno(), GLib.IO_IN,
1083
 
                self.checker_callback, pipe[0], command)
1084
 
        # Re-run this periodically if run by GLib.timeout_add
 
740
                return True
 
741
            self.checker_callback_tag = (gobject.child_watch_add
 
742
                                         (self.checker.pid,
 
743
                                          self.checker_callback,
 
744
                                          data=command))
 
745
            # The checker may have completed before the gobject
 
746
            # watch was added.  Check for this.
 
747
            try:
 
748
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
749
            except OSError as error:
 
750
                if error.errno == errno.ECHILD:
 
751
                    # This should never happen
 
752
                    logger.error("Child process vanished",
 
753
                                 exc_info=error)
 
754
                    return True
 
755
                raise
 
756
            if pid:
 
757
                gobject.source_remove(self.checker_callback_tag)
 
758
                self.checker_callback(pid, status, command)
 
759
        # Re-run this periodically if run by gobject.timeout_add
1085
760
        return True
1086
761
    
1087
762
    def stop_checker(self):
1088
763
        """Force the checker process, if any, to stop."""
1089
764
        if self.checker_callback_tag:
1090
 
            GLib.source_remove(self.checker_callback_tag)
 
765
            gobject.source_remove(self.checker_callback_tag)
1091
766
            self.checker_callback_tag = None
1092
767
        if getattr(self, "checker", None) is None:
1093
768
            return
1094
769
        logger.debug("Stopping checker for %(name)s", vars(self))
1095
 
        self.checker.terminate()
 
770
        try:
 
771
            self.checker.terminate()
 
772
            #time.sleep(0.5)
 
773
            #if self.checker.poll() is None:
 
774
            #    self.checker.kill()
 
775
        except OSError as error:
 
776
            if error.errno != errno.ESRCH: # No such process
 
777
                raise
1096
778
        self.checker = None
1097
779
 
1098
780
 
1099
 
def dbus_service_property(dbus_interface,
1100
 
                          signature="v",
1101
 
                          access="readwrite",
1102
 
                          byte_arrays=False):
 
781
def dbus_service_property(dbus_interface, signature="v",
 
782
                          access="readwrite", byte_arrays=False):
1103
783
    """Decorators for marking methods of a DBusObjectWithProperties to
1104
784
    become properties on the D-Bus.
1105
785
    
1114
794
    # "Set" method, so we fail early here:
1115
795
    if byte_arrays and signature != "ay":
1116
796
        raise ValueError("Byte arrays not supported for non-'ay'"
1117
 
                         " signature {!r}".format(signature))
1118
 
    
 
797
                         " signature {0!r}".format(signature))
1119
798
    def decorator(func):
1120
799
        func._dbus_is_property = True
1121
800
        func._dbus_interface = dbus_interface
1126
805
            func._dbus_name = func._dbus_name[:-14]
1127
806
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1128
807
        return func
1129
 
    
1130
808
    return decorator
1131
809
 
1132
810
 
1141
819
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
1142
820
                    "false"}
1143
821
    """
1144
 
    
1145
822
    def decorator(func):
1146
823
        func._dbus_is_interface = True
1147
824
        func._dbus_interface = dbus_interface
1148
825
        func._dbus_name = dbus_interface
1149
826
        return func
1150
 
    
1151
827
    return decorator
1152
828
 
1153
829
 
1155
831
    """Decorator to annotate D-Bus methods, signals or properties
1156
832
    Usage:
1157
833
    
1158
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1159
 
                       "org.freedesktop.DBus.Property."
1160
 
                       "EmitsChangedSignal": "false"})
1161
834
    @dbus_service_property("org.example.Interface", signature="b",
1162
835
                           access="r")
 
836
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
837
                        "org.freedesktop.DBus.Property."
 
838
                        "EmitsChangedSignal": "false"})
1163
839
    def Property_dbus_property(self):
1164
840
        return dbus.Boolean(False)
1165
 
    
1166
 
    See also the DBusObjectWithAnnotations class.
1167
841
    """
1168
 
    
1169
842
    def decorator(func):
1170
843
        func._dbus_annotations = annotations
1171
844
        return func
1172
 
    
1173
845
    return decorator
1174
846
 
1175
847
 
1176
848
class DBusPropertyException(dbus.exceptions.DBusException):
1177
849
    """A base class for D-Bus property-related exceptions
1178
850
    """
1179
 
    pass
 
851
    def __unicode__(self):
 
852
        return unicode(str(self))
1180
853
 
1181
854
 
1182
855
class DBusPropertyAccessException(DBusPropertyException):
1191
864
    pass
1192
865
 
1193
866
 
1194
 
class DBusObjectWithAnnotations(dbus.service.Object):
1195
 
    """A D-Bus object with annotations.
 
867
class DBusObjectWithProperties(dbus.service.Object):
 
868
    """A D-Bus object with properties.
1196
869
    
1197
 
    Classes inheriting from this can use the dbus_annotations
1198
 
    decorator to add annotations to methods or signals.
 
870
    Classes inheriting from this can use the dbus_service_property
 
871
    decorator to expose methods as D-Bus properties.  It exposes the
 
872
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1199
873
    """
1200
874
    
1201
875
    @staticmethod
1205
879
        If called like _is_dbus_thing("method") it returns a function
1206
880
        suitable for use as predicate to inspect.getmembers().
1207
881
        """
1208
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
882
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1209
883
                                   False)
1210
884
    
1211
885
    def _get_all_dbus_things(self, thing):
1212
886
        """Returns a generator of (name, attribute) pairs
1213
887
        """
1214
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
888
        return ((getattr(athing.__get__(self), "_dbus_name",
 
889
                         name),
1215
890
                 athing.__get__(self))
1216
891
                for cls in self.__class__.__mro__
1217
892
                for name, athing in
1218
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
1219
 
    
1220
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1221
 
                         out_signature = "s",
1222
 
                         path_keyword = 'object_path',
1223
 
                         connection_keyword = 'connection')
1224
 
    def Introspect(self, object_path, connection):
1225
 
        """Overloading of standard D-Bus method.
1226
 
        
1227
 
        Inserts annotation tags on methods and signals.
1228
 
        """
1229
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
1230
 
                                                   connection)
1231
 
        try:
1232
 
            document = xml.dom.minidom.parseString(xmlstring)
1233
 
            
1234
 
            for if_tag in document.getElementsByTagName("interface"):
1235
 
                # Add annotation tags
1236
 
                for typ in ("method", "signal"):
1237
 
                    for tag in if_tag.getElementsByTagName(typ):
1238
 
                        annots = dict()
1239
 
                        for name, prop in (self.
1240
 
                                           _get_all_dbus_things(typ)):
1241
 
                            if (name == tag.getAttribute("name")
1242
 
                                and prop._dbus_interface
1243
 
                                == if_tag.getAttribute("name")):
1244
 
                                annots.update(getattr(
1245
 
                                    prop, "_dbus_annotations", {}))
1246
 
                        for name, value in annots.items():
1247
 
                            ann_tag = document.createElement(
1248
 
                                "annotation")
1249
 
                            ann_tag.setAttribute("name", name)
1250
 
                            ann_tag.setAttribute("value", value)
1251
 
                            tag.appendChild(ann_tag)
1252
 
                # Add interface annotation tags
1253
 
                for annotation, value in dict(
1254
 
                    itertools.chain.from_iterable(
1255
 
                        annotations().items()
1256
 
                        for name, annotations
1257
 
                        in self._get_all_dbus_things("interface")
1258
 
                        if name == if_tag.getAttribute("name")
1259
 
                        )).items():
1260
 
                    ann_tag = document.createElement("annotation")
1261
 
                    ann_tag.setAttribute("name", annotation)
1262
 
                    ann_tag.setAttribute("value", value)
1263
 
                    if_tag.appendChild(ann_tag)
1264
 
                # Fix argument name for the Introspect method itself
1265
 
                if (if_tag.getAttribute("name")
1266
 
                                == dbus.INTROSPECTABLE_IFACE):
1267
 
                    for cn in if_tag.getElementsByTagName("method"):
1268
 
                        if cn.getAttribute("name") == "Introspect":
1269
 
                            for arg in cn.getElementsByTagName("arg"):
1270
 
                                if (arg.getAttribute("direction")
1271
 
                                    == "out"):
1272
 
                                    arg.setAttribute("name",
1273
 
                                                     "xml_data")
1274
 
            xmlstring = document.toxml("utf-8")
1275
 
            document.unlink()
1276
 
        except (AttributeError, xml.dom.DOMException,
1277
 
                xml.parsers.expat.ExpatError) as error:
1278
 
            logger.error("Failed to override Introspection method",
1279
 
                         exc_info=error)
1280
 
        return xmlstring
1281
 
 
1282
 
 
1283
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1284
 
    """A D-Bus object with properties.
1285
 
    
1286
 
    Classes inheriting from this can use the dbus_service_property
1287
 
    decorator to expose methods as D-Bus properties.  It exposes the
1288
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1289
 
    """
 
893
                inspect.getmembers(cls,
 
894
                                   self._is_dbus_thing(thing)))
1290
895
    
1291
896
    def _get_dbus_property(self, interface_name, property_name):
1292
897
        """Returns a bound method if one exists which is a D-Bus
1293
898
        property with the specified name and interface.
1294
899
        """
1295
 
        for cls in self.__class__.__mro__:
1296
 
            for name, value in inspect.getmembers(
1297
 
                    cls, self._is_dbus_thing("property")):
 
900
        for cls in  self.__class__.__mro__:
 
901
            for name, value in (inspect.getmembers
 
902
                                (cls,
 
903
                                 self._is_dbus_thing("property"))):
1298
904
                if (value._dbus_name == property_name
1299
905
                    and value._dbus_interface == interface_name):
1300
906
                    return value.__get__(self)
1301
907
        
1302
908
        # No such property
1303
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
1304
 
            self.dbus_object_path, interface_name, property_name))
1305
 
    
1306
 
    @classmethod
1307
 
    def _get_all_interface_names(cls):
1308
 
        """Get a sequence of all interfaces supported by an object"""
1309
 
        return (name for name in set(getattr(getattr(x, attr),
1310
 
                                             "_dbus_interface", None)
1311
 
                                     for x in (inspect.getmro(cls))
1312
 
                                     for attr in dir(x))
1313
 
                if name is not None)
1314
 
    
1315
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1316
 
                         in_signature="ss",
 
909
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
910
                                   + interface_name + "."
 
911
                                   + property_name)
 
912
    
 
913
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1317
914
                         out_signature="v")
1318
915
    def Get(self, interface_name, property_name):
1319
916
        """Standard D-Bus property Get() method, see D-Bus standard.
1337
934
            # The byte_arrays option is not supported yet on
1338
935
            # signatures other than "ay".
1339
936
            if prop._dbus_signature != "ay":
1340
 
                raise ValueError("Byte arrays not supported for non-"
1341
 
                                 "'ay' signature {!r}"
1342
 
                                 .format(prop._dbus_signature))
 
937
                raise ValueError
1343
938
            value = dbus.ByteArray(b''.join(chr(byte)
1344
939
                                            for byte in value))
1345
940
        prop(value)
1346
941
    
1347
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1348
 
                         in_signature="s",
 
942
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1349
943
                         out_signature="a{sv}")
1350
944
    def GetAll(self, interface_name):
1351
945
        """Standard D-Bus property GetAll() method, see D-Bus
1366
960
            if not hasattr(value, "variant_level"):
1367
961
                properties[name] = value
1368
962
                continue
1369
 
            properties[name] = type(value)(
1370
 
                value, variant_level = value.variant_level + 1)
 
963
            properties[name] = type(value)(value, variant_level=
 
964
                                           value.variant_level+1)
1371
965
        return dbus.Dictionary(properties, signature="sv")
1372
966
    
1373
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1374
 
    def PropertiesChanged(self, interface_name, changed_properties,
1375
 
                          invalidated_properties):
1376
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
1377
 
        standard.
1378
 
        """
1379
 
        pass
1380
 
    
1381
967
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1382
968
                         out_signature="s",
1383
969
                         path_keyword='object_path',
1387
973
        
1388
974
        Inserts property tags and interface annotation tags.
1389
975
        """
1390
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1391
 
                                                         object_path,
1392
 
                                                         connection)
 
976
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
977
                                                   connection)
1393
978
        try:
1394
979
            document = xml.dom.minidom.parseString(xmlstring)
1395
 
            
1396
980
            def make_tag(document, name, prop):
1397
981
                e = document.createElement("property")
1398
982
                e.setAttribute("name", name)
1399
983
                e.setAttribute("type", prop._dbus_signature)
1400
984
                e.setAttribute("access", prop._dbus_access)
1401
985
                return e
1402
 
            
1403
986
            for if_tag in document.getElementsByTagName("interface"):
1404
987
                # Add property tags
1405
988
                for tag in (make_tag(document, name, prop)
1408
991
                            if prop._dbus_interface
1409
992
                            == if_tag.getAttribute("name")):
1410
993
                    if_tag.appendChild(tag)
1411
 
                # Add annotation tags for properties
1412
 
                for tag in if_tag.getElementsByTagName("property"):
1413
 
                    annots = dict()
1414
 
                    for name, prop in self._get_all_dbus_things(
1415
 
                            "property"):
1416
 
                        if (name == tag.getAttribute("name")
1417
 
                            and prop._dbus_interface
1418
 
                            == if_tag.getAttribute("name")):
1419
 
                            annots.update(getattr(
1420
 
                                prop, "_dbus_annotations", {}))
1421
 
                    for name, value in annots.items():
1422
 
                        ann_tag = document.createElement(
1423
 
                            "annotation")
1424
 
                        ann_tag.setAttribute("name", name)
1425
 
                        ann_tag.setAttribute("value", value)
1426
 
                        tag.appendChild(ann_tag)
 
994
                # Add annotation tags
 
995
                for typ in ("method", "signal", "property"):
 
996
                    for tag in if_tag.getElementsByTagName(typ):
 
997
                        annots = dict()
 
998
                        for name, prop in (self.
 
999
                                           _get_all_dbus_things(typ)):
 
1000
                            if (name == tag.getAttribute("name")
 
1001
                                and prop._dbus_interface
 
1002
                                == if_tag.getAttribute("name")):
 
1003
                                annots.update(getattr
 
1004
                                              (prop,
 
1005
                                               "_dbus_annotations",
 
1006
                                               {}))
 
1007
                        for name, value in annots.iteritems():
 
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().iteritems()
 
1017
                        for name, annotations in
 
1018
                        self._get_all_dbus_things("interface")
 
1019
                        if name == if_tag.getAttribute("name")
 
1020
                        )).iteritems():
 
1021
                    ann_tag = document.createElement("annotation")
 
1022
                    ann_tag.setAttribute("name", annotation)
 
1023
                    ann_tag.setAttribute("value", value)
 
1024
                    if_tag.appendChild(ann_tag)
1427
1025
                # Add the names to the return values for the
1428
1026
                # "org.freedesktop.DBus.Properties" methods
1429
1027
                if (if_tag.getAttribute("name")
1447
1045
                         exc_info=error)
1448
1046
        return xmlstring
1449
1047
 
1450
 
try:
1451
 
    dbus.OBJECT_MANAGER_IFACE
1452
 
except AttributeError:
1453
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1454
 
 
1455
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1456
 
    """A D-Bus object with an ObjectManager.
1457
 
    
1458
 
    Classes inheriting from this exposes the standard
1459
 
    GetManagedObjects call and the InterfacesAdded and
1460
 
    InterfacesRemoved signals on the standard
1461
 
    "org.freedesktop.DBus.ObjectManager" interface.
1462
 
    
1463
 
    Note: No signals are sent automatically; they must be sent
1464
 
    manually.
1465
 
    """
1466
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1467
 
                         out_signature = "a{oa{sa{sv}}}")
1468
 
    def GetManagedObjects(self):
1469
 
        """This function must be overridden"""
1470
 
        raise NotImplementedError()
1471
 
    
1472
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1473
 
                         signature = "oa{sa{sv}}")
1474
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
1475
 
        pass
1476
 
    
1477
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1478
 
    def InterfacesRemoved(self, object_path, interfaces):
1479
 
        pass
1480
 
    
1481
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1482
 
                         out_signature = "s",
1483
 
                         path_keyword = 'object_path',
1484
 
                         connection_keyword = 'connection')
1485
 
    def Introspect(self, object_path, connection):
1486
 
        """Overloading of standard D-Bus method.
1487
 
        
1488
 
        Override return argument name of GetManagedObjects to be
1489
 
        "objpath_interfaces_and_properties"
1490
 
        """
1491
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1492
 
                                                         object_path,
1493
 
                                                         connection)
1494
 
        try:
1495
 
            document = xml.dom.minidom.parseString(xmlstring)
1496
 
            
1497
 
            for if_tag in document.getElementsByTagName("interface"):
1498
 
                # Fix argument name for the GetManagedObjects method
1499
 
                if (if_tag.getAttribute("name")
1500
 
                                == dbus.OBJECT_MANAGER_IFACE):
1501
 
                    for cn in if_tag.getElementsByTagName("method"):
1502
 
                        if (cn.getAttribute("name")
1503
 
                            == "GetManagedObjects"):
1504
 
                            for arg in cn.getElementsByTagName("arg"):
1505
 
                                if (arg.getAttribute("direction")
1506
 
                                    == "out"):
1507
 
                                    arg.setAttribute(
1508
 
                                        "name",
1509
 
                                        "objpath_interfaces"
1510
 
                                        "_and_properties")
1511
 
            xmlstring = document.toxml("utf-8")
1512
 
            document.unlink()
1513
 
        except (AttributeError, xml.dom.DOMException,
1514
 
                xml.parsers.expat.ExpatError) as error:
1515
 
            logger.error("Failed to override Introspection method",
1516
 
                         exc_info = error)
1517
 
        return xmlstring
1518
1048
 
1519
1049
def datetime_to_dbus(dt, variant_level=0):
1520
1050
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1521
1051
    if dt is None:
1522
1052
        return dbus.String("", variant_level = variant_level)
1523
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1053
    return dbus.String(dt.isoformat(),
 
1054
                       variant_level=variant_level)
1524
1055
 
1525
1056
 
1526
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1546
1077
    (from DBusObjectWithProperties) and interfaces (from the
1547
1078
    dbus_interface_annotations decorator).
1548
1079
    """
1549
 
    
1550
1080
    def wrapper(cls):
1551
1081
        for orig_interface_name, alt_interface_name in (
1552
 
                alt_interface_names.items()):
 
1082
            alt_interface_names.iteritems()):
1553
1083
            attr = {}
1554
1084
            interface_names = set()
1555
1085
            # Go though all attributes of the class
1557
1087
                # Ignore non-D-Bus attributes, and D-Bus attributes
1558
1088
                # with the wrong interface name
1559
1089
                if (not hasattr(attribute, "_dbus_interface")
1560
 
                    or not attribute._dbus_interface.startswith(
1561
 
                        orig_interface_name)):
 
1090
                    or not attribute._dbus_interface
 
1091
                    .startswith(orig_interface_name)):
1562
1092
                    continue
1563
1093
                # Create an alternate D-Bus interface name based on
1564
1094
                # the current name
1565
 
                alt_interface = attribute._dbus_interface.replace(
1566
 
                    orig_interface_name, alt_interface_name)
 
1095
                alt_interface = (attribute._dbus_interface
 
1096
                                 .replace(orig_interface_name,
 
1097
                                          alt_interface_name))
1567
1098
                interface_names.add(alt_interface)
1568
1099
                # Is this a D-Bus signal?
1569
1100
                if getattr(attribute, "_dbus_is_signal", False):
1570
1101
                    # Extract the original non-method undecorated
1571
1102
                    # function by black magic
1572
 
                    if sys.version_info.major == 2:
1573
 
                        nonmethod_func = (dict(
 
1103
                    nonmethod_func = (dict(
1574
1104
                            zip(attribute.func_code.co_freevars,
1575
 
                                attribute.__closure__))
1576
 
                                          ["func"].cell_contents)
1577
 
                    else:
1578
 
                        nonmethod_func = (dict(
1579
 
                            zip(attribute.__code__.co_freevars,
1580
 
                                attribute.__closure__))
1581
 
                                          ["func"].cell_contents)
 
1105
                                attribute.__closure__))["func"]
 
1106
                                      .cell_contents)
1582
1107
                    # Create a new, but exactly alike, function
1583
1108
                    # object, and decorate it to be a new D-Bus signal
1584
1109
                    # with the alternate D-Bus interface name
1585
 
                    new_function = copy_function(nonmethod_func)
1586
 
                    new_function = (dbus.service.signal(
1587
 
                        alt_interface,
1588
 
                        attribute._dbus_signature)(new_function))
 
1110
                    new_function = (dbus.service.signal
 
1111
                                    (alt_interface,
 
1112
                                     attribute._dbus_signature)
 
1113
                                    (types.FunctionType(
 
1114
                                nonmethod_func.func_code,
 
1115
                                nonmethod_func.func_globals,
 
1116
                                nonmethod_func.func_name,
 
1117
                                nonmethod_func.func_defaults,
 
1118
                                nonmethod_func.func_closure)))
1589
1119
                    # Copy annotations, if any
1590
1120
                    try:
1591
 
                        new_function._dbus_annotations = dict(
1592
 
                            attribute._dbus_annotations)
 
1121
                        new_function._dbus_annotations = (
 
1122
                            dict(attribute._dbus_annotations))
1593
1123
                    except AttributeError:
1594
1124
                        pass
1595
1125
                    # Define a creator of a function to call both the
1600
1130
                        """This function is a scope container to pass
1601
1131
                        func1 and func2 to the "call_both" function
1602
1132
                        outside of its arguments"""
1603
 
                        
1604
 
                        @functools.wraps(func2)
1605
1133
                        def call_both(*args, **kwargs):
1606
1134
                            """This function will emit two D-Bus
1607
1135
                            signals by calling func1 and func2"""
1608
1136
                            func1(*args, **kwargs)
1609
1137
                            func2(*args, **kwargs)
1610
 
                        # Make wrapper function look like a D-Bus signal
1611
 
                        for name, attr in inspect.getmembers(func2):
1612
 
                            if name.startswith("_dbus_"):
1613
 
                                setattr(call_both, name, attr)
1614
 
                        
1615
1138
                        return call_both
1616
1139
                    # Create the "call_both" function and add it to
1617
1140
                    # the class
1622
1145
                    # object.  Decorate it to be a new D-Bus method
1623
1146
                    # with the alternate D-Bus interface name.  Add it
1624
1147
                    # to the class.
1625
 
                    attr[attrname] = (
1626
 
                        dbus.service.method(
1627
 
                            alt_interface,
1628
 
                            attribute._dbus_in_signature,
1629
 
                            attribute._dbus_out_signature)
1630
 
                        (copy_function(attribute)))
 
1148
                    attr[attrname] = (dbus.service.method
 
1149
                                      (alt_interface,
 
1150
                                       attribute._dbus_in_signature,
 
1151
                                       attribute._dbus_out_signature)
 
1152
                                      (types.FunctionType
 
1153
                                       (attribute.func_code,
 
1154
                                        attribute.func_globals,
 
1155
                                        attribute.func_name,
 
1156
                                        attribute.func_defaults,
 
1157
                                        attribute.func_closure)))
1631
1158
                    # Copy annotations, if any
1632
1159
                    try:
1633
 
                        attr[attrname]._dbus_annotations = dict(
1634
 
                            attribute._dbus_annotations)
 
1160
                        attr[attrname]._dbus_annotations = (
 
1161
                            dict(attribute._dbus_annotations))
1635
1162
                    except AttributeError:
1636
1163
                        pass
1637
1164
                # Is this a D-Bus property?
1640
1167
                    # object, and decorate it to be a new D-Bus
1641
1168
                    # property with the alternate D-Bus interface
1642
1169
                    # name.  Add it to the class.
1643
 
                    attr[attrname] = (dbus_service_property(
1644
 
                        alt_interface, attribute._dbus_signature,
1645
 
                        attribute._dbus_access,
1646
 
                        attribute._dbus_get_args_options
1647
 
                        ["byte_arrays"])
1648
 
                                      (copy_function(attribute)))
 
1170
                    attr[attrname] = (dbus_service_property
 
1171
                                      (alt_interface,
 
1172
                                       attribute._dbus_signature,
 
1173
                                       attribute._dbus_access,
 
1174
                                       attribute
 
1175
                                       ._dbus_get_args_options
 
1176
                                       ["byte_arrays"])
 
1177
                                      (types.FunctionType
 
1178
                                       (attribute.func_code,
 
1179
                                        attribute.func_globals,
 
1180
                                        attribute.func_name,
 
1181
                                        attribute.func_defaults,
 
1182
                                        attribute.func_closure)))
1649
1183
                    # Copy annotations, if any
1650
1184
                    try:
1651
 
                        attr[attrname]._dbus_annotations = dict(
1652
 
                            attribute._dbus_annotations)
 
1185
                        attr[attrname]._dbus_annotations = (
 
1186
                            dict(attribute._dbus_annotations))
1653
1187
                    except AttributeError:
1654
1188
                        pass
1655
1189
                # Is this a D-Bus interface?
1658
1192
                    # object.  Decorate it to be a new D-Bus interface
1659
1193
                    # with the alternate D-Bus interface name.  Add it
1660
1194
                    # to the class.
1661
 
                    attr[attrname] = (
1662
 
                        dbus_interface_annotations(alt_interface)
1663
 
                        (copy_function(attribute)))
 
1195
                    attr[attrname] = (dbus_interface_annotations
 
1196
                                      (alt_interface)
 
1197
                                      (types.FunctionType
 
1198
                                       (attribute.func_code,
 
1199
                                        attribute.func_globals,
 
1200
                                        attribute.func_name,
 
1201
                                        attribute.func_defaults,
 
1202
                                        attribute.func_closure)))
1664
1203
            if deprecate:
1665
1204
                # Deprecate all alternate interfaces
1666
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1205
                iname="_AlternateDBusNames_interface_annotation{0}"
1667
1206
                for interface_name in interface_names:
1668
 
                    
1669
1207
                    @dbus_interface_annotations(interface_name)
1670
1208
                    def func(self):
1671
1209
                        return { "org.freedesktop.DBus.Deprecated":
1672
 
                                 "true" }
 
1210
                                     "true" }
1673
1211
                    # Find an unused name
1674
1212
                    for aname in (iname.format(i)
1675
1213
                                  for i in itertools.count()):
1679
1217
            if interface_names:
1680
1218
                # Replace the class with a new subclass of it with
1681
1219
                # methods, signals, etc. as created above.
1682
 
                if sys.version_info.major == 2:
1683
 
                    cls = type(b"{}Alternate".format(cls.__name__),
1684
 
                               (cls, ), attr)
1685
 
                else:
1686
 
                    cls = type("{}Alternate".format(cls.__name__),
1687
 
                               (cls, ), attr)
 
1220
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1221
                           (cls,), attr)
1688
1222
        return cls
1689
 
    
1690
1223
    return wrapper
1691
1224
 
1692
1225
 
1693
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1694
 
                            "se.bsnet.fukt.Mandos"})
 
1227
                                "se.bsnet.fukt.Mandos"})
1695
1228
class ClientDBus(Client, DBusObjectWithProperties):
1696
1229
    """A Client class using D-Bus
1697
1230
    
1701
1234
    """
1702
1235
    
1703
1236
    runtime_expansions = (Client.runtime_expansions
1704
 
                          + ("dbus_object_path", ))
1705
 
    
1706
 
    _interface = "se.recompile.Mandos.Client"
 
1237
                          + ("dbus_object_path",))
1707
1238
    
1708
1239
    # dbus.service.Object doesn't use super(), so we can't either.
1709
1240
    
1712
1243
        Client.__init__(self, *args, **kwargs)
1713
1244
        # Only now, when this client is initialized, can it show up on
1714
1245
        # the D-Bus
1715
 
        client_object_name = str(self.name).translate(
 
1246
        client_object_name = unicode(self.name).translate(
1716
1247
            {ord("."): ord("_"),
1717
1248
             ord("-"): ord("_")})
1718
 
        self.dbus_object_path = dbus.ObjectPath(
1719
 
            "/clients/" + client_object_name)
 
1249
        self.dbus_object_path = (dbus.ObjectPath
 
1250
                                 ("/clients/" + client_object_name))
1720
1251
        DBusObjectWithProperties.__init__(self, self.bus,
1721
1252
                                          self.dbus_object_path)
1722
1253
    
1723
 
    def notifychangeproperty(transform_func, dbus_name,
1724
 
                             type_func=lambda x: x,
1725
 
                             variant_level=1,
1726
 
                             invalidate_only=False,
1727
 
                             _interface=_interface):
 
1254
    def notifychangeproperty(transform_func,
 
1255
                             dbus_name, type_func=lambda x: x,
 
1256
                             variant_level=1):
1728
1257
        """ Modify a variable so that it's a property which announces
1729
1258
        its changes to DBus.
1730
1259
        
1735
1264
                   to the D-Bus.  Default: no transform
1736
1265
        variant_level: D-Bus variant level.  Default: 1
1737
1266
        """
1738
 
        attrname = "_{}".format(dbus_name)
1739
 
        
 
1267
        attrname = "_{0}".format(dbus_name)
1740
1268
        def setter(self, value):
1741
1269
            if hasattr(self, "dbus_object_path"):
1742
1270
                if (not hasattr(self, attrname) or
1743
1271
                    type_func(getattr(self, attrname, None))
1744
1272
                    != type_func(value)):
1745
 
                    if invalidate_only:
1746
 
                        self.PropertiesChanged(
1747
 
                            _interface, dbus.Dictionary(),
1748
 
                            dbus.Array((dbus_name, )))
1749
 
                    else:
1750
 
                        dbus_value = transform_func(
1751
 
                            type_func(value),
1752
 
                            variant_level = variant_level)
1753
 
                        self.PropertyChanged(dbus.String(dbus_name),
1754
 
                                             dbus_value)
1755
 
                        self.PropertiesChanged(
1756
 
                            _interface,
1757
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1758
 
                                              dbus_value }),
1759
 
                            dbus.Array())
 
1273
                    dbus_value = transform_func(type_func(value),
 
1274
                                                variant_level
 
1275
                                                =variant_level)
 
1276
                    self.PropertyChanged(dbus.String(dbus_name),
 
1277
                                         dbus_value)
1760
1278
            setattr(self, attrname, value)
1761
1279
        
1762
1280
        return property(lambda self: getattr(self, attrname), setter)
1768
1286
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1769
1287
    last_enabled = notifychangeproperty(datetime_to_dbus,
1770
1288
                                        "LastEnabled")
1771
 
    checker = notifychangeproperty(
1772
 
        dbus.Boolean, "CheckerRunning",
1773
 
        type_func = lambda checker: checker is not None)
 
1289
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1290
                                   type_func = lambda checker:
 
1291
                                       checker is not None)
1774
1292
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1775
1293
                                           "LastCheckedOK")
1776
1294
    last_checker_status = notifychangeproperty(dbus.Int16,
1779
1297
        datetime_to_dbus, "LastApprovalRequest")
1780
1298
    approved_by_default = notifychangeproperty(dbus.Boolean,
1781
1299
                                               "ApprovedByDefault")
1782
 
    approval_delay = notifychangeproperty(
1783
 
        dbus.UInt64, "ApprovalDelay",
1784
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1300
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1301
                                          "ApprovalDelay",
 
1302
                                          type_func =
 
1303
                                          timedelta_to_milliseconds)
1785
1304
    approval_duration = notifychangeproperty(
1786
1305
        dbus.UInt64, "ApprovalDuration",
1787
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1306
        type_func = timedelta_to_milliseconds)
1788
1307
    host = notifychangeproperty(dbus.String, "Host")
1789
 
    timeout = notifychangeproperty(
1790
 
        dbus.UInt64, "Timeout",
1791
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1308
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1309
                                   type_func =
 
1310
                                   timedelta_to_milliseconds)
1792
1311
    extended_timeout = notifychangeproperty(
1793
1312
        dbus.UInt64, "ExtendedTimeout",
1794
 
        type_func = lambda td: td.total_seconds() * 1000)
1795
 
    interval = notifychangeproperty(
1796
 
        dbus.UInt64, "Interval",
1797
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1313
        type_func = timedelta_to_milliseconds)
 
1314
    interval = notifychangeproperty(dbus.UInt64,
 
1315
                                    "Interval",
 
1316
                                    type_func =
 
1317
                                    timedelta_to_milliseconds)
1798
1318
    checker_command = notifychangeproperty(dbus.String, "Checker")
1799
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1800
 
                                  invalidate_only=True)
1801
1319
    
1802
1320
    del notifychangeproperty
1803
1321
    
1810
1328
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1811
1329
        Client.__del__(self, *args, **kwargs)
1812
1330
    
1813
 
    def checker_callback(self, source, condition,
1814
 
                         connection, command, *args, **kwargs):
1815
 
        ret = Client.checker_callback(self, source, condition,
1816
 
                                      connection, command, *args,
1817
 
                                      **kwargs)
1818
 
        exitstatus = self.last_checker_status
1819
 
        if exitstatus >= 0:
 
1331
    def checker_callback(self, pid, condition, command,
 
1332
                         *args, **kwargs):
 
1333
        self.checker_callback_tag = None
 
1334
        self.checker = None
 
1335
        if os.WIFEXITED(condition):
 
1336
            exitstatus = os.WEXITSTATUS(condition)
1820
1337
            # Emit D-Bus signal
1821
1338
            self.CheckerCompleted(dbus.Int16(exitstatus),
1822
 
                                  # This is specific to GNU libC
1823
 
                                  dbus.Int64(exitstatus << 8),
 
1339
                                  dbus.Int64(condition),
1824
1340
                                  dbus.String(command))
1825
1341
        else:
1826
1342
            # Emit D-Bus signal
1827
1343
            self.CheckerCompleted(dbus.Int16(-1),
1828
 
                                  dbus.Int64(
1829
 
                                      # This is specific to GNU libC
1830
 
                                      (exitstatus << 8)
1831
 
                                      | self.last_checker_signal),
 
1344
                                  dbus.Int64(condition),
1832
1345
                                  dbus.String(command))
1833
 
        return ret
 
1346
        
 
1347
        return Client.checker_callback(self, pid, condition, command,
 
1348
                                       *args, **kwargs)
1834
1349
    
1835
1350
    def start_checker(self, *args, **kwargs):
1836
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1351
        old_checker = self.checker
 
1352
        if self.checker is not None:
 
1353
            old_checker_pid = self.checker.pid
 
1354
        else:
 
1355
            old_checker_pid = None
1837
1356
        r = Client.start_checker(self, *args, **kwargs)
1838
1357
        # Only if new checker process was started
1839
1358
        if (self.checker is not None
1848
1367
    
1849
1368
    def approve(self, value=True):
1850
1369
        self.approved = value
1851
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1852
 
                             * 1000), self._reset_approved)
 
1370
        gobject.timeout_add(timedelta_to_milliseconds
 
1371
                            (self.approval_duration),
 
1372
                            self._reset_approved)
1853
1373
        self.send_changedstate()
1854
1374
    
1855
1375
    ## D-Bus methods, signals & properties
 
1376
    _interface = "se.recompile.Mandos.Client"
1856
1377
    
1857
1378
    ## Interfaces
1858
1379
    
 
1380
    @dbus_interface_annotations(_interface)
 
1381
    def _foo(self):
 
1382
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1383
                     "false"}
 
1384
    
1859
1385
    ## Signals
1860
1386
    
1861
1387
    # CheckerCompleted - signal
1871
1397
        pass
1872
1398
    
1873
1399
    # PropertyChanged - signal
1874
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1875
1400
    @dbus.service.signal(_interface, signature="sv")
1876
1401
    def PropertyChanged(self, property, value):
1877
1402
        "D-Bus signal"
1911
1436
        self.checked_ok()
1912
1437
    
1913
1438
    # Enable - method
1914
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1915
1439
    @dbus.service.method(_interface)
1916
1440
    def Enable(self):
1917
1441
        "D-Bus method"
1918
1442
        self.enable()
1919
1443
    
1920
1444
    # StartChecker - method
1921
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1922
1445
    @dbus.service.method(_interface)
1923
1446
    def StartChecker(self):
1924
1447
        "D-Bus method"
1925
1448
        self.start_checker()
1926
1449
    
1927
1450
    # Disable - method
1928
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1929
1451
    @dbus.service.method(_interface)
1930
1452
    def Disable(self):
1931
1453
        "D-Bus method"
1932
1454
        self.disable()
1933
1455
    
1934
1456
    # StopChecker - method
1935
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1936
1457
    @dbus.service.method(_interface)
1937
1458
    def StopChecker(self):
1938
1459
        self.stop_checker()
1945
1466
        return dbus.Boolean(bool(self.approvals_pending))
1946
1467
    
1947
1468
    # ApprovedByDefault - property
1948
 
    @dbus_service_property(_interface,
1949
 
                           signature="b",
 
1469
    @dbus_service_property(_interface, signature="b",
1950
1470
                           access="readwrite")
1951
1471
    def ApprovedByDefault_dbus_property(self, value=None):
1952
1472
        if value is None:       # get
1954
1474
        self.approved_by_default = bool(value)
1955
1475
    
1956
1476
    # ApprovalDelay - property
1957
 
    @dbus_service_property(_interface,
1958
 
                           signature="t",
 
1477
    @dbus_service_property(_interface, signature="t",
1959
1478
                           access="readwrite")
1960
1479
    def ApprovalDelay_dbus_property(self, value=None):
1961
1480
        if value is None:       # get
1962
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1963
 
                               * 1000)
 
1481
            return dbus.UInt64(self.approval_delay_milliseconds())
1964
1482
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1965
1483
    
1966
1484
    # ApprovalDuration - property
1967
 
    @dbus_service_property(_interface,
1968
 
                           signature="t",
 
1485
    @dbus_service_property(_interface, signature="t",
1969
1486
                           access="readwrite")
1970
1487
    def ApprovalDuration_dbus_property(self, value=None):
1971
1488
        if value is None:       # get
1972
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1973
 
                               * 1000)
 
1489
            return dbus.UInt64(timedelta_to_milliseconds(
 
1490
                    self.approval_duration))
1974
1491
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1975
1492
    
1976
1493
    # Name - property
1977
 
    @dbus_annotations(
1978
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1979
1494
    @dbus_service_property(_interface, signature="s", access="read")
1980
1495
    def Name_dbus_property(self):
1981
1496
        return dbus.String(self.name)
1982
1497
    
1983
1498
    # Fingerprint - property
1984
 
    @dbus_annotations(
1985
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1986
1499
    @dbus_service_property(_interface, signature="s", access="read")
1987
1500
    def Fingerprint_dbus_property(self):
1988
1501
        return dbus.String(self.fingerprint)
1989
1502
    
1990
1503
    # Host - property
1991
 
    @dbus_service_property(_interface,
1992
 
                           signature="s",
 
1504
    @dbus_service_property(_interface, signature="s",
1993
1505
                           access="readwrite")
1994
1506
    def Host_dbus_property(self, value=None):
1995
1507
        if value is None:       # get
1996
1508
            return dbus.String(self.host)
1997
 
        self.host = str(value)
 
1509
        self.host = unicode(value)
1998
1510
    
1999
1511
    # Created - property
2000
 
    @dbus_annotations(
2001
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2002
1512
    @dbus_service_property(_interface, signature="s", access="read")
2003
1513
    def Created_dbus_property(self):
2004
1514
        return datetime_to_dbus(self.created)
2009
1519
        return datetime_to_dbus(self.last_enabled)
2010
1520
    
2011
1521
    # Enabled - property
2012
 
    @dbus_service_property(_interface,
2013
 
                           signature="b",
 
1522
    @dbus_service_property(_interface, signature="b",
2014
1523
                           access="readwrite")
2015
1524
    def Enabled_dbus_property(self, value=None):
2016
1525
        if value is None:       # get
2021
1530
            self.disable()
2022
1531
    
2023
1532
    # LastCheckedOK - property
2024
 
    @dbus_service_property(_interface,
2025
 
                           signature="s",
 
1533
    @dbus_service_property(_interface, signature="s",
2026
1534
                           access="readwrite")
2027
1535
    def LastCheckedOK_dbus_property(self, value=None):
2028
1536
        if value is not None:
2031
1539
        return datetime_to_dbus(self.last_checked_ok)
2032
1540
    
2033
1541
    # LastCheckerStatus - property
2034
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1542
    @dbus_service_property(_interface, signature="n",
 
1543
                           access="read")
2035
1544
    def LastCheckerStatus_dbus_property(self):
2036
1545
        return dbus.Int16(self.last_checker_status)
2037
1546
    
2046
1555
        return datetime_to_dbus(self.last_approval_request)
2047
1556
    
2048
1557
    # Timeout - property
2049
 
    @dbus_service_property(_interface,
2050
 
                           signature="t",
 
1558
    @dbus_service_property(_interface, signature="t",
2051
1559
                           access="readwrite")
2052
1560
    def Timeout_dbus_property(self, value=None):
2053
1561
        if value is None:       # get
2054
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1562
            return dbus.UInt64(self.timeout_milliseconds())
2055
1563
        old_timeout = self.timeout
2056
1564
        self.timeout = datetime.timedelta(0, 0, 0, value)
2057
1565
        # Reschedule disabling
2065
1573
                if (getattr(self, "disable_initiator_tag", None)
2066
1574
                    is None):
2067
1575
                    return
2068
 
                GLib.source_remove(self.disable_initiator_tag)
2069
 
                self.disable_initiator_tag = GLib.timeout_add(
2070
 
                    int((self.expires - now).total_seconds() * 1000),
2071
 
                    self.disable)
 
1576
                gobject.source_remove(self.disable_initiator_tag)
 
1577
                self.disable_initiator_tag = (
 
1578
                    gobject.timeout_add(
 
1579
                        timedelta_to_milliseconds(self.expires - now),
 
1580
                        self.disable))
2072
1581
    
2073
1582
    # ExtendedTimeout - property
2074
 
    @dbus_service_property(_interface,
2075
 
                           signature="t",
 
1583
    @dbus_service_property(_interface, signature="t",
2076
1584
                           access="readwrite")
2077
1585
    def ExtendedTimeout_dbus_property(self, value=None):
2078
1586
        if value is None:       # get
2079
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
2080
 
                               * 1000)
 
1587
            return dbus.UInt64(self.extended_timeout_milliseconds())
2081
1588
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2082
1589
    
2083
1590
    # Interval - property
2084
 
    @dbus_service_property(_interface,
2085
 
                           signature="t",
 
1591
    @dbus_service_property(_interface, signature="t",
2086
1592
                           access="readwrite")
2087
1593
    def Interval_dbus_property(self, value=None):
2088
1594
        if value is None:       # get
2089
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1595
            return dbus.UInt64(self.interval_milliseconds())
2090
1596
        self.interval = datetime.timedelta(0, 0, 0, value)
2091
1597
        if getattr(self, "checker_initiator_tag", None) is None:
2092
1598
            return
2093
1599
        if self.enabled:
2094
1600
            # Reschedule checker run
2095
 
            GLib.source_remove(self.checker_initiator_tag)
2096
 
            self.checker_initiator_tag = GLib.timeout_add(
2097
 
                value, self.start_checker)
2098
 
            self.start_checker() # Start one now, too
 
1601
            gobject.source_remove(self.checker_initiator_tag)
 
1602
            self.checker_initiator_tag = (gobject.timeout_add
 
1603
                                          (value, self.start_checker))
 
1604
            self.start_checker()    # Start one now, too
2099
1605
    
2100
1606
    # Checker - property
2101
 
    @dbus_service_property(_interface,
2102
 
                           signature="s",
 
1607
    @dbus_service_property(_interface, signature="s",
2103
1608
                           access="readwrite")
2104
1609
    def Checker_dbus_property(self, value=None):
2105
1610
        if value is None:       # get
2106
1611
            return dbus.String(self.checker_command)
2107
 
        self.checker_command = str(value)
 
1612
        self.checker_command = unicode(value)
2108
1613
    
2109
1614
    # CheckerRunning - property
2110
 
    @dbus_service_property(_interface,
2111
 
                           signature="b",
 
1615
    @dbus_service_property(_interface, signature="b",
2112
1616
                           access="readwrite")
2113
1617
    def CheckerRunning_dbus_property(self, value=None):
2114
1618
        if value is None:       # get
2119
1623
            self.stop_checker()
2120
1624
    
2121
1625
    # ObjectPath - property
2122
 
    @dbus_annotations(
2123
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2124
 
         "org.freedesktop.DBus.Deprecated": "true"})
2125
1626
    @dbus_service_property(_interface, signature="o", access="read")
2126
1627
    def ObjectPath_dbus_property(self):
2127
1628
        return self.dbus_object_path # is already a dbus.ObjectPath
2128
1629
    
2129
1630
    # Secret = property
2130
 
    @dbus_annotations(
2131
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2132
 
         "invalidates"})
2133
 
    @dbus_service_property(_interface,
2134
 
                           signature="ay",
2135
 
                           access="write",
2136
 
                           byte_arrays=True)
 
1631
    @dbus_service_property(_interface, signature="ay",
 
1632
                           access="write", byte_arrays=True)
2137
1633
    def Secret_dbus_property(self, value):
2138
 
        self.secret = bytes(value)
 
1634
        self.secret = str(value)
2139
1635
    
2140
1636
    del _interface
2141
1637
 
2145
1641
        self._pipe = child_pipe
2146
1642
        self._pipe.send(('init', fpr, address))
2147
1643
        if not self._pipe.recv():
2148
 
            raise KeyError(fpr)
 
1644
            raise KeyError()
2149
1645
    
2150
1646
    def __getattribute__(self, name):
2151
1647
        if name == '_pipe':
2155
1651
        if data[0] == 'data':
2156
1652
            return data[1]
2157
1653
        if data[0] == 'function':
2158
 
            
2159
1654
            def func(*args, **kwargs):
2160
1655
                self._pipe.send(('funcall', name, args, kwargs))
2161
1656
                return self._pipe.recv()[1]
2162
 
            
2163
1657
            return func
2164
1658
    
2165
1659
    def __setattr__(self, name, value):
2177
1671
    def handle(self):
2178
1672
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2179
1673
            logger.info("TCP connection from: %s",
2180
 
                        str(self.client_address))
 
1674
                        unicode(self.client_address))
2181
1675
            logger.debug("Pipe FD: %d",
2182
1676
                         self.server.child_pipe.fileno())
2183
1677
            
2184
 
            session = gnutls.ClientSession(self.request)
 
1678
            session = (gnutls.connection
 
1679
                       .ClientSession(self.request,
 
1680
                                      gnutls.connection
 
1681
                                      .X509Credentials()))
 
1682
            
 
1683
            # Note: gnutls.connection.X509Credentials is really a
 
1684
            # generic GnuTLS certificate credentials object so long as
 
1685
            # no X.509 keys are added to it.  Therefore, we can use it
 
1686
            # here despite using OpenPGP certificates.
2185
1687
            
2186
1688
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2187
1689
            #                      "+AES-256-CBC", "+SHA1",
2191
1693
            priority = self.server.gnutls_priority
2192
1694
            if priority is None:
2193
1695
                priority = "NORMAL"
2194
 
            gnutls.priority_set_direct(session._c_object,
2195
 
                                       priority.encode("utf-8"),
2196
 
                                       None)
 
1696
            (gnutls.library.functions
 
1697
             .gnutls_priority_set_direct(session._c_object,
 
1698
                                         priority, None))
2197
1699
            
2198
1700
            # Start communication using the Mandos protocol
2199
1701
            # Get protocol number
2209
1711
            # Start GnuTLS connection
2210
1712
            try:
2211
1713
                session.handshake()
2212
 
            except gnutls.Error as error:
 
1714
            except gnutls.errors.GNUTLSError as error:
2213
1715
                logger.warning("Handshake failed: %s", error)
2214
1716
                # Do not run session.bye() here: the session is not
2215
1717
                # established.  Just abandon the request.
2219
1721
            approval_required = False
2220
1722
            try:
2221
1723
                try:
2222
 
                    fpr = self.fingerprint(
2223
 
                        self.peer_certificate(session))
2224
 
                except (TypeError, gnutls.Error) as error:
 
1724
                    fpr = self.fingerprint(self.peer_certificate
 
1725
                                           (session))
 
1726
                except (TypeError,
 
1727
                        gnutls.errors.GNUTLSError) as error:
2225
1728
                    logger.warning("Bad certificate: %s", error)
2226
1729
                    return
2227
1730
                logger.debug("Fingerprint: %s", fpr)
2240
1743
                while True:
2241
1744
                    if not client.enabled:
2242
1745
                        logger.info("Client %s is disabled",
2243
 
                                    client.name)
 
1746
                                       client.name)
2244
1747
                        if self.server.use_dbus:
2245
1748
                            # Emit D-Bus signal
2246
1749
                            client.Rejected("Disabled")
2255
1758
                        if self.server.use_dbus:
2256
1759
                            # Emit D-Bus signal
2257
1760
                            client.NeedApproval(
2258
 
                                client.approval_delay.total_seconds()
2259
 
                                * 1000, client.approved_by_default)
 
1761
                                client.approval_delay_milliseconds(),
 
1762
                                client.approved_by_default)
2260
1763
                    else:
2261
1764
                        logger.warning("Client %s was not approved",
2262
1765
                                       client.name)
2268
1771
                    #wait until timeout or approved
2269
1772
                    time = datetime.datetime.now()
2270
1773
                    client.changedstate.acquire()
2271
 
                    client.changedstate.wait(delay.total_seconds())
 
1774
                    client.changedstate.wait(
 
1775
                        float(timedelta_to_milliseconds(delay)
 
1776
                              / 1000))
2272
1777
                    client.changedstate.release()
2273
1778
                    time2 = datetime.datetime.now()
2274
1779
                    if (time2 - time) >= delay:
2285
1790
                    else:
2286
1791
                        delay -= time2 - time
2287
1792
                
2288
 
                try:
2289
 
                    session.send(client.secret)
2290
 
                except gnutls.Error as error:
2291
 
                    logger.warning("gnutls send failed",
2292
 
                                   exc_info = error)
2293
 
                    return
 
1793
                sent_size = 0
 
1794
                while sent_size < len(client.secret):
 
1795
                    try:
 
1796
                        sent = session.send(client.secret[sent_size:])
 
1797
                    except gnutls.errors.GNUTLSError as error:
 
1798
                        logger.warning("gnutls send failed",
 
1799
                                       exc_info=error)
 
1800
                        return
 
1801
                    logger.debug("Sent: %d, remaining: %d",
 
1802
                                 sent, len(client.secret)
 
1803
                                 - (sent_size + sent))
 
1804
                    sent_size += sent
2294
1805
                
2295
1806
                logger.info("Sending secret to %s", client.name)
2296
1807
                # bump the timeout using extended_timeout
2304
1815
                    client.approvals_pending -= 1
2305
1816
                try:
2306
1817
                    session.bye()
2307
 
                except gnutls.Error as error:
 
1818
                except gnutls.errors.GNUTLSError as error:
2308
1819
                    logger.warning("GnuTLS bye failed",
2309
1820
                                   exc_info=error)
2310
1821
    
2312
1823
    def peer_certificate(session):
2313
1824
        "Return the peer's OpenPGP certificate as a bytestring"
2314
1825
        # If not an OpenPGP certificate...
2315
 
        if (gnutls.certificate_type_get(session._c_object)
2316
 
            != gnutls.CRT_OPENPGP):
2317
 
            # ...return invalid data
2318
 
            return b""
 
1826
        if (gnutls.library.functions
 
1827
            .gnutls_certificate_type_get(session._c_object)
 
1828
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1829
            # ...do the normal thing
 
1830
            return session.peer_certificate
2319
1831
        list_size = ctypes.c_uint(1)
2320
 
        cert_list = (gnutls.certificate_get_peers
 
1832
        cert_list = (gnutls.library.functions
 
1833
                     .gnutls_certificate_get_peers
2321
1834
                     (session._c_object, ctypes.byref(list_size)))
2322
1835
        if not bool(cert_list) and list_size.value != 0:
2323
 
            raise gnutls.Error("error getting peer certificate")
 
1836
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1837
                                            " certificate")
2324
1838
        if list_size.value == 0:
2325
1839
            return None
2326
1840
        cert = cert_list[0]
2330
1844
    def fingerprint(openpgp):
2331
1845
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2332
1846
        # New GnuTLS "datum" with the OpenPGP public key
2333
 
        datum = gnutls.datum_t(
2334
 
            ctypes.cast(ctypes.c_char_p(openpgp),
2335
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2336
 
            ctypes.c_uint(len(openpgp)))
 
1847
        datum = (gnutls.library.types
 
1848
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1849
                                             ctypes.POINTER
 
1850
                                             (ctypes.c_ubyte)),
 
1851
                                 ctypes.c_uint(len(openpgp))))
2337
1852
        # New empty GnuTLS certificate
2338
 
        crt = gnutls.openpgp_crt_t()
2339
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1853
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1854
        (gnutls.library.functions
 
1855
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
2340
1856
        # Import the OpenPGP public key into the certificate
2341
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2342
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1857
        (gnutls.library.functions
 
1858
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1859
                                    gnutls.library.constants
 
1860
                                    .GNUTLS_OPENPGP_FMT_RAW))
2343
1861
        # Verify the self signature in the key
2344
1862
        crtverify = ctypes.c_uint()
2345
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2346
 
                                       ctypes.byref(crtverify))
 
1863
        (gnutls.library.functions
 
1864
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1865
                                         ctypes.byref(crtverify)))
2347
1866
        if crtverify.value != 0:
2348
 
            gnutls.openpgp_crt_deinit(crt)
2349
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1867
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1868
            raise (gnutls.errors.CertificateSecurityError
 
1869
                   ("Verify failed"))
2350
1870
        # New buffer for the fingerprint
2351
1871
        buf = ctypes.create_string_buffer(20)
2352
1872
        buf_len = ctypes.c_size_t()
2353
1873
        # Get the fingerprint from the certificate into the buffer
2354
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2355
 
                                           ctypes.byref(buf_len))
 
1874
        (gnutls.library.functions
 
1875
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1876
                                             ctypes.byref(buf_len)))
2356
1877
        # Deinit the certificate
2357
 
        gnutls.openpgp_crt_deinit(crt)
 
1878
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2358
1879
        # Convert the buffer to a Python bytestring
2359
1880
        fpr = ctypes.string_at(buf, buf_len.value)
2360
1881
        # Convert the bytestring to hexadecimal notation
2364
1885
 
2365
1886
class MultiprocessingMixIn(object):
2366
1887
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2367
 
    
2368
1888
    def sub_process_main(self, request, address):
2369
1889
        try:
2370
1890
            self.finish_request(request, address)
2382
1902
 
2383
1903
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2384
1904
    """ adds a pipe to the MixIn """
2385
 
    
2386
1905
    def process_request(self, request, client_address):
2387
1906
        """Overrides and wraps the original process_request().
2388
1907
        
2409
1928
        interface:      None or a network interface name (string)
2410
1929
        use_ipv6:       Boolean; to use IPv6 or not
2411
1930
    """
2412
 
    
2413
1931
    def __init__(self, server_address, RequestHandlerClass,
2414
 
                 interface=None,
2415
 
                 use_ipv6=True,
2416
 
                 socketfd=None):
 
1932
                 interface=None, use_ipv6=True, socketfd=None):
2417
1933
        """If socketfd is set, use that file descriptor instead of
2418
1934
        creating a new one with socket.socket().
2419
1935
        """
2453
1969
        """This overrides the normal server_bind() function
2454
1970
        to bind to an interface if one was specified, and also NOT to
2455
1971
        bind to an address or port if they were not specified."""
2456
 
        global SO_BINDTODEVICE
2457
1972
        if self.interface is not None:
2458
1973
            if SO_BINDTODEVICE is None:
2459
 
                # Fall back to a hard-coded value which seems to be
2460
 
                # common enough.
2461
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
2462
 
                SO_BINDTODEVICE = 25
2463
 
            try:
2464
 
                self.socket.setsockopt(
2465
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
2466
 
                    (self.interface + "\0").encode("utf-8"))
2467
 
            except socket.error as error:
2468
 
                if error.errno == errno.EPERM:
2469
 
                    logger.error("No permission to bind to"
2470
 
                                 " interface %s", self.interface)
2471
 
                elif error.errno == errno.ENOPROTOOPT:
2472
 
                    logger.error("SO_BINDTODEVICE not available;"
2473
 
                                 " cannot bind to interface %s",
2474
 
                                 self.interface)
2475
 
                elif error.errno == errno.ENODEV:
2476
 
                    logger.error("Interface %s does not exist,"
2477
 
                                 " cannot bind", self.interface)
2478
 
                else:
2479
 
                    raise
 
1974
                logger.error("SO_BINDTODEVICE does not exist;"
 
1975
                             " cannot bind to interface %s",
 
1976
                             self.interface)
 
1977
            else:
 
1978
                try:
 
1979
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1980
                                           SO_BINDTODEVICE,
 
1981
                                           str(self.interface + '\0'))
 
1982
                except socket.error as error:
 
1983
                    if error.errno == errno.EPERM:
 
1984
                        logger.error("No permission to bind to"
 
1985
                                     " interface %s", self.interface)
 
1986
                    elif error.errno == errno.ENOPROTOOPT:
 
1987
                        logger.error("SO_BINDTODEVICE not available;"
 
1988
                                     " cannot bind to interface %s",
 
1989
                                     self.interface)
 
1990
                    elif error.errno == errno.ENODEV:
 
1991
                        logger.error("Interface %s does not exist,"
 
1992
                                     " cannot bind", self.interface)
 
1993
                    else:
 
1994
                        raise
2480
1995
        # Only bind(2) the socket if we really need to.
2481
1996
        if self.server_address[0] or self.server_address[1]:
2482
1997
            if not self.server_address[0]:
2487
2002
                self.server_address = (any_address,
2488
2003
                                       self.server_address[1])
2489
2004
            elif not self.server_address[1]:
2490
 
                self.server_address = (self.server_address[0], 0)
 
2005
                self.server_address = (self.server_address[0],
 
2006
                                       0)
2491
2007
#                 if self.interface:
2492
2008
#                     self.server_address = (self.server_address[0],
2493
2009
#                                            0, # port
2505
2021
        gnutls_priority GnuTLS priority string
2506
2022
        use_dbus:       Boolean; to emit D-Bus signals or not
2507
2023
    
2508
 
    Assumes a GLib.MainLoop event loop.
 
2024
    Assumes a gobject.MainLoop event loop.
2509
2025
    """
2510
 
    
2511
2026
    def __init__(self, server_address, RequestHandlerClass,
2512
 
                 interface=None,
2513
 
                 use_ipv6=True,
2514
 
                 clients=None,
2515
 
                 gnutls_priority=None,
2516
 
                 use_dbus=True,
2517
 
                 socketfd=None):
 
2027
                 interface=None, use_ipv6=True, clients=None,
 
2028
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2518
2029
        self.enabled = False
2519
2030
        self.clients = clients
2520
2031
        if self.clients is None:
2526
2037
                                interface = interface,
2527
2038
                                use_ipv6 = use_ipv6,
2528
2039
                                socketfd = socketfd)
2529
 
    
2530
2040
    def server_activate(self):
2531
2041
        if self.enabled:
2532
2042
            return socketserver.TCPServer.server_activate(self)
2536
2046
    
2537
2047
    def add_pipe(self, parent_pipe, proc):
2538
2048
        # Call "handle_ipc" for both data and EOF events
2539
 
        GLib.io_add_watch(
2540
 
            parent_pipe.fileno(),
2541
 
            GLib.IO_IN | GLib.IO_HUP,
2542
 
            functools.partial(self.handle_ipc,
2543
 
                              parent_pipe = parent_pipe,
2544
 
                              proc = proc))
 
2049
        gobject.io_add_watch(parent_pipe.fileno(),
 
2050
                             gobject.IO_IN | gobject.IO_HUP,
 
2051
                             functools.partial(self.handle_ipc,
 
2052
                                               parent_pipe =
 
2053
                                               parent_pipe,
 
2054
                                               proc = proc))
2545
2055
    
2546
 
    def handle_ipc(self, source, condition,
2547
 
                   parent_pipe=None,
2548
 
                   proc = None,
2549
 
                   client_object=None):
 
2056
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2057
                   proc = None, client_object=None):
2550
2058
        # error, or the other end of multiprocessing.Pipe has closed
2551
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2059
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2552
2060
            # Wait for other process to exit
2553
2061
            proc.join()
2554
2062
            return False
2561
2069
            fpr = request[1]
2562
2070
            address = request[2]
2563
2071
            
2564
 
            for c in self.clients.values():
 
2072
            for c in self.clients.itervalues():
2565
2073
                if c.fingerprint == fpr:
2566
2074
                    client = c
2567
2075
                    break
2575
2083
                parent_pipe.send(False)
2576
2084
                return False
2577
2085
            
2578
 
            GLib.io_add_watch(
2579
 
                parent_pipe.fileno(),
2580
 
                GLib.IO_IN | GLib.IO_HUP,
2581
 
                functools.partial(self.handle_ipc,
2582
 
                                  parent_pipe = parent_pipe,
2583
 
                                  proc = proc,
2584
 
                                  client_object = client))
 
2086
            gobject.io_add_watch(parent_pipe.fileno(),
 
2087
                                 gobject.IO_IN | gobject.IO_HUP,
 
2088
                                 functools.partial(self.handle_ipc,
 
2089
                                                   parent_pipe =
 
2090
                                                   parent_pipe,
 
2091
                                                   proc = proc,
 
2092
                                                   client_object =
 
2093
                                                   client))
2585
2094
            parent_pipe.send(True)
2586
2095
            # remove the old hook in favor of the new above hook on
2587
2096
            # same fileno
2593
2102
            
2594
2103
            parent_pipe.send(('data', getattr(client_object,
2595
2104
                                              funcname)(*args,
2596
 
                                                        **kwargs)))
 
2105
                                                         **kwargs)))
2597
2106
        
2598
2107
        if command == 'getattr':
2599
2108
            attrname = request[1]
2600
 
            if isinstance(client_object.__getattribute__(attrname),
2601
 
                          collections.Callable):
2602
 
                parent_pipe.send(('function', ))
 
2109
            if callable(client_object.__getattribute__(attrname)):
 
2110
                parent_pipe.send(('function',))
2603
2111
            else:
2604
 
                parent_pipe.send((
2605
 
                    'data', client_object.__getattribute__(attrname)))
 
2112
                parent_pipe.send(('data', client_object
 
2113
                                  .__getattribute__(attrname)))
2606
2114
        
2607
2115
        if command == 'setattr':
2608
2116
            attrname = request[1]
2639
2147
    # avoid excessive use of external libraries.
2640
2148
    
2641
2149
    # New type for defining tokens, syntax, and semantics all-in-one
2642
 
    Token = collections.namedtuple("Token", (
2643
 
        "regexp",  # To match token; if "value" is not None, must have
2644
 
                   # a "group" containing digits
2645
 
        "value",   # datetime.timedelta or None
2646
 
        "followers"))           # Tokens valid after this token
 
2150
    Token = collections.namedtuple("Token",
 
2151
                                   ("regexp", # To match token; if
 
2152
                                              # "value" is not None,
 
2153
                                              # must have a "group"
 
2154
                                              # containing digits
 
2155
                                    "value",  # datetime.timedelta or
 
2156
                                              # None
 
2157
                                    "followers")) # Tokens valid after
 
2158
                                                  # this token
2647
2159
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2648
2160
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2649
2161
    token_end = Token(re.compile(r"$"), None, frozenset())
2650
2162
    token_second = Token(re.compile(r"(\d+)S"),
2651
2163
                         datetime.timedelta(seconds=1),
2652
 
                         frozenset((token_end, )))
 
2164
                         frozenset((token_end,)))
2653
2165
    token_minute = Token(re.compile(r"(\d+)M"),
2654
2166
                         datetime.timedelta(minutes=1),
2655
2167
                         frozenset((token_second, token_end)))
2671
2183
                       frozenset((token_month, token_end)))
2672
2184
    token_week = Token(re.compile(r"(\d+)W"),
2673
2185
                       datetime.timedelta(weeks=1),
2674
 
                       frozenset((token_end, )))
 
2186
                       frozenset((token_end,)))
2675
2187
    token_duration = Token(re.compile(r"P"), None,
2676
2188
                           frozenset((token_year, token_month,
2677
2189
                                      token_day, token_time,
2678
 
                                      token_week)))
 
2190
                                      token_week))),
2679
2191
    # Define starting values
2680
2192
    value = datetime.timedelta() # Value so far
2681
2193
    found_token = None
2682
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2194
    followers = frozenset(token_duration,) # Following valid tokens
2683
2195
    s = duration                # String left to parse
2684
2196
    # Loop until end token is found
2685
2197
    while found_token is not token_end:
2702
2214
                break
2703
2215
        else:
2704
2216
            # No currently valid tokens were found
2705
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2706
 
                             .format(duration))
 
2217
            raise ValueError("Invalid RFC 3339 duration")
2707
2218
    # End token found
2708
2219
    return value
2709
2220
 
2733
2244
    timevalue = datetime.timedelta(0)
2734
2245
    for s in interval.split():
2735
2246
        try:
2736
 
            suffix = s[-1]
 
2247
            suffix = unicode(s[-1])
2737
2248
            value = int(s[:-1])
2738
2249
            if suffix == "d":
2739
2250
                delta = datetime.timedelta(value)
2746
2257
            elif suffix == "w":
2747
2258
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2748
2259
            else:
2749
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2260
                raise ValueError("Unknown suffix {0!r}"
 
2261
                                 .format(suffix))
2750
2262
        except IndexError as e:
2751
2263
            raise ValueError(*(e.args))
2752
2264
        timevalue += delta
2769
2281
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2770
2282
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2771
2283
            raise OSError(errno.ENODEV,
2772
 
                          "{} not a character device"
 
2284
                          "{0} not a character device"
2773
2285
                          .format(os.devnull))
2774
2286
        os.dup2(null, sys.stdin.fileno())
2775
2287
        os.dup2(null, sys.stdout.fileno())
2785
2297
    
2786
2298
    parser = argparse.ArgumentParser()
2787
2299
    parser.add_argument("-v", "--version", action="version",
2788
 
                        version = "%(prog)s {}".format(version),
 
2300
                        version = "%(prog)s {0}".format(version),
2789
2301
                        help="show version number and exit")
2790
2302
    parser.add_argument("-i", "--interface", metavar="IF",
2791
2303
                        help="Bind to interface IF")
2824
2336
                        help="Directory to save/restore state in")
2825
2337
    parser.add_argument("--foreground", action="store_true",
2826
2338
                        help="Run in foreground", default=None)
2827
 
    parser.add_argument("--no-zeroconf", action="store_false",
2828
 
                        dest="zeroconf", help="Do not use Zeroconf",
2829
 
                        default=None)
2830
2339
    
2831
2340
    options = parser.parse_args()
2832
2341
    
2833
2342
    if options.check:
2834
2343
        import doctest
2835
 
        fail_count, test_count = doctest.testmod()
2836
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2344
        doctest.testmod()
 
2345
        sys.exit()
2837
2346
    
2838
2347
    # Default values for config file for server-global settings
2839
2348
    server_defaults = { "interface": "",
2841
2350
                        "port": "",
2842
2351
                        "debug": "False",
2843
2352
                        "priority":
2844
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2845
 
                        ":+SIGN-DSA-SHA256",
 
2353
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2846
2354
                        "servicename": "Mandos",
2847
2355
                        "use_dbus": "True",
2848
2356
                        "use_ipv6": "True",
2851
2359
                        "socket": "",
2852
2360
                        "statedir": "/var/lib/mandos",
2853
2361
                        "foreground": "False",
2854
 
                        "zeroconf": "True",
2855
 
                    }
 
2362
                        }
2856
2363
    
2857
2364
    # Parse config file for server-global settings
2858
2365
    server_config = configparser.SafeConfigParser(server_defaults)
2859
2366
    del server_defaults
2860
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2367
    server_config.read(os.path.join(options.configdir,
 
2368
                                    "mandos.conf"))
2861
2369
    # Convert the SafeConfigParser object to a dict
2862
2370
    server_settings = server_config.defaults()
2863
2371
    # Use the appropriate methods on the non-string config options
2881
2389
    # Override the settings from the config file with command line
2882
2390
    # options, if set.
2883
2391
    for option in ("interface", "address", "port", "debug",
2884
 
                   "priority", "servicename", "configdir", "use_dbus",
2885
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2886
 
                   "socket", "foreground", "zeroconf"):
 
2392
                   "priority", "servicename", "configdir",
 
2393
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2394
                   "statedir", "socket", "foreground"):
2887
2395
        value = getattr(options, option)
2888
2396
        if value is not None:
2889
2397
            server_settings[option] = value
2890
2398
    del options
2891
2399
    # Force all strings to be unicode
2892
2400
    for option in server_settings.keys():
2893
 
        if isinstance(server_settings[option], bytes):
2894
 
            server_settings[option] = (server_settings[option]
2895
 
                                       .decode("utf-8"))
 
2401
        if type(server_settings[option]) is str:
 
2402
            server_settings[option] = unicode(server_settings[option])
2896
2403
    # Force all boolean options to be boolean
2897
2404
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2898
 
                   "foreground", "zeroconf"):
 
2405
                   "foreground"):
2899
2406
        server_settings[option] = bool(server_settings[option])
2900
2407
    # Debug implies foreground
2901
2408
    if server_settings["debug"]:
2904
2411
    
2905
2412
    ##################################################################
2906
2413
    
2907
 
    if (not server_settings["zeroconf"]
2908
 
        and not (server_settings["port"]
2909
 
                 or server_settings["socket"] != "")):
2910
 
        parser.error("Needs port or socket to work without Zeroconf")
2911
 
    
2912
2414
    # For convenience
2913
2415
    debug = server_settings["debug"]
2914
2416
    debuglevel = server_settings["debuglevel"]
2917
2419
    stored_state_path = os.path.join(server_settings["statedir"],
2918
2420
                                     stored_state_file)
2919
2421
    foreground = server_settings["foreground"]
2920
 
    zeroconf = server_settings["zeroconf"]
2921
2422
    
2922
2423
    if debug:
2923
2424
        initlogger(debug, logging.DEBUG)
2929
2430
            initlogger(debug, level)
2930
2431
    
2931
2432
    if server_settings["servicename"] != "Mandos":
2932
 
        syslogger.setFormatter(
2933
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2934
 
                              ' %(levelname)s: %(message)s'.format(
2935
 
                                  server_settings["servicename"])))
 
2433
        syslogger.setFormatter(logging.Formatter
 
2434
                               ('Mandos ({0}) [%(process)d]:'
 
2435
                                ' %(levelname)s: %(message)s'
 
2436
                                .format(server_settings
 
2437
                                        ["servicename"])))
2936
2438
    
2937
2439
    # Parse config file with clients
2938
2440
    client_config = configparser.SafeConfigParser(Client
2943
2445
    global mandos_dbus_service
2944
2446
    mandos_dbus_service = None
2945
2447
    
2946
 
    socketfd = None
2947
 
    if server_settings["socket"] != "":
2948
 
        socketfd = server_settings["socket"]
2949
 
    tcp_server = MandosServer(
2950
 
        (server_settings["address"], server_settings["port"]),
2951
 
        ClientHandler,
2952
 
        interface=(server_settings["interface"] or None),
2953
 
        use_ipv6=use_ipv6,
2954
 
        gnutls_priority=server_settings["priority"],
2955
 
        use_dbus=use_dbus,
2956
 
        socketfd=socketfd)
 
2448
    tcp_server = MandosServer((server_settings["address"],
 
2449
                               server_settings["port"]),
 
2450
                              ClientHandler,
 
2451
                              interface=(server_settings["interface"]
 
2452
                                         or None),
 
2453
                              use_ipv6=use_ipv6,
 
2454
                              gnutls_priority=
 
2455
                              server_settings["priority"],
 
2456
                              use_dbus=use_dbus,
 
2457
                              socketfd=(server_settings["socket"]
 
2458
                                        or None))
2957
2459
    if not foreground:
2958
2460
        pidfilename = "/run/mandos.pid"
2959
2461
        if not os.path.isdir("/run/."):
2960
2462
            pidfilename = "/var/run/mandos.pid"
2961
2463
        pidfile = None
2962
2464
        try:
2963
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2465
            pidfile = open(pidfilename, "w")
2964
2466
        except IOError as e:
2965
2467
            logger.error("Could not open file %r", pidfilename,
2966
2468
                         exc_info=e)
2967
2469
    
2968
 
    for name, group in (("_mandos", "_mandos"),
2969
 
                        ("mandos", "mandos"),
2970
 
                        ("nobody", "nogroup")):
 
2470
    for name in ("_mandos", "mandos", "nobody"):
2971
2471
        try:
2972
2472
            uid = pwd.getpwnam(name).pw_uid
2973
 
            gid = pwd.getpwnam(group).pw_gid
 
2473
            gid = pwd.getpwnam(name).pw_gid
2974
2474
            break
2975
2475
        except KeyError:
2976
2476
            continue
2980
2480
    try:
2981
2481
        os.setgid(gid)
2982
2482
        os.setuid(uid)
2983
 
        if debug:
2984
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2985
 
                                                             gid))
2986
2483
    except OSError as error:
2987
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2988
 
                       .format(uid, gid, os.strerror(error.errno)))
2989
2484
        if error.errno != errno.EPERM:
2990
2485
            raise
2991
2486
    
2994
2489
        
2995
2490
        # "Use a log level over 10 to enable all debugging options."
2996
2491
        # - GnuTLS manual
2997
 
        gnutls.global_set_log_level(11)
 
2492
        gnutls.library.functions.gnutls_global_set_log_level(11)
2998
2493
        
2999
 
        @gnutls.log_func
 
2494
        @gnutls.library.types.gnutls_log_func
3000
2495
        def debug_gnutls(level, string):
3001
2496
            logger.debug("GnuTLS: %s", string[:-1])
3002
2497
        
3003
 
        gnutls.global_set_log_function(debug_gnutls)
 
2498
        (gnutls.library.functions
 
2499
         .gnutls_global_set_log_function(debug_gnutls))
3004
2500
        
3005
2501
        # Redirect stdin so all checkers get /dev/null
3006
2502
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3013
2509
        # Close all input and output, do double fork, etc.
3014
2510
        daemon()
3015
2511
    
3016
 
    # multiprocessing will use threads, so before we use GLib we need
3017
 
    # to inform GLib that threads will be used.
3018
 
    GLib.threads_init()
 
2512
    # multiprocessing will use threads, so before we use gobject we
 
2513
    # need to inform gobject that threads will be used.
 
2514
    gobject.threads_init()
3019
2515
    
3020
2516
    global main_loop
3021
2517
    # From the Avahi example code
3022
2518
    DBusGMainLoop(set_as_default=True)
3023
 
    main_loop = GLib.MainLoop()
 
2519
    main_loop = gobject.MainLoop()
3024
2520
    bus = dbus.SystemBus()
3025
2521
    # End of Avahi example code
3026
2522
    if use_dbus:
3027
2523
        try:
3028
2524
            bus_name = dbus.service.BusName("se.recompile.Mandos",
3029
 
                                            bus,
3030
 
                                            do_not_queue=True)
3031
 
            old_bus_name = dbus.service.BusName(
3032
 
                "se.bsnet.fukt.Mandos", bus,
3033
 
                do_not_queue=True)
3034
 
        except dbus.exceptions.DBusException as e:
 
2525
                                            bus, do_not_queue=True)
 
2526
            old_bus_name = (dbus.service.BusName
 
2527
                            ("se.bsnet.fukt.Mandos", bus,
 
2528
                             do_not_queue=True))
 
2529
        except dbus.exceptions.NameExistsException as e:
3035
2530
            logger.error("Disabling D-Bus:", exc_info=e)
3036
2531
            use_dbus = False
3037
2532
            server_settings["use_dbus"] = False
3038
2533
            tcp_server.use_dbus = False
3039
 
    if zeroconf:
3040
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3041
 
        service = AvahiServiceToSyslog(
3042
 
            name = server_settings["servicename"],
3043
 
            servicetype = "_mandos._tcp",
3044
 
            protocol = protocol,
3045
 
            bus = bus)
3046
 
        if server_settings["interface"]:
3047
 
            service.interface = if_nametoindex(
3048
 
                server_settings["interface"].encode("utf-8"))
 
2534
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2535
    service = AvahiServiceToSyslog(name =
 
2536
                                   server_settings["servicename"],
 
2537
                                   servicetype = "_mandos._tcp",
 
2538
                                   protocol = protocol, bus = bus)
 
2539
    if server_settings["interface"]:
 
2540
        service.interface = (if_nametoindex
 
2541
                             (str(server_settings["interface"])))
3049
2542
    
3050
2543
    global multiprocessing_manager
3051
2544
    multiprocessing_manager = multiprocessing.Manager()
3070
2563
    if server_settings["restore"]:
3071
2564
        try:
3072
2565
            with open(stored_state_path, "rb") as stored_state:
3073
 
                if sys.version_info.major == 2:                
3074
 
                    clients_data, old_client_settings = pickle.load(
3075
 
                        stored_state)
3076
 
                else:
3077
 
                    bytes_clients_data, bytes_old_client_settings = (
3078
 
                        pickle.load(stored_state, encoding = "bytes"))
3079
 
                    ### Fix bytes to strings
3080
 
                    ## clients_data
3081
 
                    # .keys()
3082
 
                    clients_data = { (key.decode("utf-8")
3083
 
                                      if isinstance(key, bytes)
3084
 
                                      else key): value
3085
 
                                     for key, value in
3086
 
                                     bytes_clients_data.items() }
3087
 
                    del bytes_clients_data
3088
 
                    for key in clients_data:
3089
 
                        value = { (k.decode("utf-8")
3090
 
                                   if isinstance(k, bytes) else k): v
3091
 
                                  for k, v in
3092
 
                                  clients_data[key].items() }
3093
 
                        clients_data[key] = value
3094
 
                        # .client_structure
3095
 
                        value["client_structure"] = [
3096
 
                            (s.decode("utf-8")
3097
 
                             if isinstance(s, bytes)
3098
 
                             else s) for s in
3099
 
                            value["client_structure"] ]
3100
 
                        # .name & .host
3101
 
                        for k in ("name", "host"):
3102
 
                            if isinstance(value[k], bytes):
3103
 
                                value[k] = value[k].decode("utf-8")
3104
 
                    ## old_client_settings
3105
 
                    # .keys()
3106
 
                    old_client_settings = {
3107
 
                        (key.decode("utf-8")
3108
 
                         if isinstance(key, bytes)
3109
 
                         else key): value
3110
 
                        for key, value in
3111
 
                        bytes_old_client_settings.items() }
3112
 
                    del bytes_old_client_settings
3113
 
                    # .host
3114
 
                    for value in old_client_settings.values():
3115
 
                        if isinstance(value["host"], bytes):
3116
 
                            value["host"] = (value["host"]
3117
 
                                             .decode("utf-8"))
 
2566
                clients_data, old_client_settings = (pickle.load
 
2567
                                                     (stored_state))
3118
2568
            os.remove(stored_state_path)
3119
2569
        except IOError as e:
3120
2570
            if e.errno == errno.ENOENT:
3121
 
                logger.warning("Could not load persistent state:"
3122
 
                               " {}".format(os.strerror(e.errno)))
 
2571
                logger.warning("Could not load persistent state: {0}"
 
2572
                                .format(os.strerror(e.errno)))
3123
2573
            else:
3124
2574
                logger.critical("Could not load persistent state:",
3125
2575
                                exc_info=e)
3126
2576
                raise
3127
2577
        except EOFError as e:
3128
2578
            logger.warning("Could not load persistent state: "
3129
 
                           "EOFError:",
3130
 
                           exc_info=e)
 
2579
                           "EOFError:", exc_info=e)
3131
2580
    
3132
2581
    with PGPEngine() as pgp:
3133
 
        for client_name, client in clients_data.items():
 
2582
        for client_name, client in clients_data.iteritems():
3134
2583
            # Skip removed clients
3135
2584
            if client_name not in client_settings:
3136
2585
                continue
3145
2594
                    # For each value in new config, check if it
3146
2595
                    # differs from the old config value (Except for
3147
2596
                    # the "secret" attribute)
3148
 
                    if (name != "secret"
3149
 
                        and (value !=
3150
 
                             old_client_settings[client_name][name])):
 
2597
                    if (name != "secret" and
 
2598
                        value != old_client_settings[client_name]
 
2599
                        [name]):
3151
2600
                        client[name] = value
3152
2601
                except KeyError:
3153
2602
                    pass
3154
2603
            
3155
2604
            # Clients who has passed its expire date can still be
3156
 
            # enabled if its last checker was successful.  A Client
 
2605
            # enabled if its last checker was successful.  Clients
3157
2606
            # whose checker succeeded before we stored its state is
3158
2607
            # assumed to have successfully run all checkers during
3159
2608
            # downtime.
3161
2610
                if datetime.datetime.utcnow() >= client["expires"]:
3162
2611
                    if not client["last_checked_ok"]:
3163
2612
                        logger.warning(
3164
 
                            "disabling client {} - Client never "
3165
 
                            "performed a successful checker".format(
3166
 
                                client_name))
 
2613
                            "disabling client {0} - Client never "
 
2614
                            "performed a successful checker"
 
2615
                            .format(client_name))
3167
2616
                        client["enabled"] = False
3168
2617
                    elif client["last_checker_status"] != 0:
3169
2618
                        logger.warning(
3170
 
                            "disabling client {} - Client last"
3171
 
                            " checker failed with error code"
3172
 
                            " {}".format(
3173
 
                                client_name,
3174
 
                                client["last_checker_status"]))
 
2619
                            "disabling client {0} - Client "
 
2620
                            "last checker failed with error code {1}"
 
2621
                            .format(client_name,
 
2622
                                    client["last_checker_status"]))
3175
2623
                        client["enabled"] = False
3176
2624
                    else:
3177
 
                        client["expires"] = (
3178
 
                            datetime.datetime.utcnow()
3179
 
                            + client["timeout"])
 
2625
                        client["expires"] = (datetime.datetime
 
2626
                                             .utcnow()
 
2627
                                             + client["timeout"])
3180
2628
                        logger.debug("Last checker succeeded,"
3181
 
                                     " keeping {} enabled".format(
3182
 
                                         client_name))
 
2629
                                     " keeping {0} enabled"
 
2630
                                     .format(client_name))
3183
2631
            try:
3184
 
                client["secret"] = pgp.decrypt(
3185
 
                    client["encrypted_secret"],
3186
 
                    client_settings[client_name]["secret"])
 
2632
                client["secret"] = (
 
2633
                    pgp.decrypt(client["encrypted_secret"],
 
2634
                                client_settings[client_name]
 
2635
                                ["secret"]))
3187
2636
            except PGPError:
3188
2637
                # If decryption fails, we use secret from new settings
3189
 
                logger.debug("Failed to decrypt {} old secret".format(
3190
 
                    client_name))
3191
 
                client["secret"] = (client_settings[client_name]
3192
 
                                    ["secret"])
 
2638
                logger.debug("Failed to decrypt {0} old secret"
 
2639
                             .format(client_name))
 
2640
                client["secret"] = (
 
2641
                    client_settings[client_name]["secret"])
3193
2642
    
3194
2643
    # Add/remove clients based on new changes made to config
3195
2644
    for client_name in (set(old_client_settings)
3200
2649
        clients_data[client_name] = client_settings[client_name]
3201
2650
    
3202
2651
    # Create all client objects
3203
 
    for client_name, client in clients_data.items():
 
2652
    for client_name, client in clients_data.iteritems():
3204
2653
        tcp_server.clients[client_name] = client_class(
3205
 
            name = client_name,
3206
 
            settings = client,
 
2654
            name = client_name, settings = client,
3207
2655
            server_settings = server_settings)
3208
2656
    
3209
2657
    if not tcp_server.clients:
3211
2659
    
3212
2660
    if not foreground:
3213
2661
        if pidfile is not None:
3214
 
            pid = os.getpid()
3215
2662
            try:
3216
2663
                with pidfile:
3217
 
                    print(pid, file=pidfile)
 
2664
                    pid = os.getpid()
 
2665
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
3218
2666
            except IOError:
3219
2667
                logger.error("Could not write to file %r with PID %d",
3220
2668
                             pidfilename, pid)
3221
2669
        del pidfile
3222
2670
        del pidfilename
3223
2671
    
3224
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3225
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3226
 
                             lambda: main_loop.quit() and False)
 
2672
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2673
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3227
2674
    
3228
2675
    if use_dbus:
3229
 
        
3230
 
        @alternate_dbus_interfaces(
3231
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3232
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2676
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2677
                                        "se.bsnet.fukt.Mandos"})
 
2678
        class MandosDBusService(DBusObjectWithProperties):
3233
2679
            """A D-Bus proxy object"""
3234
 
            
3235
2680
            def __init__(self):
3236
2681
                dbus.service.Object.__init__(self, bus, "/")
3237
 
            
3238
2682
            _interface = "se.recompile.Mandos"
3239
2683
            
 
2684
            @dbus_interface_annotations(_interface)
 
2685
            def _foo(self):
 
2686
                return { "org.freedesktop.DBus.Property"
 
2687
                         ".EmitsChangedSignal":
 
2688
                             "false"}
 
2689
            
3240
2690
            @dbus.service.signal(_interface, signature="o")
3241
2691
            def ClientAdded(self, objpath):
3242
2692
                "D-Bus signal"
3247
2697
                "D-Bus signal"
3248
2698
                pass
3249
2699
            
3250
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3251
 
                               "true"})
3252
2700
            @dbus.service.signal(_interface, signature="os")
3253
2701
            def ClientRemoved(self, objpath, name):
3254
2702
                "D-Bus signal"
3255
2703
                pass
3256
2704
            
3257
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3258
 
                               "true"})
3259
2705
            @dbus.service.method(_interface, out_signature="ao")
3260
2706
            def GetAllClients(self):
3261
2707
                "D-Bus method"
3262
 
                return dbus.Array(c.dbus_object_path for c in
3263
 
                                  tcp_server.clients.values())
 
2708
                return dbus.Array(c.dbus_object_path
 
2709
                                  for c in
 
2710
                                  tcp_server.clients.itervalues())
3264
2711
            
3265
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3266
 
                               "true"})
3267
2712
            @dbus.service.method(_interface,
3268
2713
                                 out_signature="a{oa{sv}}")
3269
2714
            def GetAllClientsWithProperties(self):
3270
2715
                "D-Bus method"
3271
2716
                return dbus.Dictionary(
3272
 
                    { c.dbus_object_path: c.GetAll(
3273
 
                        "se.recompile.Mandos.Client")
3274
 
                      for c in tcp_server.clients.values() },
 
2717
                    ((c.dbus_object_path, c.GetAll(""))
 
2718
                     for c in tcp_server.clients.itervalues()),
3275
2719
                    signature="oa{sv}")
3276
2720
            
3277
2721
            @dbus.service.method(_interface, in_signature="o")
3278
2722
            def RemoveClient(self, object_path):
3279
2723
                "D-Bus method"
3280
 
                for c in tcp_server.clients.values():
 
2724
                for c in tcp_server.clients.itervalues():
3281
2725
                    if c.dbus_object_path == object_path:
3282
2726
                        del tcp_server.clients[c.name]
3283
2727
                        c.remove_from_connection()
3284
 
                        # Don't signal the disabling
 
2728
                        # Don't signal anything except ClientRemoved
3285
2729
                        c.disable(quiet=True)
3286
 
                        # Emit D-Bus signal for removal
3287
 
                        self.client_removed_signal(c)
 
2730
                        # Emit D-Bus signal
 
2731
                        self.ClientRemoved(object_path, c.name)
3288
2732
                        return
3289
2733
                raise KeyError(object_path)
3290
2734
            
3291
2735
            del _interface
3292
 
            
3293
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3294
 
                                 out_signature = "a{oa{sa{sv}}}")
3295
 
            def GetManagedObjects(self):
3296
 
                """D-Bus method"""
3297
 
                return dbus.Dictionary(
3298
 
                    { client.dbus_object_path:
3299
 
                      dbus.Dictionary(
3300
 
                          { interface: client.GetAll(interface)
3301
 
                            for interface in
3302
 
                                 client._get_all_interface_names()})
3303
 
                      for client in tcp_server.clients.values()})
3304
 
            
3305
 
            def client_added_signal(self, client):
3306
 
                """Send the new standard signal and the old signal"""
3307
 
                if use_dbus:
3308
 
                    # New standard signal
3309
 
                    self.InterfacesAdded(
3310
 
                        client.dbus_object_path,
3311
 
                        dbus.Dictionary(
3312
 
                            { interface: client.GetAll(interface)
3313
 
                              for interface in
3314
 
                              client._get_all_interface_names()}))
3315
 
                    # Old signal
3316
 
                    self.ClientAdded(client.dbus_object_path)
3317
 
            
3318
 
            def client_removed_signal(self, client):
3319
 
                """Send the new standard signal and the old signal"""
3320
 
                if use_dbus:
3321
 
                    # New standard signal
3322
 
                    self.InterfacesRemoved(
3323
 
                        client.dbus_object_path,
3324
 
                        client._get_all_interface_names())
3325
 
                    # Old signal
3326
 
                    self.ClientRemoved(client.dbus_object_path,
3327
 
                                       client.name)
3328
2736
        
3329
2737
        mandos_dbus_service = MandosDBusService()
3330
2738
    
3331
 
    # Save modules to variables to exempt the modules from being
3332
 
    # unloaded before the function registered with atexit() is run.
3333
 
    mp = multiprocessing
3334
 
    wn = wnull
3335
2739
    def cleanup():
3336
2740
        "Cleanup function; run on exit"
3337
 
        if zeroconf:
3338
 
            service.cleanup()
 
2741
        service.cleanup()
3339
2742
        
3340
 
        mp.active_children()
3341
 
        wn.close()
 
2743
        multiprocessing.active_children()
 
2744
        wnull.close()
3342
2745
        if not (tcp_server.clients or client_settings):
3343
2746
            return
3344
2747
        
3347
2750
        # removed/edited, old secret will thus be unrecovable.
3348
2751
        clients = {}
3349
2752
        with PGPEngine() as pgp:
3350
 
            for client in tcp_server.clients.values():
 
2753
            for client in tcp_server.clients.itervalues():
3351
2754
                key = client_settings[client.name]["secret"]
3352
2755
                client.encrypted_secret = pgp.encrypt(client.secret,
3353
2756
                                                      key)
3355
2758
                
3356
2759
                # A list of attributes that can not be pickled
3357
2760
                # + secret.
3358
 
                exclude = { "bus", "changedstate", "secret",
3359
 
                            "checker", "server_settings" }
3360
 
                for name, typ in inspect.getmembers(dbus.service
3361
 
                                                    .Object):
 
2761
                exclude = set(("bus", "changedstate", "secret",
 
2762
                               "checker", "server_settings"))
 
2763
                for name, typ in (inspect.getmembers
 
2764
                                  (dbus.service.Object)):
3362
2765
                    exclude.add(name)
3363
2766
                
3364
2767
                client_dict["encrypted_secret"] = (client
3371
2774
                del client_settings[client.name]["secret"]
3372
2775
        
3373
2776
        try:
3374
 
            with tempfile.NamedTemporaryFile(
3375
 
                    mode='wb',
3376
 
                    suffix=".pickle",
3377
 
                    prefix='clients-',
3378
 
                    dir=os.path.dirname(stored_state_path),
3379
 
                    delete=False) as stored_state:
3380
 
                pickle.dump((clients, client_settings), stored_state,
3381
 
                            protocol = 2)
3382
 
                tempname = stored_state.name
 
2777
            with (tempfile.NamedTemporaryFile
 
2778
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2779
                   dir=os.path.dirname(stored_state_path),
 
2780
                   delete=False)) as stored_state:
 
2781
                pickle.dump((clients, client_settings), stored_state)
 
2782
                tempname=stored_state.name
3383
2783
            os.rename(tempname, stored_state_path)
3384
2784
        except (IOError, OSError) as e:
3385
2785
            if not debug:
3388
2788
                except NameError:
3389
2789
                    pass
3390
2790
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3391
 
                logger.warning("Could not save persistent state: {}"
 
2791
                logger.warning("Could not save persistent state: {0}"
3392
2792
                               .format(os.strerror(e.errno)))
3393
2793
            else:
3394
2794
                logger.warning("Could not save persistent state:",
3400
2800
            name, client = tcp_server.clients.popitem()
3401
2801
            if use_dbus:
3402
2802
                client.remove_from_connection()
3403
 
            # Don't signal the disabling
 
2803
            # Don't signal anything except ClientRemoved
3404
2804
            client.disable(quiet=True)
3405
 
            # Emit D-Bus signal for removal
3406
2805
            if use_dbus:
3407
 
                mandos_dbus_service.client_removed_signal(client)
 
2806
                # Emit D-Bus signal
 
2807
                mandos_dbus_service.ClientRemoved(client
 
2808
                                                  .dbus_object_path,
 
2809
                                                  client.name)
3408
2810
        client_settings.clear()
3409
2811
    
3410
2812
    atexit.register(cleanup)
3411
2813
    
3412
 
    for client in tcp_server.clients.values():
 
2814
    for client in tcp_server.clients.itervalues():
3413
2815
        if use_dbus:
3414
 
            # Emit D-Bus signal for adding
3415
 
            mandos_dbus_service.client_added_signal(client)
 
2816
            # Emit D-Bus signal
 
2817
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3416
2818
        # Need to initiate checking of clients
3417
2819
        if client.enabled:
3418
2820
            client.init_checker()
3421
2823
    tcp_server.server_activate()
3422
2824
    
3423
2825
    # Find out what port we got
3424
 
    if zeroconf:
3425
 
        service.port = tcp_server.socket.getsockname()[1]
 
2826
    service.port = tcp_server.socket.getsockname()[1]
3426
2827
    if use_ipv6:
3427
2828
        logger.info("Now listening on address %r, port %d,"
3428
2829
                    " flowinfo %d, scope_id %d",
3434
2835
    #service.interface = tcp_server.socket.getsockname()[3]
3435
2836
    
3436
2837
    try:
3437
 
        if zeroconf:
3438
 
            # From the Avahi example code
3439
 
            try:
3440
 
                service.activate()
3441
 
            except dbus.exceptions.DBusException as error:
3442
 
                logger.critical("D-Bus Exception", exc_info=error)
3443
 
                cleanup()
3444
 
                sys.exit(1)
3445
 
            # End of Avahi example code
 
2838
        # From the Avahi example code
 
2839
        try:
 
2840
            service.activate()
 
2841
        except dbus.exceptions.DBusException as error:
 
2842
            logger.critical("D-Bus Exception", exc_info=error)
 
2843
            cleanup()
 
2844
            sys.exit(1)
 
2845
        # End of Avahi example code
3446
2846
        
3447
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3448
 
                          lambda *args, **kwargs:
3449
 
                          (tcp_server.handle_request
3450
 
                           (*args[2:], **kwargs) or True))
 
2847
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2848
                             lambda *args, **kwargs:
 
2849
                             (tcp_server.handle_request
 
2850
                              (*args[2:], **kwargs) or True))
3451
2851
        
3452
2852
        logger.debug("Starting main loop")
3453
2853
        main_loop.run()
3463
2863
    # Must run before the D-Bus bus name gets deregistered
3464
2864
    cleanup()
3465
2865
 
3466
 
 
3467
2866
if __name__ == '__main__':
3468
2867
    main()