/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-10-13 15:43:42 UTC
  • Revision ID: teddy@recompile.se-20131013154342-2ztabynqog6xuk0t
* initramfs-unpack: Bug fix: Made executable.

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-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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.9"
 
89
        SO_BINDTODEVICE = None
 
90
 
 
91
version = "1.6.0"
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
228
172
    def password_encode(self, password):
229
173
        # Passphrase can not be empty and can not contain newlines or
230
174
        # NUL bytes.  So we prefix it and hex encode it.
231
 
        encoded = b"mandos" + binascii.hexlify(password)
232
 
        if len(encoded) > 2048:
233
 
            # GnuPG can't handle long passwords, so encode differently
234
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
235
 
                       .replace(b"\n", b"\\n")
236
 
                       .replace(b"\0", b"\\x00"))
237
 
        return encoded
 
175
        return b"mandos" + binascii.hexlify(password)
238
176
    
239
177
    def encrypt(self, data, password):
240
178
        passphrase = self.password_encode(password)
241
 
        with tempfile.NamedTemporaryFile(
242
 
                dir=self.tempdir) as passfile:
 
179
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
180
                                         ) as passfile:
243
181
            passfile.write(passphrase)
244
182
            passfile.flush()
245
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
183
            proc = subprocess.Popen(['gpg', '--symmetric',
246
184
                                     '--passphrase-file',
247
185
                                     passfile.name]
248
186
                                    + self.gnupgargs,
256
194
    
257
195
    def decrypt(self, data, password):
258
196
        passphrase = self.password_encode(password)
259
 
        with tempfile.NamedTemporaryFile(
260
 
                dir = self.tempdir) as passfile:
 
197
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
198
                                         ) as passfile:
261
199
            passfile.write(passphrase)
262
200
            passfile.flush()
263
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
201
            proc = subprocess.Popen(['gpg', '--decrypt',
264
202
                                     '--passphrase-file',
265
203
                                     passfile.name]
266
204
                                    + self.gnupgargs,
267
205
                                    stdin = subprocess.PIPE,
268
206
                                    stdout = subprocess.PIPE,
269
207
                                    stderr = subprocess.PIPE)
270
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
208
            decrypted_plaintext, err = proc.communicate(input
 
209
                                                        = data)
271
210
        if proc.returncode != 0:
272
211
            raise PGPError(err)
273
212
        return decrypted_plaintext
274
213
 
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
214
 
300
215
class AvahiError(Exception):
301
216
    def __init__(self, value, *args, **kwargs):
302
217
        self.value = value
303
 
        return super(AvahiError, self).__init__(value, *args,
304
 
                                                **kwargs)
305
 
 
 
218
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
    def __unicode__(self):
 
220
        return unicode(repr(self.value))
306
221
 
307
222
class AvahiServiceError(AvahiError):
308
223
    pass
309
224
 
310
 
 
311
225
class AvahiGroupError(AvahiError):
312
226
    pass
313
227
 
333
247
    bus: dbus.SystemBus()
334
248
    """
335
249
    
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):
 
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
251
                 servicetype = None, port = None, TXT = None,
 
252
                 domain = "", host = "", max_renames = 32768,
 
253
                 protocol = avahi.PROTO_UNSPEC, bus = None):
347
254
        self.interface = interface
348
255
        self.name = name
349
256
        self.type = servicetype
359
266
        self.bus = bus
360
267
        self.entry_group_state_changed_match = None
361
268
    
362
 
    def rename(self, remove=True):
 
269
    def rename(self):
363
270
        """Derived from the Avahi example code"""
364
271
        if self.rename_count >= self.max_renames:
365
272
            logger.critical("No suitable Zeroconf service name found"
366
273
                            " after %i retries, exiting.",
367
274
                            self.rename_count)
368
275
            raise AvahiServiceError("Too many renames")
369
 
        self.name = str(
370
 
            self.server.GetAlternativeServiceName(self.name))
371
 
        self.rename_count += 1
 
276
        self.name = unicode(self.server
 
277
                            .GetAlternativeServiceName(self.name))
372
278
        logger.info("Changing Zeroconf service name to %r ...",
373
279
                    self.name)
374
 
        if remove:
375
 
            self.remove()
 
280
        self.remove()
376
281
        try:
377
282
            self.add()
378
283
        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)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
 
285
            self.cleanup()
 
286
            os._exit(1)
 
287
        self.rename_count += 1
387
288
    
388
289
    def remove(self):
389
290
        """Derived from the Avahi example code"""
427
328
            self.rename()
428
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
429
330
            logger.critical("Avahi: Error in group state changed %s",
430
 
                            str(error))
431
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
331
                            unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
432
334
    
433
335
    def cleanup(self):
434
336
        """Derived from the Avahi example code"""
444
346
    def server_state_changed(self, state, error=None):
445
347
        """Derived from the Avahi example code"""
446
348
        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
 
        }
 
349
        bad_states = { avahi.SERVER_INVALID:
 
350
                           "Zeroconf server invalid",
 
351
                       avahi.SERVER_REGISTERING: None,
 
352
                       avahi.SERVER_COLLISION:
 
353
                           "Zeroconf server name collision",
 
354
                       avahi.SERVER_FAILURE:
 
355
                           "Zeroconf server failure" }
453
356
        if state in bad_states:
454
357
            if bad_states[state] is not None:
455
358
                if error is None:
458
361
                    logger.error(bad_states[state] + ": %r", error)
459
362
            self.cleanup()
460
363
        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)
 
364
            self.add()
473
365
        else:
474
366
            if error is None:
475
367
                logger.debug("Unknown state: %r", state)
485
377
                                    follow_name_owner_changes=True),
486
378
                avahi.DBUS_INTERFACE_SERVER)
487
379
        self.server.connect_to_signal("StateChanged",
488
 
                                      self.server_state_changed)
 
380
                                 self.server_state_changed)
489
381
        self.server_state_changed(self.server.GetState())
490
382
 
491
383
 
492
384
class AvahiServiceToSyslog(AvahiService):
493
 
    def rename(self, *args, **kwargs):
 
385
    def rename(self):
494
386
        """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)))
 
387
        ret = AvahiService.rename(self)
 
