/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-12 01:41:14 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150712014114-qbala4mutkixxct3
Handle local Zeroconf service name collisions on startup, too.

* mandos (AvahiService.server_state_changed): Catch name collision
                                              error when adding
                                              server.

Show diffs side-by-side

added added

removed removed

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