/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: 2013-10-20 15:25:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
  (purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
  (DM-Upload-Allowed): Removed.
  (mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
                    use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
  (pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
                                                    is "PT0S" - using
                                                    the new RFC 3339
                                                    duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
  (FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -

Show diffs side-by-side

added added

removed removed

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