388
        syslogger.setFormatter(logging.Formatter
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
499
392
        return ret
500
393
 
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()
 
394
 
 
395
def timedelta_to_milliseconds(td):
 
396
    "Convert a datetime.timedelta() to milliseconds"
 
397
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
            + (td.seconds * 1000)
 
399
            + (td.microseconds // 1000))
 
400
 
765
401
 
766
402
class Client(object):
767
403
    """A representation of a client host served by this server.
773
409
    checker:    subprocess.Popen(); a running checker process used
774
410
                                    to see if the client lives.
775
411
                                    'None' if no process is running.
776
 
    checker_callback_tag: a GLib event source tag, or None
 
412
    checker_callback_tag: a gobject event source tag, or None
777
413
    checker_command: string; External command which is run to check
778
414
                     if client lives.  %() expansions are done at
779
415
                     runtime with vars(self) as dict, so that for
780
416
                     instance %(name)s can be used in the command.
781
 
    checker_initiator_tag: a GLib event source tag, or None
 
417
    checker_initiator_tag: a gobject event source tag, or None
782
418
    created:    datetime.datetime(); (UTC) object creation
783
419
    client_structure: Object describing what attributes a client has
784
420
                      and is used for storing the client at exit
785
421
    current_checker_command: string; current running checker_command
786
 
    disable_initiator_tag: a GLib event source tag, or None
 
422
    disable_initiator_tag: a gobject event source tag, or None
787
423
    enabled:    bool()
788
424
    fingerprint: string (40 or 32 hexadecimal digits); used to
789
425
                 uniquely identify the client
794
430
    last_checker_status: integer between 0 and 255 reflecting exit
795
431
                         status of last checker. -1 reflects crashed
796
432
                         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
433
    last_enabled: datetime.datetime(); (UTC) or None
800
434
    name:       string; from the config file, used in log messages and
801
435
                        D-Bus identifiers
814
448
                          "fingerprint", "host", "interval",
815
449
                          "last_approval_request", "last_checked_ok",
816
450
                          "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
 
    }
 
451
    client_defaults = { "timeout": "PT5M",
 
452
                        "extended_timeout": "PT15M",
 
453
                        "interval": "PT2M",
 
454
                        "checker": "fping -q -- %%(host)s",
 
455
                        "host": "",
 
456
                        "approval_delay": "PT0S",
 
457
                        "approval_duration": "PT1S",
 
458
                        "approved_by_default": "True",
 
459
                        "enabled": "True",
 
460
                        }
 
461
    
 
462
    def timeout_milliseconds(self):
 
463
        "Return the 'timeout' attribute in milliseconds"
 
464
        return timedelta_to_milliseconds(self.timeout)
 
465
    
 
466
    def extended_timeout_milliseconds(self):
 
467
        "Return the 'extended_timeout' attribute in milliseconds"
 
468
        return timedelta_to_milliseconds(self.extended_timeout)
 
469
    
 
470
    def interval_milliseconds(self):
 
471
        "Return the 'interval' attribute in milliseconds"
 
472
        return timedelta_to_milliseconds(self.interval)
 
473
    
 
474
    def approval_delay_milliseconds(self):
 
475
        return timedelta_to_milliseconds(self.approval_delay)
828
476
    
829
477
    @staticmethod
830
478
    def config_parser(config):
846
494
            client["enabled"] = config.getboolean(client_name,
847
495
                                                  "enabled")
848
496
            
849
 
            # Uppercase and remove spaces from fingerprint for later
850
 
            # comparison purposes with return value from the
851
 
            # fingerprint() function
852
497
            client["fingerprint"] = (section["fingerprint"].upper()
853
498
                                     .replace(" ", ""))
854
499
            if "secret" in section:
855
 
                client["secret"] = codecs.decode(section["secret"]
856
 
                                                 .encode("utf-8"),
857
 
                                                 "base64")
 
500
                client["secret"] = section["secret"].decode("base64")
858
501
            elif "secfile" in section:
859
502
                with open(os.path.expanduser(os.path.expandvars
860
503
                                             (section["secfile"])),
861
504
                          "rb") as secfile:
862
505
                    client["secret"] = secfile.read()
863
506
            else:
864
 
                raise TypeError("No secret or secfile for section {}"
 
507
                raise TypeError("No secret or secfile for section {0}"
865
508
                                .format(section))
866
509
            client["timeout"] = string_to_delta(section["timeout"])
867
510
            client["extended_timeout"] = string_to_delta(
884
527
            server_settings = {}
885
528
        self.server_settings = server_settings
886
529
        # adding all client settings
887
 
        for setting, value in settings.items():
 
530
        for setting, value in settings.iteritems():
888
531
            setattr(self, setting, value)
889
532
        
890
533
        if self.enabled:
898
541
            self.expires = None
899
542
        
900
543
        logger.debug("Creating client %r", self.name)
 
544
        # Uppercase and remove spaces from fingerprint for later
 
545
        # comparison purposes with return value from the fingerprint()
 
546
        # function
901
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
902
548
        self.created = settings.get("created",
903
549
                                    datetime.datetime.utcnow())
910
556
        self.current_checker_command = None
911
557
        self.approved = None
912
558
        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()
 
559
        self.changedstate = (multiprocessing_manager
 
560
                             .Condition(multiprocessing_manager
 
561
                                        .Lock()))
 
562
        self.client_structure = [attr for attr in
 
563
                                 self.__dict__.iterkeys()
917
564
                                 if not attr.startswith("_")]
918
565
        self.client_structure.append("client_structure")
919
566
        
920
 
        for name, t in inspect.getmembers(
921
 
                type(self), lambda obj: isinstance(obj, property)):
 
567
        for name, t in inspect.getmembers(type(self),
 
568
                                          lambda obj:
 
569
                                              isinstance(obj,
 
570
                                                         property)):
922
571
            if not name.startswith("_"):
923
572
                self.client_structure.append(name)
924
573
    
945
594
        if not quiet:
946
595
            logger.info("Disabling client %s", self.name)
947
596
        if getattr(self, "disable_initiator_tag", None) is not None:
948
 
            GLib.source_remove(self.disable_initiator_tag)
 
597
            gobject.source_remove(self.disable_initiator_tag)
949
598
            self.disable_initiator_tag = None
950
599
        self.expires = None
951
600
        if getattr(self, "checker_initiator_tag", None) is not None:
952
 
            GLib.source_remove(self.checker_initiator_tag)
 
601
            gobject.source_remove(self.checker_initiator_tag)
953
602
            self.checker_initiator_tag = None
954
603
        self.stop_checker()
955
604
        self.enabled = False
956
605
        if not quiet:
957
606
            self.send_changedstate()
958
 
        # Do not run this again if called by a GLib.timeout_add
 
607
        # Do not run this again if called by a gobject.timeout_add
959
608
        return False
960
609
    
961
610
    def __del__(self):
965
614
        # Schedule a new checker to be started an 'interval' from now,
966
615
        # and every interval from then on.
967
616
        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)
 
617
            gobject.source_remove(self.checker_initiator_tag)
 
618
        self.checker_initiator_tag = (gobject.timeout_add
 
619
                                      (self.interval_milliseconds(),
 
620
                                       self.start_checker))
972
621
        # Schedule a disable() when 'timeout' has passed
973
622
        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)
 
623
            gobject.source_remove(self.disable_initiator_tag)
 
624
        self.disable_initiator_tag = (gobject.timeout_add
 
625
                                   (self.timeout_milliseconds(),
 
626
                                    self.disable))
977
627
        # Also start a new checker *right now*.
978
628
        self.start_checker()
979
629
    
980
 
    def checker_callback(self, source, condition, connection,
981
 
                         command):
 
630
    def checker_callback(self, pid, condition, command):
982
631
        """The checker has completed, so take appropriate actions."""
983
632
        self.checker_callback_tag = None
984
633
        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
 
634
        if os.WIFEXITED(condition):
 
635
            self.last_checker_status = os.WEXITSTATUS(condition)
992
636
            if self.last_checker_status == 0:
993
637
                logger.info("Checker for %(name)s succeeded",
994
638
                            vars(self))
995
639
                self.checked_ok()
996
640
            else:
997
 
                logger.info("Checker for %(name)s failed", vars(self))
 
641
                logger.info("Checker for %(name)s failed",
 
642
                            vars(self))
998
643
        else:
999
644
            self.last_checker_status = -1
1000
 
            self.last_checker_signal = -returncode
1001
645
            logger.warning("Checker for %(name)s crashed?",
1002
646
                           vars(self))
1003
 
        return False
1004
647
    
1005
648
    def checked_ok(self):
1006
649
        """Assert that the client has been seen, alive and well."""
1007
650
        self.last_checked_ok = datetime.datetime.utcnow()
1008
651
        self.last_checker_status = 0
1009
 
        self.last_checker_signal = None
1010
652
        self.bump_timeout()
1011
653
    
1012
654
    def bump_timeout(self, timeout=None):
1014
656
        if timeout is None:
1015
657
            timeout = self.timeout
1016
658
        if self.disable_initiator_tag is not None:
1017
 
            GLib.source_remove(self.disable_initiator_tag)
 
659
            gobject.source_remove(self.disable_initiator_tag)
1018
660
            self.disable_initiator_tag = None
1019
661
        if getattr(self, "enabled", False):
1020
 
            self.disable_initiator_tag = GLib.timeout_add(
1021
 
                int(timeout.total_seconds() * 1000), self.disable)
 
662
            self.disable_initiator_tag = (gobject.timeout_add
 
663
                                          (timedelta_to_milliseconds
 
664
                                           (timeout), self.disable))
1022
665
            self.expires = datetime.datetime.utcnow() + timeout
1023
666
    
1024
667
    def need_approval(self):
1038
681
        # than 'timeout' for the client to be disabled, which is as it
1039
682
        # should be.
1040
683
        
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
 
684
        # If a checker exists, make sure it is not a zombie
 
685
        try:
 
686
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
687
        except (AttributeError, OSError) as error:
 
688
            if (isinstance(error, OSError)
 
689
                and error.errno != errno.ECHILD):
 
690
                raise error
 
691
        else:
 
692
            if pid:
 
693
                logger.warning("Checker was a zombie")
 
694
                gobject.source_remove(self.checker_callback_tag)
 
695
                self.checker_callback(pid, status,
 
696
                                      self.current_checker_command)
1045
697
        # Start a new checker if needed
1046
698
        if self.checker is None:
1047
699
            # Escape attributes for the shell
1048
 
            escaped_attrs = {
1049
 
                attr: re.escape(str(getattr(self, attr)))
1050
 
                for attr in self.runtime_expansions }
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
1051
704
            try:
1052
705
                command = self.checker_command % escaped_attrs
1053
706
            except TypeError as error:
1054
707
                logger.error('Could not format string "%s"',
1055
 
                             self.checker_command,
 
708
                             self.checker_command, exc_info=error)
 
709
                return True # Try again later
 
710
            self.current_checker_command = command
 
711
            try:
 
712
                logger.info("Starting checker %r for %s",
 
713
                            command, self.name)
 
714
                # We don't need to redirect stdout and stderr, since
 
715
                # in normal mode, that is already done by daemon(),
 
716
                # and in debug mode we don't want to.  (Stdin is
 
717
                # always replaced by /dev/null.)
 
718
                # The exception is when not debugging but nevertheless
 
719
                # running in the foreground; use the previously
 
720
                # created wnull.
 
721
                popen_args = {}
 
722
                if (not self.server_settings["debug"]
 
723
                    and self.server_settings["foreground"]):
 
724
                    popen_args.update({"stdout": wnull,
 
725
                                       "stderr": wnull })
 
726
                self.checker = subprocess.Popen(command,
 
727
                                                close_fds=True,
 
728
                                                shell=True, cwd="/",
 
729
                                                **popen_args)
 
730
            except OSError as error:
 
731
                logger.error("Failed to start subprocess",
1056
732
                             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
 
733
                return True
 
734
            self.checker_callback_tag = (gobject.child_watch_add
 
735
                                         (self.checker.pid,
 
736
                                          self.checker_callback,
 
737
                                          data=command))
 
738
            # The checker may have completed before the gobject
 
739
            # watch was added.  Check for this.
 
740
            try:
 
741
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
742
            except OSError as error:
 
743
                if error.errno == errno.ECHILD:
 
744
                    # This should never happen
 
745
                    logger.error("Child process vanished",
 
746
                                 exc_info=error)
 
747
                    return True
 
748
                raise
 
749
            if pid:
 
750
                gobject.source_remove(self.checker_callback_tag)
 
751
                self.checker_callback(pid, status, command)
 
752
        # Re-run this periodically if run by gobject.timeout_add
1085
753
        return True
1086
754
    
1087
755
    def stop_checker(self):
1088
756
        """Force the checker process, if any, to stop."""
1089
757
        if self.checker_callback_tag:
1090
 
            GLib.source_remove(self.checker_callback_tag)
 
758
            gobject.source_remove(self.checker_callback_tag)
1091
759
            self.checker_callback_tag = None
1092
760
        if getattr(self, "checker", None) is None:
1093
761
            return
1094
762
        logger.debug("Stopping checker for %(name)s", vars(self))
1095
 
        self.checker.terminate()
 
763
        try:
 
764
            self.checker.terminate()
 
765
            #time.sleep(0.5)
 
766
            #if self.checker.poll() is None:
 
767
            #    self.checker.kill()
 
768
        except OSError as error:
 
769
            if error.errno != errno.ESRCH: # No such process
 
770
                raise
1096
771
        self.checker = None
1097
772
 
1098
773
 
1099
 
def dbus_service_property(dbus_interface,
1100
 
                          signature="v",
1101
 
                          access="readwrite",
1102
 
                          byte_arrays=False):
 
774
def dbus_service_property(dbus_interface, signature="v",
 
775
                          access="readwrite", byte_arrays=False):
1103
776
    """Decorators for marking methods of a DBusObjectWithProperties to
1104
777
    become properties on the D-Bus.
1105
778
    
1114
787
    # "Set" method, so we fail early here:
1115
788
    if byte_arrays and signature != "ay":
1116
789
        raise ValueError("Byte arrays not supported for non-'ay'"
1117
 
                         " signature {!r}".format(signature))
1118
 
    
 
790
                         " signature {0!r}".format(signature))
1119
791
    def decorator(func):
1120
792
        func._dbus_is_property = True
1121
793
        func._dbus_interface = dbus_interface
1126
798
            func._dbus_name = func._dbus_name[:-14]
1127
799
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1128
800
        return func
1129
 
    
1130
801
    return decorator
1131
802
 
1132
803
 
1141
812
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
1142
813
                    "false"}
1143
814
    """
1144
 
    
1145
815
    def decorator(func):
1146
816
        func._dbus_is_interface = True
1147
817
        func._dbus_interface = dbus_interface
1148
818
        func._dbus_name = dbus_interface
1149
819
        return func
1150
 
    
1151
820
    return decorator
1152
821
 
1153
822
 
1155
824
    """Decorator to annotate D-Bus methods, signals or properties
1156
825
    Usage:
1157
826
    
1158
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1159
 
                       "org.freedesktop.DBus.Property."
1160
 
                       "EmitsChangedSignal": "false"})
1161
827
    @dbus_service_property("org.example.Interface", signature="b",
1162
828
                           access="r")
 
829
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
830
                        "org.freedesktop.DBus.Property."
 
831
                        "EmitsChangedSignal": "false"})
1163
832
    def Property_dbus_property(self):
1164
833
        return dbus.Boolean(False)
1165
 
    
1166
 
    See also the DBusObjectWithAnnotations class.
1167
834
    """
1168
 
    
1169
835
    def decorator(func):
1170
836
        func._dbus_annotations = annotations
1171
837
        return func
1172
 
    
1173
838
    return decorator
1174
839
 
1175
840
 
1176
841
class DBusPropertyException(dbus.exceptions.DBusException):
1177
842
    """A base class for D-Bus property-related exceptions
1178
843
    """
1179
 
    pass
 
844
    def __unicode__(self):
 
845
        return unicode(str(self))
1180
846
 
1181
847
 
1182
848
class DBusPropertyAccessException(DBusPropertyException):
1191
857
    pass
1192
858
 
1193
859
 
1194
 
class DBusObjectWithAnnotations(dbus.service.Object):
1195
 
    """A D-Bus object with annotations.
 
860
class DBusObjectWithProperties(dbus.service.Object):
 
861
    """A D-Bus object with properties.
1196
862
    
1197
 
    Classes inheriting from this can use the dbus_annotations
1198
 
    decorator to add annotations to methods or signals.
 
863
    Classes inheriting from this can use the dbus_service_property
 
864
    decorator to expose methods as D-Bus properties.  It exposes the
 
865
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1199
866
    """
1200
867
    
1201
868
    @staticmethod
1205
872
        If called like _is_dbus_thing("method") it returns a function
1206
873
        suitable for use as predicate to inspect.getmembers().
1207
874
        """
1208
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
875
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1209
876
                                   False)
1210
877
    
1211
878
    def _get_all_dbus_things(self, thing):
1212
879
        """Returns a generator of (name, attribute) pairs
1213
880
        """
1214
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
1215
883
                 athing.__get__(self))
1216
884
                for cls in self.__class__.__mro__
1217
885
                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
 
    """
 
886
                inspect.getmembers(cls,
 
887
                                   self._is_dbus_thing(thing)))
1290
888
    
