/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-12-31 16:02:18 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131231160218-plmmb0o0iifkd5l2
Specify BusName in systemd service file.

* mandos.service (BusName): Uncommented.

Show diffs side-by-side

added added

removed removed

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