/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2011-10-02 19:18:24 UTC
  • mto: This revision was merged to the branch mainline in revision 505.
  • Revision ID: belorn@fukt.bsnet.se-20111002191824-eweh4pvneeg3qzia
transitional stuff actually working
documented change to D-Bus API

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2016 Teddy Hogeborn
15
 
# Copyright © 2008-2016 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
 
try:
40
 
    import SocketServer as socketserver
41
 
except ImportError:
42
 
    import socketserver
 
37
import SocketServer as socketserver
43
38
import socket
44
39
import argparse
45
40
import datetime
46
41
import errno
47
 
try:
48
 
    import ConfigParser as configparser
49
 
except ImportError:
50
 
    import configparser
 
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
51
49
import sys
52
50
import re
53
51
import os
62
60
import struct
63
61
import fcntl
64
62
import functools
65
 
try:
66
 
    import cPickle as pickle
67
 
except ImportError:
68
 
    import pickle
 
63
import cPickle as pickle
69
64
import multiprocessing
70
65
import types
71
 
import binascii
72
 
import tempfile
73
 
import itertools
74
 
import collections
75
 
import codecs
76
66
 
77
67
import dbus
78
68
import dbus.service
79
 
try:
80
 
    from gi.repository import GObject
81
 
except ImportError:
82
 
    import gobject as GObject
 
69
import gobject
83
70
import avahi
84
71
from dbus.mainloop.glib import DBusGMainLoop
85
72
import ctypes
95
82
    except ImportError:
96
83
        SO_BINDTODEVICE = None
97
84
 
98
 
if sys.version_info.major == 2:
99
 
    str = unicode
100
 
 
101
 
version = "1.7.3"
102
 
stored_state_file = "clients.pickle"
103
 
 
104
 
logger = logging.getLogger()
105
 
syslogger = None
106
 
 
107
 
try:
108
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
109
 
        ctypes.util.find_library("c")).if_nametoindex
110
 
except (OSError, AttributeError):
111
 
    
112
 
    def if_nametoindex(interface):
113
 
        "Get an interface index the hard way, i.e. using fcntl()"
114
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
115
 
        with contextlib.closing(socket.socket()) as s:
116
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
117
 
                                struct.pack(b"16s16x", interface))
118
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
119
 
        return interface_index
120
 
 
121
 
 
122
 
def initlogger(debug, level=logging.WARNING):
123
 
    """init logger and add loglevel"""
124
 
    
125
 
    global syslogger
126
 
    syslogger = (logging.handlers.SysLogHandler(
127
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
 
        address = "/dev/log"))
129
 
    syslogger.setFormatter(logging.Formatter
130
 
                           ('Mandos [%(process)d]: %(levelname)s:'
131
 
                            ' %(message)s'))
132
 
    logger.addHandler(syslogger)
133
 
    
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)
141
 
    logger.setLevel(level)
142
 
 
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
 
 
 
85
 
 
86
version = "1.3.1"
 
87
 
 
88
#logger = logging.getLogger('mandos')
 
89
logger = logging.Logger('mandos')
 
90
syslogger = (logging.handlers.SysLogHandler
 
91
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
92
              address = str("/dev/log")))
 
93
syslogger.setFormatter(logging.Formatter
 
94
                       ('Mandos [%(process)d]: %(levelname)s:'
 
95
                        ' %(message)s'))
 
96
logger.addHandler(syslogger)
 
97
 
 
98
console = logging.StreamHandler()
 
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
100
                                       ' %(levelname)s:'
 
101
                                       ' %(message)s'))
 
102
logger.addHandler(console)
241
103
 
242
104
class AvahiError(Exception):
243
105
    def __init__(self, value, *args, **kwargs):
244
106
        self.value = value
245
 
        return super(AvahiError, self).__init__(value, *args,
246
 
                                                **kwargs)
247
 
 
 
107
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
108
    def __unicode__(self):
 
109
        return unicode(repr(self.value))
248
110
 
249
111
class AvahiServiceError(AvahiError):
250
112
    pass
251
113
 
252
 
 
253
114
class AvahiGroupError(AvahiError):
254
115
    pass
255
116
 
262
123
               Used to optionally bind to the specified interface.
263
124
    name: string; Example: 'Mandos'
264
125
    type: string; Example: '_mandos._tcp'.
265
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
126
                  See <http://www.dns-sd.org/ServiceTypes.html>
266
127
    port: integer; what port to announce
267
128
    TXT: list of strings; TXT record for the service
268
129
    domain: string; Domain to publish on, default to .local if empty.
274
135
    server: D-Bus Server
275
136
    bus: dbus.SystemBus()
276
137
    """
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):
 
138
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
139
                 servicetype = None, port = None, TXT = None,
 
140
                 domain = "", host = "", max_renames = 32768,
 
141
                 protocol = avahi.PROTO_UNSPEC, bus = None):
289
142
        self.interface = interface
290
143
        self.name = name
291
144
        self.type = servicetype
300
153
        self.server = None
301
154
        self.bus = bus
302
155
        self.entry_group_state_changed_match = None
303
 
    
304
 
    def rename(self, remove=True):
 
156
    def rename(self):
305
157
        """Derived from the Avahi example code"""
306
158
        if self.rename_count >= self.max_renames:
307
159
            logger.critical("No suitable Zeroconf service name found"
308
160
                            " after %i retries, exiting.",
309
161
                            self.rename_count)
310
162
            raise AvahiServiceError("Too many renames")
311
 
        self.name = str(
312
 
            self.server.GetAlternativeServiceName(self.name))
313
 
        self.rename_count += 1
 
163
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
314
164
        logger.info("Changing Zeroconf service name to %r ...",
315
165
                    self.name)
316
 
        if remove:
317
 
            self.remove()
 
166
        syslogger.setFormatter(logging.Formatter
 
167
                               ('Mandos (%s) [%%(process)d]:'
 
168
                                ' %%(levelname)s: %%(message)s'
 
169
                                % self.name))
 
170
        self.remove()
318
171
        try:
319
172
            self.add()
320
173
        except dbus.exceptions.DBusException as error:
321
 
            if (error.get_dbus_name()
322
 
                == "org.freedesktop.Avahi.CollisionError"):
323
 
                logger.info("Local Zeroconf service name collision.")
324
 
                return self.rename(remove=False)
325
 
            else:
326
 
                logger.critical("D-Bus Exception", exc_info=error)
327
 
                self.cleanup()
328
 
                os._exit(1)
329
 
    
 
174
            logger.critical("DBusException: %s", error)
 
175
            self.cleanup()
 
176
            os._exit(1)
 
177
        self.rename_count += 1
330
178
    def remove(self):
331
179
        """Derived from the Avahi example code"""
332
180
        if self.entry_group_state_changed_match is not None:
334
182
            self.entry_group_state_changed_match = None
335
183
        if self.group is not None:
336
184
            self.group.Reset()
337
 
    
338
185
    def add(self):
339
186
        """Derived from the Avahi example code"""
340
187
        self.remove()
345
192
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
346
193
        self.entry_group_state_changed_match = (
347
194
            self.group.connect_to_signal(
348
 
                'StateChanged', self.entry_group_state_changed))
 
195
                'StateChanged', self .entry_group_state_changed))
349
196
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
350
197
                     self.name, self.type)
351
198
        self.group.AddService(
357
204
            dbus.UInt16(self.port),
358
205
            avahi.string_array_to_txt_array(self.TXT))
359
206
        self.group.Commit()
360
 
    
361
207
    def entry_group_state_changed(self, state, error):
362
208
        """Derived from the Avahi example code"""
363
209
        logger.debug("Avahi entry group state change: %i", state)
369
215
            self.rename()
370
216
        elif state == avahi.ENTRY_GROUP_FAILURE:
371
217
            logger.critical("Avahi: Error in group state changed %s",
372
 
                            str(error))
373
 
            raise AvahiGroupError("State changed: {!s}".format(error))
374
 
    
 
218
                            unicode(error))
 
219
            raise AvahiGroupError("State changed: %s"
 
220
                                  % unicode(error))
375
221
    def cleanup(self):
376
222
        """Derived from the Avahi example code"""
377
223
        if self.group is not None:
378
224
            try:
379
225
                self.group.Free()
380
226
            except (dbus.exceptions.UnknownMethodException,
381
 
                    dbus.exceptions.DBusException):
 
227
                    dbus.exceptions.DBusException) as e:
382
228
                pass
383
229
            self.group = None
384
230
        self.remove()
385
 
    
386
231
    def server_state_changed(self, state, error=None):
387
232
        """Derived from the Avahi example code"""
388
233
        logger.debug("Avahi server state change: %i", state)
389
 
        bad_states = {
390
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
391
 
            avahi.SERVER_REGISTERING: None,
392
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
393
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
394
 
        }
 
234
        bad_states = { avahi.SERVER_INVALID:
 
235
                           "Zeroconf server invalid",
 
236
                       avahi.SERVER_REGISTERING: None,
 
237
                       avahi.SERVER_COLLISION:
 
238
                           "Zeroconf server name collision",
 
239
                       avahi.SERVER_FAILURE:
 
240
                           "Zeroconf server failure" }
395
241
        if state in bad_states:
396
242
            if bad_states[state] is not None:
397
243
                if error is None:
400
246
                    logger.error(bad_states[state] + ": %r", error)
401
247
            self.cleanup()
402
248
        elif state == avahi.SERVER_RUNNING:
403
 
            try:
404
 
                self.add()
405
 
            except dbus.exceptions.DBusException as error:
406
 
                if (error.get_dbus_name()
407
 
                    == "org.freedesktop.Avahi.CollisionError"):
408
 
                    logger.info("Local Zeroconf service name"
409
 
                                " collision.")
410
 
                    return self.rename(remove=False)
411
 
                else:
412
 
                    logger.critical("D-Bus Exception", exc_info=error)
413
 
                    self.cleanup()
414
 
                    os._exit(1)
 
249
            self.add()
415
250
        else:
416
251
            if error is None:
417
252
                logger.debug("Unknown state: %r", state)
418
253
            else:
419
254
                logger.debug("Unknown state: %r: %r", state, error)
420
 
    
421
255
    def activate(self):
422
256
        """Derived from the Avahi example code"""
423
257
        if self.server is None:
427
261
                                    follow_name_owner_changes=True),
428
262
                avahi.DBUS_INTERFACE_SERVER)
429
263
        self.server.connect_to_signal("StateChanged",
430
 
                                      self.server_state_changed)
 
264
                                 self.server_state_changed)
431
265
        self.server_state_changed(self.server.GetState())
432
266
 
433
267
 
434
 
class AvahiServiceToSyslog(AvahiService):
435
 
    def rename(self, *args, **kwargs):
436
 
        """Add the new name to the syslog messages"""
437
 
        ret = AvahiService.rename(self, *args, **kwargs)
438
 
        syslogger.setFormatter(logging.Formatter(
439
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
440
 
            .format(self.name)))
441
 
        return ret
442
 
 
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
 
 
 
268
def _timedelta_to_milliseconds(td):
 
269
    "Convert a datetime.timedelta() to milliseconds"
 
270
    return ((td.days * 24 * 60 * 60 * 1000)
 
271
            + (td.seconds * 1000)
 
272
            + (td.microseconds // 1000))
 
273
        
708
274
class Client(object):
709
275
    """A representation of a client host served by this server.
710
276
    
711
277
    Attributes:
712
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
278
    _approved:   bool(); 'None' if not yet approved/disapproved
713
279
    approval_delay: datetime.timedelta(); Time to wait for approval
714
280
    approval_duration: datetime.timedelta(); Duration of one approval
715
281
    checker:    subprocess.Popen(); a running checker process used
716
282
                                    to see if the client lives.
717
283
                                    'None' if no process is running.
718
 
    checker_callback_tag: a GObject event source tag, or None
 
284
    checker_callback_tag: a gobject event source tag, or None
719
285
    checker_command: string; External command which is run to check
720
286
                     if client lives.  %() expansions are done at
721
287
                     runtime with vars(self) as dict, so that for
722
288
                     instance %(name)s can be used in the command.
723
 
    checker_initiator_tag: a GObject event source tag, or None
 
289
    checker_initiator_tag: a gobject event source tag, or None
724
290
    created:    datetime.datetime(); (UTC) object creation
725
 
    client_structure: Object describing what attributes a client has
726
 
                      and is used for storing the client at exit
727
291
    current_checker_command: string; current running checker_command
728
 
    disable_initiator_tag: a GObject event source tag, or None
 
292
    disable_hook:  If set, called by disable() as disable_hook(self)
 
293
    disable_initiator_tag: a gobject event source tag, or None
729
294
    enabled:    bool()
730
295
    fingerprint: string (40 or 32 hexadecimal digits); used to
731
296
                 uniquely identify the client
733
298
    interval:   datetime.timedelta(); How often to start a new checker
734
299
    last_approval_request: datetime.datetime(); (UTC) or None
735
300
    last_checked_ok: datetime.datetime(); (UTC) or None
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
 
301
    last_enabled: datetime.datetime(); (UTC)
742
302
    name:       string; from the config file, used in log messages and
743
303
                        D-Bus identifiers
744
304
    secret:     bytestring; sent verbatim (over TLS) to client
745
305
    timeout:    datetime.timedelta(); How long from last_checked_ok
746
306
                                      until this client is disabled
747
 
    extended_timeout:   extra long timeout when secret has been sent
 
307
    extended_timeout:   extra long timeout when password has been sent
748
308
    runtime_expansions: Allowed attributes for runtime expansion.
749
309
    expires:    datetime.datetime(); time (UTC) when a client will be
750
310
                disabled, or None
751
 
    server_settings: The server_settings dict from main()
