/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: 2016-03-05 21:46:00 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 335.
  • Revision ID: teddy@recompile.se-20160305214600-2d7peg8qb5xhpi64
Fix incorrect documentation of minor limitation

* mandos-monitor.xml (BUGS): The name which is hard-coded is the D-Bus
                             *bus* name, not the service name.  Fix
                             the documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2016 Teddy Hogeborn
 
15
# Copyright © 2008-2016 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
import SocketServer as socketserver
 
37
from future_builtins import *
 
38
 
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
38
43
import socket
39
44
import argparse
40
45
import datetime
41
46
import errno
42
 
import gnutls.crypto
43
 
import gnutls.connection
44
 
import gnutls.errors
45
 
import gnutls.library.functions
46
 
import gnutls.library.constants
47
 
import gnutls.library.types
48
 
import ConfigParser as configparser
 
47
try:
 
48
    import ConfigParser as configparser
 
49
except ImportError:
 
50
    import configparser
49
51
import sys
50
52
import re
51
53
import os
60
62
import struct
61
63
import fcntl
62
64
import functools
63
 
import cPickle as pickle
 
65
try:
 
66
    import cPickle as pickle
 
67
except ImportError:
 
68
    import pickle
64
69
import multiprocessing
65
70
import types
66
 
import hashlib
 
71
import binascii
 
72
import tempfile
 
73
import itertools
 
74
import collections
 
75
import codecs
67
76
 
68
77
import dbus
69
78
import dbus.service
70
 
import gobject
 
79
try:
 
80
    from gi.repository import GObject
 
81
except ImportError:
 
82
    import gobject as GObject
71
83
import avahi
72
84
from dbus.mainloop.glib import DBusGMainLoop
73
85
import ctypes
74
86
import ctypes.util
75
87
import xml.dom.minidom
76
88
import inspect
77
 
import Crypto.Cipher.AES
78
89
 
79
90
try:
80
91
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
95
    except ImportError:
85
96
        SO_BINDTODEVICE = None
86
97
 
 
98
if sys.version_info.major == 2:
 
99
    str = unicode
87
100
 
88
 
version = "1.4.1"
89
 
stored_state_path = "/var/lib/mandos/clients.pickle"
 
101
version = "1.7.3"
 
102
stored_state_file = "clients.pickle"
90
103
 
91
104
logger = logging.getLogger()
92
 
syslogger = (logging.handlers.SysLogHandler
93
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
 
              address = str("/dev/log")))
 
105
syslogger = None
95
106
 
96
107
try:
97
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
98
 
                      (ctypes.util.find_library("c"))
99
 
                      .if_nametoindex)
 
108
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
109
        ctypes.util.find_library("c")).if_nametoindex
100
110
except (OSError, AttributeError):
 
111
    
101
112
    def if_nametoindex(interface):
102
113
        "Get an interface index the hard way, i.e. using fcntl()"
103
114
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
104
115
        with contextlib.closing(socket.socket()) as s:
105
116
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
 
                                struct.pack(str("16s16x"),
107
 
                                            interface))
108
 
        interface_index = struct.unpack(str("I"),
109
 
                                        ifreq[16:20])[0]
 
117
                                struct.pack(b"16s16x", interface))
 
118
        interface_index = struct.unpack("I", ifreq[16:20])[0]
110
119
        return interface_index
111
120
 
112
121
 
113
 
def initlogger(level=logging.WARNING):
 
122
def initlogger(debug, level=logging.WARNING):
114
123
    """init logger and add loglevel"""
115
124
    
 
125
    global syslogger
 
126
    syslogger = (logging.handlers.SysLogHandler(
 
127
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
128
        address = "/dev/log"))
116
129
    syslogger.setFormatter(logging.Formatter
117
130
                           ('Mandos [%(process)d]: %(levelname)s:'
118
131
                            ' %(message)s'))
119
132
    logger.addHandler(syslogger)
120
133
    
121
 
    console = logging.StreamHandler()
122
 
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
123
 
                                           ' [%(process)d]:'
124
 
                                           ' %(levelname)s:'
125
 
                                           ' %(message)s'))
126
 
    logger.addHandler(console)
 
134
    if debug:
 
135
        console = logging.StreamHandler()
 
136
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
137
                                               ' [%(process)d]:'
 
138
                                               ' %(levelname)s:'
 
139
                                               ' %(message)s'))
 
140
        logger.addHandler(console)
127
141
    logger.setLevel(level)
128
142
 
129
143
 
 
144
class PGPError(Exception):
 
145
    """Exception if encryption/decryption fails"""
 
146
    pass
 
147
 
 
148
 
 
149
class PGPEngine(object):
 
150
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
151
    
 
152
    def __init__(self):
 
153
        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
        self.gnupgargs = ['--batch',
 
166
                          '--homedir', self.tempdir,
 
167
                          '--force-mdc',
 
168
                          '--quiet',
 
169
                          '--no-use-agent']
 
170
    
 
171
    def __enter__(self):
 
172
        return self
 
173
    
 
174
    def __exit__(self, exc_type, exc_value, traceback):
 
175
        self._cleanup()
 
176
        return False
 
177
    
 
178
    def __del__(self):
 
179
        self._cleanup()
 
180
    
 
181
    def _cleanup(self):
 
182
        if self.tempdir is not None:
 
183
            # Delete contents of tempdir
 
184
            for root, dirs, files in os.walk(self.tempdir,
 
185
                                             topdown = False):
 
186
                for filename in files:
 
187
                    os.remove(os.path.join(root, filename))
 
188
                for dirname in dirs:
 
189
                    os.rmdir(os.path.join(root, dirname))
 
190
            # Remove tempdir
 
191
            os.rmdir(self.tempdir)
 
192
            self.tempdir = None
 
193
    
 
194
    def password_encode(self, password):
 
195
        # Passphrase can not be empty and can not contain newlines or
 
196
        # NUL bytes.  So we prefix it and hex encode it.
 
197
        encoded = b"mandos" + binascii.hexlify(password)
 
198
        if len(encoded) > 2048:
 
199
            # GnuPG can't handle long passwords, so encode differently
 
200
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
201
                       .replace(b"\n", b"\\n")
 
202
                       .replace(b"\0", b"\\x00"))
 
203
        return encoded
 
204
    
 
205
    def encrypt(self, data, password):
 
206
        passphrase = self.password_encode(password)
 
207
        with tempfile.NamedTemporaryFile(
 
208
                dir=self.tempdir) as passfile:
 
209
            passfile.write(passphrase)
 
210
            passfile.flush()
 
211
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
212
                                     '--passphrase-file',
 
213
                                     passfile.name]
 
214
                                    + self.gnupgargs,
 
215
                                    stdin = subprocess.PIPE,
 
216
                                    stdout = subprocess.PIPE,
 
217
                                    stderr = subprocess.PIPE)
 
218
            ciphertext, err = proc.communicate(input = data)
 
219
        if proc.returncode != 0:
 
220
            raise PGPError(err)
 
221
        return ciphertext
 
222
    
 
223
    def decrypt(self, data, password):
 
224
        passphrase = self.password_encode(password)
 
225
        with tempfile.NamedTemporaryFile(
 
226
                dir = self.tempdir) as passfile:
 
227
            passfile.write(passphrase)
 
228
            passfile.flush()
 
229
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
230
                                     '--passphrase-file',
 
231
                                     passfile.name]
 
232
                                    + self.gnupgargs,
 
233
                                    stdin = subprocess.PIPE,
 
234
                                    stdout = subprocess.PIPE,
 
235
                                    stderr = subprocess.PIPE)
 
236
            decrypted_plaintext, err = proc.communicate(input = data)
 
237
        if proc.returncode != 0:
 
238
            raise PGPError(err)
 
239
        return decrypted_plaintext
 
240
 
 
241
 
130
242
class AvahiError(Exception):
131
243
    def __init__(self, value, *args, **kwargs):
132
244
        self.value = value
133
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
134
 
    def __unicode__(self):
135
 
        return unicode(repr(self.value))
 
245
        return super(AvahiError, self).__init__(value, *args,
 
246
                                                **kwargs)
 
247
 
136
248
 
137
249
class AvahiServiceError(AvahiError):
138
250
    pass
139
251
 
 
252
 
140
253
class AvahiGroupError(AvahiError):
141
254
    pass
142
255
 
149
262
               Used to optionally bind to the specified interface.
150
263
    name: string; Example: 'Mandos'
151
264
    type: string; Example: '_mandos._tcp'.
152
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
265
     See <https://www.iana.org/assignments/service-names-port-numbers>
153
266
    port: integer; what port to announce
154
267
    TXT: list of strings; TXT record for the service
155
268
    domain: string; Domain to publish on, default to .local if empty.
161
274
    server: D-Bus Server
162
275
    bus: dbus.SystemBus()
163
276
    """
164
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
165
 
                 servicetype = None, port = None, TXT = None,
166
 
                 domain = "", host = "", max_renames = 32768,
167
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
277
    
 
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):
168
289
        self.interface = interface
169
290
        self.name = name
170
291
        self.type = servicetype
179
300
        self.server = None
180
301
        self.bus = bus
181
302
        self.entry_group_state_changed_match = None
182
 
    def rename(self):
 
303
    
 
304
    def rename(self, remove=True):
183
305
        """Derived from the Avahi example code"""
184
306
        if self.rename_count >= self.max_renames:
185
307
            logger.critical("No suitable Zeroconf service name found"
186
308
                            " after %i retries, exiting.",
187
309
                            self.rename_count)
188
310
            raise AvahiServiceError("Too many renames")
189
 
        self.name = unicode(self.server
190
 
                            .GetAlternativeServiceName(self.name))
 
311
        self.name = str(
 
312
            self.server.GetAlternativeServiceName(self.name))
 
313
        self.rename_count += 1
191
314
        logger.info("Changing Zeroconf service name to %r ...",
192
315
                    self.name)
193
 
        self.remove()
 
316
        if remove:
 
317
            self.remove()
194
318
        try:
195
319
            self.add()
196
320
        except dbus.exceptions.DBusException as error:
197
 
            logger.critical("DBusException: %s", error)
198
 
            self.cleanup()
199
 
            os._exit(1)
200
 
        self.rename_count += 1
 
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)
 
329
    
201
330
    def remove(self):
202
331
        """Derived from the Avahi example code"""
203
332
        if self.entry_group_state_changed_match is not None:
205
334
            self.entry_group_state_changed_match = None
206
335
        if self.group is not None:
207
336
            self.group.Reset()
 
337
    
208
338
    def add(self):
209
339
        """Derived from the Avahi example code"""
210
340
        self.remove()
227
357
            dbus.UInt16(self.port),
228
358
            avahi.string_array_to_txt_array(self.TXT))
229
359
        self.group.Commit()
 
360
    
230
361
    def entry_group_state_changed(self, state, error):
231
362
        """Derived from the Avahi example code"""
232
363
        logger.debug("Avahi entry group state change: %i", state)
238
369
            self.rename()
239
370
        elif state == avahi.ENTRY_GROUP_FAILURE:
240
371
            logger.critical("Avahi: Error in group state changed %s",
241
 
                            unicode(error))
242
 
            raise AvahiGroupError("State changed: %s"
243
 
                                  % unicode(error))
 
372
                            str(error))
 
373
            raise AvahiGroupError("State changed: {!s}".format(error))
 
374
    
244
375
    def cleanup(self):
245
376
        """Derived from the Avahi example code"""
246
377
        if self.group is not None:
251
382
                pass
252
383
            self.group = None
253
384
        self.remove()
 
385
    
254
386
    def server_state_changed(self, state, error=None):
255
387
        """Derived from the Avahi example code"""
256
388
        logger.debug("Avahi server state change: %i", state)
257
 
        bad_states = { avahi.SERVER_INVALID:
258
 
                           "Zeroconf server invalid",
259
 
                       avahi.SERVER_REGISTERING: None,
260
 
                       avahi.SERVER_COLLISION:
261
 
                           "Zeroconf server name collision",
262
 
                       avahi.SERVER_FAILURE:
263
 
                           "Zeroconf server failure" }
 
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
        }
264
395
        if state in bad_states:
265
396
            if bad_states[state] is not None:
266
397
                if error is None:
269
400
                    logger.error(bad_states[state] + ": %r", error)
270
401
            self.cleanup()
271
402
        elif state == avahi.SERVER_RUNNING:
272
 
            self.add()
 
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)
273
415
        else:
274
416
            if error is None:
275
417
                logger.debug("Unknown state: %r", state)
276
418
            else:
277
419
                logger.debug("Unknown state: %r: %r", state, error)
 
420
    
278
421
    def activate(self):
279
422
        """Derived from the Avahi example code"""
280
423
        if self.server is None:
284
427
                                    follow_name_owner_changes=True),
285
428
                avahi.DBUS_INTERFACE_SERVER)
286
429
        self.server.connect_to_signal("StateChanged",
287
 
                                 self.server_state_changed)
 
430
                                      self.server_state_changed)
288
431
        self.server_state_changed(self.server.GetState())
289
432
 
 
433
 
290
434
class AvahiServiceToSyslog(AvahiService):
291
 
    def rename(self):
 
435
    def rename(self, *args, **kwargs):
292
436
        """Add the new name to the syslog messages"""
293
 
        ret = AvahiService.rename(self)
294
 
        syslogger.setFormatter(logging.Formatter
295
 
                               ('Mandos (%s) [%%(process)d]:'
296
 
                                ' %%(levelname)s: %%(message)s'
297
 
                                % self.name))
 
437
        ret = AvahiService.rename(self, *args, **kwargs)
 
438
        syslogger.setFormatter(logging.Formatter(
 
439
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
440
            .format(self.name)))
298
441
        return ret
299
442
 
300
 
def _timedelta_to_milliseconds(td):
301
 
    "Convert a datetime.timedelta() to milliseconds"
302
 
    return ((td.days * 24 * 60 * 60 * 1000)
303
 
            + (td.seconds * 1000)
304
 
            + (td.microseconds // 1000))
305
 
        
 
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()
 
707
 
306
708
class Client(object):
307
709
    """A representation of a client host served by this server.
308
710
    
309
711
    Attributes:
310
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
712
    approved:   bool(); 'None' if not yet approved/disapproved
311
713
    approval_delay: datetime.timedelta(); Time to wait for approval
312
714
    approval_duration: datetime.timedelta(); Duration of one approval
313
715
    checker:    subprocess.Popen(); a running checker process used
314
716
                                    to see if the client lives.
315
717
                                    'None' if no process is running.
316
 
    checker_callback_tag: a gobject event source tag, or None
 
718
    checker_callback_tag: a GObject event source tag, or None
317
719
    checker_command: string; External command which is run to check
318
720
                     if client lives.  %() expansions are done at
319
721
                     runtime with vars(self) as dict, so that for
320
722
                     instance %(name)s can be used in the command.
321
 
    checker_initiator_tag: a gobject event source tag, or None
 
723
    checker_initiator_tag: a GObject event source tag, or None
322
724
    created:    datetime.datetime(); (UTC) object creation
323
725
    client_structure: Object describing what attributes a client has
324
726
                      and is used for storing the client at exit
325
727
    current_checker_command: string; current running checker_command
326
 
    disable_initiator_tag: a gobject event source tag, or None
 
728
    disable_initiator_tag: a GObject event source tag, or None
327
729
    enabled:    bool()
328
730
    fingerprint: string (40 or 32 hexadecimal digits); used to
329
731
                 uniquely identify the client
331
733
    interval:   datetime.timedelta(); How often to start a new checker
332
734
    last_approval_request: datetime.datetime(); (UTC) or None
333
735
    last_checked_ok: datetime.datetime(); (UTC) or None
334
 
    last_checker_status: integer between 0 and 255 reflecting exit status
335
 
                         of last checker. -1 reflect crashed checker,
336
 
                         or None.
337
 
    last_enabled: datetime.datetime(); (UTC)
 
736
    last_checker_status: integer between 0 and 255 reflecting exit
 
737
                         status of last checker. -1 reflects crashed
 
738
                         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
    last_enabled: datetime.datetime(); (UTC) or None
338
742
    name:       string; from the config file, used in log messages and
339
743
                        D-Bus identifiers
340
744
    secret:     bytestring; sent verbatim (over TLS) to client
341
745
    timeout:    datetime.timedelta(); How long from last_checked_ok
342
746
                                      until this client is disabled
343
 
    extended_timeout:   extra long timeout when password has been sent
 
747
    extended_timeout:   extra long timeout when secret has been sent
344
748
    runtime_expansions: Allowed attributes for runtime expansion.