1291
889
    def _get_dbus_property(self, interface_name, property_name):
1292
890
        """Returns a bound method if one exists which is a D-Bus
1293
891
        property with the specified name and interface.
1294
892
        """
1295
 
        for cls in self.__class__.__mro__:
1296
 
            for name, value in inspect.getmembers(
1297
 
                    cls, self._is_dbus_thing("property")):
 
893
        for cls in  self.__class__.__mro__:
 
894
            for name, value in (inspect.getmembers
 
895
                                (cls,
 
896
                                 self._is_dbus_thing("property"))):
1298
897
                if (value._dbus_name == property_name
1299
898
                    and value._dbus_interface == interface_name):
1300
899
                    return value.__get__(self)
1301
900
        
1302
901
        # 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",
 
902
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
903
                                   + interface_name + "."
 
904
                                   + property_name)
 
905
    
 
906
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1317
907
                         out_signature="v")
1318
908
    def Get(self, interface_name, property_name):
1319
909
        """Standard D-Bus property Get() method, see D-Bus standard.
1337
927
            # The byte_arrays option is not supported yet on
1338
928
            # signatures other than "ay".
1339
929
            if prop._dbus_signature != "ay":
1340
 
                raise ValueError("Byte arrays not supported for non-"
1341
 
                                 "'ay' signature {!r}"
1342
 
                                 .format(prop._dbus_signature))
 
930
                raise ValueError
1343
931
            value = dbus.ByteArray(b''.join(chr(byte)
1344
932
                                            for byte in value))
1345
933
        prop(value)
1346
934
    
1347
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1348
 
                         in_signature="s",
 
935
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1349
936
                         out_signature="a{sv}")
1350
937
    def GetAll(self, interface_name):
1351
938
        """Standard D-Bus property GetAll() method, see D-Bus
1366
953
            if not hasattr(value, "variant_level"):
1367
954
                properties[name] = value
1368
955
                continue
1369
 
            properties[name] = type(value)(
1370
 
                value, variant_level = value.variant_level + 1)
 
956
            properties[name] = type(value)(value, variant_level=
 
957
                                           value.variant_level+1)
1371
958
        return dbus.Dictionary(properties, signature="sv")
1372
959
    
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
960
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1382
961
                         out_signature="s",
1383
962
                         path_keyword='object_path',
1387
966
        
1388
967
        Inserts property tags and interface annotation tags.
1389
968
        """
1390
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1391
 
                                                         object_path,
1392
 
                                                         connection)
 
969
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
970
                                                   connection)
1393
971
        try:
1394
972
            document = xml.dom.minidom.parseString(xmlstring)
1395
 
            
1396
973
            def make_tag(document, name, prop):
1397
974
                e = document.createElement("property")
1398
975
                e.setAttribute("name", name)
1399
976
                e.setAttribute("type", prop._dbus_signature)
1400
977
                e.setAttribute("access", prop._dbus_access)
1401
978
                return e
1402
 
            
1403
979
            for if_tag in document.getElementsByTagName("interface"):
1404
980
                # Add property tags
1405
981
                for tag in (make_tag(document, name, prop)
1408
984
                            if prop._dbus_interface
1409
985
                            == if_tag.getAttribute("name")):
1410
986
                    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)
 
987
                # Add annotation tags
 
988
                for typ in ("method", "signal", "property"):
 
989
                    for tag in if_tag.getElementsByTagName(typ):
 
990
                        annots = dict()
 
991
                        for name, prop in (self.
 
992
                                           _get_all_dbus_things(typ)):
 
993
                            if (name == tag.getAttribute("name")
 
994
                                and prop._dbus_interface
 
995
                                == if_tag.getAttribute("name")):
 
996
                                annots.update(getattr
 
997
                                              (prop,
 
998
                                               "_dbus_annotations",
 
999
                                               {}))
 
1000
                        for name, value in annots.iteritems():
 
1001
                            ann_tag = document.createElement(
 
1002
                                "annotation")
 
1003
                            ann_tag.setAttribute("name", name)
 
1004
                            ann_tag.setAttribute("value", value)
 
1005
                            tag.appendChild(ann_tag)
 
1006
                # Add interface annotation tags
 
1007
                for annotation, value in dict(
 
1008
                    itertools.chain.from_iterable(
 
1009
                        annotations().iteritems()
 
1010
                        for name, annotations in
 
1011
                        self._get_all_dbus_things("interface")
 
1012
                        if name == if_tag.getAttribute("name")
 
1013
                        )).iteritems():
 
1014
                    ann_tag = document.createElement("annotation")
 
1015
                    ann_tag.setAttribute("name", annotation)
 
1016
                    ann_tag.setAttribute("value", value)
 
1017
                    if_tag.appendChild(ann_tag)
1427
1018
                # Add the names to the return values for the
1428
1019
                # "org.freedesktop.DBus.Properties" methods
1429
1020
                if (if_tag.getAttribute("name")
1447
1038
                         exc_info=error)
1448
1039
        return xmlstring
1449
1040
 
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
1041
 
1519
1042
def datetime_to_dbus(dt, variant_level=0):
1520
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1521
1044
    if dt is None:
1522
1045
        return dbus.String("", variant_level = variant_level)
1523
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1046
    return dbus.String(dt.isoformat(),
 
1047
                       variant_level=variant_level)
1524
1048
 
1525
1049
 
1526
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1546
1070
    (from DBusObjectWithProperties) and interfaces (from the
1547
1071
    dbus_interface_annotations decorator).
1548
1072
    """
1549
 
    
1550
1073
    def wrapper(cls):
1551
1074
        for orig_interface_name, alt_interface_name in (
1552
 
                alt_interface_names.items()):
 
1075
            alt_interface_names.iteritems()):
1553
1076
            attr = {}
1554
1077
            interface_names = set()
1555
1078
            # Go though all attributes of the class
1557
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
1558
1081
                # with the wrong interface name
1559
1082
                if (not hasattr(attribute, "_dbus_interface")
1560
 
                    or not attribute._dbus_interface.startswith(
1561
 
                        orig_interface_name)):
 
1083
                    or not attribute._dbus_interface
 
1084
                    .startswith(orig_interface_name)):
1562
1085
                    continue
1563
1086
                # Create an alternate D-Bus interface name based on
1564
1087
                # the current name
1565
 
                alt_interface = attribute._dbus_interface.replace(
1566
 
                    orig_interface_name, alt_interface_name)
 
1088
                alt_interface = (attribute._dbus_interface
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
1567
1091
                interface_names.add(alt_interface)
1568
1092
                # Is this a D-Bus signal?
1569
1093
                if getattr(attribute, "_dbus_is_signal", False):
1570
1094
                    # Extract the original non-method undecorated
1571
1095
                    # function by black magic
1572
 
                    if sys.version_info.major == 2:
1573
 
                        nonmethod_func = (dict(
 
1096
                    nonmethod_func = (dict(
1574
1097
                            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)
 
1098
                                attribute.__closure__))["func"]
 
1099
                                      .cell_contents)
1582
1100
                    # Create a new, but exactly alike, function
1583
1101
                    # object, and decorate it to be a new D-Bus signal
1584
1102
                    # 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))
 
1103
                    new_function = (dbus.service.signal
 
1104
                                    (alt_interface,
 
1105
                                     attribute._dbus_signature)
 
1106
                                    (types.FunctionType(
 
1107
                                nonmethod_func.func_code,
 
1108
                                nonmethod_func.func_globals,
 
1109
                                nonmethod_func.func_name,
 
1110
                                nonmethod_func.func_defaults,
 
1111
                                nonmethod_func.func_closure)))
1589
1112
                    # Copy annotations, if any
1590
1113
                    try:
1591
 
                        new_function._dbus_annotations = dict(
1592
 
                            attribute._dbus_annotations)
 
1114
                        new_function._dbus_annotations = (
 
1115
                            dict(attribute._dbus_annotations))
1593
1116
                    except AttributeError:
1594
1117
                        pass
1595
1118
                    # Define a creator of a function to call both the
1600
1123
                        """This function is a scope container to pass
1601
1124
                        func1 and func2 to the "call_both" function
1602
1125
                        outside of its arguments"""
1603
 
                        
1604
 
                        @functools.wraps(func2)
1605
1126
                        def call_both(*args, **kwargs):
1606
1127
                            """This function will emit two D-Bus
1607
1128
                            signals by calling func1 and func2"""
1608
1129
                            func1(*args, **kwargs)
1609
1130
                            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
1131
                        return call_both
1616
1132
                    # Create the "call_both" function and add it to
1617
1133
                    # the class
1622
1138
                    # object.  Decorate it to be a new D-Bus method
1623
1139
                    # with the alternate D-Bus interface name.  Add it
1624
1140
                    # 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)))
 
1141
                    attr[attrname] = (dbus.service.method
 
1142
                                      (alt_interface,
 
1143
                                       attribute._dbus_in_signature,
 
1144
                                       attribute._dbus_out_signature)
 
1145
                                      (types.FunctionType
 
1146
                                       (attribute.func_code,
 
1147
                                        attribute.func_globals,
 
1148
                                        attribute.func_name,
 
1149
                                        attribute.func_defaults,
 
1150
                                        attribute.func_closure)))
1631
1151
                    # Copy annotations, if any
1632
1152
                    try:
1633
 
                        attr[attrname]._dbus_annotations = dict(
1634
 
                            attribute._dbus_annotations)
 
1153
                        attr[attrname]._dbus_annotations = (
 
1154
                            dict(attribute._dbus_annotations))
1635
1155
                    except AttributeError:
1636
1156
                        pass
1637
1157
                # Is this a D-Bus property?
1640
1160
                    # object, and decorate it to be a new D-Bus
1641
1161
                    # property with the alternate D-Bus interface
1642
1162
                    # 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)))
 
1163
                    attr[attrname] = (dbus_service_property
 
1164
                                      (alt_interface,
 
1165
                                       attribute._dbus_signature,
 
1166
                                       attribute._dbus_access,
 
1167
                                       attribute
 
1168
                                       ._dbus_get_args_options
 
1169
                                       ["byte_arrays"])
 
1170
                                      (types.FunctionType
 
1171
                                       (attribute.func_code,
 
1172
                                        attribute.func_globals,
 
1173
                                        attribute.func_name,
 
1174
                                        attribute.func_defaults,
 
1175
                                        attribute.func_closure)))
1649
1176
                    # Copy annotations, if any
1650
1177
                    try:
1651
 
                        attr[attrname]._dbus_annotations = dict(
1652
 
                            attribute._dbus_annotations)
 
1178
                        attr[attrname]._dbus_annotations = (
 
1179
                            dict(attribute._dbus_annotations))
1653
1180
                    except AttributeError:
1654
1181
                        pass
1655
1182
                # Is this a D-Bus interface?
1658
1185
                    # object.  Decorate it to be a new D-Bus interface
1659
1186
                    # with the alternate D-Bus interface name.  Add it
1660
1187
                    # to the class.
1661
 
                    attr[attrname] = (
1662
 
                        dbus_interface_annotations(alt_interface)
1663
 
                        (copy_function(attribute)))
 
1188
                    attr[attrname] = (dbus_interface_annotations
 
1189
                                      (alt_interface)
 
1190
                                      (types.FunctionType
 
1191
                                       (attribute.func_code,
 
1192
                                        attribute.func_globals,
 
1193
                                        attribute.func_name,
 
1194
                                        attribute.func_defaults,
 
1195
                                        attribute.func_closure)))
1664
1196
            if deprecate:
1665
1197
                # Deprecate all alternate interfaces
1666
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
1667
1199
                for interface_name in interface_names:
1668
 
                    
1669
1200
                    @dbus_interface_annotations(interface_name)
1670
1201
                    def func(self):
1671
1202
                        return { "org.freedesktop.DBus.Deprecated":
1672
 
                                 "true" }
 
1203
                                     "true" }
