/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: 2014-08-09 13:12:55 UTC
  • Revision ID: teddy@recompile.se-20140809131255-lp31j98u2pl0xpe6
mandos: Stop using str() and remove unnecessary unicode() calls.

* mandos (if_nametoindex): Use "bytes" literal instead of str().
  (initlogger): Use a unicode string for log device.
  (AvahiError.__unicode__): Removed.
  (DBusPropertyException.__unicode__): - '' -
  (ClientDBus.Secret_dbus_property): Use bytes() instead of str().
  (IPv6_TCPServer.server_bind): Use .encode() instead of str().
  (string_to_delta): Removed unnecessary unicode() call.
  (main): Use "isinstance(x, bytes)" instead of "type(x) is str", use
          .decode() instead of unicode(), and use .encode() instead of
          str().

Show diffs side-by-side

added added

removed removed

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