345
749
    expires:    datetime.datetime(); time (UTC) when a client will be
346
750
                disabled, or None
 
751
    server_settings: The server_settings dict from main()
347
752
    """
348
753
    
349
754
    runtime_expansions = ("approval_delay", "approval_duration",
350
 
                          "created", "enabled", "fingerprint",
351
 
                          "host", "interval", "last_checked_ok",
 
755
                          "created", "enabled", "expires",
 
756
                          "fingerprint", "host", "interval",
 
757
                          "last_approval_request", "last_checked_ok",
352
758
                          "last_enabled", "name", "timeout")
353
 
    
354
 
    def timeout_milliseconds(self):
355
 
        "Return the 'timeout' attribute in milliseconds"
356
 
        return _timedelta_to_milliseconds(self.timeout)
357
 
    
358
 
    def extended_timeout_milliseconds(self):
359
 
        "Return the 'extended_timeout' attribute in milliseconds"
360
 
        return _timedelta_to_milliseconds(self.extended_timeout)
361
 
    
362
 
    def interval_milliseconds(self):
363
 
        "Return the 'interval' attribute in milliseconds"
364
 
        return _timedelta_to_milliseconds(self.interval)
365
 
    
366
 
    def approval_delay_milliseconds(self):
367
 
        return _timedelta_to_milliseconds(self.approval_delay)
368
 
    
369
 
    def __init__(self, name = None, config=None):
370
 
        """Note: the 'checker' key in 'config' sets the
371
 
        'checker_command' attribute and *not* the 'checker'
372
 
        attribute."""
 
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
    }
 
770
    
 
771
    @staticmethod
 
772
    def config_parser(config):
 
773
        """Construct a new dict of client settings of this form:
 
774
        { client_name: {setting_name: value, ...}, ...}
 
775
        with exceptions for any special settings as defined above.
 
776
        NOTE: Must be a pure function. Must return the same result
 
777
        value given the same arguments.
 
778
        """
 
779
        settings = {}
 
780
        for client_name in config.sections():
 
781
            section = dict(config.items(client_name))
 
782
            client = settings[client_name] = {}
 
783
            
 
784
            client["host"] = section["host"]
 
785
            # Reformat values from string types to Python types
 
786
            client["approved_by_default"] = config.getboolean(
 
787
                client_name, "approved_by_default")
 
788
            client["enabled"] = config.getboolean(client_name,
 
789
                                                  "enabled")
 
790
            
 
791
            # Uppercase and remove spaces from fingerprint for later
 
792
            # comparison purposes with return value from the
 
793
            # fingerprint() function
 
794
            client["fingerprint"] = (section["fingerprint"].upper()
 
795
                                     .replace(" ", ""))
 
796
            if "secret" in section:
 
797
                client["secret"] = section["secret"].decode("base64")
 
798
            elif "secfile" in section:
 
799
                with open(os.path.expanduser(os.path.expandvars
 
800
                                             (section["secfile"])),
 
801
                          "rb") as secfile:
 
802
                    client["secret"] = secfile.read()
 
803
            else:
 
804
                raise TypeError("No secret or secfile for section {}"
 
805
                                .format(section))
 
806
            client["timeout"] = string_to_delta(section["timeout"])
 
807
            client["extended_timeout"] = string_to_delta(
 
808
                section["extended_timeout"])
 
809
            client["interval"] = string_to_delta(section["interval"])
 
810
            client["approval_delay"] = string_to_delta(
 
811
                section["approval_delay"])
 
812
            client["approval_duration"] = string_to_delta(
 
813
                section["approval_duration"])
 
814
            client["checker_command"] = section["checker"]
 
815
            client["last_approval_request"] = None
 
816
            client["last_checked_ok"] = None
 
817
            client["last_checker_status"] = -2
 
818
        
 
819
        return settings
 
820
    
 
821
    def __init__(self, settings, name = None, server_settings=None):
373
822
        self.name = name
374
 
        if config is None:
375
 
            config = {}
 
823
        if server_settings is None:
 
824
            server_settings = {}
 
825
        self.server_settings = server_settings
 
826
        # adding all client settings
 
827
        for setting, value in settings.items():
 
828
            setattr(self, setting, value)
 
829
        
 
830
        if self.enabled:
 
831
            if not hasattr(self, "last_enabled"):
 
832
                self.last_enabled = datetime.datetime.utcnow()
 
833
            if not hasattr(self, "expires"):
 
834
                self.expires = (datetime.datetime.utcnow()
 
835
                                + self.timeout)
 
836
        else:
 
837
            self.last_enabled = None
 
838
            self.expires = None
 
839
        
376
840
        logger.debug("Creating client %r", self.name)
377
 
        # Uppercase and remove spaces from fingerprint for later
378
 
        # comparison purposes with return value from the fingerprint()
379
 
        # function
380
 
        self.fingerprint = (config["fingerprint"].upper()
381
 
                            .replace(" ", ""))
382
841
        logger.debug("  Fingerprint: %s", self.fingerprint)
383
 
        if "secret" in config:
384
 
            self.secret = config["secret"].decode("base64")
385
 
        elif "secfile" in config:
386
 
            with open(os.path.expanduser(os.path.expandvars
387
 
                                         (config["secfile"])),
388
 
                      "rb") as secfile:
389
 
                self.secret = secfile.read()
390
 
        else:
391
 
            raise TypeError("No secret or secfile for client %s"
392
 
                            % self.name)
393
 
        self.host = config.get("host", "")
394
 
        self.created = datetime.datetime.utcnow()
395
 
        self.enabled = True
396
 
        self.last_approval_request = None
397
 
        self.last_enabled = datetime.datetime.utcnow()
398
 
        self.last_checked_ok = None
399
 
        self.last_checker_status = None
400
 
        self.timeout = string_to_delta(config["timeout"])
401
 
        self.extended_timeout = string_to_delta(config
402
 
                                                ["extended_timeout"])
403
 
        self.interval = string_to_delta(config["interval"])
 
842
        self.created = settings.get("created",
 
843
                                    datetime.datetime.utcnow())
 
844
        
 
845
        # attributes specific for this server instance
404
846
        self.checker = None
405
847
        self.checker_initiator_tag = None
406
848
        self.disable_initiator_tag = None
407
 
        self.expires = datetime.datetime.utcnow() + self.timeout
408
849
        self.checker_callback_tag = None
409
 
        self.checker_command = config["checker"]
410
850
        self.current_checker_command = None
411
 
        self._approved = None
412
 
        self.approved_by_default = config.get("approved_by_default",
413
 
                                              True)
 
851
        self.approved = None
414
852
        self.approvals_pending = 0
415
 
        self.approval_delay = string_to_delta(
416
 
            config["approval_delay"])
417
 
        self.approval_duration = string_to_delta(
418
 
            config["approval_duration"])
419
 
        self.changedstate = (multiprocessing_manager
420
 
                             .Condition(multiprocessing_manager
421
 
                                        .Lock()))
422
 
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
 
853
        self.changedstate = multiprocessing_manager.Condition(
 
854
            multiprocessing_manager.Lock())
 
855
        self.client_structure = [attr
 
856
                                 for attr in self.__dict__.iterkeys()
 
857
                                 if not attr.startswith("_")]
423
858
        self.client_structure.append("client_structure")
424
859
        
425
 
        for name, t in inspect.getmembers(type(self),
426
 
                                          lambda obj: isinstance(obj, property)):
 
860
        for name, t in inspect.getmembers(
 
861
                type(self), lambda obj: isinstance(obj, property)):
427
862
            if not name.startswith("_"):
428
863
                self.client_structure.append(name)
429
864
    
437
872
        if getattr(self, "enabled", False):
438
873
            # Already enabled
439
874
            return
440
 
        self.send_changedstate()
441
875
        self.expires = datetime.datetime.utcnow() + self.timeout
442
876
        self.enabled = True
443
877
        self.last_enabled = datetime.datetime.utcnow()
444
878
        self.init_checker()
 
879
        self.send_changedstate()
445
880
    
446
881
    def disable(self, quiet=True):
447
882
        """Disable this client."""
448
883
        if not getattr(self, "enabled", False):
449
884
            return False
450
885
        if not quiet:
451
 
            self.send_changedstate()
452
 
        if not quiet:
453
886
            logger.info("Disabling client %s", self.name)
454
 
        if getattr(self, "disable_initiator_tag", False):
455
 
            gobject.source_remove(self.disable_initiator_tag)
 
887
        if getattr(self, "disable_initiator_tag", None) is not None:
 
888
            GObject.source_remove(self.disable_initiator_tag)
456
889
            self.disable_initiator_tag = None
457
890
        self.expires = None
458
 
        if getattr(self, "checker_initiator_tag", False):
459
 
            gobject.source_remove(self.checker_initiator_tag)
 
891
        if getattr(self, "checker_initiator_tag", None) is not None:
 
892
            GObject.source_remove(self.checker_initiator_tag)
460
893
            self.checker_initiator_tag = None
461
894
        self.stop_checker()
462
895
        self.enabled = False
463
 
        # Do not run this again if called by a gobject.timeout_add
 
896
        if not quiet:
 
897
            self.send_changedstate()
 
898
        # Do not run this again if called by a GObject.timeout_add
464
899
        return False
465
900
    
466
901
    def __del__(self):
469
904
    def init_checker(self):
470
905
        # Schedule a new checker to be started an 'interval' from now,
471
906
        # and every interval from then on.
472
 
        self.checker_initiator_tag = (gobject.timeout_add
473
 
                                      (self.interval_milliseconds(),
474
 
                                       self.start_checker))
 
907
        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)
475
912
        # Schedule a disable() when 'timeout' has passed
476
 
        self.disable_initiator_tag = (gobject.timeout_add
477
 
                                   (self.timeout_milliseconds(),
478
 
                                    self.disable))
 
913
        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)
479
917
        # Also start a new checker *right now*.
480
918
        self.start_checker()
481
919
    
482
 
    def checker_callback(self, pid, condition, command):
 
920
    def checker_callback(self, source, condition, connection,
 
921
                         command):
483
922
        """The checker has completed, so take appropriate actions."""
484
923
        self.checker_callback_tag = None
485
924
        self.checker = None
486
 
        if os.WIFEXITED(condition):
487
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
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
488
932
            if self.last_checker_status == 0:
489
933
                logger.info("Checker for %(name)s succeeded",
490
934
                            vars(self))
491
935
                self.checked_ok()
492
936
            else:
493
 
                logger.info("Checker for %(name)s failed",
494
 
                            vars(self))
 
937
                logger.info("Checker for %(name)s failed", vars(self))
495
938
        else:
496
939
            self.last_checker_status = -1
 
940
            self.last_checker_signal = -returncode
497
941
            logger.warning("Checker for %(name)s crashed?",
498
942
                           vars(self))
499
 
    
500
 
    def checked_ok(self, timeout=None):
501
 
        """Bump up the timeout for this client.
502
 
        
503
 
        This should only be called when the client has been seen,
504
 
        alive and well.
505
 
        """
 
943
        return False
 
944
    
 
945
    def checked_ok(self):
 
946
        """Assert that the client has been seen, alive and well."""
 
947
        self.last_checked_ok = datetime.datetime.utcnow()
 
948
        self.last_checker_status = 0
 
949
        self.last_checker_signal = None
 
950
        self.bump_timeout()
 
951
    
 
952
    def bump_timeout(self, timeout=None):
 
953
        """Bump up the timeout for this client."""
506
954
        if timeout is None:
507
955
            timeout = self.timeout
508
 
        self.last_checked_ok = datetime.datetime.utcnow()
509
956
        if self.disable_initiator_tag is not None:
510
 
            gobject.source_remove(self.disable_initiator_tag)
 
957
            GObject.source_remove(self.disable_initiator_tag)
 
958
            self.disable_initiator_tag = None
511
959
        if getattr(self, "enabled", False):
512
 
            self.disable_initiator_tag = (gobject.timeout_add
513
 
                                          (_timedelta_to_milliseconds
514
 
                                           (timeout), self.disable))
 
960
            self.disable_initiator_tag = GObject.timeout_add(
 
961
                int(timeout.total_seconds() * 1000), self.disable)
515
962
            self.expires = datetime.datetime.utcnow() + timeout
516
963
    
517
964
    def need_approval(self):
523
970
        If a checker already exists, leave it running and do
524
971
        nothing."""
525
972
        # The reason for not killing a running checker is that if we
526
 
        # did that, then if a checker (for some reason) started
527
 
        # running slowly and taking more than 'interval' time, the
528
 
        # client would inevitably timeout, since no checker would get
529
 
        # a chance to run to completion.  If we instead leave running
 
973
        # did that, and if a checker (for some reason) started running
 
974
        # slowly and taking more than 'interval' time, then the client
 
975
        # would inevitably timeout, since no checker would get a
 
976
        # chance to run to completion.  If we instead leave running
530
977
        # checkers alone, the checker would have to take more time
531
978
        # than 'timeout' for the client to be disabled, which is as it
532
979
        # should be.
533
980
        
534
 
        # If a checker exists, make sure it is not a zombie
535
 
        try:
536
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
537
 
        except (AttributeError, OSError) as error:
538
 
            if (isinstance(error, OSError)
539
 
                and error.errno != errno.ECHILD):
540
 
                raise error
541
 
        else:
542
 
            if pid:
543
 
                logger.warning("Checker was a zombie")
544
 
                gobject.source_remove(self.checker_callback_tag)
545
 
                self.checker_callback(pid, status,
546
 
                                      self.current_checker_command)
 
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
547
985
        # Start a new checker if needed
548
986
        if self.checker is None:
 
987
            # Escape attributes for the shell
 
988
            escaped_attrs = {
 
989
                attr: re.escape(str(getattr(self, attr)))
 
990
                for attr in self.runtime_expansions }
549
991
            try:
550
 
                # In case checker_command has exactly one % operator
551
 
                command = self.checker_command % self.host
552
 
            except TypeError:
553
 
                # Escape attributes for the shell
554
 
                escaped_attrs = dict(
555
 
                    (attr,
556
 
                     re.escape(unicode(str(getattr(self, attr, "")),
557
 
                                       errors=
558
 
                                       'replace')))
559
 
                    for attr in
560
 
                    self.runtime_expansions)
561
 
                
562
 
                try:
563
 
                    command = self.checker_command % escaped_attrs
564
 
                except TypeError as error:
565
 
                    logger.error('Could not format string "%s":'
566
 
                                 ' %s', self.checker_command, error)
567
 
                    return True # Try again later
 
992
                command = self.checker_command % escaped_attrs
 
993
            except TypeError as error:
 
994
                logger.error('Could not format string "%s"',
 
995
                             self.checker_command,
 
996
                             exc_info=error)
 
997
                return True     # Try again later
568
998
            self.current_checker_command = command
569
 
            try:
570
 
                logger.info("Starting checker %r for %s",
571
 
                            command, self.name)
572
 
                # We don't need to redirect stdout and stderr, since
573
 
                # in normal mode, that is already done by daemon(),
574
 
                # and in debug mode we don't want to.  (Stdin is
575
 
                # always replaced by /dev/null.)
576
 
                self.checker = subprocess.Popen(command,
577
 
                                                close_fds=True,
578
 
                                                shell=True, cwd="/")
579
 
                self.checker_callback_tag = (gobject.child_watch_add
580
 
                                             (self.checker.pid,
581
 
                                              self.checker_callback,
582
 
                                              data=command))
583
 
                # The checker may have completed before the gobject
584
 
                # watch was added.  Check for this.
585
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
586
 
                if pid:
587
 
                    gobject.source_remove(self.checker_callback_tag)
588
 
                    self.checker_callback(pid, status, command)
589
 
            except OSError as error:
590
 
                logger.error("Failed to start subprocess: %s",
591
 
                             error)
592
 
        # Re-run this periodically if run by gobject.timeout_add
 
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
593
1025
        return True
594
1026
    
595
1027
    def stop_checker(self):
596
1028
        """Force the checker process, if any, to stop."""
597
1029
        if self.checker_callback_tag:
598
 
            gobject.source_remove(self.checker_callback_tag)
 
1030
            GObject.source_remove(self.checker_callback_tag)
599
1031
            self.checker_callback_tag = None
600
1032
        if getattr(self, "checker", None) is None:
601
1033
            return
602
1034
        logger.debug("Stopping checker for %(name)s", vars(self))
603
 
        try:
604
 
            os.kill(self.checker.pid, signal.SIGTERM)
605
 
            #time.sleep(0.5)
606
 
            #if self.checker.poll() is None:
607
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
608
 
        except OSError as error:
609
 
            if error.errno != errno.ESRCH: # No such process