1673
1204
                    # Find an unused name
1674
1205
                    for aname in (iname.format(i)
1675
1206
                                  for i in itertools.count()):
1679
1210
            if interface_names:
1680
1211
                # Replace the class with a new subclass of it with
1681
1212
                # 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)
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1214
                           (cls,), attr)
1688
1215
        return cls
1689
 
    
1690
1216
    return wrapper
1691
1217
 
1692
1218
 
1693
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
1694
 
                            "se.bsnet.fukt.Mandos"})
 
1220
                                "se.bsnet.fukt.Mandos"})
1695
1221
class ClientDBus(Client, DBusObjectWithProperties):
1696
1222
    """A Client class using D-Bus
1697
1223
    
1701
1227
    """
1702
1228
    
1703
1229
    runtime_expansions = (Client.runtime_expansions
1704
 
                          + ("dbus_object_path", ))
1705
 
    
1706
 
    _interface = "se.recompile.Mandos.Client"
 
1230
                          + ("dbus_object_path",))
1707
1231
    
1708
1232
    # dbus.service.Object doesn't use super(), so we can't either.
1709
1233
    
1712
1236
        Client.__init__(self, *args, **kwargs)
1713
1237
        # Only now, when this client is initialized, can it show up on
1714
1238
        # the D-Bus
1715
 
        client_object_name = str(self.name).translate(
 
1239
        client_object_name = unicode(self.name).translate(
1716
1240
            {ord("."): ord("_"),
1717
1241
             ord("-"): ord("_")})
1718
 
        self.dbus_object_path = dbus.ObjectPath(
1719
 
            "/clients/" + client_object_name)
 
1242
        self.dbus_object_path = (dbus.ObjectPath
 
1243
                                 ("/clients/" + client_object_name))
1720
1244
        DBusObjectWithProperties.__init__(self, self.bus,
1721
1245
                                          self.dbus_object_path)
1722
1246
    
1723
 
    def notifychangeproperty(transform_func, dbus_name,
1724
 
                             type_func=lambda x: x,
1725
 
                             variant_level=1,
1726
 
                             invalidate_only=False,
1727
 
                             _interface=_interface):
 
1247
    def notifychangeproperty(transform_func,
 
1248
                             dbus_name, type_func=lambda x: x,
 
1249
                             variant_level=1):
1728
1250
        """ Modify a variable so that it's a property which announces
1729
1251
        its changes to DBus.
1730
1252
        
1735
1257
                   to the D-Bus.  Default: no transform
1736
1258
        variant_level: D-Bus variant level.  Default: 1
1737
1259
        """
1738
 
        attrname = "_{}".format(dbus_name)
1739
 
        
 
1260
        attrname = "_{0}".format(dbus_name)
1740
1261
        def setter(self, value):
1741
1262
            if hasattr(self, "dbus_object_path"):
1742
1263
                if (not hasattr(self, attrname) or
1743
1264
                    type_func(getattr(self, attrname, None))
1744
1265
                    != 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())
 
1266
                    dbus_value = transform_func(type_func(value),
 
1267
                                                variant_level
 
1268
                                                =variant_level)
 
1269
                    self.PropertyChanged(dbus.String(dbus_name),
 
1270
                                         dbus_value)
1760
1271
            setattr(self, attrname, value)
1761
1272
        
1762
1273
        return property(lambda self: getattr(self, attrname), setter)
1768
1279
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1769
1280
    last_enabled = notifychangeproperty(datetime_to_dbus,
1770
1281
                                        "LastEnabled")
1771
 
    checker = notifychangeproperty(
1772
 
        dbus.Boolean, "CheckerRunning",
1773
 
        type_func = lambda checker: checker is not None)
 
1282
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1283
                                   type_func = lambda checker:
 
1284
                                       checker is not None)
1774
1285
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1775
1286
                                           "LastCheckedOK")
1776
1287
    last_checker_status = notifychangeproperty(dbus.Int16,
1779
1290
        datetime_to_dbus, "LastApprovalRequest")
1780
1291
    approved_by_default = notifychangeproperty(dbus.Boolean,
1781
1292
                                               "ApprovedByDefault")
1782
 
    approval_delay = notifychangeproperty(
1783
 
        dbus.UInt64, "ApprovalDelay",
1784
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1293
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1294
                                          "ApprovalDelay",
 
1295
                                          type_func =
 
1296
                                          timedelta_to_milliseconds)
1785
1297
    approval_duration = notifychangeproperty(
1786
1298
        dbus.UInt64, "ApprovalDuration",
1787
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1299
        type_func = timedelta_to_milliseconds)
1788
1300
    host = notifychangeproperty(dbus.String, "Host")
1789
 
    timeout = notifychangeproperty(
1790
 
        dbus.UInt64, "Timeout",
1791
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1301
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1302
                                   type_func =
 
1303
                                   timedelta_to_milliseconds)
1792
1304
    extended_timeout = notifychangeproperty(
1793
1305
        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)
 
1306
        type_func = timedelta_to_milliseconds)
 
1307
    interval = notifychangeproperty(dbus.UInt64,
 
1308
                                    "Interval",
 
1309
                                    type_func =
 
1310
                                    timedelta_to_milliseconds)
1798
1311
    checker_command = notifychangeproperty(dbus.String, "Checker")
1799
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1800
 
                                  invalidate_only=True)
1801
1312
    
1802
1313
    del notifychangeproperty
1803
1314
    
1810
1321
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1811
1322
        Client.__del__(self, *args, **kwargs)
1812
1323
    
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:
 
1324
    def checker_callback(self, pid, condition, command,
 
1325
                         *args, **kwargs):
 
1326
        self.checker_callback_tag = None
 
1327
        self.checker = None
 
1328
        if os.WIFEXITED(condition):
 
1329
            exitstatus = os.WEXITSTATUS(condition)
1820
1330
            # Emit D-Bus signal
1821
1331
            self.CheckerCompleted(dbus.Int16(exitstatus),
1822
 
                                  # This is specific to GNU libC
1823
 
                                  dbus.Int64(exitstatus << 8),
 
1332
                                  dbus.Int64(condition),
1824
1333
                                  dbus.String(command))
1825
1334
        else:
1826
1335
            # Emit D-Bus signal
1827
1336
            self.CheckerCompleted(dbus.Int16(-1),
1828
 
                                  dbus.Int64(
1829
 
                                      # This is specific to GNU libC
1830
 
                                      (exitstatus << 8)
1831
 
                                      | self.last_checker_signal),
 
1337
                                  dbus.Int64(condition),
1832
1338
                                  dbus.String(command))
1833
 
        return ret
 
1339
        
 
1340
        return Client.checker_callback(self, pid, condition, command,
 
1341
                                       *args, **kwargs)
1834
1342
    
1835
1343
    def start_checker(self, *args, **kwargs):
1836
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1344
        old_checker = self.checker
 
1345
        if self.checker is not None:
 
1346
            old_checker_pid = self.checker.pid
 
1347
        else:
 
1348
            old_checker_pid = None
1837
1349
        r = Client.start_checker(self, *args, **kwargs)
1838
1350
        # Only if new checker process was started
1839
1351
        if (self.checker is not None
1848
1360
    
1849
1361
    def approve(self, value=True):
1850
1362
        self.approved = value
1851
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1852
 
                             * 1000), self._reset_approved)
 
1363
        gobject.timeout_add(timedelta_to_milliseconds
 
1364
                            (self.approval_duration),
 
1365
                            self._reset_approved)
1853
1366
        self.send_changedstate()
1854
1367
    
1855
1368
    ## D-Bus methods, signals & properties
 
1369
    _interface = "se.recompile.Mandos.Client"
1856
1370
    
1857
1371
    ## Interfaces
1858
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1859
1378
    ## Signals
1860
1379
    
1861
1380
    # CheckerCompleted - signal
1871
1390
        pass
1872
1391
    
1873
1392
    # PropertyChanged - signal
1874
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1875
1393
    @dbus.service.signal(_interface, signature="sv")
1876
1394
    def PropertyChanged(self, property, value):
1877
1395
        "D-Bus signal"
1911
1429
        self.checked_ok()
1912
1430
    
1913
1431
    # Enable - method
1914
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1915
1432
    @dbus.service.method(_interface)
1916
1433
    def Enable(self):
1917
1434
        "D-Bus method"
1918
1435
        self.enable()
1919
1436
    
1920
1437
    # StartChecker - method
1921
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1922
1438
    @dbus.service.method(_interface)
1923
1439
    def StartChecker(self):
1924
1440
        "D-Bus method"
1925
1441
        self.start_checker()
1926
1442
    
1927
1443
    # Disable - method
1928
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1929
1444
    @dbus.service.method(_interface)
1930
1445
    def Disable(self):
1931
1446
        "D-Bus method"
1932
1447
        self.disable()
1933
1448
    
1934
1449
    # StopChecker - method
1935
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1936
1450
    @dbus.service.method(_interface)
1937
1451
    def StopChecker(self):
1938
1452
        self.stop_checker()
1945
1459
        return dbus.Boolean(bool(self.approvals_pending))
1946
1460
    
1947
1461
    # ApprovedByDefault - property