752
311
    """
753
312
    
754
313
    runtime_expansions = ("approval_delay", "approval_duration",
755
 
                          "created", "enabled", "expires",
756
 
                          "fingerprint", "host", "interval",
757
 
                          "last_approval_request", "last_checked_ok",
 
314
                          "created", "enabled", "fingerprint",
 
315
                          "host", "interval", "last_checked_ok",
758
316
                          "last_enabled", "name", "timeout")
759
 
    client_defaults = {
760
 
        "timeout": "PT5M",
761
 
        "extended_timeout": "PT15M",
762
 
        "interval": "PT2M",
763
 
        "checker": "fping -q -- %%(host)s",
764
 
        "host": "",
765
 
        "approval_delay": "PT0S",
766
 
        "approval_duration": "PT1S",
767
 
        "approved_by_default": "True",
768
 
        "enabled": "True",
769
 
    }
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):
 
317
    
 
318
    def timeout_milliseconds(self):
 
319
        "Return the 'timeout' attribute in milliseconds"
 
320
        return _timedelta_to_milliseconds(self.timeout)
 
321
    
 
322
    def extended_timeout_milliseconds(self):
 
323
        "Return the 'extended_timeout' attribute in milliseconds"
 
324
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
325
    
 
326
    def interval_milliseconds(self):
 
327
        "Return the 'interval' attribute in milliseconds"
 
328
        return _timedelta_to_milliseconds(self.interval)
 
329
    
 
330
    def approval_delay_milliseconds(self):
 
331
        return _timedelta_to_milliseconds(self.approval_delay)
 
332
    
 
333
    def __init__(self, name = None, disable_hook=None, config=None):
 
334
        """Note: the 'checker' key in 'config' sets the
 
335
        'checker_command' attribute and *not* the 'checker'
 
336
        attribute."""
822
337
        self.name = name
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
 
        
 
338
        if config is None:
 
339
            config = {}
840
340
        logger.debug("Creating client %r", self.name)
 
341
        # Uppercase and remove spaces from fingerprint for later
 
342
        # comparison purposes with return value from the fingerprint()
 
343
        # function
 
344
        self.fingerprint = (config["fingerprint"].upper()
 
345
                            .replace(" ", ""))
841
346
        logger.debug("  Fingerprint: %s", self.fingerprint)
842
 
        self.created = settings.get("created",
843
 
                                    datetime.datetime.utcnow())
844
 
        
845
 
        # attributes specific for this server instance
 
347
        if "secret" in config:
 
348
            self.secret = config["secret"].decode("base64")
 
349
        elif "secfile" in config:
 
350
            with open(os.path.expanduser(os.path.expandvars
 
351
                                         (config["secfile"])),
 
352
                      "rb") as secfile:
 
353
                self.secret = secfile.read()
 
354
        else:
 
355
            raise TypeError("No secret or secfile for client %s"
 
356
                            % self.name)
 
357
        self.host = config.get("host", "")
 
358
        self.created = datetime.datetime.utcnow()
 
359
        self.enabled = False
 
360
        self.last_approval_request = None
 
361
        self.last_enabled = None
 
362
        self.last_checked_ok = None
 
363
        self.timeout = string_to_delta(config["timeout"])
 
364
        self.extended_timeout = string_to_delta(config["extended_timeout"])
 
365
        self.interval = string_to_delta(config["interval"])
 
366
        self.disable_hook = disable_hook
846
367
        self.checker = None
847
368
        self.checker_initiator_tag = None
848
369
        self.disable_initiator_tag = None
 
370
        self.expires = None
849
371
        self.checker_callback_tag = None
 
372
        self.checker_command = config["checker"]
850
373
        self.current_checker_command = None
851
 
        self.approved = None
 
374
        self.last_connect = None
 
375
        self._approved = None
 
376
        self.approved_by_default = config.get("approved_by_default",
 
377
                                              True)
852
378
        self.approvals_pending = 0
853
 
        self.changedstate = multiprocessing_manager.Condition(
854
 
            multiprocessing_manager.Lock())
855
 
        self.client_structure = [attr
856
 
                                 for attr in self.__dict__.iterkeys()
857
 
                                 if not attr.startswith("_")]
858
 
        self.client_structure.append("client_structure")
859
 
        
860
 
        for name, t in inspect.getmembers(
861
 
                type(self), lambda obj: isinstance(obj, property)):
862
 
            if not name.startswith("_"):
863
 
                self.client_structure.append(name)
 
379
        self.approval_delay = string_to_delta(
 
380
            config["approval_delay"])
 
381
        self.approval_duration = string_to_delta(
 
382
            config["approval_duration"])
 
383
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
864
384
    
865
 
    # Send notice to process children that client state has changed
866
385
    def send_changedstate(self):
867
 
        with self.changedstate:
868
 
            self.changedstate.notify_all()
869
 
    
 
386
        self.changedstate.acquire()
 
387
        self.changedstate.notify_all()
 
388
        self.changedstate.release()
 
389
        
870
390
    def enable(self):
871
391
        """Start this client's checker and timeout hooks"""
872
392
        if getattr(self, "enabled", False):
873
393
            # Already enabled
874
394
            return
 
395
        self.send_changedstate()
 
396
        # Schedule a new checker to be started an 'interval' from now,
 
397
        # and every interval from then on.
 
398
        self.checker_initiator_tag = (gobject.timeout_add
 
399
                                      (self.interval_milliseconds(),
 
400
                                       self.start_checker))
 
401
        # Schedule a disable() when 'timeout' has passed
875
402
        self.expires = datetime.datetime.utcnow() + self.timeout
 
403
        self.disable_initiator_tag = (gobject.timeout_add
 
404
                                   (self.timeout_milliseconds(),
 
405
                                    self.disable))
876
406
        self.enabled = True
877
407
        self.last_enabled = datetime.datetime.utcnow()
878
 
        self.init_checker()
879
 
        self.send_changedstate()
 
408
        # Also start a new checker *right now*.
 
409
        self.start_checker()
880
410
    
881
411
    def disable(self, quiet=True):
882
412
        """Disable this client."""
883
413
        if not getattr(self, "enabled", False):
884
414
            return False
885
415
        if not quiet:
 
416
            self.send_changedstate()
 
417
        if not quiet:
886
418
            logger.info("Disabling client %s", self.name)
887
 
        if getattr(self, "disable_initiator_tag", None) is not None:
888
 
            GObject.source_remove(self.disable_initiator_tag)
 
419
        if getattr(self, "disable_initiator_tag", False):
 
420
            gobject.source_remove(self.disable_initiator_tag)
889
421
            self.disable_initiator_tag = None
890
422
        self.expires = None
891
 
        if getattr(self, "checker_initiator_tag", None) is not None:
892
 
            GObject.source_remove(self.checker_initiator_tag)
 
423
        if getattr(self, "checker_initiator_tag", False):
 
424
            gobject.source_remove(self.checker_initiator_tag)
893
425
            self.checker_initiator_tag = None
894
426
        self.stop_checker()
 
427
        if self.disable_hook:
 
428
            self.disable_hook(self)
895
429
        self.enabled = False
896
 
        if not quiet:
897
 
            self.send_changedstate()
898
 
        # Do not run this again if called by a GObject.timeout_add
 
430
        # Do not run this again if called by a gobject.timeout_add
899
431
        return False
900
432
    
901
433
    def __del__(self):
 
434
        self.disable_hook = None
902
435
        self.disable()
903
436
    
904
 
    def init_checker(self):
905
 
        # Schedule a new checker to be started an 'interval' from now,
906
 
        # and every interval from then on.
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)
912
 
        # Schedule a disable() when 'timeout' has passed
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)
917
 
        # Also start a new checker *right now*.
918
 
        self.start_checker()
919
 
    
920
 
    def checker_callback(self, source, condition, connection,
921
 
                         command):
 
437
    def checker_callback(self, pid, condition, command):
922
438
        """The checker has completed, so take appropriate actions."""
923
439
        self.checker_callback_tag = None
924
440
        self.checker = None
925
 
        # Read return code from connection (see call_pipe)
926
 
        returncode = connection.recv()
927
 
        connection.close()
928
 
        
929
 
        if returncode >= 0:
930
 
            self.last_checker_status = returncode
931
 
            self.last_checker_signal = None
932
 
            if self.last_checker_status == 0:
 
441
        if os.WIFEXITED(condition):
 
442
            exitstatus = os.WEXITSTATUS(condition)
 
443
            if exitstatus == 0:
933
444
                logger.info("Checker for %(name)s succeeded",
934
445
                            vars(self))
935
446
                self.checked_ok()
936
447
            else:
937
 
                logger.info("Checker for %(name)s failed", vars(self))
 
448
                logger.info("Checker for %(name)s failed",
 
449
                            vars(self))
938
450
        else:
939
 
            self.last_checker_status = -1
940
 
            self.last_checker_signal = -returncode
941
451
            logger.warning("Checker for %(name)s crashed?",
942
452
                           vars(self))
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."""
 
453
    
 
454
    def checked_ok(self, timeout=None):
 
455
        """Bump up the timeout for this client.
 
456
        
 
457
        This should only be called when the client has been seen,
 
458
        alive and well.
 
459
        """
954
460
        if timeout is None:
955
461
            timeout = self.timeout
956
 
        if self.disable_initiator_tag is not None:
957
 
            GObject.source_remove(self.disable_initiator_tag)
958
 
            self.disable_initiator_tag = None
959
 
        if getattr(self, "enabled", False):
960
 
            self.disable_initiator_tag = GObject.timeout_add(
961
 
                int(timeout.total_seconds() * 1000), self.disable)
962
 
            self.expires = datetime.datetime.utcnow() + timeout
 
462
        self.last_checked_ok = datetime.datetime.utcnow()
 
463
        gobject.source_remove(self.disable_initiator_tag)
 
464
        self.expires = datetime.datetime.utcnow() + timeout
 
465
        self.disable_initiator_tag = (gobject.timeout_add
 
466
                                      (_timedelta_to_milliseconds(timeout),
 
467
                                       self.disable))
963
468
    
964
469
    def need_approval(self):
965
470
        self.last_approval_request = datetime.datetime.utcnow()
970
475
        If a checker already exists, leave it running and do
971
476
        nothing."""
972
477
        # The reason for not killing a running checker is that if we
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
 
478
        # did that, then if a checker (for some reason) started
 
479
        # running slowly and taking more than 'interval' time, the
 
480
        # client would inevitably timeout, since no checker would get
 
481
        # a chance to run to completion.  If we instead leave running
977
482
        # checkers alone, the checker would have to take more time
978
483
        # than 'timeout' for the client to be disabled, which is as it
979
484
        # should be.
980
485
        
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
 
486
        # If a checker exists, make sure it is not a zombie
 
487
        try:
 
488
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
489
        except (AttributeError, OSError) as error:
 
490
            if (isinstance(error, OSError)
 
491
                and error.errno != errno.ECHILD):
 
492
                raise error
 
493
        else:
 
494
            if pid:
 
495
                logger.warning("Checker was a zombie")
 
496
                gobject.source_remove(self.checker_callback_tag)
 
497
                self.checker_callback(pid, status,
 
498
                                      self.current_checker_command)
985
499
        # Start a new checker if needed
986
500
        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 }
991
501
            try:
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
 
502
                # In case checker_command has exactly one % operator
 
503
                command = self.checker_command % self.host
 
504
            except TypeError:
 
505
                # Escape attributes for the shell
 
506
                escaped_attrs = dict(
 
507
                    (attr,
 
508
                     re.escape(unicode(str(getattr(self, attr, "")),
 
509
                                       errors=
 
510
                                       'replace')))
 
511
                    for attr in
 
512
                    self.runtime_expansions)
 
513
                
 
514
                try:
 
515
                    command = self.checker_command % escaped_attrs
 
516
                except TypeError as error:
 
517
                    logger.error('Could not format string "%s":'
 
518
                                 ' %s', self.checker_command, error)
 
519
                    return True # Try again later
998
520
            self.current_checker_command = command
999
 
            logger.info("Starting checker %r for %s", command,
1000
 
                        self.name)
1001
 
            # We don't need to redirect stdout and stderr, since
1002
 
            # in normal mode, that is already done by daemon(),
1003
 
            # and in debug mode we don't want to.  (Stdin is
1004
 
            # always replaced by /dev/null.)
1005
 
            # The exception is when not debugging but nevertheless
1006
 
            # running in the foreground; use the previously
1007
 
            # created wnull.
1008
 
            popen_args = { "close_fds": True,
1009
 
                           "shell": True,
1010
 
                           "cwd": "/" }
1011
 
            if (not self.server_settings["debug"]
1012
 
                and self.server_settings["foreground"]):
1013
 
                popen_args.update({"stdout": wnull,
1014
 
                                   "stderr": wnull })
1015
 
            pipe = multiprocessing.Pipe(duplex = False)
1016
 
            self.checker = multiprocessing.Process(
1017
 
                target = call_pipe,
1018
 
                args = (pipe[1], subprocess.call, command),
1019
 
                kwargs = popen_args)
1020
 
            self.checker.start()
1021
 
            self.checker_callback_tag = GObject.io_add_watch(
1022
 
                pipe[0].fileno(), GObject.IO_IN,
1023
 
                self.checker_callback, pipe[0], command)
1024
 
        # Re-run this periodically if run by GObject.timeout_add
 
521
            try:
 
522
                logger.info("Starting checker %r for %s",
 
523
                            command, self.name)
 
524
                # We don't need to redirect stdout and stderr, since
 
525
                # in normal mode, that is already done by daemon(),
 
526
                # and in debug mode we don't want to.  (Stdin is
 
527
                # always replaced by /dev/null.)
 
528
                self.checker = subprocess.Popen(command,
 
529
                                                close_fds=True,
 
530
                                                shell=True, cwd="/")
 