610
 
                raise
 
1035
        self.checker.terminate()
611
1036
        self.checker = None
612
 
    
613
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
614
 
    def encrypt_secret(self, key):
615
 
        # Encryption-key need to be of a specific size, so we hash inputed key
616
 
        hasheng = hashlib.sha256()
617
 
        hasheng.update(key)
618
 
        encryptionkey = hasheng.digest()
619
 
        
620
 
        # Create validation hash so we know at decryption if it was sucessful
621
 
        hasheng = hashlib.sha256()
622
 
        hasheng.update(self.secret)
623
 
        validationhash = hasheng.digest()
624
 
        
625
 
        # Encrypt secret
626
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
627
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
628
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
629
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
630
 
        self.encrypted_secret = (ciphertext, iv)
631
 
    
632
 
    # Decrypt a encrypted client secret
633
 
    def decrypt_secret(self, key):
634
 
        # Decryption-key need to be of a specific size, so we hash inputed key
635
 
        hasheng = hashlib.sha256()
636
 
        hasheng.update(key)
637
 
        encryptionkey = hasheng.digest()
638
 
        
639
 
        # Decrypt encrypted secret
640
 
        ciphertext, iv = self.encrypted_secret
641
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
642
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
643
 
        plain = ciphereng.decrypt(ciphertext)
644
 
        
645
 
        # Validate decrypted secret to know if it was succesful
646
 
        hasheng = hashlib.sha256()
647
 
        validationhash = plain[:hasheng.digest_size]
648
 
        secret = plain[hasheng.digest_size:]
649
 
        hasheng.update(secret)
650
 
        
651
 
        # if validation fails, we use key as new secret. Otherwhise, we use
652
 
        # the decrypted secret
653
 
        if hasheng.digest() == validationhash:
654
 
            self.secret = secret
655
 
        else:
656
 
            self.secret = key
657
 
        del self.encrypted_secret
658
 
 
659
 
 
660
 
def dbus_service_property(dbus_interface, signature="v",
661
 
                          access="readwrite", byte_arrays=False):
 
1037
 
 
1038
 
 
1039
def dbus_service_property(dbus_interface,
 
1040
                          signature="v",
 
1041
                          access="readwrite",
 
1042
                          byte_arrays=False):
662
1043
    """Decorators for marking methods of a DBusObjectWithProperties to
663
1044
    become properties on the D-Bus.
664
1045
    
673
1054
    # "Set" method, so we fail early here:
674
1055
    if byte_arrays and signature != "ay":
675
1056
        raise ValueError("Byte arrays not supported for non-'ay'"
676
 
                         " signature %r" % signature)
 
1057
                         " signature {!r}".format(signature))
 
1058
    
677
1059
    def decorator(func):
678
1060
        func._dbus_is_property = True
679
1061
        func._dbus_interface = dbus_interface
684
1066
            func._dbus_name = func._dbus_name[:-14]
685
1067
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
686
1068
        return func
 
1069
    
 
1070
    return decorator
 
1071
 
 
1072
 
 
1073
def dbus_interface_annotations(dbus_interface):
 
1074
    """Decorator for marking functions returning interface annotations
 
1075
    
 
1076
    Usage:
 
1077
    
 
1078
    @dbus_interface_annotations("org.example.Interface")
 
1079
    def _foo(self):  # Function name does not matter
 
1080
        return {"org.freedesktop.DBus.Deprecated": "true",
 
1081
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1082
                    "false"}
 
1083
    """
 
1084
    
 
1085
    def decorator(func):
 
1086
        func._dbus_is_interface = True
 
1087
        func._dbus_interface = dbus_interface
 
1088
        func._dbus_name = dbus_interface
 
1089
        return func
 
1090
    
 
1091
    return decorator
 
1092
 
 
1093
 
 
1094
def dbus_annotations(annotations):
 
1095
    """Decorator to annotate D-Bus methods, signals or properties
 
1096
    Usage:
 
1097
    
 
1098
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
1099
                       "org.freedesktop.DBus.Property."
 
1100
                       "EmitsChangedSignal": "false"})
 
1101
    @dbus_service_property("org.example.Interface", signature="b",
 
1102
                           access="r")
 
1103
    def Property_dbus_property(self):
 
1104
        return dbus.Boolean(False)
 
1105
    
 
1106
    See also the DBusObjectWithAnnotations class.
 
1107
    """
 
1108
    
 
1109
    def decorator(func):
 
1110
        func._dbus_annotations = annotations
 
1111
        return func
 
1112
    
687
1113
    return decorator
688
1114
 
689
1115
 
690
1116
class DBusPropertyException(dbus.exceptions.DBusException):
691
1117
    """A base class for D-Bus property-related exceptions
692
1118
    """
693
 
    def __unicode__(self):
694
 
        return unicode(str(self))
 
1119
    pass
695
1120
 
696
1121
 
697
1122
class DBusPropertyAccessException(DBusPropertyException):
706
1131
    pass
707
1132
 
708
1133
 
709
 
class DBusObjectWithProperties(dbus.service.Object):
 
1134
class DBusObjectWithAnnotations(dbus.service.Object):
 
1135
    """A D-Bus object with annotations.
 
1136
    
 
1137
    Classes inheriting from this can use the dbus_annotations
 
1138
    decorator to add annotations to methods or signals.
 
1139
    """
 
1140
    
 
1141
    @staticmethod
 
1142
    def _is_dbus_thing(thing):
 
1143
        """Returns a function testing if an attribute is a D-Bus thing
 
1144
        
 
1145
        If called like _is_dbus_thing("method") it returns a function
 
1146
        suitable for use as predicate to inspect.getmembers().
 
1147
        """
 
1148
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
1149
                                   False)
 
1150
    
 
1151
    def _get_all_dbus_things(self, thing):
 
1152
        """Returns a generator of (name, attribute) pairs
 
1153
        """
 
1154
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
1155
                 athing.__get__(self))
 
1156
                for cls in self.__class__.__mro__
 
1157
                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):
710
1224
    """A D-Bus object with properties.
711
1225
    
712
1226
    Classes inheriting from this can use the dbus_service_property
714
1228
    standard Get(), Set(), and GetAll() methods on the D-Bus.
715
1229
    """
716
1230
    
717
 
    @staticmethod
718
 
    def _is_dbus_property(obj):
719
 
        return getattr(obj, "_dbus_is_property", False)
720
 
    
721
 
    def _get_all_dbus_properties(self):
722
 
        """Returns a generator of (name, attribute) pairs
723
 
        """
724
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
725
 
                for cls in self.__class__.__mro__
726
 
                for name, prop in
727
 
                inspect.getmembers(cls, self._is_dbus_property))
728
 
    
729
1231
    def _get_dbus_property(self, interface_name, property_name):
730
1232
        """Returns a bound method if one exists which is a D-Bus
731
1233
        property with the specified name and interface.
732
1234
        """
733
 
        for cls in  self.__class__.__mro__:
734
 
            for name, value in (inspect.getmembers
735
 
                                (cls, self._is_dbus_property)):
 
1235
        for cls in self.__class__.__mro__:
 
1236
            for name, value in inspect.getmembers(
 
1237
                    cls, self._is_dbus_thing("property")):
736
1238
                if (value._dbus_name == property_name
737
1239
                    and value._dbus_interface == interface_name):
738
1240
                    return value.__get__(self)
739
1241
        
740
1242
        # No such property
741
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
742
 
                                   + interface_name + "."
743
 
                                   + property_name)
744
 
    
745
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
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",
746
1257
                         out_signature="v")
747
1258
    def Get(self, interface_name, property_name):
748
1259
        """Standard D-Bus property Get() method, see D-Bus standard.
766
1277
            # The byte_arrays option is not supported yet on
767
1278
            # signatures other than "ay".
768
1279
            if prop._dbus_signature != "ay":
769
 
                raise ValueError
770
 
            value = dbus.ByteArray(''.join(unichr(byte)
771
 
                                           for byte in value))
 
1280
                raise ValueError("Byte arrays not supported for non-"
 
1281
                                 "'ay' signature {!r}"
 
1282
                                 .format(prop._dbus_signature))
 
1283
            value = dbus.ByteArray(b''.join(chr(byte)
 
1284
                                            for byte in value))
772
1285
        prop(value)
773
1286
    
774
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
1287
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
1288
                         in_signature="s",
775
1289
                         out_signature="a{sv}")
776
1290
    def GetAll(self, interface_name):
777
1291
        """Standard D-Bus property GetAll() method, see D-Bus
780
1294
        Note: Will not include properties with access="write".
781
1295
        """
782
1296
        properties = {}
783
 
        for name, prop in self._get_all_dbus_properties():
 
1297
        for name, prop in self._get_all_dbus_things("property"):
784
1298
            if (interface_name
785
1299
                and interface_name != prop._dbus_interface):
786
1300
                # Interface non-empty but did not match
792
1306
            if not hasattr(value, "variant_level"):
793
1307
                properties[name] = value
794
1308
                continue
795
 
            properties[name] = type(value)(value, variant_level=
796
 
                                           value.variant_level+1)
 
1309
            properties[name] = type(value)(
 
1310
                value, variant_level = value.variant_level + 1)
797
1311
        return dbus.Dictionary(properties, signature="sv")
798
1312
    
 
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
    
799
1321
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
800
1322
                         out_signature="s",
801
1323
                         path_keyword='object_path',
802
1324
                         connection_keyword='connection')
803
1325
    def Introspect(self, object_path, connection):
804
 
        """Standard D-Bus method, overloaded to insert property tags.
 
1326
        """Overloading of standard D-Bus method.
 
1327
        
 
1328
        Inserts property tags and interface annotation tags.
805
1329
        """
806
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
807
 
                                                   connection)
 
1330
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
1331
                                                         object_path,
 
1332
                                                         connection)
808
1333
        try:
809
1334
            document = xml.dom.minidom.parseString(xmlstring)
 
1335
            
810
1336
            def make_tag(document, name, prop):
811
1337
                e = document.createElement("property")
812
1338
                e.setAttribute("name", name)
813
1339
                e.setAttribute("type", prop._dbus_signature)
814
1340
                e.setAttribute("access", prop._dbus_access)
815
1341
                return e
 
1342
            
816
1343
            for if_tag in document.getElementsByTagName("interface"):
 
1344
                # Add property tags
817
1345
                for tag in (make_tag(document, name, prop)
818
1346
                            for name, prop
819
 
                            in self._get_all_dbus_properties()
 
1347
                            in self._get_all_dbus_things("property")
820
1348
                            if prop._dbus_interface
821
1349
                            == if_tag.getAttribute("name")):
822
1350
                    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)
823
1367
                # Add the names to the return values for the
824
1368
                # "org.freedesktop.DBus.Properties" methods
825
1369
                if (if_tag.getAttribute("name")
840
1384
        except (AttributeError, xml.dom.DOMException,
841
1385
                xml.parsers.expat.ExpatError) as error:
842
1386
            logger.error("Failed to override Introspection method",
843
 
                         error)
844
 
        return xmlstring
845
 
 
846
 
 
847
 
def datetime_to_dbus (dt, variant_level=0):
 
1387
                         exc_info=error)
 
1388
        return xmlstring
 
1389
 
 
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
 
 
1459
def datetime_to_dbus(dt, variant_level=0):
848
1460
    """Convert a UTC datetime.datetime() to a D-Bus type."""
849
1461
    if dt is None:
850
1462
        return dbus.String("", variant_level = variant_level)
851
 
    return dbus.String(dt.isoformat(),
852
 
                       variant_level=variant_level)
853
 
 
854
 
 
855
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
856
 
                                  .__metaclass__):
857
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
858
 
    will add additional D-Bus attributes matching a certain pattern.
 
1463
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1464
 
 
1465
 
 
1466
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1467
    """A class decorator; applied to a subclass of
 
1468
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1469
    interface names according to the "alt_interface_names" mapping.
 
1470
    Usage:
 
1471
    
 
1472
    @alternate_dbus_interfaces({"org.example.Interface":
 
1473
                                    "net.example.AlternateInterface"})
 
1474
    class SampleDBusObject(dbus.service.Object):
 
1475
        @dbus.service.method("org.example.Interface")
 
1476
        def SampleDBusMethod():
 
1477
            pass
 
1478
    
 
1479
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1480
    reachable via two interfaces: "org.example.Interface" and
 
1481
    "net.example.AlternateInterface", the latter of which will have
 
1482
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1483
    "true", unless "deprecate" is passed with a False value.
 
1484
    
 
1485
    This works for methods and signals, and also for D-Bus properties
 
1486
    (from DBusObjectWithProperties) and interfaces (from the
 
1487
    dbus_interface_annotations decorator).
859
1488
    """
860
 
    def __new__(mcs, name, bases, attr):
861
 
        # Go through all the base classes which could have D-Bus
862
 
        # methods, signals, or properties in them
863
 
        for base in (b for b in bases
864
 
                     if issubclass(b, dbus.service.Object)):
865
 
            # Go though all attributes of the base class
866
 
            for attrname, attribute in inspect.getmembers(base):
 
1489
    
 
1490
    def wrapper(cls):
 
1491
        for orig_interface_name, alt_interface_name in (
 
1492
                alt_interface_names.items()):
 
1493
            attr = {}
 
1494
            interface_names = set()
 
1495
            # Go though all attributes of the class
 
1496
            for attrname, attribute in inspect.getmembers(cls):
867
1497
                # Ignore non-D-Bus attributes, and D-Bus attributes
868
1498
                # with the wrong interface name
869
1499
                if (not hasattr(attribute, "_dbus_interface")
870
 
                    or not attribute._dbus_interface
871
 
                    .startswith("se.recompile.Mandos")):
 
1500
                    or not attribute._dbus_interface.startswith(
 
1501
                        orig_interface_name)):
872
1502
                    continue
873
1503
                # Create an alternate D-Bus interface name based on
874
1504
                # the current name
875
 
                alt_interface = (attribute._dbus_interface
876
 
                                 .replace("se.recompile.Mandos",
877
 
                                          "se.bsnet.fukt.Mandos"))
 
1505
                alt_interface = attribute._dbus_interface.replace(
 
1506
                    orig_interface_name, alt_interface_name)
 
1507
                interface_names.add(alt_interface)
878
1508
                # Is this a D-Bus signal?
879
1509
                if getattr(attribute, "_dbus_is_signal", False):
880
 
                    # Extract the original non-method function by
881
 
                    # black magic
882
 
                    nonmethod_func = (dict(
 
1510
                    if sys.version_info.major == 2:
 
1511
                        # Extract the original non-method undecorated
 
1512
                        # function by black magic
 
1513
                        nonmethod_func = (dict(
883
1514
                            zip(attribute.func_code.co_freevars,
884
 
                                attribute.__closure__))["func"]
885
 
                                      .cell_contents)
 
1515
                                attribute.__closure__))
 
1516
                                          ["func"].cell_contents)
 
1517
                    else:
 
1518
                        nonmethod_func = attribute
886
1519
                    # Create a new, but exactly alike, function
887
1520
                    # object, and decorate it to be a new D-Bus signal
888
1521
                    # with the alternate D-Bus interface name
889
 
                    new_function = (dbus.service.signal
890
 
                                    (alt_interface,
891
 
                                     attribute._dbus_signature)
892
 
                                    (types.FunctionType(
893
 
                                nonmethod_func.func_code,
894
 
                                nonmethod_func.func_globals,
895
 
                                nonmethod_func.func_name,
896
 
                                nonmethod_func.func_defaults,
897
 
                                nonmethod_func.func_closure)))
 
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))
 
1539
                    # Copy annotations, if any
 
1540
                    try:
 
1541
                        new_function._dbus_annotations = dict(
 
1542
                            attribute._dbus_annotations)
 
1543
                    except AttributeError:
 
1544
                        pass
898
1545
                    # Define a creator of a function to call both the
899
 
                    # old and new functions, so both the old and new
900
 
                    # signals gets sent when the function is called
 
1546
                    # original and alternate functions, so both the
 
1547
                    # original and alternate signals gets sent when
 
1548
                    # the function is called
901
1549
                    def fixscope(func1, func2):
902
1550
                        """This function is a scope container to pass
903
1551
                        func1 and func2 to the "call_both" function
904
1552
                        outside of its arguments"""
 
1553
                        
 
1554
                        @functools.wraps(func2)
905
1555
                        def call_both(*args, **kwargs):
906
1556
                            """This function will emit two D-Bus