1948
 
    @dbus_service_property(_interface,
1949
 
                           signature="b",
 
1462
    @dbus_service_property(_interface, signature="b",
1950
1463
                           access="readwrite")
1951
1464
    def ApprovedByDefault_dbus_property(self, value=None):
1952
1465
        if value is None:       # get
1954
1467
        self.approved_by_default = bool(value)
1955
1468
    
1956
1469
    # ApprovalDelay - property
1957
 
    @dbus_service_property(_interface,
1958
 
                           signature="t",
 
1470
    @dbus_service_property(_interface, signature="t",
1959
1471
                           access="readwrite")
1960
1472
    def ApprovalDelay_dbus_property(self, value=None):
1961
1473
        if value is None:       # get
1962
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1963
 
                               * 1000)
 
1474
            return dbus.UInt64(self.approval_delay_milliseconds())
1964
1475
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1965
1476
    
1966
1477
    # ApprovalDuration - property
1967
 
    @dbus_service_property(_interface,
1968
 
                           signature="t",
 
1478
    @dbus_service_property(_interface, signature="t",
1969
1479
                           access="readwrite")
1970
1480
    def ApprovalDuration_dbus_property(self, value=None):
1971
1481
        if value is None:       # get
1972
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1973
 
                               * 1000)
 
1482
            return dbus.UInt64(timedelta_to_milliseconds(
 
1483
                    self.approval_duration))
1974
1484
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1975
1485
    
1976
1486
    # Name - property
1977
 
    @dbus_annotations(
1978
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1979
1487
    @dbus_service_property(_interface, signature="s", access="read")
1980
1488
    def Name_dbus_property(self):
1981
1489
        return dbus.String(self.name)
1982
1490
    
1983
1491
    # Fingerprint - property
1984
 
    @dbus_annotations(
1985
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1986
1492
    @dbus_service_property(_interface, signature="s", access="read")
1987
1493
    def Fingerprint_dbus_property(self):
1988
1494
        return dbus.String(self.fingerprint)
1989
1495
    
1990
1496
    # Host - property
1991
 
    @dbus_service_property(_interface,
1992
 
                           signature="s",
 
1497
    @dbus_service_property(_interface, signature="s",
1993
1498
                           access="readwrite")
1994
1499
    def Host_dbus_property(self, value=None):
1995
1500
        if value is None:       # get
1996
1501
            return dbus.String(self.host)
1997
 
        self.host = str(value)
 
1502
        self.host = unicode(value)
1998
1503
    
1999
1504
    # Created - property
2000
 
    @dbus_annotations(
2001
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2002
1505
    @dbus_service_property(_interface, signature="s", access="read")
2003
1506
    def Created_dbus_property(self):
2004
1507
        return datetime_to_dbus(self.created)
2009
1512
        return datetime_to_dbus(self.last_enabled)
2010
1513
    
2011
1514
    # Enabled - property
2012
 
    @dbus_service_property(_interface,
2013
 
                           signature="b",
 
1515
    @dbus_service_property(_interface, signature="b",
2014
1516
                           access="readwrite")
2015
1517
    def Enabled_dbus_property(self, value=None):
2016
1518
        if value is None:       # get
2021
1523
            self.disable()
2022
1524
    
2023
1525
    # LastCheckedOK - property
2024
 
    @dbus_service_property(_interface,
2025
 
                           signature="s",
 
1526
    @dbus_service_property(_interface, signature="s",
2026
1527
                           access="readwrite")
2027
1528
    def LastCheckedOK_dbus_property(self, value=None):
2028
1529
        if value is not None:
2031
1532
        return datetime_to_dbus(self.last_checked_ok)
2032
1533
    
2033
1534
    # LastCheckerStatus - property
2034
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1535
    @dbus_service_property(_interface, signature="n",
 
1536
                           access="read")
2035
1537
    def LastCheckerStatus_dbus_property(self):
2036
1538
        return dbus.Int16(self.last_checker_status)
2037
1539
    
2046
1548
        return datetime_to_dbus(self.last_approval_request)
2047
1549
    
2048
1550
    # Timeout - property
2049
 
    @dbus_service_property(_interface,
2050
 
                           signature="t",
 
1551
    @dbus_service_property(_interface, signature="t",
2051
1552
                           access="readwrite")
2052
1553
    def Timeout_dbus_property(self, value=None):
2053
1554
        if value is None:       # get
2054
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1555
            return dbus.UInt64(self.timeout_milliseconds())
2055
1556
        old_timeout = self.timeout
2056
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
2057
1558
        # Reschedule disabling
2065
1566
                if (getattr(self, "disable_initiator_tag", None)
2066
1567
                    is None):
2067
1568
                    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)
 
1569
                gobject.source_remove(self.disable_initiator_tag)
 
1570
                self.disable_initiator_tag = (
 
1571
                    gobject.timeout_add(
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
2072
1574
    
2073
1575
    # ExtendedTimeout - property
2074
 
    @dbus_service_property(_interface,
2075
 
                           signature="t",
 
1576
    @dbus_service_property(_interface, signature="t",
2076
1577
                           access="readwrite")
2077
1578
    def ExtendedTimeout_dbus_property(self, value=None):
2078
1579
        if value is None:       # get
2079
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
2080
 
                               * 1000)
 
1580
            return dbus.UInt64(self.extended_timeout_milliseconds())
2081
1581
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2082
1582
    
2083
1583
    # Interval - property
2084
 
    @dbus_service_property(_interface,
2085
 
                           signature="t",
 
1584
    @dbus_service_property(_interface, signature="t",
2086
1585
                           access="readwrite")
2087
1586
    def Interval_dbus_property(self, value=None):
2088
1587
        if value is None:       # get
2089
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1588
            return dbus.UInt64(self.interval_milliseconds())
2090
1589
        self.interval = datetime.timedelta(0, 0, 0, value)
2091
1590
        if getattr(self, "checker_initiator_tag", None) is None:
2092
1591
            return
2093
1592
        if self.enabled:
2094
1593
            # 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
 
1594
            gobject.source_remove(self.checker_initiator_tag)
 
1595
            self.checker_initiator_tag = (gobject.timeout_add
 
1596
                                          (value, self.start_checker))
 
1597
            self.start_checker()    # Start one now, too
2099
1598
    
2100
1599
    # Checker - property
2101
 
    @dbus_service_property(_interface,
2102
 
                           signature="s",
 
1600
    @dbus_service_property(_interface, signature="s",
2103
1601
                           access="readwrite")
2104
1602
    def Checker_dbus_property(self, value=None):
2105
1603
        if value is None:       # get
2106
1604
            return dbus.String(self.checker_command)
2107
 
        self.checker_command = str(value)
 
1605
        self.checker_command = unicode(value)
2108
1606
    
2109
1607
    # CheckerRunning - property
2110
 
    @dbus_service_property(_interface,
2111
 
                           signature="b",
 
1608
    @dbus_service_property(_interface, signature="b",
2112
1609
                           access="readwrite")
2113
1610
    def CheckerRunning_dbus_property(self, value=None):
2114
1611
        if value is None:       # get
2119
1616
            self.stop_checker()
2120
1617
    
2121
1618
    # ObjectPath - property
2122
 
    @dbus_annotations(
2123
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2124
 
         "org.freedesktop.DBus.Deprecated": "true"})
2125
1619
    @dbus_service_property(_interface, signature="o", access="read")
2126
1620
    def ObjectPath_dbus_property(self):
2127
1621
        return self.dbus_object_path # is already a dbus.ObjectPath
2128
1622
    
2129
1623
    # 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)
 
1624
    @dbus_service_property(_interface, signature="ay",
 
1625
                           access="write", byte_arrays=True)
2137
1626
    def Secret_dbus_property(self, value):
2138
 
        self.secret = bytes(value)
 
1627
        self.secret = str(value)
2139
1628
    
2140
1629
    del _interface
2141
1630
 
2145
1634
        self._pipe = child_pipe
2146
1635
        self._pipe.send(('init', fpr, address))
2147
1636
        if not self._pipe.recv():
2148
 
            raise KeyError(fpr)
 
1637
            raise KeyError()
2149
1638
    
2150
1639
    def __getattribute__(self, name):
2151
1640
        if name == '_pipe':
2155
1644
        if data[0] == 'data':
2156
1645
            return data[1]
2157
1646
        if data[0] == 'function':
2158
 
            
2159
1647
            def func(*args, **kwargs):
2160
1648
                self._pipe.send(('funcall', name, args, kwargs))
2161
1649
                return self._pipe.recv()[1]
2162
 
            
2163
1650
            return func
2164
1651
    
2165
1652
    def __setattr__(self, name, value):
2177
1664
    def handle(self):
2178
1665
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2179
1666
            logger.info("TCP connection from: %s",
2180
 
                        str(self.client_address))
 
1667
                        unicode(self.client_address))
2181
1668
            logger.debug("Pipe FD: %d",
2182
1669
                         self.server.child_pipe.fileno())
2183
1670
            
2184
 
            session = gnutls.ClientSession(self.request)
 
1671
            session = (gnutls.connection
 
1672
                       .ClientSession(self.request,
 
1673
                                      gnutls.connection
 
1674
                                      .X509Credentials()))
 
1675
            
 
1676
            # Note: gnutls.connection.X509Credentials is really a
 
1677
            # generic GnuTLS certificate credentials object so long as
 
1678
            # no X.509 keys are added to it.  Therefore, we can use it
 
1679
            # here despite using OpenPGP certificates.
2185
1680
            
2186
1681
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2187
1682
            #                      "+AES-256-CBC", "+SHA1",
2191
1686
            priority = self.server.gnutls_priority
2192
1687
            if priority is None:
2193
1688
                priority = "NORMAL"
2194
 
            gnutls.priority_set_direct(session._c_object,
2195
 
                                       priority.encode("utf-8"),
2196
 
                                       None)
 
1689
            (gnutls.library.functions
 
1690
             .gnutls_priority_set_direct(session._c_object,
 
1691
                                         priority, None))
2197
1692
            
2198
1693
            # Start communication using the Mandos protocol
2199
1694
            # Get protocol number
2201
1696
            logger.debug("Protocol version: %r", line)
2202
1697
            try:
2203
1698
                if int(line.strip().split()[0]) > 1:
2204
 
                    raise RuntimeError(line)
 
1699
                    raise RuntimeError
2205
1700
            except (ValueError, IndexError, RuntimeError) as error:
2206
1701
                logger.error("Unknown protocol version: %s", error)
2207
1702
                return
2209
1704
            # Start GnuTLS connection
2210
1705
            try:
2211
1706
                session.handshake()
2212
 
            except gnutls.Error as error:
 
1707
            except gnutls.errors.GNUTLSError as error:
2213
1708
                logger.warning("Handshake failed: %s", error)
2214
1709
                # Do not run session.bye() here: the session is not
2215
1710
                # established.  Just abandon the request.
2219
1714
            approval_required = False
2220
1715
            try:
2221
1716
                try:
2222
 
                    fpr = self.fingerprint(
2223
 
                        self.peer_certificate(session))
2224
 
                except (TypeError, gnutls.Error) as error:
 
1717
                    fpr = self.fingerprint(self.peer_certificate
 
1718
                                           (session))
 
1719
                except (TypeError,
 
1720
                        gnutls.errors.GNUTLSError) as error:
2225
1721
                    logger.warning("Bad certificate: %s", error)
2226
1722
                    return
2227
1723
                logger.debug("Fingerprint: %s", fpr)
2240
1736
                while True:
2241
1737
                    if not client.enabled:
2242
1738
                        logger.info("Client %s is disabled",
2243
 
                                    client.name)
 
1739
                                       client.name)
2244
1740
                        if self.server.use_dbus:
2245
1741
                            # Emit D-Bus signal
2246
1742
                            client.Rejected("Disabled")
2255
1751
                        if self.server.use_dbus:
2256
1752
                            # Emit D-Bus signal
2257
1753
                            client.NeedApproval(
2258
 
                                client.approval_delay.total_seconds()
2259
 
                                * 1000, client.approved_by_default)
 
1754
                                client.approval_delay_milliseconds(),
 
1755
                                client.approved_by_default)
2260
1756
                    else:
2261
1757
                        logger.warning("Client %s was not approved",
2262
1758
                                       client.name)
2268
1764
                    #wait until timeout or approved
2269
1765
                    time = datetime.datetime.now()
2270
1766
                    client.changedstate.acquire()
2271
 
                    client.changedstate.wait(delay.total_seconds())
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
2272
1770
                    client.changedstate.release()
2273
1771
                    time2 = datetime.datetime.now()
2274
1772
                    if (time2 - time) >= delay:
2285
1783
                    else:
2286
1784
                        delay -= time2 - time
2287
1785
                
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
 
1786
                sent_size = 0
 
1787
                while sent_size < len(client.secret):
 
1788
                    try:
 
1789
                        sent = session.send(client.secret[sent_size:])
 
1790
                    except gnutls.errors.GNUTLSError as error:
 
1791
                        logger.warning("gnutls send failed",
 
1792
                                       exc_info=error)
 
1793
                        return
 
1794
                    logger.debug("Sent: %d, remaining: %d",
 
1795
                                 sent, len(client.secret)
 
1796
                                 - (sent_size + sent))
 
1797
                    sent_size += sent
2294
1798
                
2295
1799
                logger.info("Sending secret to %s", client.name)
2296
1800
                # bump the timeout using extended_timeout
2304
1808
                    client.approvals_pending -= 1
2305
1809
                try:
2306
1810
                    session.bye()
2307
 
                except gnutls.Error as error:
 
1811
                except gnutls.errors.GNUTLSError as error:
2308
1812
                    logger.warning("GnuTLS bye failed",
2309
1813
                                   exc_info=error)
2310
1814
    
2312
1816
    def peer_certificate(session):
2313
1817
        "Return the peer's OpenPGP certificate as a bytestring"
2314
1818
        # 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""
 
1819
        if (gnutls.library.functions
 
1820
            .gnutls_certificate_type_get(session._c_object)
 
1821
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1822
            # ...do the normal thing
 
1823
            return session.peer_certificate
2319
1824
        list_size = ctypes.c_uint(1)
2320
 
        cert_list = (gnutls.certificate_get_peers
 
1825
        cert_list = (gnutls.library.functions
 
1826
                     .gnutls_certificate_get_peers
2321
1827
                     (session._c_object, ctypes.byref(list_size)))
2322
1828
        if not bool(cert_list) and list_size.value != 0:
2323
 
            raise gnutls.Error("error getting peer certificate")
 
1829
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1830
                                            " certificate")
2324
1831
        if list_size.value == 0:
2325
1832
            return None
2326
1833
        cert = cert_list[0]
2330
1837
    def fingerprint(openpgp):
2331
1838
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2332
1839
        # 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)))
 
1840
        datum = (gnutls.library.types
 
1841
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1842
                                             ctypes.POINTER
 
1843
                                             (ctypes.c_ubyte)),
 
1844
                                 ctypes.c_uint(len(openpgp))))
2337
1845
        # New empty GnuTLS certificate
2338
 
        crt = gnutls.openpgp_crt_t()
2339
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1846
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1847
        (gnutls.library.functions
 
1848
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
2340
1849
        # Import the OpenPGP public key into the certificate
2341
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2342
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1850
        (gnutls.library.functions
 
1851
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1852
                                    gnutls.library.constants
 
1853
                                    .GNUTLS_OPENPGP_FMT_RAW))
2343
1854
        # Verify the self signature in the key
2344
1855
        crtverify = ctypes.c_uint()
2345
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2346
 
                                       ctypes.byref(crtverify))
 
1856
        (gnutls.library.functions
 
1857
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1858
                                         ctypes.byref(crtverify)))
2347
1859
        if crtverify.value != 0:
2348
 
            gnutls.openpgp_crt_deinit(crt)
2349
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1860
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1861
            raise (gnutls.errors.CertificateSecurityError
 
1862
                   ("Verify failed"))
2350
1863
        # New buffer for the fingerprint
2351
1864
        buf = ctypes.create_string_buffer(20)
2352
1865
        buf_len = ctypes.c_size_t()
2353
1866
        # Get the fingerprint from the certificate into the buffer
2354
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2355
 
                                           ctypes.byref(buf_len))
 
1867
        (gnutls.library.functions
 
1868
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1869
                                             ctypes.byref(buf_len)))
2356
1870
        # Deinit the certificate
2357
 
        gnutls.openpgp_crt_deinit(crt)
 
1871
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2358
1872
        # Convert the buffer to a Python bytestring
2359
1873
        fpr = ctypes.string_at(buf, buf_len.value)
2360
1874
        # Convert the bytestring to hexadecimal notation
2364
1878
 
2365
1879
class MultiprocessingMixIn(object):
2366
1880
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2367
 
    
2368
1881
    def sub_process_main(self, request, address):
2369
1882
        try:
2370
1883
            self.finish_request(request, address)
2382
1895
 
2383
1896
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2384
1897
    """ adds a pipe to the MixIn """
2385
 
    
2386
1898
    def process_request(self, request, client_address):
2387
1899
        """Overrides and wraps the original process_request().
2388
1900
        
2397
1909
    
2398
1910
    def add_pipe(self, parent_pipe, proc):
2399
1911
        """Dummy function; override as necessary"""
2400
 
        raise NotImplementedError()
 
1912
        raise NotImplementedError
2401
1913
 
2402
1914
 
2403
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2409
1921
        interface:      None or a network interface name (string)
2410
1922
        use_ipv6:       Boolean; to use IPv6 or not
2411
1923
    """
2412
 
    
2413
1924
    def __init__(self, server_address, RequestHandlerClass,
2414
 
                 interface=None,
2415
 
                 use_ipv6=True,
2416
 
                 socketfd=None):
 
1925
                 interface=None, use_ipv6=True, socketfd=None):
2417
1926
        """If socketfd is set, use that file descriptor instead of
2418
1927
        creating a new one with socket.socket().
2419
1928
        """
2453
1962
        """This overrides the normal server_bind() function
2454
1963
        to bind to an interface if one was specified, and also NOT to
2455
1964
        bind to an address or port if they were not specified."""
2456
 
        global SO_BINDTODEVICE
2457
1965
        if self.interface is not None:
2458
1966
            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
 
1967
                logger.error("SO_BINDTODEVICE does not exist;"
 
1968
                             " cannot bind to interface %s",
 
1969
                             self.interface)
 
1970
            else:
 
1971
                try:
 
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1973
                                           SO_BINDTODEVICE,
 
1974
                                           str(self.interface + '\0'))
 
1975
                except socket.error as error:
 
1976
                    if error.errno == errno.EPERM:
 
1977
                        logger.error("No permission to bind to"
 
1978
                                     " interface %s", self.interface)
 
1979
                    elif error.errno == errno.ENOPROTOOPT:
 
1980
                        logger.error("SO_BINDTODEVICE not available;"
 
1981
                                     " cannot bind to interface %s",
 
1982
                                     self.interface)
 
1983
                    elif error.errno == errno.ENODEV:
 
1984
                        logger.error("Interface %s does not exist,"
 
1985
                                     " cannot bind", self.interface)
 
1986
                    else:
 
1987
                        raise
2480
1988
        # Only bind(2) the socket if we really need to.
2481
1989
        if self.server_address[0] or self.server_address[1]:
2482
1990
            if not self.server_address[0]:
2487
1995
                self.server_address = (any_address,
2488
1996
                                       self.server_address[1])
2489
1997
            elif not self.server_address[1]:
2490
 
                self.server_address = (self.server_address[0], 0)
 
1998
                self.server_address = (self.server_address[0],
 
1999
                                       0)
2491
2000
#                 if self.interface:
2492
2001
#                     self.server_address = (self.server_address[0],
2493
2002
#                                            0, # port
2505
2014
        gnutls_priority GnuTLS priority string
2506
2015
        use_dbus:       Boolean; to emit D-Bus signals or not
2507
2016
    
2508
 
    Assumes a GLib.MainLoop event loop.
 
2017
    Assumes a gobject.MainLoop event loop.
2509
2018
    """
2510
 
    
2511
2019
    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):
 
2020
                 interface=None, use_ipv6=True, clients=None,
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2518
2022
        self.enabled = False
2519
2023
        self.clients = clients
2520
2024
        if self.clients is None:
2526
2030
                                interface = interface,
2527
2031
                                use_ipv6 = use_ipv6,
2528
2032
                                socketfd = socketfd)
2529
 
    
2530
2033
    def server_activate(self):
2531
2034
        if self.enabled:
2532
2035
            return socketserver.TCPServer.server_activate(self)
2536
2039
    
2537
2040
    def add_pipe(self, parent_pipe, proc):
2538
2041
        # 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))
 
2042
        gobject.io_add_watch(parent_pipe.fileno(),
 
2043
                             gobject.IO_IN | gobject.IO_HUP,
 
2044
                             functools.partial(self.handle_ipc,
 
2045
                                               parent_pipe =
 
2046
                                               parent_pipe,
 
2047
                                               proc = proc))
2545
2048
    
2546
 
    def handle_ipc(self, source, condition,
2547
 
                   parent_pipe=None,
2548
 
                   proc = None,
2549
 
                   client_object=None):
 
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2050
                   proc = None, client_object=None):
2550
2051
        # error, or the other end of multiprocessing.Pipe has closed
2551
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2552
2053
            # Wait for other process to exit
2553
2054
            proc.join()
2554
2055
            return False
2561
2062
            fpr = request[1]
2562
2063
            address = request[2]
2563
2064
            
2564
 
            for c in self.clients.values():
 
2065
            for c in self.clients.itervalues():
2565
2066
                if c.fingerprint == fpr:
2566
2067
                    client = c
2567
2068
                    break
2575
2076
                parent_pipe.send(False)
2576
2077
                return False
2577
2078
            
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))
 
2079
            gobject.io_add_watch(parent_pipe.fileno(),
 
2080
                                 gobject.IO_IN | gobject.IO_HUP,
 
2081
                                 functools.partial(self.handle_ipc,
 
2082
                                                   parent_pipe =
 
2083
                                                   parent_pipe,
 
2084
                                                   proc = proc,
 
2085
                                                   client_object =
 
2086
                                                   client))
2585
2087
            parent_pipe.send(True)
2586
2088
            # remove the old hook in favor of the new above hook on
2587
2089
            # same fileno
2593
2095
            
2594
2096
            parent_pipe.send(('data', getattr(client_object,
2595
2097
                                              funcname)(*args,
2596
 
                                                        **kwargs)))
 
2098
                                                         **kwargs)))
2597
2099
        
2598
2100
        if command == 'getattr':
2599
2101
            attrname = request[1]
2600
 
            if isinstance(client_object.__getattribute__(attrname),
2601
 
                          collections.Callable):
2602
 
                parent_pipe.send(('function', ))
 
2102
            if callable(client_object.__getattribute__(attrname)):
 
2103
                parent_pipe.send(('function',))
2603
2104
            else:
2604
 
                parent_pipe.send((
2605
 
                    'data', client_object.__getattribute__(attrname)))
 
2105
                parent_pipe.send(('data', client_object
 
2106
                                  .__getattribute__(attrname)))
2606
2107
        
2607
2108
        if command == 'setattr':
2608
2109
            attrname = request[1]
2639
2140
    # avoid excessive use of external libraries.
2640
2141
    
2641
2142
    # 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
 
2143
    Token = collections.namedtuple("Token",
 
2144
                                   ("regexp", # To match token; if
 
2145
                                              # "value" is not None,
 
2146
                                              # must have a "group"
 
2147
                                              # containing digits
 
2148
                                    "value",  # datetime.timedelta or
 
2149
                                              # None
 
2150
                                    "followers")) # Tokens valid after
 
2151
                                                  # this token
2647
2152
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2648
2153
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2649
2154
    token_end = Token(re.compile(r"$"), None, frozenset())
2650
2155
    token_second = Token(re.compile(r"(\d+)S"),
2651
2156
                         datetime.timedelta(seconds=1),
2652
 
                         frozenset((token_end, )))
 
2157
                         frozenset((token_end,)))
2653
2158
    token_minute = Token(re.compile(r"(\d+)M"),
2654
2159
                         datetime.timedelta(minutes=1),
2655
2160
                         frozenset((token_second, token_end)))
2671
2176
                       frozenset((token_month, token_end)))
2672
2177
    token_week = Token(re.compile(r"(\d+)W"),
2673
2178
                       datetime.timedelta(weeks=1),
2674
 
                       frozenset((token_end, )))
 
2179
                       frozenset((token_end,)))
2675
2180
    token_duration = Token(re.compile(r"P"), None,
2676
2181
                           frozenset((token_year, token_month,
2677
2182
                                      token_day, token_time,
2678
 
                                      token_week)))
 
2183
                                      token_week))),
2679
2184
    # Define starting values
2680
2185
    value = datetime.timedelta() # Value so far
2681
2186
    found_token = None
2682
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
2683
2188
    s = duration                # String left to parse
2684
2189
    # Loop until end token is found
2685
2190
    while found_token is not token_end:
2702
2207
                break
2703
2208
        else:
2704
2209
            # No currently valid tokens were found
2705
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2706
 
                             .format(duration))
 
2210
            raise ValueError("Invalid RFC 3339 duration")
2707
2211
    # End token found
2708
2212
    return value
2709
2213
 
2733
2237
    timevalue = datetime.timedelta(0)
2734
2238
    for s in interval.split():
2735
2239
        try:
2736
 
            suffix = s[-1]
 
2240
            suffix = unicode(s[-1])
2737
2241
            value = int(s[:-1])
2738
2242
            if suffix == "d":
2739
2243
                delta = datetime.timedelta(value)
2746
2250
            elif suffix == "w":
2747
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2748
2252
            else:
2749
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2750
 
        except IndexError as e:
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
 
2255
        except (ValueError, IndexError) as e:
2751
2256
            raise ValueError(*(e.args))
2752
2257
        timevalue += delta
2753
2258
    return timevalue
2769
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2770
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2771
2276
            raise OSError(errno.ENODEV,
2772
 
                          "{} not a character device"
 
2277
                          "{0} not a character device"
2773
2278
                          .format(os.devnull))
2774
2279
        os.dup2(null, sys.stdin.fileno())
2775
2280
        os.dup2(null, sys.stdout.fileno())
2785
2290
    
2786
2291
    parser = argparse.ArgumentParser()
2787
2292
    parser.add_argument("-v", "--version", action="version",
2788
 
                        version = "%(prog)s {}".format(version),
 
2293
                        version = "%(prog)s {0}".format(version),
2789
2294
                        help="show version number and exit")
2790
2295
    parser.add_argument("-i", "--interface", metavar="IF",
2791
2296
                        help="Bind to interface IF")
2824
2329
                        help="Directory to save/restore state in")
2825
2330
    parser.add_argument("--foreground", action="store_true",
2826
2331
                        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
2332
    
2831
2333
    options = parser.parse_args()
2832
2334
    
2833
2335
    if options.check:
2834
2336
        import doctest
2835
 
        fail_count, test_count = doctest.testmod()
2836
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2337
        doctest.testmod()
 
2338
        sys.exit()
2837
2339
    
2838
2340
    # Default values for config file for server-global settings
2839
2341
    server_defaults = { "interface": "",
2841
2343
                        "port": "",
2842
2344
                        "debug": "False",
2843
2345
                        "priority":
2844
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2845
 
                        ":+SIGN-DSA-SHA256",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2846
2347
                        "servicename": "Mandos",
2847
2348
                        "use_dbus": "True",
2848
2349
                        "use_ipv6": "True",
2851
2352
                        "socket": "",
2852
2353
                        "statedir": "/var/lib/mandos",
2853
2354
                        "foreground": "False",
2854
 
                        "zeroconf": "True",
2855
 
                    }
 
2355
                        }
2856
2356
    
2857
2357
    # Parse config file for server-global settings
2858
2358
    server_config = configparser.SafeConfigParser(server_defaults)
2859
2359
    del server_defaults
2860
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2360
    server_config.read(os.path.join(options.configdir,
 
2361
                                    "mandos.conf"))
2861
2362
    # Convert the SafeConfigParser object to a dict
2862
2363
    server_settings = server_config.defaults()
2863
2364
    # Use the appropriate methods on the non-string config options
2881
2382
    # Override the settings from the config file with command line
2882
2383
    # options, if set.
2883
2384
    for option in ("interface", "address", "port", "debug",
2884
 
                   "priority", "servicename", "configdir", "use_dbus",
2885
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2886
 
                   "socket", "foreground", "zeroconf"):
 
2385
                   "priority", "servicename", "configdir",
 
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2387
                   "statedir", "socket", "foreground"):
2887
2388
        value = getattr(options, option)
2888
2389
        if value is not None:
2889
2390
            server_settings[option] = value
2890
2391
    del options
2891
2392
    # Force all strings to be unicode
2892
2393
    for option in server_settings.keys():
2893
 
        if isinstance(server_settings[option], bytes):
2894
 
            server_settings[option] = (server_settings[option]
2895
 
                                       .decode("utf-8"))
 
2394
        if type(server_settings[option]) is str:
 
2395
            server_settings[option] = unicode(server_settings[option])
2896
2396
    # Force all boolean options to be boolean
2897
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2898
 
                   "foreground", "zeroconf"):
 
2398
                   "foreground"):
2899
2399
        server_settings[option] = bool(server_settings[option])
2900
2400
    # Debug implies foreground
2901
2401
    if server_settings["debug"]:
2904
2404
    
2905
2405
    ##################################################################
2906
2406
    
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
2407
    # For convenience
2913
2408
    debug = server_settings["debug"]
2914
2409
    debuglevel = server_settings["debuglevel"]
2917
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2918
2413
                                     stored_state_file)
2919
2414
    foreground = server_settings["foreground"]
2920
 
    zeroconf = server_settings["zeroconf"]
2921
2415
    
2922
2416
    if debug:
2923
2417
        initlogger(debug, logging.DEBUG)
2929
2423
            initlogger(debug, level)
2930
2424
    
2931
2425
    if server_settings["servicename"] != "Mandos":
2932
 
        syslogger.setFormatter(
2933
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2934
 
                              ' %(levelname)s: %(message)s'.format(
2935
 
                                  server_settings["servicename"])))
 
2426
        syslogger.setFormatter(logging.Formatter
 
2427
                               ('Mandos ({0}) [%(process)d]:'
 
2428
                                ' %(levelname)s: %(message)s'
 
2429
                                .format(server_settings
 
2430
                                        ["servicename"])))
2936
2431
    
2937
2432
    # Parse config file with clients
2938
2433
    client_config = configparser.SafeConfigParser(Client
2943
2438
    global mandos_dbus_service
2944
2439
    mandos_dbus_service = None
2945
2440
    
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)
 
2441
    tcp_server = MandosServer((server_settings["address"],
 
2442
                               server_settings["port"]),
 
2443
                              ClientHandler,
 
2444
                              interface=(server_settings["interface"]
 
2445
                                         or None),
 
2446
                              use_ipv6=use_ipv6,
 
2447
                              gnutls_priority=
 
2448
                              server_settings["priority"],
 
2449
                              use_dbus=use_dbus,
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
2957
2452
    if not foreground:
2958
 
        pidfilename = "/run/mandos.pid"
2959
 
        if not os.path.isdir("/run/."):
2960
 
            pidfilename = "/var/run/mandos.pid"
 
2453
        pidfilename = "/var/run/mandos.pid"
2961
2454
        pidfile = None
2962
2455
        try:
2963
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2456
            pidfile = open(pidfilename, "w")
2964
2457
        except IOError as e:
2965
2458
            logger.error("Could not open file %r", pidfilename,
2966
2459
                         exc_info=e)
2967
2460
    
2968
 
    for name, group in (("_mandos", "_mandos"),
2969
 
                        ("mandos", "mandos"),
2970
 
                        ("nobody", "nogroup")):
 
2461
    for name in ("_mandos", "mandos", "nobody"):
2971
2462
        try:
2972
2463
            uid = pwd.getpwnam(name).pw_uid
2973
 
            gid = pwd.getpwnam(group).pw_gid
 
2464
            gid = pwd.getpwnam(name).pw_gid
2974
2465
            break
2975
2466
        except KeyError:
2976
2467
            continue
2980
2471
    try:
2981
2472
        os.setgid(gid)
2982
2473
        os.setuid(uid)
2983
 
        if debug:
2984
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2985
 
                                                             gid))
2986
2474
    except OSError as error:
2987
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2988
 
                       .format(uid, gid, os.strerror(error.errno)))
2989
2475
        if error.errno != errno.EPERM:
2990
 
            raise
 
2476
            raise error
2991
2477
    
2992
2478
    if debug:
2993
2479
        # Enable all possible GnuTLS debugging
2994
2480
        
2995
2481
        # "Use a log level over 10 to enable all debugging options."
2996
2482
        # - GnuTLS manual
2997
 
        gnutls.global_set_log_level(11)
 
2483
        gnutls.library.functions.gnutls_global_set_log_level(11)
2998
2484
        
2999
 
        @gnutls.log_func
 
2485
        @gnutls.library.types.gnutls_log_func
3000
2486
        def debug_gnutls(level, string):
3001
2487
            logger.debug("GnuTLS: %s", string[:-1])
3002
2488
        
3003
 
        gnutls.global_set_log_function(debug_gnutls)
 
2489
        (gnutls.library.functions
 
2490
         .gnutls_global_set_log_function(debug_gnutls))
3004
2491
        
3005
2492
        # Redirect stdin so all checkers get /dev/null
3006
2493
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3013
2500
        # Close all input and output, do double fork, etc.
3014
2501
        daemon()
3015
2502
    
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()
 
2503
    # multiprocessing will use threads, so before we use gobject we
 
2504
    # need to inform gobject that threads will be used.
 
2505
    gobject.threads_init()
3019
2506
    
3020
2507
    global main_loop
3021
2508
    # From the Avahi example code
3022
2509
    DBusGMainLoop(set_as_default=True)
3023
 
    main_loop = GLib.MainLoop()
 
2510
    main_loop = gobject.MainLoop()
3024
2511
    bus = dbus.SystemBus()
3025
2512
    # End of Avahi example code
3026
2513
    if use_dbus:
3027
2514
        try:
3028
2515
            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:
 
2516
                                            bus, do_not_queue=True)
 
2517
            old_bus_name = (dbus.service.BusName
 
2518
                            ("se.bsnet.fukt.Mandos", bus,
 
2519
                             do_not_queue=True))
 
2520
        except dbus.exceptions.NameExistsException as e:
3035
2521
            logger.error("Disabling D-Bus:", exc_info=e)
3036
2522
            use_dbus = False
3037
2523
            server_settings["use_dbus"] = False
3038
2524
            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"))
 
2525
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2526
    service = AvahiServiceToSyslog(name =
 
2527
                                   server_settings["servicename"],
 
2528
                                   servicetype = "_mandos._tcp",
 
2529
                                   protocol = protocol, bus = bus)
 
2530
    if server_settings["interface"]:
 
2531
        service.interface = (if_nametoindex
 
2532
                             (str(server_settings["interface"])))
3049
2533
    
3050
2534
    global multiprocessing_manager
3051
2535
    multiprocessing_manager = multiprocessing.Manager()
3070
2554
    if server_settings["restore"]:
3071
2555
        try:
3072
2556
            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"))
 
2557
                clients_data, old_client_settings = (pickle.load
 
2558
                                                     (stored_state))
3118
2559
            os.remove(stored_state_path)
3119
2560
        except IOError as e:
3120
2561
            if e.errno == errno.ENOENT:
3121
 
                logger.warning("Could not load persistent state:"
3122
 
                               " {}".format(os.strerror(e.errno)))
 
2562
                logger.warning("Could not load persistent state: {0}"
 
2563
                                .format(os.strerror(e.errno)))
3123
2564
            else:
3124
2565
                logger.critical("Could not load persistent state:",
3125
2566
                                exc_info=e)
3126
2567
                raise
3127
2568
        except EOFError as e:
3128
2569
            logger.warning("Could not load persistent state: "
3129
 
                           "EOFError:",
3130
 
                           exc_info=e)
 
2570
                           "EOFError:", exc_info=e)
3131
2571
    
3132
2572
    with PGPEngine() as pgp:
3133
 
        for client_name, client in clients_data.items():
 
2573
        for client_name, client in clients_data.iteritems():
3134
2574
            # Skip removed clients
3135
2575
            if client_name not in client_settings:
3136
2576
                continue
3145
2585
                    # For each value in new config, check if it
3146
2586
                    # differs from the old config value (Except for
3147
2587
                    # the "secret" attribute)
3148
 
                    if (name != "secret"
3149
 
                        and (value !=
3150
 
                             old_client_settings[client_name][name])):
 
2588
                    if (name != "secret" and
 
2589
                        value != old_client_settings[client_name]
 
2590
                        [name]):
3151
2591
                        client[name] = value
3152
2592
                except KeyError:
3153
2593
                    pass
3154
2594
            
3155
2595
            # Clients who has passed its expire date can still be
3156
 
            # enabled if its last checker was successful.  A Client
 
2596
            # enabled if its last checker was successful.  Clients
3157
2597
            # whose checker succeeded before we stored its state is
3158
2598
            # assumed to have successfully run all checkers during
3159
2599
            # downtime.
3161
2601
                if datetime.datetime.utcnow() >= client["expires"]:
3162
2602
                    if not client["last_checked_ok"]:
3163
2603
                        logger.warning(
3164
 
                            "disabling client {} - Client never "
3165
 
                            "performed a successful checker".format(
3166
 
                                client_name))
 
2604
                            "disabling client {0} - Client never "
 
2605
                            "performed a successful checker"
 
2606
                            .format(client_name))
3167
2607
                        client["enabled"] = False
3168
2608
                    elif client["last_checker_status"] != 0:
3169
2609
                        logger.warning(
3170
 
                            "disabling client {} - Client last"
3171
 
                            " checker failed with error code"
3172
 
                            " {}".format(
3173
 
                                client_name,
3174
 
                                client["last_checker_status"]))
 
2610
                            "disabling client {0} - Client "
 
2611
                            "last checker failed with error code {1}"
 
2612
                            .format(client_name,
 
2613
                                    client["last_checker_status"]))
3175
2614
                        client["enabled"] = False
3176
2615
                    else:
3177
 
                        client["expires"] = (
3178
 
                            datetime.datetime.utcnow()
3179
 
                            + client["timeout"])
 
2616
                        client["expires"] = (datetime.datetime
 
2617
                                             .utcnow()
 
2618
                                             + client["timeout"])
3180
2619
                        logger.debug("Last checker succeeded,"
3181
 
                                     " keeping {} enabled".format(
3182
 
                                         client_name))
 
2620
                                     " keeping {0} enabled"
 
2621
                                     .format(client_name))
3183
2622
            try:
3184
 
                client["secret"] = pgp.decrypt(
3185
 
                    client["encrypted_secret"],
3186
 
                    client_settings[client_name]["secret"])
 
2623
                client["secret"] = (
 
2624
                    pgp.decrypt(client["encrypted_secret"],
 
2625
                                client_settings[client_name]
 
2626
                                ["secret"]))
3187
2627
            except PGPError:
3188
2628
                # 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"])
 
2629
                logger.debug("Failed to decrypt {0} old secret"
 
2630
                             .format(client_name))
 
2631
                client["secret"] = (
 
2632
                    client_settings[client_name]["secret"])
3193
2633
    
3194
2634
    # Add/remove clients based on new changes made to config
3195
2635
    for client_name in (set(old_client_settings)
3200
2640
        clients_data[client_name] = client_settings[client_name]
3201
2641
    
3202
2642
    # Create all client objects
3203
 
    for client_name, client in clients_data.items():
 
2643
    for client_name, client in clients_data.iteritems():
3204
2644
        tcp_server.clients[client_name] = client_class(
3205
 
            name = client_name,
3206
 
            settings = client,
 
2645
            name = client_name, settings = client,
3207
2646
            server_settings = server_settings)
3208
2647
    
3209
2648
    if not tcp_server.clients:
3211
2650
    
3212
2651
    if not foreground:
3213
2652
        if pidfile is not None:
3214
 
            pid = os.getpid()
3215
2653
            try:
3216
2654
                with pidfile:
3217
 
                    print(pid, file=pidfile)
 
2655
                    pid = os.getpid()
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
3218
2657
            except IOError:
3219
2658
                logger.error("Could not write to file %r with PID %d",
3220
2659
                             pidfilename, pid)
3221
2660
        del pidfile
3222
2661
        del pidfilename
3223
2662
    
3224
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3225
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3226
 
                             lambda: main_loop.quit() and False)
 
2663
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2664
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3227
2665
    
3228
2666
    if use_dbus:
3229
 
        
3230
 
        @alternate_dbus_interfaces(
3231
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3232
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2667
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2668
                                        "se.bsnet.fukt.Mandos"})
 
2669
        class MandosDBusService(DBusObjectWithProperties):
3233
2670
            """A D-Bus proxy object"""
3234
 
            
3235
2671
            def __init__(self):
3236
2672
                dbus.service.Object.__init__(self, bus, "/")
3237
 
            
3238
2673
            _interface = "se.recompile.Mandos"
3239
2674
            
 
2675
            @dbus_interface_annotations(_interface)
 
2676
            def _foo(self):
 
2677
                return { "org.freedesktop.DBus.Property"
 
2678
                         ".EmitsChangedSignal":
 
2679
                             "false"}
 
2680
            
3240
2681
            @dbus.service.signal(_interface, signature="o")
3241
2682
            def ClientAdded(self, objpath):
3242
2683
                "D-Bus signal"
3247
2688
                "D-Bus signal"
3248
2689
                pass
3249
2690
            
3250
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3251
 
                               "true"})
3252
2691
            @dbus.service.signal(_interface, signature="os")
3253
2692
            def ClientRemoved(self, objpath, name):
3254
2693
                "D-Bus signal"
3255
2694
                pass
3256
2695
            
3257
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3258
 
                               "true"})
3259
2696
            @dbus.service.method(_interface, out_signature="ao")
3260
2697
            def GetAllClients(self):
3261
2698
                "D-Bus method"
3262
 
                return dbus.Array(c.dbus_object_path for c in
3263
 
                                  tcp_server.clients.values())
 
2699
                return dbus.Array(c.dbus_object_path
 
2700
                                  for c in
 
2701
                                  tcp_server.clients.itervalues())
3264
2702
            
3265
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3266
 
                               "true"})
3267
2703
            @dbus.service.method(_interface,
3268
2704
                                 out_signature="a{oa{sv}}")
3269
2705
            def GetAllClientsWithProperties(self):
3270
2706
                "D-Bus method"
3271
2707
                return dbus.Dictionary(
3272
 
                    { c.dbus_object_path: c.GetAll(
3273
 
                        "se.recompile.Mandos.Client")
3274
 
                      for c in tcp_server.clients.values() },
 
2708
                    ((c.dbus_object_path, c.GetAll(""))
 
2709
                     for c in tcp_server.clients.itervalues()),
3275
2710
                    signature="oa{sv}")
3276
2711
            
3277
2712
            @dbus.service.method(_interface, in_signature="o")
3278
2713
            def RemoveClient(self, object_path):
3279
2714
                "D-Bus method"
3280
 
                for c in tcp_server.clients.values():
 
2715
                for c in tcp_server.clients.itervalues():
3281
2716
                    if c.dbus_object_path == object_path:
3282
2717
                        del tcp_server.clients[c.name]
3283
2718
                        c.remove_from_connection()
3284
 
                        # Don't signal the disabling
 
2719
                        # Don't signal anything except ClientRemoved
3285
2720
                        c.disable(quiet=True)
3286
 
                        # Emit D-Bus signal for removal
3287
 
                        self.client_removed_signal(c)
 
2721
                        # Emit D-Bus signal
 
2722
                        self.ClientRemoved(object_path, c.name)
3288
2723
                        return
3289
2724
                raise KeyError(object_path)
3290
2725
            
3291
2726
            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
2727
        
3329
2728
        mandos_dbus_service = MandosDBusService()
3330
2729
    
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
2730
    def cleanup():
3336
2731
        "Cleanup function; run on exit"
3337
 
        if zeroconf:
3338
 
            service.cleanup()
 
2732
        service.cleanup()
3339
2733
        
3340
 
        mp.active_children()
3341
 
        wn.close()
 
2734
        multiprocessing.active_children()
 
2735
        wnull.close()
3342
2736
        if not (tcp_server.clients or client_settings):
3343
2737
            return
3344
2738
        
3347
2741
        # removed/edited, old secret will thus be unrecovable.
3348
2742
        clients = {}
3349
2743
        with PGPEngine() as pgp:
3350
 
            for client in tcp_server.clients.values():
 
2744
            for client in tcp_server.clients.itervalues():
3351
2745
                key = client_settings[client.name]["secret"]
3352
2746
                client.encrypted_secret = pgp.encrypt(client.secret,
3353
2747
                                                      key)
3355
2749
                
3356
2750
                # A list of attributes that can not be pickled
3357
2751
                # + secret.
3358
 
                exclude = { "bus", "changedstate", "secret",
3359
 
                            "checker", "server_settings" }
3360
 
                for name, typ in inspect.getmembers(dbus.service
3361
 
                                                    .Object):
 
2752
                exclude = set(("bus", "changedstate", "secret",
 
2753
                               "checker", "server_settings"))
 
2754
                for name, typ in (inspect.getmembers
 
2755
                                  (dbus.service.Object)):
3362
2756
                    exclude.add(name)
3363
2757
                
3364
2758
                client_dict["encrypted_secret"] = (client
3371
2765
                del client_settings[client.name]["secret"]
3372
2766
        
3373
2767
        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
 
2768
            with (tempfile.NamedTemporaryFile
 
2769
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2770
                   dir=os.path.dirname(stored_state_path),
 
2771
                   delete=False)) as stored_state:
 
2772
                pickle.dump((clients, client_settings), stored_state)
 
2773
                tempname=stored_state.name
3383
2774
            os.rename(tempname, stored_state_path)
3384
2775
        except (IOError, OSError) as e:
3385
2776
            if not debug:
3388
2779
                except NameError:
3389
2780
                    pass
3390
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3391
 
                logger.warning("Could not save persistent state: {}"
 
2782
                logger.warning("Could not save persistent state: {0}"
3392
2783
                               .format(os.strerror(e.errno)))
3393
2784
            else:
3394
2785
                logger.warning("Could not save persistent state:",
3395
2786
                               exc_info=e)
3396
 
                raise
 
2787
                raise e
3397
2788
        
3398
2789
        # Delete all clients, and settings from config
3399
2790
        while tcp_server.clients:
3400
2791
            name, client = tcp_server.clients.popitem()
3401
2792
            if use_dbus:
3402
2793
                client.remove_from_connection()
3403
 
            # Don't signal the disabling
 
2794
            # Don't signal anything except ClientRemoved
3404
2795
            client.disable(quiet=True)
3405
 
            # Emit D-Bus signal for removal
3406
2796
            if use_dbus:
3407
 
                mandos_dbus_service.client_removed_signal(client)
 
2797
                # Emit D-Bus signal
 
2798
                mandos_dbus_service.ClientRemoved(client
 
2799
                                                  .dbus_object_path,
 
2800
                                                  client.name)
3408
2801
        client_settings.clear()
3409
2802
    
3410
2803
    atexit.register(cleanup)
3411
2804
    
3412
 
    for client in tcp_server.clients.values():
 
2805
    for client in tcp_server.clients.itervalues():
3413
2806
        if use_dbus:
3414
 
            # Emit D-Bus signal for adding
3415
 
            mandos_dbus_service.client_added_signal(client)
 
2807
            # Emit D-Bus signal
 
2808
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3416
2809
        # Need to initiate checking of clients
3417
2810
        if client.enabled:
3418
2811
            client.init_checker()
3421
2814
    tcp_server.server_activate()
3422
2815
    
3423
2816
    # Find out what port we got
3424
 
    if zeroconf:
3425
 
        service.port = tcp_server.socket.getsockname()[1]
 
2817
    service.port = tcp_server.socket.getsockname()[1]
3426
2818
    if use_ipv6:
3427
2819
        logger.info("Now listening on address %r, port %d,"
3428
2820
                    " flowinfo %d, scope_id %d",
3434
2826
    #service.interface = tcp_server.socket.getsockname()[3]
3435
2827
    
3436
2828
    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
 
2829
        # From the Avahi example code
 
2830
        try:
 
2831
            service.activate()
 
2832
        except dbus.exceptions.DBusException as error:
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
 
2834
            cleanup()
 
2835
            sys.exit(1)
 
2836
        # End of Avahi example code
3446
2837
        
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))
 
2838
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2839
                             lambda *args, **kwargs:
 
2840
                             (tcp_server.handle_request
 
2841
                              (*args[2:], **kwargs) or True))
3451
2842
        
3452
2843
        logger.debug("Starting main loop")
3453
2844
        main_loop.run()
3463
2854
    # Must run before the D-Bus bus name gets deregistered
3464
2855
    cleanup()
3465
2856
 
3466
 
 
3467
2857
if __name__ == '__main__':
3468
2858
    main()