531
                self.checker_callback_tag = (gobject.child_watch_add
 
532
                                             (self.checker.pid,
 
533
                                              self.checker_callback,
 
534
                                              data=command))
 
535
                # The checker may have completed before the gobject
 
536
                # watch was added.  Check for this.
 
537
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
538
                if pid:
 
539
                    gobject.source_remove(self.checker_callback_tag)
 
540
                    self.checker_callback(pid, status, command)
 
541
            except OSError as error:
 
542
                logger.error("Failed to start subprocess: %s",
 
543
                             error)
 
544
        # Re-run this periodically if run by gobject.timeout_add
1025
545
        return True
1026
546
    
1027
547
    def stop_checker(self):
1028
548
        """Force the checker process, if any, to stop."""
1029
549
        if self.checker_callback_tag:
1030
 
            GObject.source_remove(self.checker_callback_tag)
 
550
            gobject.source_remove(self.checker_callback_tag)
1031
551
            self.checker_callback_tag = None
1032
552
        if getattr(self, "checker", None) is None:
1033
553
            return
1034
554
        logger.debug("Stopping checker for %(name)s", vars(self))
1035
 
        self.checker.terminate()
 
555
        try:
 
556
            os.kill(self.checker.pid, signal.SIGTERM)
 
557
            #time.sleep(0.5)
 
558
            #if self.checker.poll() is None:
 
559
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
560
        except OSError as error:
 
561
            if error.errno != errno.ESRCH: # No such process
 
562
                raise
1036
563
        self.checker = None
1037
564
 
1038
565
 
1039
 
def dbus_service_property(dbus_interface,
1040
 
                          signature="v",
1041
 
                          access="readwrite",
1042
 
                          byte_arrays=False):
 
566
def dbus_service_property(dbus_interface, signature="v",
 
567
                          access="readwrite", byte_arrays=False):
1043
568
    """Decorators for marking methods of a DBusObjectWithProperties to
1044
569
    become properties on the D-Bus.
1045
570
    
1054
579
    # "Set" method, so we fail early here:
1055
580
    if byte_arrays and signature != "ay":
1056
581
        raise ValueError("Byte arrays not supported for non-'ay'"
1057
 
                         " signature {!r}".format(signature))
1058
 
    
 
582
                         " signature %r" % signature)
1059
583
    def decorator(func):
1060
584
        func._dbus_is_property = True
1061
585
        func._dbus_interface = dbus_interface
1066
590
            func._dbus_name = func._dbus_name[:-14]
1067
591
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1068
592
        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
 
    
1113
593
    return decorator
1114
594
 
1115
595
 
1116
596
class DBusPropertyException(dbus.exceptions.DBusException):
1117
597
    """A base class for D-Bus property-related exceptions
1118
598
    """
1119
 
    pass
 
599
    def __unicode__(self):
 
600
        return unicode(str(self))
1120
601
 
1121
602
 
1122
603
class DBusPropertyAccessException(DBusPropertyException):
1131
612
    pass
1132
613
 
1133
614
 
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):
 
615
class DBusObjectWithProperties(dbus.service.Object):
1224
616
    """A D-Bus object with properties.
1225
617
    
1226
618
    Classes inheriting from this can use the dbus_service_property
1228
620
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1229
621
    """
1230
622
    
 
623
    @staticmethod
 
624
    def _is_dbus_property(obj):
 
625
        return getattr(obj, "_dbus_is_property", False)
 
626
    
 
627
    def _get_all_dbus_properties(self):
 
628
        """Returns a generator of (name, attribute) pairs
 
629
        """
 
630
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
631
                for cls in self.__class__.__mro__
 
632
                for name, prop in inspect.getmembers(cls, self._is_dbus_property))
 
633
    
1231
634
    def _get_dbus_property(self, interface_name, property_name):
1232
635
        """Returns a bound method if one exists which is a D-Bus
1233
636
        property with the specified name and interface.
1234
637
        """
1235
 
        for cls in self.__class__.__mro__:
1236
 
            for name, value in inspect.getmembers(
1237
 
                    cls, self._is_dbus_thing("property")):
1238
 
                if (value._dbus_name == property_name
1239
 
                    and value._dbus_interface == interface_name):
 
638
        for cls in  self.__class__.__mro__:
 
639
            for name, value in inspect.getmembers(cls, self._is_dbus_property):
 
640
                if value._dbus_name == property_name and value._dbus_interface == interface_name:
1240
641
                    return value.__get__(self)
1241
642
        
1242
643
        # No such property
1243
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
1244
 
            self.dbus_object_path, interface_name, property_name))
1245
 
    
1246
 
    @classmethod
1247
 
    def _get_all_interface_names(cls):
1248
 
        """Get a sequence of all interfaces supported by an object"""
1249
 
        return (name for name in set(getattr(getattr(x, attr),
1250
 
                                             "_dbus_interface", None)
1251
 
                                     for x in (inspect.getmro(cls))
1252
 
                                     for attr in dir(x))
1253
 
                if name is not None)
1254
 
    
1255
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1256
 
                         in_signature="ss",
 
644
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
645
                                   + interface_name + "."
 
646
                                   + property_name)
 
647
 
 
648
    
 
649
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1257
650
                         out_signature="v")
1258
651
    def Get(self, interface_name, property_name):
1259
652
        """Standard D-Bus property Get() method, see D-Bus standard.
1277
670
            # The byte_arrays option is not supported yet on
1278
671
            # signatures other than "ay".
1279
672
            if prop._dbus_signature != "ay":
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))
 
673
                raise ValueError
 
674
            value = dbus.ByteArray(''.join(unichr(byte)
 
675
                                           for byte in value))
1285
676
        prop(value)
1286
677
    
1287
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1288
 
                         in_signature="s",
 
678
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1289
679
                         out_signature="a{sv}")
1290
680
    def GetAll(self, interface_name):
1291
681
        """Standard D-Bus property GetAll() method, see D-Bus
1293
683
        
1294
684
        Note: Will not include properties with access="write".
1295
685
        """
1296
 
        properties = {}
1297
 
        for name, prop in self._get_all_dbus_things("property"):
 
686
        all = {}
 
687
        for name, prop in self._get_all_dbus_properties():
1298
688
            if (interface_name
1299
689
                and interface_name != prop._dbus_interface):
1300
690
                # Interface non-empty but did not match
1304
694
                continue
1305
695
            value = prop()
1306
696
            if not hasattr(value, "variant_level"):
1307
 
                properties[name] = value
 
697
                all[name] = value
1308
698
                continue
1309
 
            properties[name] = type(value)(
1310
 
                value, variant_level = value.variant_level + 1)
1311
 
        return dbus.Dictionary(properties, signature="sv")
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
 
699
            all[name] = type(value)(value, variant_level=
 
700
                                    value.variant_level+1)
 
701
        return dbus.Dictionary(all, signature="sv")
1320
702
    
1321
703
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1322
704
                         out_signature="s",
1323
705
                         path_keyword='object_path',
1324
706
                         connection_keyword='connection')
1325
707
    def Introspect(self, object_path, connection):
1326
 
        """Overloading of standard D-Bus method.
1327
 
        
1328
 
        Inserts property tags and interface annotation tags.
 
708
        """Standard D-Bus method, overloaded to insert property tags.
1329
709
        """
1330
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1331
 
                                                         object_path,
1332
 
                                                         connection)
 
710
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
711
                                                   connection)
1333
712
        try:
1334
713
            document = xml.dom.minidom.parseString(xmlstring)
1335
 
            
1336
714
            def make_tag(document, name, prop):
1337
715
                e = document.createElement("property")
1338
716
                e.setAttribute("name", name)
1339
717
                e.setAttribute("type", prop._dbus_signature)
1340
718
                e.setAttribute("access", prop._dbus_access)
1341
719
                return e
1342
 
            
1343
720
            for if_tag in document.getElementsByTagName("interface"):
1344
 
                # Add property tags
1345
721
                for tag in (make_tag(document, name, prop)
1346
722
                            for name, prop
1347
 
                            in self._get_all_dbus_things("property")
 
723
                            in self._get_all_dbus_properties()
1348
724
                            if prop._dbus_interface
1349
725
                            == if_tag.getAttribute("name")):
1350
726
                    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)
1367
727
                # Add the names to the return values for the
1368
728
                # "org.freedesktop.DBus.Properties" methods
1369
729
                if (if_tag.getAttribute("name")
1384
744
        except (AttributeError, xml.dom.DOMException,
1385
745
                xml.parsers.expat.ExpatError) as error:
1386
746
            logger.error("Failed to override Introspection method",
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):
 
747
                         error)
 
748
        return xmlstring
 
749
 
 
750
 
 
751
def datetime_to_dbus (dt, variant_level=0):
1460
752
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1461
753
    if dt is None:
1462
754
        return dbus.String("", variant_level = variant_level)
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).
1488
 
    """
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):
1497
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1498
 
                # with the wrong interface name
1499
 
                if (not hasattr(attribute, "_dbus_interface")
1500
 
                    or not attribute._dbus_interface.startswith(
1501
 
                        orig_interface_name)):
1502
 
                    continue
1503
 
                # Create an alternate D-Bus interface name based on
1504
 
                # the current name
1505
 
                alt_interface = attribute._dbus_interface.replace(
1506
 
                    orig_interface_name, alt_interface_name)
1507
 
                interface_names.add(alt_interface)
1508
 
                # Is this a D-Bus signal?
1509
 
                if getattr(attribute, "_dbus_is_signal", False):
1510
 
                    if sys.version_info.major == 2:
1511
 
                        # Extract the original non-method undecorated
1512
 
                        # function by black magic
1513
 
                        nonmethod_func = (dict(
1514
 
                            zip(attribute.func_code.co_freevars,
1515
 
                                attribute.__closure__))
1516
 
                                          ["func"].cell_contents)
1517
 
                    else:
1518
 
                        nonmethod_func = attribute
1519
 
                    # Create a new, but exactly alike, function
1520
 
                    # object, and decorate it to be a new D-Bus signal
1521
 
                    # with the alternate D-Bus interface name
1522
 
                    if sys.version_info.major == 2:
1523
 
                        new_function = types.FunctionType(
1524
 
                            nonmethod_func.func_code,
1525
 
                            nonmethod_func.func_globals,
1526
 
                            nonmethod_func.func_name,
1527
 
                            nonmethod_func.func_defaults,
1528
 
                            nonmethod_func.func_closure)
1529
 
                    else:
1530
 
                        new_function = types.FunctionType(
1531
 
                            nonmethod_func.__code__,
1532
 
                            nonmethod_func.__globals__,
1533
 
                            nonmethod_func.__name__,
1534
 
                            nonmethod_func.__defaults__,
1535
 
                            nonmethod_func.__closure__)
1536
 
                    new_function = (dbus.service.signal(
1537
 
                        alt_interface,
1538
 
                        attribute._dbus_signature)(new_function))
1539
 
                    # Copy annotations, if any
1540
 
                    try:
1541
 
                        new_function._dbus_annotations = dict(
1542
 
                            attribute._dbus_annotations)
1543
 
                    except AttributeError:
1544
 
                        pass
1545
 
                    # Define a creator of a function to call both the
1546
 
                    # original and alternate functions, so both the
1547
 
                    # original and alternate signals gets sent when
1548
 
                    # the function is called
1549
 
                    def fixscope(func1, func2):
1550
 
                        """This function is a scope container to pass
1551
 
                        func1 and func2 to the "call_both" function
1552
 
                        outside of its arguments"""
1553
 
                        
1554
 
                        @functools.wraps(func2)
1555
 
                        def call_both(*args, **kwargs):
1556
 
                            """This function will emit two D-Bus
1557
 
                            signals by calling func1 and func2"""
1558
 
                            func1(*args, **kwargs)
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
 
                        
1565
 
                        return call_both
1566
 
                    # Create the "call_both" function and add it to
1567
 
                    # the class
1568
 
                    attr[attrname] = fixscope(attribute, new_function)
1569
 
                # Is this a D-Bus method?
1570
 
                elif getattr(attribute, "_dbus_is_method", False):
1571
 
                    # Create a new, but exactly alike, function
1572
 
                    # object.  Decorate it to be a new D-Bus method
1573
 
                    # with the alternate D-Bus interface name.  Add it
1574
 
                    # to the class.
1575
 
                    attr[attrname] = (
1576
 
                        dbus.service.method(
1577
 
                            alt_interface,
1578
 
                            attribute._dbus_in_signature,
1579
 
                            attribute._dbus_out_signature)
1580
 
                        (types.FunctionType(attribute.func_code,
1581
 
                                            attribute.func_globals,
1582
 
                                            attribute.func_name,
1583
 
                                            attribute.func_defaults,
1584
 
                                            attribute.func_closure)))
1585
 
                    # Copy annotations, if any
1586
 
                    try:
1587
 
                        attr[attrname]._dbus_annotations = dict(
1588
 
                            attribute._dbus_annotations)
1589
 
                    except AttributeError:
1590
 
                        pass
1591
 
                # Is this a D-Bus property?
1592
 
                elif getattr(attribute, "_dbus_is_property", False):
1593
 
                    # Create a new, but exactly alike, function
1594
 
                    # object, and decorate it to be a new D-Bus
1595
 
                    # property with the alternate D-Bus interface
1596
 
                    # name.  Add it to the class.
1597
 
                    attr[attrname] = (dbus_service_property(
1598
 
                        alt_interface, attribute._dbus_signature,
1599
 
                        attribute._dbus_access,
1600
 
                        attribute._dbus_get_args_options
1601
 
                        ["byte_arrays"])
1602
 
                                      (types.FunctionType(
1603
 
                                          attribute.func_code,
1604
 
                                          attribute.func_globals,
1605
 
                                          attribute.func_name,
1606
 
                                          attribute.func_defaults,
1607
 
                                          attribute.func_closure)))
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"})
 
