/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-07-25 22:44:20 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725224420-4a5ct2ptt0hsc92z
Require Python 2.7.

This is in preparation for the eventual move to Python 3, which will
happen as soon as all Python modules required by Mandos are available.
The mandos-ctl and mandos-monitor programs are already portable
between Python 2.6 and Python 3 without changes; this change will
bring the requirement up to Python 2.7.

* INSTALL (Prerequisites/Libraries/Mandos Server): Document
                                                   requirement of
                                                   Python 2.7; remove
                                                   Python-argparse
                                                   which is in the
                                                   Python 2.7 standard
                                                   library.
* debian/control (Source: mandos/Build-Depends-Indep): Depend on
                                                       exactly the
                                                       python2.7
                                                       package and all
                                                       the Python 2.7
                                                       versions of the
                                                       python modules.
  (Package: mandos/Depends): - '' - but still depend on python (<=2.7)
                            and the generic versions of the Python
                            modules; this is for mandos-ctl and
                            mandos-monitor, both of which are
                            compatible with Python 3, and use
                            #!/usr/bin/python.
* mandos: Use #!/usr/bin/python2.7 instead of #!/usr/bin/python.

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