907
1557
                            signals by calling func1 and func2"""
908
1558
                            func1(*args, **kwargs)
909
1559
                            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
                        
910
1565
                        return call_both
911
1566
                    # Create the "call_both" function and add it to
912
1567
                    # the class
913
 
                    attr[attrname] = fixscope(attribute,
914
 
                                              new_function)
 
1568
                    attr[attrname] = fixscope(attribute, new_function)
915
1569
                # Is this a D-Bus method?
916
1570
                elif getattr(attribute, "_dbus_is_method", False):
917
1571
                    # Create a new, but exactly alike, function
918
1572
                    # object.  Decorate it to be a new D-Bus method
919
1573
                    # with the alternate D-Bus interface name.  Add it
920
1574
                    # to the class.
921
 
                    attr[attrname] = (dbus.service.method
922
 
                                      (alt_interface,
923
 
                                       attribute._dbus_in_signature,
924
 
                                       attribute._dbus_out_signature)
925
 
                                      (types.FunctionType
926
 
                                       (attribute.func_code,
927
 
                                        attribute.func_globals,
928
 
                                        attribute.func_name,
929
 
                                        attribute.func_defaults,
930
 
                                        attribute.func_closure)))
 
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)))
 
1585
                    # Copy annotations, if any
 
1586
                    try:
 
1587
                        attr[attrname]._dbus_annotations = dict(
 
1588
                            attribute._dbus_annotations)
 
1589
                    except AttributeError:
 
1590
                        pass
931
1591
                # Is this a D-Bus property?
932
1592
                elif getattr(attribute, "_dbus_is_property", False):
933
1593
                    # Create a new, but exactly alike, function
934
1594
                    # object, and decorate it to be a new D-Bus
935
1595
                    # property with the alternate D-Bus interface
936
1596
                    # name.  Add it to the class.
937
 
                    attr[attrname] = (dbus_service_property
938
 
                                      (alt_interface,
939
 
                                       attribute._dbus_signature,
940
 
                                       attribute._dbus_access,
941
 
                                       attribute
942
 
                                       ._dbus_get_args_options
943
 
                                       ["byte_arrays"])
944
 
                                      (types.FunctionType
945
 
                                       (attribute.func_code,
946
 
                                        attribute.func_globals,
947
 
                                        attribute.func_name,
948
 
                                        attribute.func_defaults,
949
 
                                        attribute.func_closure)))
950
 
        return type.__new__(mcs, name, bases, attr)
951
 
 
952
 
 
 
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)))
 
1608
                    # Copy annotations, if any
 
1609
                    try:
 
1610
                        attr[attrname]._dbus_annotations = dict(
 
1611
                            attribute._dbus_annotations)
 
1612
                    except AttributeError:
 
1613
                        pass
 
1614
                # Is this a D-Bus interface?
 
1615
                elif getattr(attribute, "_dbus_is_interface", False):
 
1616
                    # Create a new, but exactly alike, function
 
1617
                    # object.  Decorate it to be a new D-Bus interface
 
1618
                    # with the alternate D-Bus interface name.  Add it
 
1619
                    # 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)))
 
1627
            if deprecate:
 
1628
                # Deprecate all alternate interfaces
 
1629
                iname="_AlternateDBusNames_interface_annotation{}"
 
1630
                for interface_name in interface_names:
 
1631
                    
 
1632
                    @dbus_interface_annotations(interface_name)
 
1633
                    def func(self):
 
1634
                        return { "org.freedesktop.DBus.Deprecated":
 
1635
                                 "true" }
 
1636
                    # Find an unused name
 
1637
                    for aname in (iname.format(i)
 
1638
                                  for i in itertools.count()):
 
1639
                        if aname not in attr:
 
1640
                            attr[aname] = func
 
1641
                            break
 
1642
            if interface_names:
 
1643
                # Replace the class with a new subclass of it with
 
1644
                # methods, signals, etc. as created above.
 
1645
                cls = type(b"{}Alternate".format(cls.__name__),
 
1646
                           (cls, ), attr)
 
1647
        return cls
 
1648
    
 
1649
    return wrapper
 
1650
 
 
1651
 
 
1652
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1653
                            "se.bsnet.fukt.Mandos"})
953
1654
class ClientDBus(Client, DBusObjectWithProperties):
954
1655
    """A Client class using D-Bus
955
1656
    
959
1660
    """
960
1661
    
961
1662
    runtime_expansions = (Client.runtime_expansions
962
 
                          + ("dbus_object_path",))
 
1663
                          + ("dbus_object_path", ))
 
1664
    
 
1665
    _interface = "se.recompile.Mandos.Client"
963
1666
    
964
1667
    # dbus.service.Object doesn't use super(), so we can't either.
965
1668
    
966
1669
    def __init__(self, bus = None, *args, **kwargs):
967
1670
        self.bus = bus
968
1671
        Client.__init__(self, *args, **kwargs)
969
 
        
970
 
        self._approvals_pending = 0
971
1672
        # Only now, when this client is initialized, can it show up on
972
1673
        # the D-Bus
973
 
        client_object_name = unicode(self.name).translate(
 
1674
        client_object_name = str(self.name).translate(
974
1675
            {ord("."): ord("_"),
975
1676
             ord("-"): ord("_")})
976
 
        self.dbus_object_path = (dbus.ObjectPath
977
 
                                 ("/clients/" + client_object_name))
 
1677
        self.dbus_object_path = dbus.ObjectPath(
 
1678
            "/clients/" + client_object_name)
978
1679
        DBusObjectWithProperties.__init__(self, self.bus,
979
1680
                                          self.dbus_object_path)
980
 
        
981
 
    def notifychangeproperty(transform_func,
982
 
                             dbus_name, type_func=lambda x: x,
983
 
                             variant_level=1):
 
1681
    
 
1682
    def notifychangeproperty(transform_func, dbus_name,
 
1683
                             type_func=lambda x: x,
 
1684
                             variant_level=1,
 
1685
                             invalidate_only=False,
 
1686
                             _interface=_interface):
984
1687
        """ Modify a variable so that it's a property which announces
985
1688
        its changes to DBus.
986
1689
        
991
1694
                   to the D-Bus.  Default: no transform
992
1695
        variant_level: D-Bus variant level.  Default: 1
993
1696
        """
994
 
        attrname = "_{0}".format(dbus_name)
 
1697
        attrname = "_{}".format(dbus_name)
 
1698
        
995
1699
        def setter(self, value):
996
1700
            if hasattr(self, "dbus_object_path"):
997
1701
                if (not hasattr(self, attrname) or
998
1702
                    type_func(getattr(self, attrname, None))
999
1703
                    != type_func(value)):
1000
 
                    dbus_value = transform_func(type_func(value),
1001
 
                                                variant_level
1002
 
                                                =variant_level)
1003
 
                    self.PropertyChanged(dbus.String(dbus_name),
1004
 
                                         dbus_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())
1005
1719
            setattr(self, attrname, value)
1006
1720
        
1007
1721
        return property(lambda self: getattr(self, attrname), setter)
1008
1722
    
1009
 
    
1010
1723
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1011
1724
    approvals_pending = notifychangeproperty(dbus.Boolean,
1012
1725
                                             "ApprovalPending",
1014
1727
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1015
1728
    last_enabled = notifychangeproperty(datetime_to_dbus,
1016
1729
                                        "LastEnabled")
1017
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1018
 
                                   type_func = lambda checker:
1019
 
                                       checker is not None)
 
1730
    checker = notifychangeproperty(
 
1731
        dbus.Boolean, "CheckerRunning",
 
1732
        type_func = lambda checker: checker is not None)
1020
1733
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1021
1734
                                           "LastCheckedOK")
 
1735
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1736
                                               "LastCheckerStatus")
1022
1737
    last_approval_request = notifychangeproperty(
1023
1738
        datetime_to_dbus, "LastApprovalRequest")
1024
1739
    approved_by_default = notifychangeproperty(dbus.Boolean,
1025
1740
                                               "ApprovedByDefault")
1026
 
    approval_delay = notifychangeproperty(dbus.UInt16,
1027
 
                                          "ApprovalDelay",
1028
 
                                          type_func =
1029
 
                                          _timedelta_to_milliseconds)
 
1741
    approval_delay = notifychangeproperty(
 
1742
        dbus.UInt64, "ApprovalDelay",
 
1743
        type_func = lambda td: td.total_seconds() * 1000)
1030
1744
    approval_duration = notifychangeproperty(
1031
 
        dbus.UInt16, "ApprovalDuration",
1032
 
        type_func = _timedelta_to_milliseconds)
 
1745
        dbus.UInt64, "ApprovalDuration",
 
1746
        type_func = lambda td: td.total_seconds() * 1000)
1033
1747
    host = notifychangeproperty(dbus.String, "Host")
1034
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1035
 
                                   type_func =
1036
 
                                   _timedelta_to_milliseconds)
 
1748
    timeout = notifychangeproperty(
 
1749
        dbus.UInt64, "Timeout",
 
1750
        type_func = lambda td: td.total_seconds() * 1000)
1037
1751
    extended_timeout = notifychangeproperty(
1038
 
        dbus.UInt16, "ExtendedTimeout",
1039
 
        type_func = _timedelta_to_milliseconds)
1040
 
    interval = notifychangeproperty(dbus.UInt16,
1041
 
                                    "Interval",
1042
 
                                    type_func =
1043
 
                                    _timedelta_to_milliseconds)
 
1752
        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)
1044
1757
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1758
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1759
                                  invalidate_only=True)
1045
1760
    
1046
1761
    del notifychangeproperty
1047
1762
    
1054
1769
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1055
1770
        Client.__del__(self, *args, **kwargs)
1056
1771
    
1057
 
    def checker_callback(self, pid, condition, command,
1058
 
                         *args, **kwargs):
1059
 
        self.checker_callback_tag = None
1060
 
        self.checker = None
1061
 
        if os.WIFEXITED(condition):
1062
 
            exitstatus = os.WEXITSTATUS(condition)
 
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:
1063
1779
            # Emit D-Bus signal
1064
1780
            self.CheckerCompleted(dbus.Int16(exitstatus),
1065
 
                                  dbus.Int64(condition),
 
1781
                                  # This is specific to GNU libC
 
1782
                                  dbus.Int64(exitstatus << 8),
1066
1783
                                  dbus.String(command))
1067
1784
        else:
1068
1785
            # Emit D-Bus signal
1069
1786
            self.CheckerCompleted(dbus.Int16(-1),
1070
 
                                  dbus.Int64(condition),
 
1787
                                  dbus.Int64(
 
1788
                                      # This is specific to GNU libC
 
1789
                                      (exitstatus << 8)
 
1790
                                      | self.last_checker_signal),
1071
1791
                                  dbus.String(command))
1072
 
        
1073
 
        return Client.checker_callback(self, pid, condition, command,
1074
 
                                       *args, **kwargs)
 
1792
        return ret
1075
1793
    
1076
1794
    def start_checker(self, *args, **kwargs):
1077
 
        old_checker = self.checker
1078
 
        if self.checker is not None:
1079
 
            old_checker_pid = self.checker.pid
1080
 
        else:
1081
 
            old_checker_pid = None
 
1795
        old_checker_pid = getattr(self.checker, "pid", None)
1082
1796
        r = Client.start_checker(self, *args, **kwargs)
1083
1797
        # Only if new checker process was started
1084
1798
        if (self.checker is not None
1088
1802
        return r
1089
1803
    
1090
1804
    def _reset_approved(self):
1091
 
        self._approved = None
 
1805
        self.approved = None
1092
1806
        return False
1093
1807
    
1094
1808
    def approve(self, value=True):
 
1809
        self.approved = value
 
1810
        GObject.timeout_add(int(self.approval_duration.total_seconds()
 
1811
                                * 1000), self._reset_approved)
1095
1812
        self.send_changedstate()
1096
 
        self._approved = value
1097
 
        gobject.timeout_add(_timedelta_to_milliseconds
1098
 
                            (self.approval_duration),
1099
 
                            self._reset_approved)
1100
 
    
1101
1813
    
1102
1814
    ## D-Bus methods, signals & properties
1103
 
    _interface = "se.recompile.Mandos.Client"
 
1815
    
 
1816
    ## Interfaces
1104
1817
    
1105
1818
    ## Signals
1106
1819
    
1117
1830
        pass
1118
1831
    
1119
1832
    # PropertyChanged - signal
 
1833
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1120
1834
    @dbus.service.signal(_interface, signature="sv")
1121
1835
    def PropertyChanged(self, property, value):
1122
1836
        "D-Bus signal"
1143
1857
        "D-Bus signal"
1144
1858
        return self.need_approval()
1145
1859
    
1146
 
    # NeRwequest - signal
1147
 
    @dbus.service.signal(_interface, signature="s")
1148
 
    def NewRequest(self, ip):
1149
 
        """D-Bus signal
1150
 
        Is sent after a client request a password.