755
    return dbus.String(dt.isoformat(),
 
756
                       variant_level=variant_level)
 
757
 
 
758
class transitional_dbus_metaclass(DBusObjectWithProperties.__metaclass__):
 
759
    def __new__(mcs, name, bases, attr):
 
760
        for attrname, old_dbusobj in inspect.getmembers(bases[0]):
 
761
            new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
 
762
            if (getattr(old_dbusobj, "_dbus_is_signal", False)
 
763
                and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
 
764
                unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
 
765
                                    old_dbusobj.__closure__))["func"].cell_contents
 
766
                newfunc = types.FunctionType(unwrappedfunc.func_code,
 
767
                                             unwrappedfunc.func_globals,
 
768
                                             unwrappedfunc.func_name,
 
769
                                             unwrappedfunc.func_defaults,
 
770
                                             unwrappedfunc.func_closure)
 
771
                new_dbusfunc = dbus.service.signal(
 
772
                    new_interface, old_dbusobj._dbus_signature)(newfunc)            
 
773
                attr["_transitional_" + attrname] = new_dbusfunc
 
774
 
 
775
                def fixscope(func1, func2):
 
776
                    def newcall(*args, **kwargs):
 
777
                        func1(*args, **kwargs)
 
778
                        func2(*args, **kwargs)
 
779
                    return newcall
 
780
 
 
781
                attr[attrname] = fixscope(old_dbusobj, new_dbusfunc)
 
782
            
 
783
            elif (getattr(old_dbusobj, "_dbus_is_method", False)
 
784
                and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
 
785
                new_dbusfunc = (dbus.service.method
 
786
                                (new_interface,
 
787
                                 old_dbusobj._dbus_in_signature,
 
788
                                 old_dbusobj._dbus_out_signature)
 
789
                                (types.FunctionType
 
790
                                 (old_dbusobj.func_code,
 
791
                                  old_dbusobj.func_globals,
 
792
                                  old_dbusobj.func_name,
 
793
                                  old_dbusobj.func_defaults,
 
794
                                  old_dbusobj.func_closure)))
 
795
 
 
796
                attr[attrname] = new_dbusfunc
 
797
            elif (getattr(old_dbusobj, "_dbus_is_property", False)
 
798
                  and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
 
799
                new_dbusfunc = (dbus_service_property
 
800
                                (new_interface,
 
801
                                 old_dbusobj._dbus_signature,
 
802
                                 old_dbusobj._dbus_access,
 
803
                                 old_dbusobj._dbus_get_args_options["byte_arrays"])
 
804
                                (types.FunctionType
 
805
                                 (old_dbusobj.func_code,
 
806
                                  old_dbusobj.func_globals,
 
807
                                  old_dbusobj.func_name,
 
808
                                  old_dbusobj.func_defaults,
 
809
                                  old_dbusobj.func_closure)))
 
810
 
 
811
                attr[attrname] = new_dbusfunc
 
812
        return type.__new__(mcs, name, bases, attr)
 
813
 
1654
814
class ClientDBus(Client, DBusObjectWithProperties):
1655
815
    """A Client class using D-Bus
1656
816
    
1660
820
    """
1661
821
    
1662
822
    runtime_expansions = (Client.runtime_expansions
1663
 
                          + ("dbus_object_path", ))
1664
 
    
1665
 
    _interface = "se.recompile.Mandos.Client"
 
823
                          + ("dbus_object_path",))
1666
824
    
1667
825
    # dbus.service.Object doesn't use super(), so we can't either.
1668
826
    
1669
827
    def __init__(self, bus = None, *args, **kwargs):
 
828
        self._approvals_pending = 0
1670
829
        self.bus = bus
1671
830
        Client.__init__(self, *args, **kwargs)
1672
831
        # Only now, when this client is initialized, can it show up on
1673
832
        # the D-Bus
1674
 
        client_object_name = str(self.name).translate(
 
833
        client_object_name = unicode(self.name).translate(
1675
834
            {ord("."): ord("_"),
1676
835
             ord("-"): ord("_")})
1677
 
        self.dbus_object_path = dbus.ObjectPath(
1678
 
            "/clients/" + client_object_name)
 
836
        self.dbus_object_path = (dbus.ObjectPath
 
837
                                 ("/clients/" + client_object_name))
1679
838
        DBusObjectWithProperties.__init__(self, self.bus,
1680
839
                                          self.dbus_object_path)
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):
1687
 
        """ Modify a variable so that it's a property which announces
1688
 
        its changes to DBus.
1689
840
        
1690
 
        transform_fun: Function that takes a value and a variant_level
1691
 
                       and transforms it to a D-Bus type.
1692
 
        dbus_name: D-Bus name of the variable
 
841
    def notifychangeproperty(transform_func,
 
842
                             dbus_name, type_func=lambda x: x,
 
843
                             variant_level=1):
 
844
        """ Modify a variable so that its a property that announce its
 
845
        changes to DBus.
 
846
        transform_fun: Function that takes a value and transform it to
 
847
                       DBus type.
 
848
        dbus_name: DBus name of the variable
1693
849
        type_func: Function that transform the value before sending it
1694
 
                   to the D-Bus.  Default: no transform
1695
 
        variant_level: D-Bus variant level.  Default: 1
 
850
                   to DBus
 
851
        variant_level: DBus variant level. default: 1
1696
852
        """
1697
 
        attrname = "_{}".format(dbus_name)
1698
 
        
 
853
        real_value = [None,]
1699
854
        def setter(self, value):
 
855
            old_value = real_value[0]
 
856
            real_value[0] = value
1700
857
            if hasattr(self, "dbus_object_path"):
1701
 
                if (not hasattr(self, attrname) or
1702
 
                    type_func(getattr(self, attrname, None))
1703
 
                    != type_func(value)):
1704
 
                    if invalidate_only:
1705
 
                        self.PropertiesChanged(
1706
 
                            _interface, dbus.Dictionary(),
1707
 
                            dbus.Array((dbus_name, )))
1708
 
                    else:
1709
 
                        dbus_value = transform_func(
1710
 
                            type_func(value),
1711
 
                            variant_level = variant_level)
1712
 
                        self.PropertyChanged(dbus.String(dbus_name),
1713
 
                                             dbus_value)
1714
 
                        self.PropertiesChanged(
1715
 
                            _interface,
1716
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1717
 
                                              dbus_value }),
1718
 
                            dbus.Array())
1719
 
            setattr(self, attrname, value)
 
858
                if type_func(old_value) != type_func(real_value[0]):
 
859
                    dbus_value = transform_func(type_func(real_value[0]),
 
860
                                                variant_level)
 
861
                    self.PropertyChanged(dbus.String(dbus_name),
 
862
                                         dbus_value)
1720
863
        
1721
 
        return property(lambda self: getattr(self, attrname), setter)
 
864
        return property(lambda self: real_value[0], setter)
 
865
    
1722
866
    
1723
867
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1724
868
    approvals_pending = notifychangeproperty(dbus.Boolean,
1727
871
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1728
872
    last_enabled = notifychangeproperty(datetime_to_dbus,
1729
873
                                        "LastEnabled")
1730
 
    checker = notifychangeproperty(
1731
 
        dbus.Boolean, "CheckerRunning",
1732
 
        type_func = lambda checker: checker is not None)
 
874
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
875
                                   type_func = lambda checker: checker is not None)
1733
876
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1734
877
                                           "LastCheckedOK")
1735
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1736
 
                                               "LastCheckerStatus")
1737
 
    last_approval_request = notifychangeproperty(
1738
 
        datetime_to_dbus, "LastApprovalRequest")
 
878
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
879
                                                 "LastApprovalRequest")
1739
880
    approved_by_default = notifychangeproperty(dbus.Boolean,
1740
881
                                               "ApprovedByDefault")
1741
 
    approval_delay = notifychangeproperty(
1742
 
        dbus.UInt64, "ApprovalDelay",
1743
 
        type_func = lambda td: td.total_seconds() * 1000)
1744
 
    approval_duration = notifychangeproperty(
1745
 
        dbus.UInt64, "ApprovalDuration",
1746
 
        type_func = lambda td: td.total_seconds() * 1000)
 
882
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
 
883
                                          type_func = _timedelta_to_milliseconds)
 
884
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
 
885
                                             type_func = _timedelta_to_milliseconds)
1747
886
    host = notifychangeproperty(dbus.String, "Host")
1748
 
    timeout = notifychangeproperty(
1749
 
        dbus.UInt64, "Timeout",
1750
 
        type_func = lambda td: td.total_seconds() * 1000)
1751
 
    extended_timeout = notifychangeproperty(
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)
 
887
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
888
                                   type_func = _timedelta_to_milliseconds)
 
889
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
 
890
                                            type_func = _timedelta_to_milliseconds)
 
891
    interval = notifychangeproperty(dbus.UInt16, "Interval",
 
892
                                    type_func = _timedelta_to_milliseconds)
1757
893
    checker_command = notifychangeproperty(dbus.String, "Checker")
1758
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1759
 
                                  invalidate_only=True)
1760
894
    
1761
895
    del notifychangeproperty
1762
896
    
1769
903
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1770
904
        Client.__del__(self, *args, **kwargs)
1771
905
    
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:
 
906
    def checker_callback(self, pid, condition, command,
 
907
                         *args, **kwargs):
 
908
        self.checker_callback_tag = None
 
909
        self.checker = None
 
910
        if os.WIFEXITED(condition):
 
911
            exitstatus = os.WEXITSTATUS(condition)
1779
912
            # Emit D-Bus signal
1780
913
            self.CheckerCompleted(dbus.Int16(exitstatus),
1781
 
                                  # This is specific to GNU libC
1782
 
                                  dbus.Int64(exitstatus << 8),
 
914
                                  dbus.Int64(condition),
1783
915
                                  dbus.String(command))
1784
916
        else:
1785
917
            # Emit D-Bus signal
1786
918
            self.CheckerCompleted(dbus.Int16(-1),
1787
 
                                  dbus.Int64(
1788
 
                                      # This is specific to GNU libC
1789
 
                                      (exitstatus << 8)
1790
 
                                      | self.last_checker_signal),
 
919
                                  dbus.Int64(condition),
1791
920
                                  dbus.String(command))
1792
 
        return ret
 
921
        
 
922
        return Client.checker_callback(self, pid, condition, command,
 
923
                                       *args, **kwargs)
1793
924
    
1794
925
    def start_checker(self, *args, **kwargs):
1795
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
926
        old_checker = self.checker
 
927
        if self.checker is not None:
 
928
            old_checker_pid = self.checker.pid
 
929
        else:
 
930
            old_checker_pid = None
1796
931
        r = Client.start_checker(self, *args, **kwargs)
1797
932
        # Only if new checker process was started
1798
933
        if (self.checker is not None
1802
937
        return r
1803
938
    
1804
939
    def _reset_approved(self):
1805
 
        self.approved = None
 
940
        self._approved = None
1806
941
        return False
1807
942
    
1808
943
    def approve(self, value=True):
1809
 
        self.approved = value
1810
 
        GObject.timeout_add(int(self.approval_duration.total_seconds()
1811
 
                                * 1000), self._reset_approved)
1812
944
        self.send_changedstate()
 
945
        self._approved = value
 
946
        gobject.timeout_add(_timedelta_to_milliseconds
 
947
                            (self.approval_duration),
 
948
                            self._reset_approved)
 
949
    
1813
950
    
1814
951
    ## D-Bus methods, signals & properties
1815
 
    
1816
 
    ## Interfaces
1817
 
    
 
952
    _interface = "se.bsnet.fukt.Mandos.Client"
 
953
 
1818
954
    ## Signals
1819
955
    
1820
956
    # CheckerCompleted - signal
1830
966
        pass
1831
967
    
1832
968
    # PropertyChanged - signal
1833
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1834
969
    @dbus.service.signal(_interface, signature="sv")
1835
970
    def PropertyChanged(self, property, value):
1836
971
        "D-Bus signal"
1870
1005
        self.checked_ok()
1871
1006
    
1872
1007
    # Enable - method
1873
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1874
1008
    @dbus.service.method(_interface)
1875
1009
    def Enable(self):
1876
1010
        "D-Bus method"
1877
1011
        self.enable()
1878
1012
    
1879
1013
    # StartChecker - method
1880
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1881
1014
    @dbus.service.method(_interface)
1882
1015
    def StartChecker(self):
1883
1016
        "D-Bus method"
1884
1017
        self.start_checker()
1885
1018
    
1886
1019
    # Disable - method
1887
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1888
1020
    @dbus.service.method(_interface)
1889
1021
    def Disable(self):
1890
1022
        "D-Bus method"
1891
1023
        self.disable()
1892
1024
    
1893
1025
    # StopChecker - method
1894
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1895
1026
    @dbus.service.method(_interface)
1896
1027
    def StopChecker(self):
1897
1028
        self.stop_checker()
1904
1035
        return dbus.Boolean(bool(self.approvals_pending))
1905
1036
    
1906
1037
    # ApprovedByDefault - property
1907
 
    @dbus_service_property(_interface,
1908
 
                           signature="b",
 
1038
    @dbus_service_property(_interface, signature="b",
1909
1039
                           access="readwrite")
1910
1040
    def ApprovedByDefault_dbus_property(self, value=None):
1911
1041
        if value is None:       # get
1913
1043
        self.approved_by_default = bool(value)
1914
1044
    
1915
1045
    # ApprovalDelay - property
1916
 
    @dbus_service_property(_interface,
1917
 
                           signature="t",
 
1046
    @dbus_service_property(_interface, signature="t",
1918
1047
                           access="readwrite")
1919
1048
    def ApprovalDelay_dbus_property(self, value=None):
1920
1049
        if value is None:       # get
1921
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1922
 
                               * 1000)
 
1050
            return dbus.UInt64(self.approval_delay_milliseconds())
1923
1051
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1924
1052
    
1925
1053
    # ApprovalDuration - property
1926
 
    @dbus_service_property(_interface,
1927
 
                           signature="t",
 
1054
    @dbus_service_property(_interface, signature="t",
1928
1055
                           access="readwrite")
1929
1056
    def ApprovalDuration_dbus_property(self, value=None):
1930
1057
        if value is None:       # get
1931
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1932
 
                               * 1000)
 
1058
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1059
                    self.approval_duration))
1933
1060
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1934
1061
    
1935
1062
    # Name - property
1936
 
    @dbus_annotations(
1937
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1938
1063
    @dbus_service_property(_interface, signature="s", access="read")
1939
1064
    def Name_dbus_property(self):
1940
1065
        return dbus.String(self.name)
1941
1066
    
1942
1067
    # Fingerprint - property
1943
 
    @dbus_annotations(
1944
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1945
1068
    @dbus_service_property(_interface, signature="s", access="read")
1946
1069
    def Fingerprint_dbus_property(self):
1947
1070
        return dbus.String(self.fingerprint)
1948
1071
    
1949
1072
    # Host - property
1950
 
    @dbus_service_property(_interface,
1951
 
                           signature="s",
 
1073
    @dbus_service_property(_interface, signature="s",
1952
1074
                           access="readwrite")
1953
1075
    def Host_dbus_property(self, value=None):
1954
1076
        if value is None:       # get
1955
1077
            return dbus.String(self.host)
1956
 
        self.host = str(value)
 
1078
        self.host = value
1957
1079
    
1958
1080
    # Created - property
1959
 
    @dbus_annotations(
1960
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1961
1081
    @dbus_service_property(_interface, signature="s", access="read")
1962
1082
    def Created_dbus_property(self):
1963
 
        return datetime_to_dbus(self.created)
 
1083
        return dbus.String(datetime_to_dbus(self.created))
1964
1084
    
1965
1085
    # LastEnabled - property
1966
1086
    @dbus_service_property(_interface, signature="s", access="read")
1968
1088
        return datetime_to_dbus(self.last_enabled)
1969
1089
    
1970
1090
    # Enabled - property
1971
 
    @dbus_service_property(_interface,
1972
 
                           signature="b",
 
1091
    @dbus_service_property(_interface, signature="b",
1973
1092
                           access="readwrite")
1974
1093
    def Enabled_dbus_property(self, value=None):
1975
1094
        if value is None:       # get
1980
1099
            self.disable()
1981
1100
    
1982
1101
    # LastCheckedOK - property
1983
 
    @dbus_service_property(_interface,
1984
 
                           signature="s",
 
1102
    @dbus_service_property(_interface, signature="s",
1985
1103
                           access="readwrite")
1986
1104
    def LastCheckedOK_dbus_property(self, value=None):
1987
1105
        if value is not None:
1989
1107
            return
1990
1108
        return datetime_to_dbus(self.last_checked_ok)
1991
1109
    
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
 
    
1997
1110
    # Expires - property
1998
1111
    @dbus_service_property(_interface, signature="s", access="read")
1999
1112
    def Expires_dbus_property(self):
2005
1118
        return datetime_to_dbus(self.last_approval_request)
2006
1119
    
2007
1120
    # Timeout - property
2008
 
    @dbus_service_property(_interface,
2009
 
                           signature="t",
 
1121
    @dbus_service_property(_interface, signature="t",
2010
1122
                           access="readwrite")
2011
1123
    def Timeout_dbus_property(self, value=None):
2012
1124
        if value is None:       # get
2013
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
2014
 
        old_timeout = self.timeout
 
1125
            return dbus.UInt64(self.timeout_milliseconds())
2015
1126
        self.timeout = datetime.timedelta(0, 0, 0, value)
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)
 
1127
        if getattr(self, "disable_initiator_tag", None) is None:
 
1128
            return
 
1129
        # Reschedule timeout
 
1130
        gobject.source_remove(self.disable_initiator_tag)
 
1131
        self.disable_initiator_tag = None
 
1132
        self.expires = None
 
1133
        time_to_die = (self.
 
1134
                       _timedelta_to_milliseconds((self
 
1135
                                                   .last_checked_ok
 
1136
                                                   + self.timeout)
 
1137
                                                  - datetime.datetime
 
1138
                                                  .utcnow()))
 
1139
        if time_to_die <= 0:
 
1140
            # The timeout has passed
 
1141
            self.disable()
 
1142
        else:
 
1143
            self.expires = (datetime.datetime.utcnow()
 
1144
                            + datetime.timedelta(milliseconds = time_to_die))
 
1145
            self.disable_initiator_tag = (gobject.timeout_add
 
1146
                                          (time_to_die, self.disable))
2031
1147
    
2032
1148
    # ExtendedTimeout - property
2033
 
    @dbus_service_property(_interface,
2034
 
                           signature="t",
 
1149
    @dbus_service_property(_interface, signature="t",
2035
1150
                           access="readwrite")
2036
1151
    def ExtendedTimeout_dbus_property(self, value=None):
2037
1152
        if value is None:       # get
2038
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
2039
 
                               * 1000)
 
1153
            return dbus.UInt64(self.extended_timeout_milliseconds())
2040
1154
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2041
1155
    
2042
1156
    # Interval - property
2043
 
    @dbus_service_property(_interface,
2044
 
                           signature="t",
 
1157
    @dbus_service_property(_interface, signature="t",
2045
1158
                           access="readwrite")
2046
1159
    def Interval_dbus_property(self, value=None):
2047
1160
        if value is None:       # get
2048
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1161
            return dbus.UInt64(self.interval_milliseconds())
2049
1162
        self.interval = datetime.timedelta(0, 0, 0, value)
2050
1163
        if getattr(self, "checker_initiator_tag", None) is None:
2051
1164
            return
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
 
1165
        # Reschedule checker run
 
1166
        gobject.source_remove(self.checker_initiator_tag)
 
1167
        self.checker_initiator_tag = (gobject.timeout_add
 
1168
                                      (value, self.start_checker))
 
1169
        self.start_checker()    # Start one now, too
2058
1170
    
2059
1171
    # Checker - property
2060
 
    @dbus_service_property(_interface,
2061
 
                           signature="s",
 
1172
    @dbus_service_property(_interface, signature="s",
2062
1173
                           access="readwrite")
2063
1174
    def Checker_dbus_property(self, value=None):
2064
1175
        if value is None:       # get
2065
1176
            return dbus.String(self.checker_command)
2066
 
        self.checker_command = str(value)
 
1177
        self.checker_command = value
2067
1178
    
2068
1179
    # CheckerRunning - property
2069
 
    @dbus_service_property(_interface,
2070
 
                           signature="b",
 
1180
    @dbus_service_property(_interface, signature="b",
2071
1181
                           access="readwrite")
2072
1182
    def CheckerRunning_dbus_property(self, value=None):
2073
1183
        if value is None:       # get
2078
1188
            self.stop_checker()
2079
1189
    
2080
1190
    # ObjectPath - property
2081
 
    @dbus_annotations(
2082
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2083
 
         "org.freedesktop.DBus.Deprecated": "true"})
2084
1191
    @dbus_service_property(_interface, signature="o", access="read")
2085
1192
    def ObjectPath_dbus_property(self):
2086
1193
        return self.dbus_object_path # is already a dbus.ObjectPath
2087
1194
    
2088
1195
    # Secret = property
2089
 
    @dbus_annotations(
2090
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2091
 
         "invalidates"})
2092
 
    @dbus_service_property(_interface,
2093
 
                           signature="ay",
2094
 
                           access="write",
2095
 
                           byte_arrays=True)
 
1196
    @dbus_service_property(_interface, signature="ay",
 
1197
                           access="write", byte_arrays=True)
2096
1198
    def Secret_dbus_property(self, value):
2097
 
        self.secret = bytes(value)
 
1199
        self.secret = str(value)
2098
1200
    
2099
1201
    del _interface
2100
1202
 
2104
1206
        self._pipe = child_pipe
2105
1207
        self._pipe.send(('init', fpr, address))
2106
1208
        if not self._pipe.recv():
2107
 
            raise KeyError(fpr)
 
1209
            raise KeyError()
2108
1210
    
2109
1211
    def __getattribute__(self, name):
2110
 
        if name == '_pipe':
 
1212
        if(name == '_pipe'):
2111
1213
            return super(ProxyClient, self).__getattribute__(name)
2112
1214
        self._pipe.send(('getattr', name))
2113
1215
        data = self._pipe.recv()
2114
1216
        if data[0] == 'data':
2115
1217
            return data[1]
2116
1218
        if data[0] == 'function':
2117
 
            
2118
1219
            def func(*args, **kwargs):
2119
1220
                self._pipe.send(('funcall', name, args, kwargs))
2120
1221
                return self._pipe.recv()[1]
2121
 
            
2122
1222
            return func
2123
1223
    
2124
1224
    def __setattr__(self, name, value):
2125
 
        if name == '_pipe':
 
1225
        if(name == '_pipe'):
2126
1226
            return super(ProxyClient, self).__setattr__(name, value)
2127
1227
        self._pipe.send(('setattr', name, value))
2128
1228
 
 
1229
class ClientDBusTransitional(ClientDBus):
 
1230
    __metaclass__ = transitional_dbus_metaclass
2129
1231
 
2130
1232
class ClientHandler(socketserver.BaseRequestHandler, object):
2131
1233
    """A class to handle client connections.
2136
1238
    def handle(self):
2137
1239
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2138
1240
            logger.info("TCP connection from: %s",
2139
 
                        str(self.client_address))
 
1241
                        unicode(self.client_address))
2140
1242
            logger.debug("Pipe FD: %d",
2141
1243
                         self.server.child_pipe.fileno())
2142
1244
            
2143
 
            session = gnutls.ClientSession(self.request)
 
1245
            session = (gnutls.connection
 
1246
                       .ClientSession(self.request,
 
1247
                                      gnutls.connection
 
1248
                                      .X509Credentials()))
 
1249
            
 
1250
            # Note: gnutls.connection.X509Credentials is really a
 
1251
            # generic GnuTLS certificate credentials object so long as
 
1252
            # no X.509 keys are added to it.  Therefore, we can use it
 
1253
            # here despite using OpenPGP certificates.
2144
1254
            
2145
1255
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2146
1256
            #                      "+AES-256-CBC", "+SHA1",
2150
1260
            priority = self.server.gnutls_priority
2151
1261
            if priority is None:
2152
1262
                priority = "NORMAL"
2153
 
            gnutls.priority_set_direct(session._c_object, priority,
2154
 
                                       None)
 
1263
            (gnutls.library.functions
 
1264
             .gnutls_priority_set_direct(session._c_object,
 
1265
                                         priority, None))
2155
1266
            
2156
1267
            # Start communication using the Mandos protocol
2157
1268
            # Get protocol number
2159
1270
            logger.debug("Protocol version: %r", line)
2160
1271
            try:
2161
1272
                if int(line.strip().split()[0]) > 1:
2162
 
                    raise RuntimeError(line)
 
1273
                    raise RuntimeError
2163
1274
            except (ValueError, IndexError, RuntimeError) as error:
2164
1275
                logger.error("Unknown protocol version: %s", error)
2165
1276
                return
2167
1278
            # Start GnuTLS connection
2168
1279
            try:
2169
1280
                session.handshake()
2170
 
            except gnutls.Error as error:
 
1281
            except gnutls.errors.GNUTLSError as error:
2171
1282
                logger.warning("Handshake failed: %s", error)
2172
1283
                # Do not run session.bye() here: the session is not
2173
1284
                # established.  Just abandon the request.
2177
1288
            approval_required = False
2178
1289
            try:
2179
1290
                try:
2180
 
                    fpr = self.fingerprint(
2181
 
                        self.peer_certificate(session))
2182
 
                except (TypeError, gnutls.Error) as error:
 
1291
                    fpr = self.fingerprint(self.peer_certificate
 
1292
                                           (session))
 
1293
                except (TypeError,
 
1294
                        gnutls.errors.GNUTLSError) as error:
2183
1295
                    logger.warning("Bad certificate: %s", error)
2184
1296
                    return
2185
1297
                logger.debug("Fingerprint: %s", fpr)
2198
1310
                while True:
2199
1311
                    if not client.enabled:
2200
1312
                        logger.info("Client %s is disabled",
2201
 
                                    client.name)
 
1313
                                       client.name)
2202
1314
                        if self.server.use_dbus:
2203
1315
                            # Emit D-Bus signal
2204
 
                            client.Rejected("Disabled")
 
1316
                            client.Rejected("Disabled")                    
2205
1317
                        return
2206
1318
                    
2207
 
                    if client.approved or not client.approval_delay:
 
1319
                    if client._approved or not client.approval_delay:
2208
1320
                        #We are approved or approval is disabled
2209
1321
                        break
2210
 
                    elif client.approved is None:
 
1322
                    elif client._approved is None:
2211
1323
                        logger.info("Client %s needs approval",
2212
1324
                                    client.name)
2213
1325
                        if self.server.use_dbus:
2214
1326
                            # Emit D-Bus signal
2215
1327
                            client.NeedApproval(
2216
 
                                client.approval_delay.total_seconds()
2217
 
                                * 1000, client.approved_by_default)
 
1328
                                client.approval_delay_milliseconds(),
 
1329
                                client.approved_by_default)
2218
1330
                    else:
2219
1331
                        logger.warning("Client %s was not approved",
2220
1332
                                       client.name)
2224
1336
                        return
2225
1337
                    
2226
1338
                    #wait until timeout or approved
 
1339
                    #x = float(client._timedelta_to_milliseconds(delay))
2227
1340
                    time = datetime.datetime.now()
2228
1341
                    client.changedstate.acquire()
2229
 
                    client.changedstate.wait(delay.total_seconds())
 
1342
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
2230
1343
                    client.changedstate.release()
2231
1344
                    time2 = datetime.datetime.now()
2232
1345
                    if (time2 - time) >= delay:
2243
1356
                    else:
2244
1357
                        delay -= time2 - time
2245
1358
                
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
 
1359
                sent_size = 0
 
1360
                while sent_size < len(client.secret):
 
1361
                    try:
 
1362
                        sent = session.send(client.secret[sent_size:])
 
1363
                    except gnutls.errors.GNUTLSError as error:
 
1364
                        logger.warning("gnutls send failed")
 
1365
                        return
 
1366
                    logger.debug("Sent: %d, remaining: %d",
 
1367
                                 sent, len(client.secret)
 
1368
                                 - (sent_size + sent))
 
1369
                    sent_size += sent
2252
1370
                
2253
1371
                logger.info("Sending secret to %s", client.name)
2254
 
                # bump the timeout using extended_timeout
2255
 
                client.bump_timeout(client.extended_timeout)
 
1372
                # bump the timeout as if seen
 
1373
                client.checked_ok(client.extended_timeout)
2256
1374
                if self.server.use_dbus:
2257
1375
                    # Emit D-Bus signal
2258
1376
                    client.GotSecret()
2262
1380
                    client.approvals_pending -= 1
2263
1381
                try:
2264
1382
                    session.bye()
2265
 
                except gnutls.Error as error:
2266
 
                    logger.warning("GnuTLS bye failed",
2267
 
                                   exc_info=error)
 
1383
                except gnutls.errors.GNUTLSError as error:
 
1384
                    logger.warning("GnuTLS bye failed")
2268
1385
    
2269
1386
    @staticmethod
2270
1387
    def peer_certificate(session):
2271
1388
        "Return the peer's OpenPGP certificate as a bytestring"
2272
1389
        # If not an OpenPGP certificate...
2273
 
        if (gnutls.certificate_type_get(session._c_object)
2274
 
            != gnutls.CRT_OPENPGP):
2275
 
            # ...return invalid data
2276
 
            return b""
 
1390
        if (gnutls.library.functions
 
1391
            .gnutls_certificate_type_get(session._c_object)
 
1392
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1393
            # ...do the normal thing
 
1394
            return session.peer_certificate
2277
1395
        list_size = ctypes.c_uint(1)
2278
 
        cert_list = (gnutls.certificate_get_peers
 
1396
        cert_list = (gnutls.library.functions
 
1397
                     .gnutls_certificate_get_peers
2279
1398
                     (session._c_object, ctypes.byref(list_size)))
2280
1399
        if not bool(cert_list) and list_size.value != 0:
2281
 
            raise gnutls.Error("error getting peer certificate")
 
1400
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1401
                                            " certificate")
2282
1402
        if list_size.value == 0:
2283
1403
            return None
2284
1404
        cert = cert_list[0]
2288
1408
    def fingerprint(openpgp):
2289
1409
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2290
1410
        # New GnuTLS "datum" with the OpenPGP public key
2291
 
        datum = gnutls.datum_t(
2292
 
            ctypes.cast(ctypes.c_char_p(openpgp),
2293
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2294
 
            ctypes.c_uint(len(openpgp)))
 
1411
        datum = (gnutls.library.types
 
1412
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1413
                                             ctypes.POINTER
 
1414
                                             (ctypes.c_ubyte)),
 
1415
                                 ctypes.c_uint(len(openpgp))))
2295
1416
        # New empty GnuTLS certificate
2296
 
        crt = gnutls.openpgp_crt_t()
2297
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1417
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1418
        (gnutls.library.functions
 
1419
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
2298
1420
        # Import the OpenPGP public key into the certificate
2299
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2300
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1421
        (gnutls.library.functions
 
1422
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1423
                                    gnutls.library.constants
 
1424
                                    .GNUTLS_OPENPGP_FMT_RAW))
2301
1425
        # Verify the self signature in the key
2302
1426
        crtverify = ctypes.c_uint()
2303
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2304
 
                                       ctypes.byref(crtverify))
 
1427
        (gnutls.library.functions
 
1428
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1429
                                         ctypes.byref(crtverify)))
2305
1430
        if crtverify.value != 0:
2306
 
            gnutls.openpgp_crt_deinit(crt)
2307
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1431
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1432
            raise (gnutls.errors.CertificateSecurityError
 
1433
                   ("Verify failed"))
2308
1434
        # New buffer for the fingerprint
2309
1435
        buf = ctypes.create_string_buffer(20)
2310
1436
        buf_len = ctypes.c_size_t()
2311
1437
        # Get the fingerprint from the certificate into the buffer
2312
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2313
 
                                           ctypes.byref(buf_len))
 
1438
        (gnutls.library.functions
 
1439
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1440
                                             ctypes.byref(buf_len)))
2314
1441
        # Deinit the certificate
2315
 
        gnutls.openpgp_crt_deinit(crt)
 
1442
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2316
1443
        # Convert the buffer to a Python bytestring
2317
1444
        fpr = ctypes.string_at(buf, buf_len.value)
2318
1445
        # Convert the bytestring to hexadecimal notation
2319
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1446
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
2320
1447
        return hex_fpr
2321
1448
 
2322
1449
 
2323
1450
class MultiprocessingMixIn(object):
2324
1451
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2325
 
    
2326
1452
    def sub_process_main(self, request, address):
2327
1453
        try:
2328
1454
            self.finish_request(request, address)
2329
 
        except Exception:
 
1455
        except:
2330
1456
            self.handle_error(request, address)
2331
1457
        self.close_request(request)
2332
 
    
 
1458
            
2333
1459
    def process_request(self, request, address):
2334
1460
        """Start a new process to process the request."""
2335
 
        proc = multiprocessing.Process(target = self.sub_process_main,
2336
 
                                       args = (request, address))
2337
 
        proc.start()
2338
 
        return proc
 
1461
        multiprocessing.Process(target = self.sub_process_main,
 
1462
                                args = (request, address)).start()
2339
1463
 
2340
1464
 
2341
1465
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2342
1466
    """ adds a pipe to the MixIn """
2343
 
    
2344
1467
    def process_request(self, request, client_address):
2345
1468
        """Overrides and wraps the original process_request().
2346
1469
        
2348
1471
        """
2349
1472
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
2350
1473
        
2351
 
        proc = MultiprocessingMixIn.process_request(self, request,
2352
 
                                                    client_address)
 
1474
        super(MultiprocessingMixInWithPipe,
 
1475
              self).process_request(request, client_address)
2353
1476
        self.child_pipe.close()
2354
 
        self.add_pipe(parent_pipe, proc)
 
1477
        self.add_pipe(parent_pipe)
2355
1478
    
2356
 
    def add_pipe(self, parent_pipe, proc):
 
1479
    def add_pipe(self, parent_pipe):
2357
1480
        """Dummy function; override as necessary"""
2358
 
        raise NotImplementedError()
 
1481
        raise NotImplementedError
2359
1482
 
2360
1483
 
2361
1484
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2367
1490
        interface:      None or a network interface name (string)
2368
1491
        use_ipv6:       Boolean; to use IPv6 or not
2369
1492
    """
2370
 
    
2371
1493
    def __init__(self, server_address, RequestHandlerClass,
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
 
        """
 
1494
                 interface=None, use_ipv6=True):
2378
1495
        self.interface = interface
2379
1496
        if use_ipv6:
2380
1497
            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.
2407
1498
        socketserver.TCPServer.__init__(self, server_address,
2408
1499
                                        RequestHandlerClass)
2409
 
    
2410
1500
    def server_bind(self):
2411
1501
        """This overrides the normal server_bind() function
2412
1502
        to bind to an interface if one was specified, and also NOT to
2418
1508
                             self.interface)
2419
1509
            else:
2420
1510
                try:
2421
 
                    self.socket.setsockopt(
2422
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
2423
 
                        (self.interface + "\0").encode("utf-8"))
 
1511
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1512
                                           SO_BINDTODEVICE,
 
1513
                                           str(self.interface
 
1514
                                               + '\0'))
2424
1515
                except socket.error as error:
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:
 
1516
                    if error[0] == errno.EPERM:
 
1517
                        logger.error("No permission to"
 
1518
                                     " bind to interface %s",
 
1519
                                     self.interface)
 
1520
                    elif error[0] == errno.ENOPROTOOPT:
2429
1521
                        logger.error("SO_BINDTODEVICE not available;"
2430
1522
                                     " cannot bind to interface %s",
2431
1523
                                     self.interface)
2432
 
                    elif error.errno == errno.ENODEV:
2433
 
                        logger.error("Interface %s does not exist,"
2434
 
                                     " cannot bind", self.interface)
2435
1524
                    else:
2436
1525
                        raise
2437
1526
        # Only bind(2) the socket if we really need to.
2440
1529
                if self.address_family == socket.AF_INET6:
2441
1530
                    any_address = "::" # in6addr_any
2442
1531
                else:
2443
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1532
                    any_address = socket.INADDR_ANY
2444
1533
                self.server_address = (any_address,
2445
1534
                                       self.server_address[1])
2446
1535
            elif not self.server_address[1]:
2447
 
                self.server_address = (self.server_address[0], 0)
 
1536
                self.server_address = (self.server_address[0],
 
1537
                                       0)
2448
1538
#                 if self.interface:
2449
1539
#                     self.server_address = (self.server_address[0],
2450
1540
#                                            0, # port
2462
1552
        gnutls_priority GnuTLS priority string
2463
1553
        use_dbus:       Boolean; to emit D-Bus signals or not
2464
1554
    
2465
 
    Assumes a GObject.MainLoop event loop.
 
1555
    Assumes a gobject.MainLoop event loop.
2466
1556
    """
2467
 
    
2468
1557
    def __init__(self, server_address, RequestHandlerClass,
2469
 
                 interface=None,
2470
 
                 use_ipv6=True,
2471
 
                 clients=None,
2472
 
                 gnutls_priority=None,
2473
 
                 use_dbus=True,
2474
 
                 socketfd=None):
 
1558
                 interface=None, use_ipv6=True, clients=None,
 
1559
                 gnutls_priority=None, use_dbus=True):
2475
1560
        self.enabled = False
2476
1561
        self.clients = clients
2477
1562
        if self.clients is None:
2478
 
            self.clients = {}
 
1563
            self.clients = set()
2479
1564
        self.use_dbus = use_dbus
2480
1565
        self.gnutls_priority = gnutls_priority
2481
1566
        IPv6_TCPServer.__init__(self, server_address,
2482
1567
                                RequestHandlerClass,
2483
1568
                                interface = interface,
2484
 
                                use_ipv6 = use_ipv6,
2485
 
                                socketfd = socketfd)
2486
 
    
 
1569
                                use_ipv6 = use_ipv6)
2487
1570
    def server_activate(self):
2488
1571
        if self.enabled:
2489
1572
            return socketserver.TCPServer.server_activate(self)
2490
 
    
2491
1573
    def enable(self):
2492
1574
        self.enabled = True
2493
 
    
2494
 
    def add_pipe(self, parent_pipe, proc):
 
1575
    def add_pipe(self, parent_pipe):
2495
1576
        # Call "handle_ipc" for both data and EOF events
2496
 
        GObject.io_add_watch(
2497
 
            parent_pipe.fileno(),
2498
 
            GObject.IO_IN | GObject.IO_HUP,
2499
 
            functools.partial(self.handle_ipc,
2500
 
                              parent_pipe = parent_pipe,
2501
 
                              proc = proc))
2502
 
    
2503
 
    def handle_ipc(self, source, condition,
2504
 
                   parent_pipe=None,
2505
 
                   proc = None,
 
1577
        gobject.io_add_watch(parent_pipe.fileno(),
 
1578
                             gobject.IO_IN | gobject.IO_HUP,
 
1579
                             functools.partial(self.handle_ipc,
 
1580
                                               parent_pipe = parent_pipe))
 
1581
        
 
1582
    def handle_ipc(self, source, condition, parent_pipe=None,
2506
1583
                   client_object=None):
2507
 
        # error, or the other end of multiprocessing.Pipe has closed
2508
 
        if condition & (GObject.IO_ERR | GObject.IO_HUP):
2509
 
            # Wait for other process to exit
2510
 
            proc.join()
 
1584
        condition_names = {
 
1585
            gobject.IO_IN: "IN",   # There is data to read.
 
1586
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1587
                                    # blocking).
 
1588
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1589
            gobject.IO_ERR: "ERR", # Error condition.
 
1590
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1591
                                    # broken, usually for pipes and
 
1592
                                    # sockets).
 
1593
            }
 
1594
        conditions_string = ' | '.join(name
 
1595
                                       for cond, name in
 
1596
                                       condition_names.iteritems()
 
1597
                                       if cond & condition)
 
1598
        # error or the other end of multiprocessing.Pipe has closed
 
1599
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2511
1600
            return False
2512
1601
        
2513
1602
        # Read a request from the child
2518
1607
            fpr = request[1]
2519
1608
            address = request[2]
2520
1609
            
2521
 
            for c in self.clients.itervalues():
 
1610
            for c in self.clients:
2522
1611
                if c.fingerprint == fpr:
2523
1612
                    client = c
2524
1613
                    break
2527
1616
                            "dress: %s", fpr, address)
2528
1617
                if self.use_dbus:
2529
1618
                    # Emit D-Bus signal
2530
 
                    mandos_dbus_service.ClientNotFound(fpr,
2531
 
                                                       address[0])
 
1619
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2532
1620
                parent_pipe.send(False)
2533
1621
                return False
2534
1622
            
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))
 
1623
            gobject.io_add_watch(parent_pipe.fileno(),
 
1624
                                 gobject.IO_IN | gobject.IO_HUP,
 
1625
                                 functools.partial(self.handle_ipc,
 
1626
                                                   parent_pipe = parent_pipe,
 
1627
                                                   client_object = client))
2542
1628
            parent_pipe.send(True)
2543
 
            # remove the old hook in favor of the new above hook on
2544
 
            # same fileno
 
1629
            # remove the old hook in favor of the new above hook on same fileno
2545
1630
            return False
2546
1631
        if command == 'funcall':
2547
1632
            funcname = request[1]
2548
1633
            args = request[2]
2549
1634
            kwargs = request[3]
2550
1635
            
2551
 
            parent_pipe.send(('data', getattr(client_object,
2552
 
                                              funcname)(*args,
2553
 
                                                        **kwargs)))
 
1636
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2554
1637
        
2555
1638
        if command == 'getattr':
2556
1639
            attrname = request[1]
2557
 
            if isinstance(client_object.__getattribute__(attrname),
2558
 
                          collections.Callable):
2559
 
                parent_pipe.send(('function', ))
 
1640
            if callable(client_object.__getattribute__(attrname)):
 
1641
                parent_pipe.send(('function',))
2560
1642
            else:
2561
 
                parent_pipe.send((
2562
 
                    'data', client_object.__getattribute__(attrname)))
 
1643
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2563
1644
        
2564
1645
        if command == 'setattr':
2565
1646
            attrname = request[1]
2569
1650
        return True
2570
1651
 
2571
1652
 
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
 
 
2668
1653
def string_to_delta(interval):
2669
1654
    """Parse a string and return a datetime.timedelta
2670
1655
    
2681
1666
    >>> string_to_delta('5m 30s')
2682
1667
    datetime.timedelta(0, 330)
2683
1668
    """
2684
 
    
2685
 
    try:
2686
 
        return rfc3339_duration_to_delta(interval)
2687
 
    except ValueError:
2688
 
        pass
2689
 
    
2690
1669
    timevalue = datetime.timedelta(0)
2691
1670
    for s in interval.split():
2692
1671
        try:
2693
 
            suffix = s[-1]
 
1672
            suffix = unicode(s[-1])
2694
1673
            value = int(s[:-1])
2695
1674
            if suffix == "d":
2696
1675
                delta = datetime.timedelta(value)
2703
1682
            elif suffix == "w":
2704
1683
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2705
1684
            else:
2706
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2707
 
        except IndexError as e:
 
1685
                raise ValueError("Unknown suffix %r" % suffix)
 
1686
        except (ValueError, IndexError) as e:
2708
1687
            raise ValueError(*(e.args))
2709
1688
        timevalue += delta
2710
1689
    return timevalue
2711
1690
 
2712
1691
 
 
1692
def if_nametoindex(interface):
 
1693
    """Call the C function if_nametoindex(), or equivalent
 
1694
    
 
1695
    Note: This function cannot accept a unicode string."""
 
1696
    global if_nametoindex
 
1697
    try:
 
1698
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1699
                          (ctypes.util.find_library("c"))
 
1700
                          .if_nametoindex)
 
1701
    except (OSError, AttributeError):
 
1702
        logger.warning("Doing if_nametoindex the hard way")
 
1703
        def if_nametoindex(interface):
 
1704
            "Get an interface index the hard way, i.e. using fcntl()"
 
1705
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1706
            with contextlib.closing(socket.socket()) as s:
 
1707
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1708
                                    struct.pack(str("16s16x"),
 
1709
                                                interface))
 
1710
            interface_index = struct.unpack(str("I"),
 
1711
                                            ifreq[16:20])[0]
 
1712
            return interface_index
 
1713
    return if_nametoindex(interface)
 
1714
 
 
1715
 
2713
1716
def daemon(nochdir = False, noclose = False):
2714
1717
    """See daemon(3).  Standard BSD Unix function.
2715
1718
    
2723
1726
        sys.exit()
2724
1727
    if not noclose:
2725
1728
        # Close all standard open file descriptors
2726
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1729
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2727
1730
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2728
1731
            raise OSError(errno.ENODEV,
2729
 
                          "{} not a character device"
2730
 
                          .format(os.devnull))
 
1732
                          "%s not a character device"
 
1733
                          % os.path.devnull)
2731
1734
        os.dup2(null, sys.stdin.fileno())
2732
1735
        os.dup2(null, sys.stdout.fileno())
2733
1736
        os.dup2(null, sys.stderr.fileno())
2742
1745
    
2743
1746
    parser = argparse.ArgumentParser()
2744
1747
    parser.add_argument("-v", "--version", action="version",
2745
 
                        version = "%(prog)s {}".format(version),
 
1748
                        version = "%%(prog)s %s" % version,
2746
1749
                        help="show version number and exit")
2747
1750
    parser.add_argument("-i", "--interface", metavar="IF",
2748
1751
                        help="Bind to interface IF")
2754
1757
                        help="Run self-test")
2755
1758
    parser.add_argument("--debug", action="store_true",
2756
1759
                        help="Debug mode; run in foreground and log"
2757
 
                        " to terminal", default=None)
 
1760
                        " to terminal")
2758
1761
    parser.add_argument("--debuglevel", metavar="LEVEL",
2759
1762
                        help="Debug level for stdout output")
2760
1763
    parser.add_argument("--priority", help="GnuTLS"
2767
1770
                        " files")
2768
1771
    parser.add_argument("--no-dbus", action="store_false",
2769
1772
                        dest="use_dbus", help="Do not provide D-Bus"
2770
 
                        " system bus interface", default=None)
 
1773
                        " system bus interface")
2771
1774
    parser.add_argument("--no-ipv6", action="store_false",
2772
 
                        dest="use_ipv6", help="Do not use IPv6",
2773
 
                        default=None)
2774
 
    parser.add_argument("--no-restore", action="store_false",
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)
2787
 
    
 
1775
                        dest="use_ipv6", help="Do not use IPv6")
2788
1776
    options = parser.parse_args()
2789
1777
    
2790
1778
    if options.check:
2791
1779
        import doctest
2792
 
        fail_count, test_count = doctest.testmod()
2793
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1780
        doctest.testmod()
 
1781
        sys.exit()
2794
1782
    
2795
1783
    # Default values for config file for server-global settings
2796
1784
    server_defaults = { "interface": "",
2798
1786
                        "port": "",
2799
1787
                        "debug": "False",
2800
1788
                        "priority":
2801
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2802
 
                        ":+SIGN-DSA-SHA256",
 
1789
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2803
1790
                        "servicename": "Mandos",
2804
1791
                        "use_dbus": "True",
2805
1792
                        "use_ipv6": "True",
2806
1793
                        "debuglevel": "",
2807
 
                        "restore": "True",
2808
 
                        "socket": "",
2809
 
                        "statedir": "/var/lib/mandos",
2810
 
                        "foreground": "False",
2811
 
                        "zeroconf": "True",
2812
 
                    }
 
1794
                        }
2813
1795
    
2814
1796
    # Parse config file for server-global settings
2815
1797
    server_config = configparser.SafeConfigParser(server_defaults)
2816
1798
    del server_defaults
2817
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
1799
    server_config.read(os.path.join(options.configdir,
 
1800
                                    "mandos.conf"))
2818
1801
    # Convert the SafeConfigParser object to a dict
2819
1802
    server_settings = server_config.defaults()
2820
1803
    # Use the appropriate methods on the non-string config options
2821
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1804
    for option in ("debug", "use_dbus", "use_ipv6"):
2822
1805
        server_settings[option] = server_config.getboolean("DEFAULT",
2823
1806
                                                           option)
2824
1807
    if server_settings["port"]:
2825
1808
        server_settings["port"] = server_config.getint("DEFAULT",
2826
1809
                                                       "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"])
2836
1810
    del server_config
2837
1811
    
2838
1812
    # Override the settings from the config file with command line
2839
1813
    # options, if set.
2840
1814
    for option in ("interface", "address", "port", "debug",
2841
 
                   "priority", "servicename", "configdir", "use_dbus",
2842
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2843
 
                   "socket", "foreground", "zeroconf"):
 
1815
                   "priority", "servicename", "configdir",
 
1816
                   "use_dbus", "use_ipv6", "debuglevel"):
2844
1817
        value = getattr(options, option)
2845
1818
        if value is not None:
2846
1819
            server_settings[option] = value
2847
1820
    del options
2848
1821
    # Force all strings to be unicode
2849
1822
    for option in server_settings.keys():
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
 
1823
        if type(server_settings[option]) is str:
 
1824
            server_settings[option] = unicode(server_settings[option])
2860
1825
    # Now we have our good server settings in "server_settings"
2861
1826
    
2862
1827
    ##################################################################
2863
1828
    
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
 
    
2869
1829
    # For convenience
2870
1830
    debug = server_settings["debug"]
2871
1831
    debuglevel = server_settings["debuglevel"]
2872
1832
    use_dbus = server_settings["use_dbus"]
2873
1833
    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"]
2878
 
    
2879
 
    if debug:
2880
 
        initlogger(debug, logging.DEBUG)
2881
 
    else:
2882
 
        if not debuglevel:
2883
 
            initlogger(debug)
2884
 
        else:
2885
 
            level = getattr(logging, debuglevel.upper())
2886
 
            initlogger(debug, level)
2887
1834
    
2888
1835
    if server_settings["servicename"] != "Mandos":
2889
 
        syslogger.setFormatter(
2890
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2891
 
                              ' %(levelname)s: %(message)s'.format(
2892
 
                                  server_settings["servicename"])))
 
1836
        syslogger.setFormatter(logging.Formatter
 
1837
                               ('Mandos (%s) [%%(process)d]:'
 
1838
                                ' %%(levelname)s: %%(message)s'
 
1839
                                % server_settings["servicename"]))
2893
1840
    
2894
1841
    # Parse config file with clients
2895
 
    client_config = configparser.SafeConfigParser(Client
2896
 
                                                  .client_defaults)
 
1842
    client_defaults = { "timeout": "5m",
 
1843
                        "extended_timeout": "15m",
 
1844
                        "interval": "2m",
 
1845
                        "checker": "fping -q -- %%(host)s",
 
1846
                        "host": "",
 
1847
                        "approval_delay": "0s",
 
1848
                        "approval_duration": "1s",
 
1849
                        }
 
1850
    client_config = configparser.SafeConfigParser(client_defaults)
2897
1851
    client_config.read(os.path.join(server_settings["configdir"],
2898
1852
                                    "clients.conf"))
2899
1853
    
2900
1854
    global mandos_dbus_service
2901
1855
    mandos_dbus_service = None
2902
1856
    
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
 
1857
    tcp_server = MandosServer((server_settings["address"],
 
1858
                               server_settings["port"]),
 
1859
                              ClientHandler,
 
1860
                              interface=(server_settings["interface"]
 
1861
                                         or None),
 
1862
                              use_ipv6=use_ipv6,
 
1863
                              gnutls_priority=
 
1864
                              server_settings["priority"],
 
1865
                              use_dbus=use_dbus)
 
1866
    if not debug:
 
1867
        pidfilename = "/var/run/mandos.pid"
2919
1868
        try:
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)
 
1869
            pidfile = open(pidfilename, "w")
 
1870
        except IOError:
 
1871
            logger.error("Could not open file %r", pidfilename)
2924
1872
    
2925
 
    for name, group in (("_mandos", "_mandos"),
2926
 
                        ("mandos", "mandos"),
2927
 
                        ("nobody", "nogroup")):
 
1873
    try:
 
1874
        uid = pwd.getpwnam("_mandos").pw_uid
 
1875
        gid = pwd.getpwnam("_mandos").pw_gid
 
1876
    except KeyError:
2928
1877
        try:
2929
 
            uid = pwd.getpwnam(name).pw_uid
2930
 
            gid = pwd.getpwnam(group).pw_gid
2931
 
            break
 
1878
            uid = pwd.getpwnam("mandos").pw_uid
 
1879
            gid = pwd.getpwnam("mandos").pw_gid
2932
1880
        except KeyError:
2933
 
            continue
2934
 
    else:
2935
 
        uid = 65534
2936
 
        gid = 65534
 
1881
            try:
 
1882
                uid = pwd.getpwnam("nobody").pw_uid
 
1883
                gid = pwd.getpwnam("nobody").pw_gid
 
1884
            except KeyError:
 
1885
                uid = 65534
 
1886
                gid = 65534
2937
1887
    try:
2938
1888
        os.setgid(gid)
2939
1889
        os.setuid(uid)
2940
1890
    except OSError as error:
2941
 
        if error.errno != errno.EPERM:
2942
 
            raise
 
1891
        if error[0] != errno.EPERM:
 
1892
            raise error
 
1893
    
 
1894
    if not debug and not debuglevel:
 
1895
        syslogger.setLevel(logging.WARNING)
 
1896
        console.setLevel(logging.WARNING)
 
1897
    if debuglevel:
 
1898
        level = getattr(logging, debuglevel.upper())
 
1899
        syslogger.setLevel(level)
 
1900
        console.setLevel(level)
2943
1901
    
2944
1902
    if debug:
2945
1903
        # Enable all possible GnuTLS debugging
2946
1904
        
2947
1905
        # "Use a log level over 10 to enable all debugging options."
2948
1906
        # - GnuTLS manual
2949
 
        gnutls.global_set_log_level(11)
 
1907
        gnutls.library.functions.gnutls_global_set_log_level(11)
2950
1908
        
2951
 
        @gnutls.log_func
 
1909
        @gnutls.library.types.gnutls_log_func
2952
1910
        def debug_gnutls(level, string):
2953
1911
            logger.debug("GnuTLS: %s", string[:-1])
2954
1912
        
2955
 
        gnutls.global_set_log_function(debug_gnutls)
 
1913
        (gnutls.library.functions
 
1914
         .gnutls_global_set_log_function(debug_gnutls))
2956
1915
        
2957
1916
        # Redirect stdin so all checkers get /dev/null
2958
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1917
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2959
1918
        os.dup2(null, sys.stdin.fileno())
2960
1919
        if null > 2:
2961
1920
            os.close(null)
 
1921
    else:
 
1922
        # No console logging
 
1923
        logger.removeHandler(console)
2962
1924
    
2963
1925
    # Need to fork before connecting to D-Bus
2964
 
    if not foreground:
 
1926
    if not debug:
2965
1927
        # Close all input and output, do double fork, etc.
2966
1928
        daemon()
2967
1929
    
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
 
    
2972
1930
    global main_loop
2973
1931
    # From the Avahi example code
2974
 
    DBusGMainLoop(set_as_default=True)
2975
 
    main_loop = GObject.MainLoop()
 
1932
    DBusGMainLoop(set_as_default=True )
 
1933
    main_loop = gobject.MainLoop()
2976
1934
    bus = dbus.SystemBus()
2977
1935
    # End of Avahi example code
2978
1936
    if use_dbus:
2979
1937
        try:
2980
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2981
 
                                            bus,
2982
 
                                            do_not_queue=True)
2983
 
            old_bus_name = dbus.service.BusName(
2984
 
                "se.bsnet.fukt.Mandos", bus,
2985
 
                do_not_queue=True)
2986
 
        except dbus.exceptions.DBusException as e:
2987
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
1938
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1939
                                            bus, do_not_queue=True)
 
1940
            bus_name2 = dbus.service.BusName("se.recompile.Mandos",
 
1941
                                            bus, do_not_queue=True)
 
1942
        except dbus.exceptions.NameExistsException as e:
 
1943
            logger.error(unicode(e) + ", disabling D-Bus")
2988
1944
            use_dbus = False
2989
1945
            server_settings["use_dbus"] = False
2990
1946
            tcp_server.use_dbus = False
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"))
 
1947
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1948
    service = AvahiService(name = server_settings["servicename"],
 
1949
                           servicetype = "_mandos._tcp",
 
1950
                           protocol = protocol, bus = bus)
 
1951
    if server_settings["interface"]:
 
1952
        service.interface = (if_nametoindex
 
1953
                             (str(server_settings["interface"])))
3001
1954
    
3002
1955
    global multiprocessing_manager
3003
1956
    multiprocessing_manager = multiprocessing.Manager()
3004
1957
    
3005
1958
    client_class = Client
3006
1959
    if use_dbus:
3007
 
        client_class = functools.partial(ClientDBus, bus = bus)
3008
 
    
3009
 
    client_settings = Client.config_parser(client_config)
3010
 
    old_client_settings = {}
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.
3022
 
    if server_settings["restore"]:
3023
 
        try:
3024
 
            with open(stored_state_path, "rb") as stored_state:
3025
 
                clients_data, old_client_settings = pickle.load(
3026
 
                    stored_state)
3027
 
            os.remove(stored_state_path)
3028
 
        except IOError as e:
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)
3035
 
                raise
3036
 
        except EOFError as e:
3037
 
            logger.warning("Could not load persistent state: "
3038
 
                           "EOFError:",
3039
 
                           exc_info=e)
3040
 
    
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))
 
1960
        client_class = functools.partial(ClientDBusTransitional, bus = bus)        
 
1961
    def client_config_items(config, section):
 
1962
        special_settings = {
 
1963
            "approved_by_default":
 
1964
                lambda: config.getboolean(section,
 
1965
                                          "approved_by_default"),
 
1966
            }
 
1967
        for name, value in config.items(section):
3092
1968
            try:
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)
3117
 
    
 
1969
                yield (name, special_settings[name]())
 
1970
            except KeyError:
 
1971
                yield (name, value)
 
1972
    
 
1973
    tcp_server.clients.update(set(
 
1974
            client_class(name = section,
 
1975
                         config= dict(client_config_items(
 
1976
                        client_config, section)))
 
1977
            for section in client_config.sections()))
3118
1978
    if not tcp_server.clients:
3119
1979
        logger.warning("No clients defined")
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
 
1980
        
 
1981
    if not debug:
 
1982
        try:
 
1983
            with pidfile:
 
1984
                pid = os.getpid()
 
1985
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1986
            del pidfile
 
1987
        except IOError:
 
1988
            logger.error("Could not write to file %r with PID %d",
 
1989
                         pidfilename, pid)
 
1990
        except NameError:
 
1991
            # "pidfile" was never created
 
1992
            pass
3131
1993
        del pidfilename
 
1994
        
 
1995
        signal.signal(signal.SIGINT, signal.SIG_IGN)
3132
1996
    
3133
1997
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
3134
1998
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3135
1999
    
3136
2000
    if use_dbus:
3137
 
        
3138
 
        @alternate_dbus_interfaces(
3139
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3140
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2001
        class MandosDBusService(dbus.service.Object):
3141
2002
            """A D-Bus proxy object"""
3142
 
            
3143
2003
            def __init__(self):
3144
2004
                dbus.service.Object.__init__(self, bus, "/")
3145
 
            
3146
 
            _interface = "se.recompile.Mandos"
 
2005
            _interface = "se.bsnet.fukt.Mandos"
3147
2006
            
3148
2007
            @dbus.service.signal(_interface, signature="o")
3149
2008
            def ClientAdded(self, objpath):
3155
2014
                "D-Bus signal"
3156
2015
                pass
3157
2016
            
3158
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3159
 
                               "true"})
3160
2017
            @dbus.service.signal(_interface, signature="os")
3161
2018
            def ClientRemoved(self, objpath, name):
3162
2019
                "D-Bus signal"
3163
2020
                pass
3164
2021
            
3165
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3166
 
                               "true"})
3167
2022
            @dbus.service.method(_interface, out_signature="ao")
3168
2023
            def GetAllClients(self):
3169
2024
                "D-Bus method"
3170
 
                return dbus.Array(c.dbus_object_path for c in
3171
 
                                  tcp_server.clients.itervalues())
 
2025
                return dbus.Array(c.dbus_object_path
 
2026
                                  for c in tcp_server.clients)
3172
2027
            
3173
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3174
 
                               "true"})
3175
2028
            @dbus.service.method(_interface,
3176
2029
                                 out_signature="a{oa{sv}}")
3177
2030
            def GetAllClientsWithProperties(self):
3178
2031
                "D-Bus method"
3179
2032
                return dbus.Dictionary(
3180
 
                    { c.dbus_object_path: c.GetAll(
3181
 
                        "se.recompile.Mandos.Client")
3182
 
                      for c in tcp_server.clients.itervalues() },
 
2033
                    ((c.dbus_object_path, c.GetAll(""))
 
2034
                     for c in tcp_server.clients),
3183
2035
                    signature="oa{sv}")
3184
2036
            
3185
2037
            @dbus.service.method(_interface, in_signature="o")
3186
2038
            def RemoveClient(self, object_path):
3187
2039
                "D-Bus method"
3188
 
                for c in tcp_server.clients.itervalues():
 
2040
                for c in tcp_server.clients:
3189
2041
                    if c.dbus_object_path == object_path:
3190
 
                        del tcp_server.clients[c.name]
 
2042
                        tcp_server.clients.remove(c)
3191
2043
                        c.remove_from_connection()
3192
 
                        # Don't signal the disabling
 
2044
                        # Don't signal anything except ClientRemoved
3193
2045
                        c.disable(quiet=True)
3194
 
                        # Emit D-Bus signal for removal
3195
 
                        self.client_removed_signal(c)
 
2046
                        # Emit D-Bus signal
 
2047
                        self.ClientRemoved(object_path, c.name)
3196
2048
                        return
3197
2049
                raise KeyError(object_path)
3198
2050
            
3199
2051
            del _interface
3200
 
            
3201
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3202
 
                                 out_signature = "a{oa{sa{sv}}}")
3203
 
            def GetManagedObjects(self):
3204
 
                """D-Bus method"""
3205
 
                return dbus.Dictionary(
3206
 
                    { client.dbus_object_path:
3207
 
                      dbus.Dictionary(
3208
 
                          { interface: client.GetAll(interface)
3209
 
                            for interface in
3210
 
                                 client._get_all_interface_names()})
3211
 
                      for client in tcp_server.clients.values()})
3212
 
            
3213
 
            def client_added_signal(self, client):
3214
 
                """Send the new standard signal and the old signal"""
3215
 
                if use_dbus:
3216
 
                    # New standard signal
3217
 
                    self.InterfacesAdded(
3218
 
                        client.dbus_object_path,
3219
 
                        dbus.Dictionary(
3220
 
                            { interface: client.GetAll(interface)
3221
 
                              for interface in
3222
 
                              client._get_all_interface_names()}))
3223
 
                    # Old signal
3224
 
                    self.ClientAdded(client.dbus_object_path)
3225
 
            
3226
 
            def client_removed_signal(self, client):
3227
 
                """Send the new standard signal and the old signal"""
3228
 
                if use_dbus:
3229
 
                    # New standard signal
3230
 
                    self.InterfacesRemoved(
3231
 
                        client.dbus_object_path,
3232
 
                        client._get_all_interface_names())
3233
 
                    # Old signal
3234
 
                    self.ClientRemoved(client.dbus_object_path,
3235
 
                                       client.name)
3236
2052
        
3237
 
        mandos_dbus_service = MandosDBusService()
 
2053
        class MandosDBusServiceTransitional(MandosDBusService):
 
2054
            __metaclass__ = transitional_dbus_metaclass
 
2055
        mandos_dbus_service = MandosDBusServiceTransitional()
3238
2056
    
3239
2057
    def cleanup():
3240
2058
        "Cleanup function; run on exit"
3241
 
        if zeroconf:
3242
 
            service.cleanup()
3243
 
        
3244
 
        multiprocessing.active_children()
3245
 
        wnull.close()
3246
 
        if not (tcp_server.clients or client_settings):
3247
 
            return
3248
 
        
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
 
        
3277
 
        try:
3278
 
            with tempfile.NamedTemporaryFile(
3279
 
                    mode='wb',
3280
 
                    suffix=".pickle",
3281
 
                    prefix='clients-',
3282
 
                    dir=os.path.dirname(stored_state_path),
3283
 
                    delete=False) as stored_state:
3284
 
                pickle.dump((clients, client_settings), stored_state)
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)
3299
 
                raise
3300
 
        
3301
 
        # Delete all clients, and settings from config
 
2059
        service.cleanup()
 
2060
        
3302
2061
        while tcp_server.clients:
3303
 
            name, client = tcp_server.clients.popitem()
 
2062
            client = tcp_server.clients.pop()
3304
2063
            if use_dbus:
3305
2064
                client.remove_from_connection()
3306
 
            # Don't signal the disabling
 
2065
            client.disable_hook = None
 
2066
            # Don't signal anything except ClientRemoved
3307
2067
            client.disable(quiet=True)
3308
 
            # Emit D-Bus signal for removal
3309
2068
            if use_dbus:
3310
 
                mandos_dbus_service.client_removed_signal(client)
3311
 
        client_settings.clear()
 
2069
                # Emit D-Bus signal
 
2070
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2071
                                                  client.name)
3312
2072
    
3313
2073
    atexit.register(cleanup)
3314
2074
    
3315
 
    for client in tcp_server.clients.itervalues():
 
2075
    for client in tcp_server.clients:
3316
2076
        if use_dbus:
3317
 
            # Emit D-Bus signal for adding
3318
 
            mandos_dbus_service.client_added_signal(client)
3319
 
        # Need to initiate checking of clients
3320
 
        if client.enabled:
3321
 
            client.init_checker()
 
2077
            # Emit D-Bus signal
 
2078
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
2079
        client.enable()
3322
2080
    
3323
2081
    tcp_server.enable()
3324
2082
    tcp_server.server_activate()
3325
2083
    
3326
2084
    # Find out what port we got
3327
 
    if zeroconf:
3328
 
        service.port = tcp_server.socket.getsockname()[1]
 
2085
    service.port = tcp_server.socket.getsockname()[1]
3329
2086
    if use_ipv6:
3330
2087
        logger.info("Now listening on address %r, port %d,"
3331
 
                    " flowinfo %d, scope_id %d",
3332
 
                    *tcp_server.socket.getsockname())
 
2088
                    " flowinfo %d, scope_id %d"
 
2089
                    % tcp_server.socket.getsockname())
3333
2090
    else:                       # IPv4
3334
 
        logger.info("Now listening on address %r, port %d",
3335
 
                    *tcp_server.socket.getsockname())
 
2091
        logger.info("Now listening on address %r, port %d"
 
2092
                    % tcp_server.socket.getsockname())
3336
2093
    
3337
2094
    #service.interface = tcp_server.socket.getsockname()[3]
3338
2095
    
3339
2096
    try:
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
 
2097
        # From the Avahi example code
 
2098
        try:
 
2099
            service.activate()
 
2100
        except dbus.exceptions.DBusException as error:
 
2101
            logger.critical("DBusException: %s", error)
 
2102
            cleanup()
 
2103
            sys.exit(1)
 
2104
        # End of Avahi example code
3349
2105
        
3350
 
        GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
 
2106
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3351
2107
                             lambda *args, **kwargs:
3352
2108
                             (tcp_server.handle_request
3353
2109
                              (*args[2:], **kwargs) or True))
3355
2111
        logger.debug("Starting main loop")
3356
2112
        main_loop.run()
3357
2113
    except AvahiError as error:
3358
 
        logger.critical("Avahi Error", exc_info=error)
 
2114
        logger.critical("AvahiError: %s", error)
3359
2115
        cleanup()
3360
2116
        sys.exit(1)
3361
2117
    except KeyboardInterrupt: