/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-03-12 20:23:15 UTC
  • Revision ID: teddy@recompile.se-20160312202315-hu7b87ivetlxqbw3
Server: Fix minor thing with Python 3 compatibility

Fix another small thing with unpickling string values.

* mandos (main): When restoring pickled client data, only decode byte
                 string for "host" key if it really is a byte string.

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