1151
 
        """
1152
 
        pass
1153
 
    
1154
1860
    ## Methods
1155
1861
    
1156
1862
    # Approve - method
1164
1870
        self.checked_ok()
1165
1871
    
1166
1872
    # Enable - method
 
1873
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1167
1874
    @dbus.service.method(_interface)
1168
1875
    def Enable(self):
1169
1876
        "D-Bus method"
1170
1877
        self.enable()
1171
1878
    
1172
1879
    # StartChecker - method
 
1880
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1173
1881
    @dbus.service.method(_interface)
1174
1882
    def StartChecker(self):
1175
1883
        "D-Bus method"
1176
1884
        self.start_checker()
1177
1885
    
1178
1886
    # Disable - method
 
1887
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1179
1888
    @dbus.service.method(_interface)
1180
1889
    def Disable(self):
1181
1890
        "D-Bus method"
1182
1891
        self.disable()
1183
1892
    
1184
1893
    # StopChecker - method
 
1894
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1185
1895
    @dbus.service.method(_interface)
1186
1896
    def StopChecker(self):
1187
1897
        self.stop_checker()
1194
1904
        return dbus.Boolean(bool(self.approvals_pending))
1195
1905
    
1196
1906
    # ApprovedByDefault - property
1197
 
    @dbus_service_property(_interface, signature="b",
 
1907
    @dbus_service_property(_interface,
 
1908
                           signature="b",
1198
1909
                           access="readwrite")
1199
1910
    def ApprovedByDefault_dbus_property(self, value=None):
1200
1911
        if value is None:       # get
1202
1913
        self.approved_by_default = bool(value)
1203
1914
    
1204
1915
    # ApprovalDelay - property
1205
 
    @dbus_service_property(_interface, signature="t",
 
1916
    @dbus_service_property(_interface,
 
1917
                           signature="t",
1206
1918
                           access="readwrite")
1207
1919
    def ApprovalDelay_dbus_property(self, value=None):
1208
1920
        if value is None:       # get
1209
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1921
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1922
                               * 1000)
1210
1923
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1211
1924
    
1212
1925
    # ApprovalDuration - property
1213
 
    @dbus_service_property(_interface, signature="t",
 
1926
    @dbus_service_property(_interface,
 
1927
                           signature="t",
1214
1928
                           access="readwrite")
1215
1929
    def ApprovalDuration_dbus_property(self, value=None):
1216
1930
        if value is None:       # get
1217
 
            return dbus.UInt64(_timedelta_to_milliseconds(
1218
 
                    self.approval_duration))
 
1931
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1932
                               * 1000)
1219
1933
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1220
1934
    
1221
1935
    # Name - property
 
1936
    @dbus_annotations(
 
1937
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1222
1938
    @dbus_service_property(_interface, signature="s", access="read")
1223
1939
    def Name_dbus_property(self):
1224
1940
        return dbus.String(self.name)
1225
1941
    
1226
1942
    # Fingerprint - property
 
1943
    @dbus_annotations(
 
1944
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1227
1945
    @dbus_service_property(_interface, signature="s", access="read")
1228
1946
    def Fingerprint_dbus_property(self):
1229
1947
        return dbus.String(self.fingerprint)
1230
1948
    
1231
1949
    # Host - property
1232
 
    @dbus_service_property(_interface, signature="s",
 
1950
    @dbus_service_property(_interface,
 
1951
                           signature="s",
1233
1952
                           access="readwrite")
1234
1953
    def Host_dbus_property(self, value=None):
1235
1954
        if value is None:       # get
1236
1955
            return dbus.String(self.host)
1237
 
        self.host = value
 
1956
        self.host = str(value)
1238
1957
    
1239
1958
    # Created - property
 
1959
    @dbus_annotations(
 
1960
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1240
1961
    @dbus_service_property(_interface, signature="s", access="read")
1241
1962
    def Created_dbus_property(self):
1242
 
        return dbus.String(datetime_to_dbus(self.created))
 
1963
        return datetime_to_dbus(self.created)
1243
1964
    
1244
1965
    # LastEnabled - property
1245
1966
    @dbus_service_property(_interface, signature="s", access="read")
1247
1968
        return datetime_to_dbus(self.last_enabled)
1248
1969
    
1249
1970
    # Enabled - property
1250
 
    @dbus_service_property(_interface, signature="b",
 
1971
    @dbus_service_property(_interface,
 
1972
                           signature="b",
1251
1973
                           access="readwrite")
1252
1974
    def Enabled_dbus_property(self, value=None):
1253
1975
        if value is None:       # get
1258
1980
            self.disable()
1259
1981
    
1260
1982
    # LastCheckedOK - property
1261
 
    @dbus_service_property(_interface, signature="s",
 
1983
    @dbus_service_property(_interface,
 
1984
                           signature="s",
1262
1985
                           access="readwrite")
1263
1986
    def LastCheckedOK_dbus_property(self, value=None):
1264
1987
        if value is not None:
1266
1989
            return
1267
1990
        return datetime_to_dbus(self.last_checked_ok)
1268
1991
    
 
1992
    # LastCheckerStatus - property
 
1993
    @dbus_service_property(_interface, signature="n", access="read")
 
1994
    def LastCheckerStatus_dbus_property(self):
 
1995
        return dbus.Int16(self.last_checker_status)
 
1996
    
1269
1997
    # Expires - property
1270
1998
    @dbus_service_property(_interface, signature="s", access="read")
1271
1999
    def Expires_dbus_property(self):
1277
2005
        return datetime_to_dbus(self.last_approval_request)
1278
2006
    
1279
2007
    # Timeout - property
1280
 
    @dbus_service_property(_interface, signature="t",
 
2008
    @dbus_service_property(_interface,
 
2009
                           signature="t",
1281
2010
                           access="readwrite")
1282
2011
    def Timeout_dbus_property(self, value=None):
1283
2012
        if value is None:       # get
1284
 
            return dbus.UInt64(self.timeout_milliseconds())
 
2013
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
2014
        old_timeout = self.timeout
1285
2015
        self.timeout = datetime.timedelta(0, 0, 0, value)
1286
 
        if getattr(self, "disable_initiator_tag", None) is None:
1287
 
            return
1288
 
        # Reschedule timeout
1289
 
        gobject.source_remove(self.disable_initiator_tag)
1290
 
        self.disable_initiator_tag = None
1291
 
        self.expires = None
1292
 
        time_to_die = _timedelta_to_milliseconds((self
1293
 
                                                  .last_checked_ok
1294
 
                                                  + self.timeout)
1295
 
                                                 - datetime.datetime
1296
 
                                                 .utcnow())
1297
 
        if time_to_die <= 0:
1298
 
            # The timeout has passed
1299
 
            self.disable()
1300
 
        else:
1301
 
            self.expires = (datetime.datetime.utcnow()
1302
 
                            + datetime.timedelta(milliseconds =
1303
 
                                                 time_to_die))
1304
 
            self.disable_initiator_tag = (gobject.timeout_add
1305
 
                                          (time_to_die, self.disable))
 
2016
        # Reschedule disabling
 
2017
        if self.enabled:
 
2018
            now = datetime.datetime.utcnow()
 
2019
            self.expires += self.timeout - old_timeout
 
2020
            if self.expires <= now:
 
2021
                # The timeout has passed
 
2022
                self.disable()
 
2023
            else:
 
2024
                if (getattr(self, "disable_initiator_tag", None)
 
2025
                    is None):
 
2026
                    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)
1306
2031
    
1307
2032
    # ExtendedTimeout - property
1308
 
    @dbus_service_property(_interface, signature="t",
 
2033
    @dbus_service_property(_interface,
 
2034
                           signature="t",
1309
2035
                           access="readwrite")
1310
2036
    def ExtendedTimeout_dbus_property(self, value=None):
1311
2037
        if value is None:       # get
1312
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
2038
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
2039
                               * 1000)
1313
2040
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1314
2041
    
1315
2042
    # Interval - property
1316
 
    @dbus_service_property(_interface, signature="t",
 
2043
    @dbus_service_property(_interface,
 
2044
                           signature="t",
1317
2045
                           access="readwrite")
1318
2046
    def Interval_dbus_property(self, value=None):
1319
2047
        if value is None:       # get
1320
 
            return dbus.UInt64(self.interval_milliseconds())
 
2048
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1321
2049
        self.interval = datetime.timedelta(0, 0, 0, value)
1322
2050
        if getattr(self, "checker_initiator_tag", None) is None:
1323
2051
            return
1324
 
        # Reschedule checker run
1325
 
        gobject.source_remove(self.checker_initiator_tag)
1326
 
        self.checker_initiator_tag = (gobject.timeout_add
1327
 
                                      (value, self.start_checker))
1328
 
        self.start_checker()    # Start one now, too
 
2052
        if self.enabled:
 
2053
            # 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
1329
2058
    
1330
2059
    # Checker - property
1331
 
    @dbus_service_property(_interface, signature="s",
 
2060
    @dbus_service_property(_interface,
 
2061
                           signature="s",
1332
2062
                           access="readwrite")
1333
2063
    def Checker_dbus_property(self, value=None):
1334
2064
        if value is None:       # get
1335
2065
            return dbus.String(self.checker_command)
1336
 
        self.checker_command = value
 
2066
        self.checker_command = str(value)
1337
2067
    
1338
2068
    # CheckerRunning - property
1339
 
    @dbus_service_property(_interface, signature="b",
 
2069
    @dbus_service_property(_interface,
 
2070
                           signature="b",
1340
2071
                           access="readwrite")
1341
2072
    def CheckerRunning_dbus_property(self, value=None):
1342
2073
        if value is None:       # get
1347
2078
            self.stop_checker()
1348
2079
    
1349
2080
    # ObjectPath - property
 
2081
    @dbus_annotations(
 
2082
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
 
2083
         "org.freedesktop.DBus.Deprecated": "true"})
1350
2084
    @dbus_service_property(_interface, signature="o", access="read")
1351
2085
    def ObjectPath_dbus_property(self):
1352
2086
        return self.dbus_object_path # is already a dbus.ObjectPath
1353
2087
    
1354
2088
    # Secret = property
1355
 
    @dbus_service_property(_interface, signature="ay",
1356
 
                           access="write", byte_arrays=True)
 
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)
1357
2096
    def Secret_dbus_property(self, value):
1358
 
        self.secret = str(value)
 
2097
        self.secret = bytes(value)
1359
2098
    
1360
2099
    del _interface
1361
2100
 
1365
2104
        self._pipe = child_pipe
1366
2105
        self._pipe.send(('init', fpr, address))
1367
2106
        if not self._pipe.recv():
1368
 
            raise KeyError()
 
2107
            raise KeyError(fpr)
1369
2108
    
1370
2109
    def __getattribute__(self, name):
1371
 
        if(name == '_pipe'):
 
2110
        if name == '_pipe':
1372
2111
            return super(ProxyClient, self).__getattribute__(name)
1373
2112
        self._pipe.send(('getattr', name))
1374
2113
        data = self._pipe.recv()
1375
2114
        if data[0] == 'data':
1376
2115
            return data[1]
1377
2116
        if data[0] == 'function':
 
2117
            
1378
2118
            def func(*args, **kwargs):
1379
2119
                self._pipe.send(('funcall', name, args, kwargs))
1380
2120
                return self._pipe.recv()[1]
 
2121
            
1381
2122
            return func
1382
2123
    
1383
2124
    def __setattr__(self, name, value):
1384
 
        if(name == '_pipe'):
 
2125
        if name == '_pipe':
1385
2126
            return super(ProxyClient, self).__setattr__(name, value)
1386
2127
        self._pipe.send(('setattr', name, value))
1387
2128
 
1388
2129
 
1389
 
class ClientDBusTransitional(ClientDBus):
1390
 
    __metaclass__ = AlternateDBusNamesMetaclass
1391
 
 
1392
 
 
1393
2130
class ClientHandler(socketserver.BaseRequestHandler, object):
1394
2131
    """A class to handle client connections.
1395
2132
    
1399
2136
    def handle(self):
1400
2137
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1401
2138
            logger.info("TCP connection from: %s",
1402
 
                        unicode(self.client_address))
 
2139
                        str(self.client_address))
1403
2140
            logger.debug("Pipe FD: %d",
1404
2141
                         self.server.child_pipe.fileno())
1405
2142
            
1406
 
            session = (gnutls.connection
1407
 
                       .ClientSession(self.request,
1408
 
                                      gnutls.connection
1409
 
                                      .X509Credentials()))
1410
 
            
1411
 
            # Note: gnutls.connection.X509Credentials is really a
1412
 
            # generic GnuTLS certificate credentials object so long as
1413
 
            # no X.509 keys are added to it.  Therefore, we can use it
1414
 
            # here despite using OpenPGP certificates.
 
2143
            session = gnutls.ClientSession(self.request)
1415
2144
            
1416
2145
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1417
2146
            #                      "+AES-256-CBC", "+SHA1",
1421
2150
            priority = self.server.gnutls_priority
1422
2151
            if priority is None:
1423
2152
                priority = "NORMAL"
1424
 
            (gnutls.library.functions
1425
 
             .gnutls_priority_set_direct(session._c_object,
1426
 
                                         priority, None))
 
2153
            gnutls.priority_set_direct(session._c_object, priority,
 
2154
                                       None)
1427
2155
            
1428
2156
            # Start communication using the Mandos protocol
1429
2157
            # Get protocol number
1431
2159
            logger.debug("Protocol version: %r", line)
1432
2160
            try:
1433
2161
                if int(line.strip().split()[0]) > 1:
1434
 
                    raise RuntimeError
 
2162
                    raise RuntimeError(line)
1435
2163
            except (ValueError, IndexError, RuntimeError) as error:
1436
2164
                logger.error("Unknown protocol version: %s", error)
1437
2165
                return
1439
2167
            # Start GnuTLS connection
1440
2168
            try:
1441
2169
                session.handshake()
1442
 
            except gnutls.errors.GNUTLSError as error:
 
2170
            except gnutls.Error as error:
1443
2171
                logger.warning("Handshake failed: %s", error)
1444
2172
                # Do not run session.bye() here: the session is not
1445
2173
                # established.  Just abandon the request.
1449
2177
            approval_required = False
1450
2178
            try:
1451
2179
                try:
1452
 
                    fpr = self.fingerprint(self.peer_certificate
1453
 
                                           (session))
1454
 
                except (TypeError,
1455
 
                        gnutls.errors.GNUTLSError) as error:
 
2180
                    fpr = self.fingerprint(
 
2181
                        self.peer_certificate(session))
 
2182
                except (TypeError, gnutls.Error) as error:
1456
2183
                    logger.warning("Bad certificate: %s", error)
1457
2184
                    return
1458
2185
                logger.debug("Fingerprint: %s", fpr)
1459
 
                if self.server.use_dbus:
1460
 
                    # Emit D-Bus signal
1461
 
                    client.NewRequest(str(self.client_address))
1462
2186
                
1463
2187
                try:
1464
2188
                    client = ProxyClient(child_pipe, fpr,
1474
2198
                while True:
1475
2199
                    if not client.enabled:
1476
2200
                        logger.info("Client %s is disabled",
1477
 
                                       client.name)
 
2201
                                    client.name)
1478
2202
                        if self.server.use_dbus:
1479
2203
                            # Emit D-Bus signal
1480
2204
                            client.Rejected("Disabled")
1481
2205
                        return
1482
2206
                    
1483
 
                    if client._approved or not client.approval_delay:
 
2207
                    if client.approved or not client.approval_delay:
1484
2208
                        #We are approved or approval is disabled
1485
2209
                        break
1486
 
                    elif client._approved is None:
 
2210
                    elif client.approved is None:
1487
2211
                        logger.info("Client %s needs approval",
1488
2212
                                    client.name)
1489
2213
                        if self.server.use_dbus:
1490
2214
                            # Emit D-Bus signal
1491
2215
                            client.NeedApproval(
1492
 
                                client.approval_delay_milliseconds(),
1493
 
                                client.approved_by_default)
 
2216
                                client.approval_delay.total_seconds()
 
2217
                                * 1000, client.approved_by_default)
1494
2218
                    else:
1495
2219
                        logger.warning("Client %s was not approved",
1496
2220
                                       client.name)
1502
2226
                    #wait until timeout or approved
1503
2227
                    time = datetime.datetime.now()
1504
2228
                    client.changedstate.acquire()
1505
 
                    (client.changedstate.wait
1506
 
                     (float(client._timedelta_to_milliseconds(delay)
1507
 
                            / 1000)))
 
2229
                    client.changedstate.wait(delay.total_seconds())
1508
2230
                    client.changedstate.release()
1509
2231
                    time2 = datetime.datetime.now()
1510
2232
                    if (time2 - time) >= delay:
1521
2243
                    else:
1522
2244
                        delay -= time2 - time
1523
2245
                
1524
 
                sent_size = 0
1525
 
                while sent_size < len(client.secret):
1526
 
                    try:
1527
 
                        sent = session.send(client.secret[sent_size:])
1528
 
                    except gnutls.errors.GNUTLSError as error:
1529
 
                        logger.warning("gnutls send failed")
1530
 
                        return
1531
 
                    logger.debug("Sent: %d, remaining: %d",
1532
 
                                 sent, len(client.secret)
1533
 
                                 - (sent_size + sent))
1534
 
                    sent_size += sent
 
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
1535
2252
                
1536
2253
                logger.info("Sending secret to %s", client.name)
1537
2254
                # bump the timeout using extended_timeout
1538
 
                client.checked_ok(client.extended_timeout)
 
2255
                client.bump_timeout(client.extended_timeout)
1539
2256
                if self.server.use_dbus:
1540
2257
                    # Emit D-Bus signal
1541
2258
                    client.GotSecret()
1545
2262
                    client.approvals_pending -= 1
1546
2263
                try:
1547
2264
                    session.bye()
1548
 
                except gnutls.errors.GNUTLSError as error:
1549
 
                    logger.warning("GnuTLS bye failed")
 
2265
                except gnutls.Error as error:
 
2266
                    logger.warning("GnuTLS bye failed",
 
2267
                                   exc_info=error)
1550
2268
    
1551
2269
    @staticmethod
1552
2270
    def peer_certificate(session):
1553
2271
        "Return the peer's OpenPGP certificate as a bytestring"
1554
2272
        # If not an OpenPGP certificate...
1555
 
        if (gnutls.library.functions
1556
 
            .gnutls_certificate_type_get(session._c_object)
1557
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1558
 
            # ...do the normal thing
1559
 
            return session.peer_certificate
 
2273
        if (gnutls.certificate_type_get(session._c_object)
 
2274
            != gnutls.CRT_OPENPGP):
 
2275
            # ...return invalid data
 
2276
            return b""
1560
2277
        list_size = ctypes.c_uint(1)
1561
 
        cert_list = (gnutls.library.functions
1562
 
                     .gnutls_certificate_get_peers
 
2278
        cert_list = (gnutls.certificate_get_peers
1563
2279
                     (session._c_object, ctypes.byref(list_size)))
1564
2280
        if not bool(cert_list) and list_size.value != 0:
1565
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1566
 
                                            " certificate")
 
2281
            raise gnutls.Error("error getting peer certificate")
1567
2282
        if list_size.value == 0:
1568
2283
            return None
1569
2284
        cert = cert_list[0]
1573
2288
    def fingerprint(openpgp):
1574
2289
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1575
2290
        # New GnuTLS "datum" with the OpenPGP public key
1576
 
        datum = (gnutls.library.types
1577
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1578
 
                                             ctypes.POINTER
1579
 
                                             (ctypes.c_ubyte)),
1580
 
                                 ctypes.c_uint(len(openpgp))))
 
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)))
1581
2295
        # New empty GnuTLS certificate
1582
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1583
 
        (gnutls.library.functions
1584
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
2296
        crt = gnutls.openpgp_crt_t()
 
2297
        gnutls.openpgp_crt_init(ctypes.byref(crt))
1585
2298
        # Import the OpenPGP public key into the certificate
1586
 
        (gnutls.library.functions
1587
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1588
 
                                    gnutls.library.constants
1589
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
2299
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
2300
                                  gnutls.OPENPGP_FMT_RAW)
1590
2301
        # Verify the self signature in the key
1591
2302
        crtverify = ctypes.c_uint()
1592
 
        (gnutls.library.functions
1593
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1594
 
                                         ctypes.byref(crtverify)))
 
2303
        gnutls.openpgp_crt_verify_self(crt, 0,
 
2304
                                       ctypes.byref(crtverify))
1595
2305
        if crtverify.value != 0:
1596
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1597
 
            raise (gnutls.errors.CertificateSecurityError
1598
 
                   ("Verify failed"))
 
2306
            gnutls.openpgp_crt_deinit(crt)
 
2307
            raise gnutls.CertificateSecurityError("Verify failed")
1599
2308
        # New buffer for the fingerprint
1600
2309
        buf = ctypes.create_string_buffer(20)
1601
2310
        buf_len = ctypes.c_size_t()
1602
2311
        # Get the fingerprint from the certificate into the buffer
1603
 
        (gnutls.library.functions
1604
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1605
 
                                             ctypes.byref(buf_len)))
 
2312
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
2313
                                           ctypes.byref(buf_len))
1606
2314
        # Deinit the certificate
1607
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
2315
        gnutls.openpgp_crt_deinit(crt)
1608
2316
        # Convert the buffer to a Python bytestring
1609
2317
        fpr = ctypes.string_at(buf, buf_len.value)
1610
2318
        # Convert the bytestring to hexadecimal notation
1611
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
2319
        hex_fpr = binascii.hexlify(fpr).upper()
1612
2320
        return hex_fpr
1613
2321
 
1614
2322
 
1615
2323
class MultiprocessingMixIn(object):
1616
2324
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
2325
    
1617
2326
    def sub_process_main(self, request, address):
1618
2327
        try:
1619
2328
            self.finish_request(request, address)
1620
 
        except:
 
2329
        except Exception:
1621
2330
            self.handle_error(request, address)
1622
2331
        self.close_request(request)
1623
2332
    
1624
2333
    def process_request(self, request, address):
1625
2334
        """Start a new process to process the request."""
1626
2335
        proc = multiprocessing.Process(target = self.sub_process_main,
1627
 
                                       args = (request,
1628
 
                                               address))
 
2336
                                       args = (request, address))
1629
2337
        proc.start()
1630
2338
        return proc
1631
2339
 
1632
2340
 
1633
2341
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1634
2342
    """ adds a pipe to the MixIn """
 
2343
    
1635
2344
    def process_request(self, request, client_address):
1636
2345
        """Overrides and wraps the original process_request().
1637
2346
        
1646
2355
    
1647
2356
    def add_pipe(self, parent_pipe, proc):
1648
2357
        """Dummy function; override as necessary"""
1649
 
        raise NotImplementedError
 
2358
        raise NotImplementedError()
1650
2359
 
1651
2360
 
1652
2361
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1658
2367
        interface:      None or a network interface name (string)
1659
2368
        use_ipv6:       Boolean; to use IPv6 or not
1660
2369
    """
 
2370
    
1661
2371
    def __init__(self, server_address, RequestHandlerClass,
1662
 
                 interface=None, use_ipv6=True):
 
2372
                 interface=None,
 
2373
                 use_ipv6=True,
 
2374
                 socketfd=None):
 
2375
        """If socketfd is set, use that file descriptor instead of
 
2376
        creating a new one with socket.socket().
 
2377
        """
1663
2378
        self.interface = interface
1664
2379
        if use_ipv6:
1665
2380
            self.address_family = socket.AF_INET6
 
2381
        if socketfd is not None:
 
2382
            # Save the file descriptor
 
2383
            self.socketfd = socketfd
 
2384
            # Save the original socket.socket() function
 
2385
            self.socket_socket = socket.socket
 
2386
            # To implement --socket, we monkey patch socket.socket.
 
2387
            # 
 
2388
            # (When socketserver.TCPServer is a new-style class, we
 
2389
            # could make self.socket into a property instead of monkey
 
2390
            # patching socket.socket.)
 
2391
            # 
 
2392
            # Create a one-time-only replacement for socket.socket()
 
2393
            @functools.wraps(socket.socket)
 
2394
            def socket_wrapper(*args, **kwargs):
 
2395
                # Restore original function so subsequent calls are
 
2396
                # not affected.
 
2397
                socket.socket = self.socket_socket
 
2398
                del self.socket_socket
 
2399
                # This time only, return a new socket object from the
 
2400
                # saved file descriptor.
 
2401
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2402
            # Replace socket.socket() function with wrapper
 
2403
            socket.socket = socket_wrapper
 
2404
        # The socketserver.TCPServer.__init__ will call
 
2405
        # socket.socket(), which might be our replacement,
 
2406
        # socket_wrapper(), if socketfd was set.
1666
2407
        socketserver.TCPServer.__init__(self, server_address,
1667
2408
                                        RequestHandlerClass)
 
2409
    
1668
2410
    def server_bind(self):
1669
2411
        """This overrides the normal server_bind() function
1670
2412
        to bind to an interface if one was specified, and also NOT to
1676
2418
                             self.interface)
1677
2419
            else:
1678
2420
                try:
1679
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1680
 
                                           SO_BINDTODEVICE,
1681
 
                                           str(self.interface
1682
 
                                               + '\0'))
 
2421
                    self.socket.setsockopt(
 
2422
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2423
                        (self.interface + "\0").encode("utf-8"))
1683
2424
                except socket.error as error:
1684
 
                    if error[0] == errno.EPERM:
1685
 
                        logger.error("No permission to"
1686
 
                                     " bind to interface %s",
1687
 
                                     self.interface)
1688
 
                    elif error[0] == errno.ENOPROTOOPT:
 
2425
                    if error.errno == errno.EPERM:
 
2426
                        logger.error("No permission to bind to"
 
2427
                                     " interface %s", self.interface)
 
2428
                    elif error.errno == errno.ENOPROTOOPT:
1689
2429
                        logger.error("SO_BINDTODEVICE not available;"
1690
2430
                                     " cannot bind to interface %s",
1691
2431
                                     self.interface)
 
2432
                    elif error.errno == errno.ENODEV:
 
2433
                        logger.error("Interface %s does not exist,"
 
2434
                                     " cannot bind", self.interface)
1692
2435
                    else:
1693
2436
                        raise
1694
2437
        # Only bind(2) the socket if we really need to.
1697
2440
                if self.address_family == socket.AF_INET6:
1698
2441
                    any_address = "::" # in6addr_any
1699
2442
                else:
1700
 
                    any_address = socket.INADDR_ANY
 
2443
                    any_address = "0.0.0.0" # INADDR_ANY
1701
2444
                self.server_address = (any_address,
1702
2445
                                       self.server_address[1])
1703
2446
            elif not self.server_address[1]:
1704
 
                self.server_address = (self.server_address[0],
1705
 
                                       0)
 
2447
                self.server_address = (self.server_address[0], 0)
1706
2448
#                 if self.interface:
1707
2449
#                     self.server_address = (self.server_address[0],
1708
2450
#                                            0, # port
1720
2462
        gnutls_priority GnuTLS priority string
1721
2463
        use_dbus:       Boolean; to emit D-Bus signals or not
1722
2464
    
1723
 
    Assumes a gobject.MainLoop event loop.
 
2465
    Assumes a GObject.MainLoop event loop.
1724
2466
    """
 
2467
    
1725
2468
    def __init__(self, server_address, RequestHandlerClass,
1726
 
                 interface=None, use_ipv6=True, clients=None,
1727
 
                 gnutls_priority=None, use_dbus=True):
 
2469
                 interface=None,
 
2470
                 use_ipv6=True,
 
2471
                 clients=None,
 
2472
                 gnutls_priority=None,
 
2473
                 use_dbus=True,
 
2474
                 socketfd=None):
1728
2475
        self.enabled = False
1729
2476
        self.clients = clients
1730
2477
        if self.clients is None:
1734
2481
        IPv6_TCPServer.__init__(self, server_address,
1735
2482
                                RequestHandlerClass,
1736
2483
                                interface = interface,
1737
 
                                use_ipv6 = use_ipv6)
 
2484
                                use_ipv6 = use_ipv6,
 
2485
                                socketfd = socketfd)
 
2486
    
1738
2487
    def server_activate(self):
1739
2488
        if self.enabled:
1740
2489
            return socketserver.TCPServer.server_activate(self)
1744
2493
    
1745
2494
    def add_pipe(self, parent_pipe, proc):
1746
2495
        # Call "handle_ipc" for both data and EOF events
1747
 
        gobject.io_add_watch(parent_pipe.fileno(),
1748
 
                             gobject.IO_IN | gobject.IO_HUP,
1749
 
                             functools.partial(self.handle_ipc,
1750
 
                                               parent_pipe =
1751
 
                                               parent_pipe,
1752
 
                                               proc = proc))
 
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))
1753
2502
    
1754
 
    def handle_ipc(self, source, condition, parent_pipe=None,
1755
 
                   proc = None, client_object=None):
1756
 
        condition_names = {
1757
 
            gobject.IO_IN: "IN",   # There is data to read.
1758
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1759
 
                                    # blocking).
1760
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1761
 
            gobject.IO_ERR: "ERR", # Error condition.
1762
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1763
 
                                    # broken, usually for pipes and
1764
 
                                    # sockets).
1765
 
            }
1766
 
        conditions_string = ' | '.join(name
1767
 
                                       for cond, name in
1768
 
                                       condition_names.iteritems()
1769
 
                                       if cond & condition)
 
2503
    def handle_ipc(self, source, condition,
 
2504
                   parent_pipe=None,
 
2505
                   proc = None,
 
2506
                   client_object=None):
1770
2507
        # error, or the other end of multiprocessing.Pipe has closed
1771
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2508
        if condition & (GObject.IO_ERR | GObject.IO_HUP):
1772
2509
            # Wait for other process to exit
1773
2510
            proc.join()
1774
2511
            return False
1795
2532
                parent_pipe.send(False)
1796
2533
                return False
1797
2534
            
1798
 
            gobject.io_add_watch(parent_pipe.fileno(),
1799
 
                                 gobject.IO_IN | gobject.IO_HUP,
1800
 
                                 functools.partial(self.handle_ipc,
1801
 
                                                   parent_pipe =
1802
 
                                                   parent_pipe,
1803
 
                                                   proc = proc,
1804
 
                                                   client_object =
1805
 
                                                   client))
 
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))
1806
2542
            parent_pipe.send(True)
1807
2543
            # remove the old hook in favor of the new above hook on
1808
2544
            # same fileno
1814
2550
            
1815
2551
            parent_pipe.send(('data', getattr(client_object,
1816
2552
                                              funcname)(*args,
1817
 
                                                         **kwargs)))
 
2553
                                                        **kwargs)))
1818
2554
        
1819
2555
        if command == 'getattr':
1820
2556
            attrname = request[1]
1821
 
            if callable(client_object.__getattribute__(attrname)):
1822
 
                parent_pipe.send(('function',))
 
2557
            if isinstance(client_object.__getattribute__(attrname),
 
2558
                          collections.Callable):
 
2559
                parent_pipe.send(('function', ))
1823
2560
            else:
1824
 
                parent_pipe.send(('data', client_object
1825
 
                                  .__getattribute__(attrname)))
 
2561
                parent_pipe.send((
 
2562
                    'data', client_object.__getattribute__(attrname)))
1826
2563
        
1827
2564
        if command == 'setattr':
1828
2565
            attrname = request[1]
1832
2569
        return True
1833
2570
 
1834
2571
 
 
2572
def rfc3339_duration_to_delta(duration):
 
2573
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2574
    
 
2575
    >>> rfc3339_duration_to_delta("P7D")
 
2576
    datetime.timedelta(7)
 
2577
    >>> rfc3339_duration_to_delta("PT60S")
 
2578
    datetime.timedelta(0, 60)
 
2579
    >>> rfc3339_duration_to_delta("PT60M")
 
2580
    datetime.timedelta(0, 3600)
 
2581
    >>> rfc3339_duration_to_delta("PT24H")
 
2582
    datetime.timedelta(1)
 
2583
    >>> rfc3339_duration_to_delta("P1W")
 
2584
    datetime.timedelta(7)
 
2585
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2586
    datetime.timedelta(0, 330)
 
2587
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2588
    datetime.timedelta(1, 200)
 
2589
    """
 
2590
    
 
2591
    # Parsing an RFC 3339 duration with regular expressions is not
 
2592
    # possible - there would have to be multiple places for the same
 
2593
    # values, like seconds.  The current code, while more esoteric, is
 
2594
    # cleaner without depending on a parsing library.  If Python had a
 
2595
    # built-in library for parsing we would use it, but we'd like to
 
2596
    # avoid excessive use of external libraries.
 
2597
    
 
2598
    # 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
 
2604
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2605
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2606
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2607
    token_second = Token(re.compile(r"(\d+)S"),
 
2608
                         datetime.timedelta(seconds=1),
 
2609
                         frozenset((token_end, )))
 
2610
    token_minute = Token(re.compile(r"(\d+)M"),
 
2611
                         datetime.timedelta(minutes=1),
 
2612
                         frozenset((token_second, token_end)))
 
2613
    token_hour = Token(re.compile(r"(\d+)H"),
 
2614
                       datetime.timedelta(hours=1),
 
2615
                       frozenset((token_minute, token_end)))
 
2616
    token_time = Token(re.compile(r"T"),
 
2617
                       None,
 
2618
                       frozenset((token_hour, token_minute,
 
2619
                                  token_second)))
 
2620
    token_day = Token(re.compile(r"(\d+)D"),
 
2621
                      datetime.timedelta(days=1),
 
2622
                      frozenset((token_time, token_end)))
 
2623
    token_month = Token(re.compile(r"(\d+)M"),
 
2624
                        datetime.timedelta(weeks=4),
 
2625
                        frozenset((token_day, token_end)))
 
2626
    token_year = Token(re.compile(r"(\d+)Y"),
 
2627
                       datetime.timedelta(weeks=52),
 
2628
                       frozenset((token_month, token_end)))
 
2629
    token_week = Token(re.compile(r"(\d+)W"),
 
2630
                       datetime.timedelta(weeks=1),
 
2631
                       frozenset((token_end, )))
 
2632
    token_duration = Token(re.compile(r"P"), None,
 
2633
                           frozenset((token_year, token_month,
 
2634
                                      token_day, token_time,
 
2635
                                      token_week)))
 
2636
    # Define starting values
 
2637
    value = datetime.timedelta() # Value so far
 
2638
    found_token = None
 
2639
    followers = frozenset((token_duration, )) # Following valid tokens
 
2640
    s = duration                # String left to parse
 
2641
    # Loop until end token is found
 
2642
    while found_token is not token_end:
 
2643
        # Search for any currently valid tokens
 
2644
        for token in followers:
 
2645
            match = token.regexp.match(s)
 
2646
            if match is not None:
 
2647
                # Token found
 
2648
                if token.value is not None:
 
2649
                    # Value found, parse digits
 
2650
                    factor = int(match.group(1), 10)
 
2651
                    # Add to value so far
 
2652
                    value += factor * token.value
 
2653
                # Strip token from string
 
2654
                s = token.regexp.sub("", s, 1)
 
2655
                # Go to found token
 
2656
                found_token = token
 
2657
                # Set valid next tokens
 
2658
                followers = found_token.followers
 
2659
                break
 
2660
        else:
 
2661
            # No currently valid tokens were found
 
2662
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2663
                             .format(duration))
 
2664
    # End token found
 
2665
    return value
 
2666
 
 
2667
 
1835
2668
def string_to_delta(interval):
1836
2669
    """Parse a string and return a datetime.timedelta
1837
2670
    
1848
2681
    >>> string_to_delta('5m 30s')
1849
2682
    datetime.timedelta(0, 330)
1850
2683
    """
 
2684
    
 
2685
    try:
 
2686
        return rfc3339_duration_to_delta(interval)
 
2687
    except ValueError:
 
2688
        pass
 
2689
    
1851
2690
    timevalue = datetime.timedelta(0)
1852
2691
    for s in interval.split():
1853
2692
        try:
1854
 
            suffix = unicode(s[-1])
 
2693
            suffix = s[-1]
1855
2694
            value = int(s[:-1])
1856
2695
            if suffix == "d":
1857
2696
                delta = datetime.timedelta(value)
1864
2703
            elif suffix == "w":
1865
2704
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1866
2705
            else:
1867
 
                raise ValueError("Unknown suffix %r" % suffix)
1868
 
        except (ValueError, IndexError) as e:
 
2706
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2707
        except IndexError as e:
1869
2708
            raise ValueError(*(e.args))
1870
2709
        timevalue += delta
1871
2710
    return timevalue
1884
2723
        sys.exit()
1885
2724
    if not noclose:
1886
2725
        # Close all standard open file descriptors
1887
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2726
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1888
2727
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1889
2728
            raise OSError(errno.ENODEV,
1890
 
                          "%s not a character device"
1891
 
                          % os.path.devnull)
 
2729
                          "{} not a character device"
 
2730
                          .format(os.devnull))
1892
2731
        os.dup2(null, sys.stdin.fileno())
1893
2732
        os.dup2(null, sys.stdout.fileno())
1894
2733
        os.dup2(null, sys.stderr.fileno())
1903
2742
    
1904
2743
    parser = argparse.ArgumentParser()
1905
2744
    parser.add_argument("-v", "--version", action="version",
1906
 
                        version = "%%(prog)s %s" % version,
 
2745
                        version = "%(prog)s {}".format(version),
1907
2746
                        help="show version number and exit")
1908
2747
    parser.add_argument("-i", "--interface", metavar="IF",
1909
2748
                        help="Bind to interface IF")
1915
2754
                        help="Run self-test")
1916
2755
    parser.add_argument("--debug", action="store_true",
1917
2756
                        help="Debug mode; run in foreground and log"
1918
 
                        " to terminal")
 
2757
                        " to terminal", default=None)
1919
2758
    parser.add_argument("--debuglevel", metavar="LEVEL",
1920
2759
                        help="Debug level for stdout output")
1921
2760
    parser.add_argument("--priority", help="GnuTLS"
1928
2767
                        " files")
1929
2768
    parser.add_argument("--no-dbus", action="store_false",
1930
2769
                        dest="use_dbus", help="Do not provide D-Bus"
1931
 
                        " system bus interface")
 
2770
                        " system bus interface", default=None)
1932
2771
    parser.add_argument("--no-ipv6", action="store_false",
1933
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2772
                        dest="use_ipv6", help="Do not use IPv6",
 
2773
                        default=None)
1934
2774
    parser.add_argument("--no-restore", action="store_false",
1935
 
                        dest="restore", help="Do not restore stored state",
1936
 
                        default=True)
 
2775
                        dest="restore", help="Do not restore stored"
 
2776
                        " state", default=None)
 
2777
    parser.add_argument("--socket", type=int,
 
2778
                        help="Specify a file descriptor to a network"
 
2779
                        " socket to use instead of creating one")
 
2780
    parser.add_argument("--statedir", metavar="DIR",
 
2781
                        help="Directory to save/restore state in")
 
2782
    parser.add_argument("--foreground", action="store_true",
 
2783
                        help="Run in foreground", default=None)
 
2784
    parser.add_argument("--no-zeroconf", action="store_false",
 
2785
                        dest="zeroconf", help="Do not use Zeroconf",
 
2786
                        default=None)
1937
2787
    
1938
2788
    options = parser.parse_args()
1939
2789
    
1940
2790
    if options.check:
1941
2791
        import doctest
1942
 
        doctest.testmod()
1943
 
        sys.exit()
 
2792
        fail_count, test_count = doctest.testmod()
 
2793
        sys.exit(os.EX_OK if fail_count == 0 else 1)
1944
2794
    
1945
2795
    # Default values for config file for server-global settings
1946
2796
    server_defaults = { "interface": "",
1948
2798
                        "port": "",
1949
2799
                        "debug": "False",
1950
2800
                        "priority":
1951
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2801
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2802
                        ":+SIGN-DSA-SHA256",
1952
2803
                        "servicename": "Mandos",
1953
2804
                        "use_dbus": "True",
1954
2805
                        "use_ipv6": "True",
1955
2806
                        "debuglevel": "",
1956
 
                        }
 
2807
                        "restore": "True",
 
2808
                        "socket": "",
 
2809
                        "statedir": "/var/lib/mandos",
 
2810
                        "foreground": "False",
 
2811
                        "zeroconf": "True",
 
2812
                    }
1957
2813
    
1958
2814
    # Parse config file for server-global settings
1959
2815
    server_config = configparser.SafeConfigParser(server_defaults)
1960
2816
    del server_defaults
1961
 
    server_config.read(os.path.join(options.configdir,
1962
 
                                    "mandos.conf"))
 
2817
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1963
2818
    # Convert the SafeConfigParser object to a dict
1964
2819
    server_settings = server_config.defaults()
1965
2820
    # Use the appropriate methods on the non-string config options
1966
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2821
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1967
2822
        server_settings[option] = server_config.getboolean("DEFAULT",
1968
2823
                                                           option)
1969
2824
    if server_settings["port"]:
1970
2825
        server_settings["port"] = server_config.getint("DEFAULT",
1971
2826
                                                       "port")
 
2827
    if server_settings["socket"]:
 
2828
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2829
                                                         "socket")
 
2830
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2831
        # over with an opened os.devnull.  But we don't want this to
 
2832
        # happen with a supplied network socket.
 
2833
        if 0 <= server_settings["socket"] <= 2:
 
2834
            server_settings["socket"] = os.dup(server_settings
 
2835
                                               ["socket"])
1972
2836
    del server_config
1973
2837
    
1974
2838
    # Override the settings from the config file with command line
1975
2839
    # options, if set.
1976
2840
    for option in ("interface", "address", "port", "debug",
1977
 
                   "priority", "servicename", "configdir",
1978
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2841
                   "priority", "servicename", "configdir", "use_dbus",
 
2842
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2843
                   "socket", "foreground", "zeroconf"):
1979
2844
        value = getattr(options, option)
1980
2845
        if value is not None:
1981
2846
            server_settings[option] = value
1982
2847
    del options
1983
2848
    # Force all strings to be unicode
1984
2849
    for option in server_settings.keys():
1985
 
        if type(server_settings[option]) is str:
1986
 
            server_settings[option] = unicode(server_settings[option])
 
2850
        if isinstance(server_settings[option], bytes):
 
2851
            server_settings[option] = (server_settings[option]
 
2852
                                       .decode("utf-8"))
 
2853
    # Force all boolean options to be boolean
 
2854
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2855
                   "foreground", "zeroconf"):
 
2856
        server_settings[option] = bool(server_settings[option])
 
2857
    # Debug implies foreground
 
2858
    if server_settings["debug"]:
 
2859
        server_settings["foreground"] = True
1987
2860
    # Now we have our good server settings in "server_settings"
1988
2861
    
1989
2862
    ##################################################################
1990
2863
    
 
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")
 
2868
    
1991
2869
    # For convenience
1992
2870
    debug = server_settings["debug"]
1993
2871
    debuglevel = server_settings["debuglevel"]
1994
2872
    use_dbus = server_settings["use_dbus"]
1995
2873
    use_ipv6 = server_settings["use_ipv6"]
 
2874
    stored_state_path = os.path.join(server_settings["statedir"],
 
2875
                                     stored_state_file)
 
2876
    foreground = server_settings["foreground"]
 
2877
    zeroconf = server_settings["zeroconf"]
1996
2878
    
1997
2879
    if debug:
1998
 
        initlogger(logging.DEBUG)
 
2880
        initlogger(debug, logging.DEBUG)
1999
2881
    else:
2000
2882
        if not debuglevel:
2001
 
            initlogger()
 
2883
            initlogger(debug)
2002
2884
        else:
2003
2885
            level = getattr(logging, debuglevel.upper())
2004
 
            initlogger(level)    
 
2886
            initlogger(debug, level)
2005
2887
    
2006
2888
    if server_settings["servicename"] != "Mandos":
2007
 
        syslogger.setFormatter(logging.Formatter
2008
 
                               ('Mandos (%s) [%%(process)d]:'
2009
 
                                ' %%(levelname)s: %%(message)s'
2010
 
                                % server_settings["servicename"]))
 
2889
        syslogger.setFormatter(
 
2890
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2891
                              ' %(levelname)s: %(message)s'.format(
 
2892
                                  server_settings["servicename"])))
2011
2893
    
2012
2894
    # Parse config file with clients
2013
 
    client_defaults = { "timeout": "5m",
2014
 
                        "extended_timeout": "15m",
2015
 
                        "interval": "2m",
2016
 
                        "checker": "fping -q -- %%(host)s",
2017
 
                        "host": "",
2018
 
                        "approval_delay": "0s",
2019
 
                        "approval_duration": "1s",
2020
 
                        }
2021
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2895
    client_config = configparser.SafeConfigParser(Client
 
2896
                                                  .client_defaults)
2022
2897
    client_config.read(os.path.join(server_settings["configdir"],
2023
2898
                                    "clients.conf"))
2024
2899
    
2025
2900
    global mandos_dbus_service
2026
2901
    mandos_dbus_service = None
2027
2902
    
2028
 
    tcp_server = MandosServer((server_settings["address"],
2029
 
                               server_settings["port"]),
2030
 
                              ClientHandler,
2031
 
                              interface=(server_settings["interface"]
2032
 
                                         or None),
2033
 
                              use_ipv6=use_ipv6,
2034
 
                              gnutls_priority=
2035
 
                              server_settings["priority"],
2036
 
                              use_dbus=use_dbus)
2037
 
    if not debug:
2038
 
        pidfilename = "/var/run/mandos.pid"
 
2903
    socketfd = None
 
2904
    if server_settings["socket"] != "":
 
2905
        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)
 
2914
    if not foreground:
 
2915
        pidfilename = "/run/mandos.pid"
 
2916
        if not os.path.isdir("/run/."):
 
2917
            pidfilename = "/var/run/mandos.pid"
 
2918
        pidfile = None
2039
2919
        try:
2040
 
            pidfile = open(pidfilename, "w")
2041
 
        except IOError:
2042
 
            logger.error("Could not open file %r", pidfilename)
 
2920
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2921
        except IOError as e:
 
2922
            logger.error("Could not open file %r", pidfilename,
 
2923
                         exc_info=e)
2043
2924
    
2044
 
    try:
2045
 
        uid = pwd.getpwnam("_mandos").pw_uid
2046
 
        gid = pwd.getpwnam("_mandos").pw_gid
2047
 
    except KeyError:
 
2925
    for name, group in (("_mandos", "_mandos"),
 
2926
                        ("mandos", "mandos"),
 
2927
                        ("nobody", "nogroup")):
2048
2928
        try:
2049
 
            uid = pwd.getpwnam("mandos").pw_uid
2050
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2929
            uid = pwd.getpwnam(name).pw_uid
 
2930
            gid = pwd.getpwnam(group).pw_gid
 
2931
            break
2051
2932
        except KeyError:
2052
 
            try:
2053
 
                uid = pwd.getpwnam("nobody").pw_uid
2054
 
                gid = pwd.getpwnam("nobody").pw_gid
2055
 
            except KeyError:
2056
 
                uid = 65534
2057
 
                gid = 65534
 
2933
            continue
 
2934
    else:
 
2935
        uid = 65534
 
2936
        gid = 65534
2058
2937
    try:
2059
2938
        os.setgid(gid)
2060
2939
        os.setuid(uid)
2061
2940
    except OSError as error:
2062
 
        if error[0] != errno.EPERM:
2063
 
            raise error
 
2941
        if error.errno != errno.EPERM:
 
2942
            raise
2064
2943
    
2065
2944
    if debug:
2066
2945
        # Enable all possible GnuTLS debugging
2067
2946
        
2068
2947
        # "Use a log level over 10 to enable all debugging options."
2069
2948
        # - GnuTLS manual
2070
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2949
        gnutls.global_set_log_level(11)
2071
2950
        
2072
 
        @gnutls.library.types.gnutls_log_func
 
2951
        @gnutls.log_func
2073
2952
        def debug_gnutls(level, string):
2074
2953
            logger.debug("GnuTLS: %s", string[:-1])
2075
2954
        
2076
 
        (gnutls.library.functions
2077
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2955
        gnutls.global_set_log_function(debug_gnutls)
2078
2956
        
2079
2957
        # Redirect stdin so all checkers get /dev/null
2080
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2958
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2081
2959
        os.dup2(null, sys.stdin.fileno())
2082
2960
        if null > 2:
2083
2961
            os.close(null)
2084
 
    else:
2085
 
        # No console logging
2086
 
        logger.removeHandler(console)
2087
2962
    
2088
2963
    # Need to fork before connecting to D-Bus
2089
 
    if not debug:
 
2964
    if not foreground:
2090
2965
        # Close all input and output, do double fork, etc.
2091
2966
        daemon()
2092
2967
    
 
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()
 
2971
    
2093
2972
    global main_loop
2094
2973
    # From the Avahi example code
2095
 
    DBusGMainLoop(set_as_default=True )
2096
 
    main_loop = gobject.MainLoop()
 
2974
    DBusGMainLoop(set_as_default=True)
 
2975
    main_loop = GObject.MainLoop()
2097
2976
    bus = dbus.SystemBus()
2098
2977
    # End of Avahi example code
2099
2978
    if use_dbus:
2100
2979
        try:
2101
2980
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2102
 
                                            bus, do_not_queue=True)
2103
 
            old_bus_name = (dbus.service.BusName
2104
 
                            ("se.bsnet.fukt.Mandos", bus,
2105
 
                             do_not_queue=True))
2106
 
        except dbus.exceptions.NameExistsException as e:
2107
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
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:
 
2987
            logger.error("Disabling D-Bus:", exc_info=e)
2108
2988
            use_dbus = False
2109
2989
            server_settings["use_dbus"] = False
2110
2990
            tcp_server.use_dbus = False
2111
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2112
 
    service = AvahiServiceToSyslog(name =
2113
 
                                   server_settings["servicename"],
2114
 
                                   servicetype = "_mandos._tcp",
2115
 
                                   protocol = protocol, bus = bus)
2116
 
    if server_settings["interface"]:
2117
 
        service.interface = (if_nametoindex
2118
 
                             (str(server_settings["interface"])))
 
2991
    if zeroconf:
 
2992
        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)
 
2998
        if server_settings["interface"]:
 
2999
            service.interface = if_nametoindex(
 
3000
                server_settings["interface"].encode("utf-8"))
2119
3001
    
2120
3002
    global multiprocessing_manager
2121
3003
    multiprocessing_manager = multiprocessing.Manager()
2122
3004
    
2123
3005
    client_class = Client
2124
3006
    if use_dbus:
2125
 
        client_class = functools.partial(ClientDBusTransitional,
2126
 
                                         bus = bus)
2127
 
    
2128
 
    special_settings = {
2129
 
        # Some settings need to be accessd by special methods;
2130
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2131
 
        "approved_by_default":
2132
 
            lambda section:
2133
 
            client_config.getboolean(section, "approved_by_default"),
2134
 
        }
2135
 
    # Construct a new dict of client settings of this form:
2136
 
    # { client_name: {setting_name: value, ...}, ...}
2137
 
    # with exceptions for any special settings as defined above
2138
 
    client_settings = dict((clientname,
2139
 
                           dict((setting,
2140
 
                                 (value if setting not in special_settings
2141
 
                                  else special_settings[setting](clientname)))
2142
 
                                for setting, value in client_config.items(clientname)))
2143
 
                          for clientname in client_config.sections())
2144
 
    
 
3007
        client_class = functools.partial(ClientDBus, bus = bus)
 
3008
    
 
3009
    client_settings = Client.config_parser(client_config)
2145
3010
    old_client_settings = {}
2146
 
    clients_data = []
2147
 
    
2148
 
    # Get client data and settings from last running state. 
 
3011
    clients_data = {}
 
3012
    
 
3013
    # This is used to redirect stdout and stderr for checker processes
 
3014
    global wnull
 
3015
    wnull = open(os.devnull, "w") # A writable /dev/null
 
3016
    # Only used if server is running in foreground but not in debug
 
3017
    # mode
 
3018
    if debug or not foreground:
 
3019
        wnull.close()
 
3020
    
 
3021
    # Get client data and settings from last running state.
2149
3022
    if server_settings["restore"]:
2150
3023
        try:
2151
3024
            with open(stored_state_path, "rb") as stored_state:
2152
 
                clients_data, old_client_settings = pickle.load(stored_state)
 
3025
                clients_data, old_client_settings = pickle.load(
 
3026
                    stored_state)
2153
3027
            os.remove(stored_state_path)
2154
3028
        except IOError as e:
2155
 
            logger.warning("Could not load persistant state: {0}".format(e))
2156
 
            if e.errno != errno.ENOENT:
 
3029
            if e.errno == errno.ENOENT:
 
3030
                logger.warning("Could not load persistent state:"
 
3031
                               " {}".format(os.strerror(e.errno)))
 
3032
            else:
 
3033
                logger.critical("Could not load persistent state:",
 
3034
                                exc_info=e)
2157
3035
                raise
 
3036
        except EOFError as e:
 
3037
            logger.warning("Could not load persistent state: "
 
3038
                           "EOFError:",
 
3039
                           exc_info=e)
2158
3040
    
2159
 
    for client in clients_data:
2160
 
        client_name = client["name"]
2161
 
        
2162
 
        # Decide which value to use after restoring saved state.
2163
 
        # We have three different values: Old config file,
2164
 
        # new config file, and saved state.
2165
 
        # New config value takes precedence if it differs from old
2166
 
        # config value, otherwise use saved state.
2167
 
        for name, value in client_settings[client_name].items():
 
3041
    with PGPEngine() as pgp:
 
3042
        for client_name, client in clients_data.items():
 
3043
            # Skip removed clients
 
3044
            if client_name not in client_settings:
 
3045
                continue
 
3046
            
 
3047
            # Decide which value to use after restoring saved state.
 
3048
            # We have three different values: Old config file,
 
3049
            # new config file, and saved state.
 
3050
            # New config value takes precedence if it differs from old
 
3051
            # config value, otherwise use saved state.
 
3052
            for name, value in client_settings[client_name].items():
 
3053
                try:
 
3054
                    # For each value in new config, check if it
 
3055
                    # differs from the old config value (Except for
 
3056
                    # the "secret" attribute)
 
3057
                    if (name != "secret"
 
3058
                        and (value !=
 
3059
                             old_client_settings[client_name][name])):
 
3060
                        client[name] = value
 
3061
                except KeyError:
 
3062
                    pass
 
3063
            
 
3064
            # Clients who has passed its expire date can still be
 
3065
            # enabled if its last checker was successful.  A Client
 
3066
            # whose checker succeeded before we stored its state is
 
3067
            # assumed to have successfully run all checkers during
 
3068
            # downtime.
 
3069
            if client["enabled"]:
 
3070
                if datetime.datetime.utcnow() >= client["expires"]:
 
3071
                    if not client["last_checked_ok"]:
 
3072
                        logger.warning(
 
3073
                            "disabling client {} - Client never "
 
3074
                            "performed a successful checker".format(
 
3075
                                client_name))
 
3076
                        client["enabled"] = False
 
3077
                    elif client["last_checker_status"] != 0:
 
3078
                        logger.warning(
 
3079
                            "disabling client {} - Client last"
 
3080
                            " checker failed with error code"
 
3081
                            " {}".format(
 
3082
                                client_name,
 
3083
                                client["last_checker_status"]))
 
3084
                        client["enabled"] = False
 
3085
                    else:
 
3086
                        client["expires"] = (
 
3087
                            datetime.datetime.utcnow()
 
3088
                            + client["timeout"])
 
3089
                        logger.debug("Last checker succeeded,"
 
3090
                                     " keeping {} enabled".format(
 
3091
                                         client_name))
2168
3092
            try:
2169
 
                # For each value in new config, check if it differs
2170
 
                # from the old config value (Except for the "secret"
2171
 
                # attribute)
2172
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2173
 
                    setattr(client, name, value)
2174
 
            except KeyError:
2175
 
                pass
2176
 
        
2177
 
        # Clients who has passed its expire date, can still be enabled if its
2178
 
        # last checker was sucessful. Clients who checkers failed before we
2179
 
        # stored it state is asumed to had failed checker during downtime.
2180
 
        if client["enabled"] and client["last_checked_ok"]:
2181
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2182
 
                > client["interval"]):
2183
 
                if client["last_checker_status"] != 0:
2184
 
                    client["enabled"] = False
2185
 
                else:
2186
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2187
 
        
2188
 
        client["changedstate"] = (multiprocessing_manager
2189
 
                                  .Condition(multiprocessing_manager
2190
 
                                             .Lock()))
2191
 
        if use_dbus:
2192
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2193
 
            tcp_server.clients[client_name] = new_client
2194
 
            new_client.bus = bus
2195
 
            for name, value in client.iteritems():
2196
 
                setattr(new_client, name, value)
2197
 
            client_object_name = unicode(client_name).translate(
2198
 
                {ord("."): ord("_"),
2199
 
                 ord("-"): ord("_")})
2200
 
            new_client.dbus_object_path = (dbus.ObjectPath
2201
 
                                     ("/clients/" + client_object_name))
2202
 
            DBusObjectWithProperties.__init__(new_client,
2203
 
                                              new_client.bus,
2204
 
                                              new_client.dbus_object_path)
2205
 
        else:
2206
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2207
 
            for name, value in client.iteritems():
2208
 
                setattr(tcp_server.clients[client_name], name, value)
2209
 
                
2210
 
        tcp_server.clients[client_name].decrypt_secret(
2211
 
            client_settings[client_name]["secret"])            
2212
 
        
2213
 
    # Create/remove clients based on new changes made to config
2214
 
    for clientname in set(old_client_settings) - set(client_settings):
2215
 
        del tcp_server.clients[clientname]
2216
 
    for clientname in set(client_settings) - set(old_client_settings):
2217
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2218
 
                                                       config =
2219
 
                                                       client_settings
2220
 
                                                       [clientname]))
2221
 
    
 
3093
                client["secret"] = pgp.decrypt(
 
3094
                    client["encrypted_secret"],
 
3095
                    client_settings[client_name]["secret"])
 
3096
            except PGPError:
 
3097
                # 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"])
 
3102
    
 
3103
    # Add/remove clients based on new changes made to config
 
3104
    for client_name in (set(old_client_settings)
 
3105
                        - set(client_settings)):
 
3106
        del clients_data[client_name]
 
3107
    for client_name in (set(client_settings)
 
3108
                        - set(old_client_settings)):
 
3109
        clients_data[client_name] = client_settings[client_name]
 
3110
    
 
3111
    # Create all client objects
 
3112
    for client_name, client in clients_data.items():
 
3113
        tcp_server.clients[client_name] = client_class(
 
3114
            name = client_name,
 
3115
            settings = client,
 
3116
            server_settings = server_settings)
2222
3117
    
2223
3118
    if not tcp_server.clients:
2224
3119
        logger.warning("No clients defined")
2225
 
        
2226
 
    if not debug:
2227
 
        try:
2228
 
            with pidfile:
2229
 
                pid = os.getpid()
2230
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2231
 
            del pidfile
2232
 
        except IOError:
2233
 
            logger.error("Could not write to file %r with PID %d",
2234
 
                         pidfilename, pid)
2235
 
        except NameError:
2236
 
            # "pidfile" was never created
2237
 
            pass
 
3120
    
 
3121
    if not foreground:
 
3122
        if pidfile is not None:
 
3123
            pid = os.getpid()
 
3124
            try:
 
3125
                with pidfile:
 
3126
                    print(pid, file=pidfile)
 
3127
            except IOError:
 
3128
                logger.error("Could not write to file %r with PID %d",
 
3129
                             pidfilename, pid)
 
3130
        del pidfile
2238
3131
        del pidfilename
2239
 
        
2240
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2241
3132
    
2242
3133
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2243
3134
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2244
3135
    
2245
3136
    if use_dbus:
2246
 
        class MandosDBusService(dbus.service.Object):
 
3137
        
 
3138
        @alternate_dbus_interfaces(
 
3139
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
3140
        class MandosDBusService(DBusObjectWithObjectManager):
2247
3141
            """A D-Bus proxy object"""
 
3142
            
2248
3143
            def __init__(self):
2249
3144
                dbus.service.Object.__init__(self, bus, "/")
 
3145
            
2250
3146
            _interface = "se.recompile.Mandos"
2251
3147
            
2252
3148
            @dbus.service.signal(_interface, signature="o")
2259
3155
                "D-Bus signal"
2260
3156
                pass
2261
3157
            
 
3158
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3159
                               "true"})
2262
3160
            @dbus.service.signal(_interface, signature="os")
2263
3161
            def ClientRemoved(self, objpath, name):
2264
3162
                "D-Bus signal"
2265
3163
                pass
2266
3164
            
 
3165
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3166
                               "true"})
2267
3167
            @dbus.service.method(_interface, out_signature="ao")
2268
3168
            def GetAllClients(self):
2269
3169
                "D-Bus method"
2270
 
                return dbus.Array(c.dbus_object_path
2271
 
                                  for c in
 
3170
                return dbus.Array(c.dbus_object_path for c in
2272
3171
                                  tcp_server.clients.itervalues())
2273
3172
            
 
3173
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
3174
                               "true"})
2274
3175
            @dbus.service.method(_interface,
2275
3176
                                 out_signature="a{oa{sv}}")
2276
3177
            def GetAllClientsWithProperties(self):
2277
3178
                "D-Bus method"
2278
3179
                return dbus.Dictionary(
2279
 
                    ((c.dbus_object_path, c.GetAll(""))
2280
 
                     for c in tcp_server.clients.itervalues()),
 
3180
                    { c.dbus_object_path: c.GetAll(
 
3181
                        "se.recompile.Mandos.Client")
 
3182
                      for c in tcp_server.clients.itervalues() },
2281
3183
                    signature="oa{sv}")
2282
3184
            
2283
3185
            @dbus.service.method(_interface, in_signature="o")
2287
3189
                    if c.dbus_object_path == object_path:
2288
3190
                        del tcp_server.clients[c.name]
2289
3191
                        c.remove_from_connection()
2290
 
                        # Don't signal anything except ClientRemoved
 
3192
                        # Don't signal the disabling
2291
3193
                        c.disable(quiet=True)
2292
 
                        # Emit D-Bus signal
2293
 
                        self.ClientRemoved(object_path, c.name)
 
3194
                        # Emit D-Bus signal for removal
 
3195
                        self.client_removed_signal(c)
2294
3196
                        return
2295
3197
                raise KeyError(object_path)
2296
3198
            
2297
3199
            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)
2298
3236
        
2299
 
        class MandosDBusServiceTransitional(MandosDBusService):
2300
 
            __metaclass__ = AlternateDBusNamesMetaclass
2301
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
3237
        mandos_dbus_service = MandosDBusService()
2302
3238
    
2303
3239
    def cleanup():
2304
3240
        "Cleanup function; run on exit"
2305
 
        service.cleanup()
 
3241
        if zeroconf:
 
3242
            service.cleanup()
2306
3243
        
2307
3244
        multiprocessing.active_children()
 
3245
        wnull.close()
2308
3246
        if not (tcp_server.clients or client_settings):
2309
3247
            return
2310
3248
        
2311
 
        # Store client before exiting. Secrets are encrypted with key based
2312
 
        # on what config file has. If config file is removed/edited, old
2313
 
        # secret will thus be unrecovable.
2314
 
        clients = []
2315
 
        for client in tcp_server.clients.itervalues():
2316
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2317
 
            
2318
 
            client_dict = {}
2319
 
            
2320
 
            # A list of attributes that will not be stored when shuting down.
2321
 
            exclude = set(("bus", "changedstate", "secret"))            
2322
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2323
 
                exclude.add(name)
2324
 
                
2325
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2326
 
            for attr in client.client_structure:
2327
 
                if attr not in exclude:
2328
 
                    client_dict[attr] = getattr(client, attr)
2329
 
            
2330
 
            clients.append(client_dict) 
2331
 
            del client_settings[client.name]["secret"]
2332
 
            
 
3249
        # Store client before exiting. Secrets are encrypted with key
 
3250
        # based on what config file has. If config file is
 
3251
        # removed/edited, old secret will thus be unrecovable.
 
3252
        clients = {}
 
3253
        with PGPEngine() as pgp:
 
3254
            for client in tcp_server.clients.itervalues():
 
3255
                key = client_settings[client.name]["secret"]
 
3256
                client.encrypted_secret = pgp.encrypt(client.secret,
 
3257
                                                      key)
 
3258
                client_dict = {}
 
3259
                
 
3260
                # A list of attributes that can not be pickled
 
3261
                # + secret.
 
3262
                exclude = { "bus", "changedstate", "secret",
 
3263
                            "checker", "server_settings" }
 
3264
                for name, typ in inspect.getmembers(dbus.service
 
3265
                                                    .Object):
 
3266
                    exclude.add(name)
 
3267
                
 
3268
                client_dict["encrypted_secret"] = (client
 
3269
                                                   .encrypted_secret)
 
3270
                for attr in client.client_structure:
 
3271
                    if attr not in exclude:
 
3272
                        client_dict[attr] = getattr(client, attr)
 
3273
                
 
3274
                clients[client.name] = client_dict
 
3275
                del client_settings[client.name]["secret"]
 
3276
        
2333
3277
        try:
2334
 
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
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:
2335
3284
                pickle.dump((clients, client_settings), stored_state)
2336
 
        except IOError as e:
2337
 
            logger.warning("Could not save persistant state: {0}".format(e))
2338
 
            if e.errno != errno.ENOENT:
 
3285
                tempname = stored_state.name
 
3286
            os.rename(tempname, stored_state_path)
 
3287
        except (IOError, OSError) as e:
 
3288
            if not debug:
 
3289
                try:
 
3290
                    os.remove(tempname)
 
3291
                except NameError:
 
3292
                    pass
 
3293
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
3294
                logger.warning("Could not save persistent state: {}"
 
3295
                               .format(os.strerror(e.errno)))
 
3296
            else:
 
3297
                logger.warning("Could not save persistent state:",
 
3298
                               exc_info=e)
2339
3299
                raise
2340
3300
        
2341
3301
        # Delete all clients, and settings from config
2343
3303
            name, client = tcp_server.clients.popitem()
2344
3304
            if use_dbus:
2345
3305
                client.remove_from_connection()
2346
 
            # Don't signal anything except ClientRemoved
 
3306
            # Don't signal the disabling
2347
3307
            client.disable(quiet=True)
 
3308
            # Emit D-Bus signal for removal
2348
3309
            if use_dbus:
2349
 
                # Emit D-Bus signal
2350
 
                mandos_dbus_service.ClientRemoved(client
2351
 
                                                  .dbus_object_path,
2352
 
                                                  client.name)
 
3310
                mandos_dbus_service.client_removed_signal(client)
2353
3311
        client_settings.clear()
2354
3312
    
2355
3313
    atexit.register(cleanup)
2356
3314
    
2357
3315
    for client in tcp_server.clients.itervalues():
2358
3316
        if use_dbus:
2359
 
            # Emit D-Bus signal
2360
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
3317
            # Emit D-Bus signal for adding
 
3318
            mandos_dbus_service.client_added_signal(client)
2361
3319
        # Need to initiate checking of clients
2362
3320
        if client.enabled:
2363
3321
            client.init_checker()
2364
 
 
2365
3322
    
2366
3323
    tcp_server.enable()
2367
3324
    tcp_server.server_activate()
2368
3325
    
2369
3326
    # Find out what port we got
2370
 
    service.port = tcp_server.socket.getsockname()[1]
 
3327
    if zeroconf:
 
3328
        service.port = tcp_server.socket.getsockname()[1]
2371
3329
    if use_ipv6:
2372
3330
        logger.info("Now listening on address %r, port %d,"
2373
 
                    " flowinfo %d, scope_id %d"
2374
 
                    % tcp_server.socket.getsockname())
 
3331
                    " flowinfo %d, scope_id %d",
 
3332
                    *tcp_server.socket.getsockname())
2375
3333
    else:                       # IPv4
2376
 
        logger.info("Now listening on address %r, port %d"
2377
 
                    % tcp_server.socket.getsockname())
 
3334
        logger.info("Now listening on address %r, port %d",
 
3335
                    *tcp_server.socket.getsockname())
2378
3336
    
2379
3337
    #service.interface = tcp_server.socket.getsockname()[3]
2380
3338
    
2381
3339
    try:
2382
 
        # From the Avahi example code
2383
 
        try:
2384
 
            service.activate()
2385
 
        except dbus.exceptions.DBusException as error:
2386
 
            logger.critical("DBusException: %s", error)
2387
 
            cleanup()
2388
 
            sys.exit(1)
2389
 
        # End of Avahi example code
 
3340
        if zeroconf:
 
3341
            # From the Avahi example code
 
3342
            try:
 
3343
                service.activate()
 
3344
            except dbus.exceptions.DBusException as error:
 
3345
                logger.critical("D-Bus Exception", exc_info=error)
 
3346
                cleanup()
 
3347
                sys.exit(1)
 
3348
            # End of Avahi example code
2390
3349
        
2391
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
3350
        GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
2392
3351
                             lambda *args, **kwargs:
2393
3352
                             (tcp_server.handle_request
2394
3353
                              (*args[2:], **kwargs) or True))
2396
3355
        logger.debug("Starting main loop")
2397
3356
        main_loop.run()
2398
3357
    except AvahiError as error:
2399
 
        logger.critical("AvahiError: %s", error)
 
3358
        logger.critical("Avahi Error", exc_info=error)
2400
3359
        cleanup()
2401
3360
        sys.exit(1)
2402
3361
    except KeyboardInterrupt: