/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
79
75
import ctypes.util
80
76
import xml.dom.minidom
81
77
import inspect
 
78
import GnuPGInterface
82
79
 
83
80
try:
84
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.6.2"
 
88
 
 
89
version = "1.4.1"
92
90
stored_state_file = "clients.pickle"
93
91
 
94
92
logger = logging.getLogger()
113
111
        return interface_index
114
112
 
115
113
 
116
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
117
115
    """init logger and add loglevel"""
118
116
    
119
117
    syslogger.setFormatter(logging.Formatter
121
119
                            ' %(message)s'))
122
120
    logger.addHandler(syslogger)
123
121
    
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)
 
122
    console = logging.StreamHandler()
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                           ' [%(process)d]:'
 
125
                                           ' %(levelname)s:'
 
126
                                           ' %(message)s'))
 
127
    logger.addHandler(console)
131
128
    logger.setLevel(level)
132
129
 
133
130
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
136
132
    pass
137
133
 
138
134
 
139
 
class PGPEngine(object):
 
135
class Crypto(object):
140
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
137
    def __init__(self):
 
138
        self.gnupg = GnuPGInterface.GnuPG()
142
139
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--no-use-agent']
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
141
        self.gnupg.options.meta_interactive = False
 
142
        self.gnupg.options.homedir = self.tempdir
 
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
144
                                              '--quiet'])
148
145
    
149
146
    def __enter__(self):
150
147
        return self
151
148
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
153
150
        self._cleanup()
154
151
        return False
155
152
    
172
169
    def password_encode(self, password):
173
170
        # Passphrase can not be empty and can not contain newlines or
174
171
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        encoded = b"mandos" + binascii.hexlify(password)
176
 
        if len(encoded) > 2048:
177
 
            # GnuPG can't handle long passwords, so encode differently
178
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
 
                       .replace(b"\n", b"\\n")
180
 
                       .replace(b"\0", b"\\x00"))
181
 
        return encoded
 
172
        return b"mandos" + binascii.hexlify(password)
182
173
    
183
174
    def encrypt(self, data, password):
184
 
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
187
 
            passfile.write(passphrase)
188
 
            passfile.flush()
189
 
            proc = subprocess.Popen(['gpg', '--symmetric',
190
 
                                     '--passphrase-file',
191
 
                                     passfile.name]
192
 
                                    + self.gnupgargs,
193
 
                                    stdin = subprocess.PIPE,
194
 
                                    stdout = subprocess.PIPE,
195
 
                                    stderr = subprocess.PIPE)
196
 
            ciphertext, err = proc.communicate(input = data)
197
 
        if proc.returncode != 0:
198
 
            raise PGPError(err)
 
175
        self.gnupg.passphrase = self.password_encode(password)
 
176
        with open(os.devnull) as devnull:
 
177
            try:
 
178
                proc = self.gnupg.run(['--symmetric'],
 
179
                                      create_fhs=['stdin', 'stdout'],
 
180
                                      attach_fhs={'stderr': devnull})
 
181
                with contextlib.closing(proc.handles['stdin']) as f:
 
182
                    f.write(data)
 
183
                with contextlib.closing(proc.handles['stdout']) as f:
 
184
                    ciphertext = f.read()
 
185
                proc.wait()
 
186
            except IOError as e:
 
187
                raise CryptoError(e)
 
188
        self.gnupg.passphrase = None
199
189
        return ciphertext
200
190
    
201
191
    def decrypt(self, data, password):
202
 
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
205
 
            passfile.write(passphrase)
206
 
            passfile.flush()
207
 
            proc = subprocess.Popen(['gpg', '--decrypt',
208
 
                                     '--passphrase-file',
209
 
                                     passfile.name]
210
 
                                    + self.gnupgargs,
211
 
                                    stdin = subprocess.PIPE,
212
 
                                    stdout = subprocess.PIPE,
213
 
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
216
 
        if proc.returncode != 0:
217
 
            raise PGPError(err)
 
192
        self.gnupg.passphrase = self.password_encode(password)
 
193
        with open(os.devnull) as devnull:
 
194
            try:
 
195
                proc = self.gnupg.run(['--decrypt'],
 
196
                                      create_fhs=['stdin', 'stdout'],
 
197
                                      attach_fhs={'stderr': devnull})
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
199
                    f.write(data)
 
200
                with contextlib.closing(proc.handles['stdout']) as f:
 
201
                    decrypted_plaintext = f.read()
 
202
                proc.wait()
 
203
            except IOError as e:
 
204
                raise CryptoError(e)
 
205
        self.gnupg.passphrase = None
218
206
        return decrypted_plaintext
219
207
 
220
208
 
 
209
 
221
210
class AvahiError(Exception):
222
211
    def __init__(self, value, *args, **kwargs):
223
212
        self.value = value
240
229
               Used to optionally bind to the specified interface.
241
230
    name: string; Example: 'Mandos'
242
231
    type: string; Example: '_mandos._tcp'.
243
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
232
                  See <http://www.dns-sd.org/ServiceTypes.html>
244
233
    port: integer; what port to announce
245
234
    TXT: list of strings; TXT record for the service
246
235
    domain: string; Domain to publish on, default to .local if empty.
252
241
    server: D-Bus Server
253
242
    bus: dbus.SystemBus()
254
243
    """
255
 
    
256
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
245
                 servicetype = None, port = None, TXT = None,
258
246
                 domain = "", host = "", max_renames = 32768,
271
259
        self.server = None
272
260
        self.bus = bus
273
261
        self.entry_group_state_changed_match = None
274
 
    
275
262
    def rename(self):
276
263
        """Derived from the Avahi example code"""
277
264
        if self.rename_count >= self.max_renames:
287
274
        try:
288
275
            self.add()
289
276
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
291
278
            self.cleanup()
292
279
            os._exit(1)
293
280
        self.rename_count += 1
294
 
    
295
281
    def remove(self):
296
282
        """Derived from the Avahi example code"""
297
283
        if self.entry_group_state_changed_match is not None:
299
285
            self.entry_group_state_changed_match = None
300
286
        if self.group is not None:
301
287
            self.group.Reset()
302
 
    
303
288
    def add(self):
304
289
        """Derived from the Avahi example code"""
305
290
        self.remove()
322
307
            dbus.UInt16(self.port),
323
308
            avahi.string_array_to_txt_array(self.TXT))
324
309
        self.group.Commit()
325
 
    
326
310
    def entry_group_state_changed(self, state, error):
327
311
        """Derived from the Avahi example code"""
328
312
        logger.debug("Avahi entry group state change: %i", state)
335
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
320
            logger.critical("Avahi: Error in group state changed %s",
337
321
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {0!s}"
339
 
                                  .format(error))
340
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
341
324
    def cleanup(self):
342
325
        """Derived from the Avahi example code"""
343
326
        if self.group is not None:
348
331
                pass
349
332
            self.group = None
350
333
        self.remove()
351
 
    
352
334
    def server_state_changed(self, state, error=None):
353
335
        """Derived from the Avahi example code"""
354
336
        logger.debug("Avahi server state change: %i", state)
373
355
                logger.debug("Unknown state: %r", state)
374
356
            else:
375
357
                logger.debug("Unknown state: %r: %r", state, error)
376
 
    
377
358
    def activate(self):
378
359
        """Derived from the Avahi example code"""
379
360
        if self.server is None:
386
367
                                 self.server_state_changed)
387
368
        self.server_state_changed(self.server.GetState())
388
369
 
389
 
 
390
370
class AvahiServiceToSyslog(AvahiService):
391
371
    def rename(self):
392
372
        """Add the new name to the syslog messages"""
393
373
        ret = AvahiService.rename(self)
394
374
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({0}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
398
378
        return ret
399
379
 
400
 
 
401
 
def timedelta_to_milliseconds(td):
 
380
def _timedelta_to_milliseconds(td):
402
381
    "Convert a datetime.timedelta() to milliseconds"
403
382
    return ((td.days * 24 * 60 * 60 * 1000)
404
383
            + (td.seconds * 1000)
405
384
            + (td.microseconds // 1000))
406
 
 
407
 
 
 
385
        
408
386
class Client(object):
409
387
    """A representation of a client host served by this server.
410
388
    
411
389
    Attributes:
412
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
390
    _approved:   bool(); 'None' if not yet approved/disapproved
413
391
    approval_delay: datetime.timedelta(); Time to wait for approval
414
392
    approval_duration: datetime.timedelta(); Duration of one approval
415
393
    checker:    subprocess.Popen(); a running checker process used
433
411
    interval:   datetime.timedelta(); How often to start a new checker
434
412
    last_approval_request: datetime.datetime(); (UTC) or None
435
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
436
415
    last_checker_status: integer between 0 and 255 reflecting exit
437
416
                         status of last checker. -1 reflects crashed
438
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
439
418
    last_enabled: datetime.datetime(); (UTC) or None
440
419
    name:       string; from the config file, used in log messages and
441
420
                        D-Bus identifiers
442
421
    secret:     bytestring; sent verbatim (over TLS) to client
443
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
444
423
                                      until this client is disabled
445
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
446
425
    runtime_expansions: Allowed attributes for runtime expansion.
447
426
    expires:    datetime.datetime(); time (UTC) when a client will be
448
427
                disabled, or None
449
 
    server_settings: The server_settings dict from main()
450
428
    """
451
429
    
452
430
    runtime_expansions = ("approval_delay", "approval_duration",
453
 
                          "created", "enabled", "expires",
454
 
                          "fingerprint", "host", "interval",
455
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
456
433
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
460
 
                        "checker": "fping -q -- %%(host)s",
461
 
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
464
 
                        "approved_by_default": "True",
465
 
                        "enabled": "True",
466
 
                        }
467
434
    
468
435
    def timeout_milliseconds(self):
469
436
        "Return the 'timeout' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
471
438
    
472
439
    def extended_timeout_milliseconds(self):
473
440
        "Return the 'extended_timeout' attribute in milliseconds"
474
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
475
442
    
476
443
    def interval_milliseconds(self):
477
444
        "Return the 'interval' attribute in milliseconds"
478
 
        return timedelta_to_milliseconds(self.interval)
 
445
        return _timedelta_to_milliseconds(self.interval)
479
446
    
480
447
    def approval_delay_milliseconds(self):
481
 
        return timedelta_to_milliseconds(self.approval_delay)
482
 
    
483
 
    @staticmethod
484
 
    def config_parser(config):
485
 
        """Construct a new dict of client settings of this form:
486
 
        { client_name: {setting_name: value, ...}, ...}
487
 
        with exceptions for any special settings as defined above.
488
 
        NOTE: Must be a pure function. Must return the same result
489
 
        value given the same arguments.
490
 
        """
491
 
        settings = {}
492
 
        for client_name in config.sections():
493
 
            section = dict(config.items(client_name))
494
 
            client = settings[client_name] = {}
495
 
            
496
 
            client["host"] = section["host"]
497
 
            # Reformat values from string types to Python types
498
 
            client["approved_by_default"] = config.getboolean(
499
 
                client_name, "approved_by_default")
500
 
            client["enabled"] = config.getboolean(client_name,
501
 
                                                  "enabled")
502
 
            
503
 
            client["fingerprint"] = (section["fingerprint"].upper()
504
 
                                     .replace(" ", ""))
505
 
            if "secret" in section:
506
 
                client["secret"] = section["secret"].decode("base64")
507
 
            elif "secfile" in section:
508
 
                with open(os.path.expanduser(os.path.expandvars
509
 
                                             (section["secfile"])),
510
 
                          "rb") as secfile:
511
 
                    client["secret"] = secfile.read()
512
 
            else:
513
 
                raise TypeError("No secret or secfile for section {0}"
514
 
                                .format(section))
515
 
            client["timeout"] = string_to_delta(section["timeout"])
516
 
            client["extended_timeout"] = string_to_delta(
517
 
                section["extended_timeout"])
518
 
            client["interval"] = string_to_delta(section["interval"])
519
 
            client["approval_delay"] = string_to_delta(
520
 
                section["approval_delay"])
521
 
            client["approval_duration"] = string_to_delta(
522
 
                section["approval_duration"])
523
 
            client["checker_command"] = section["checker"]
524
 
            client["last_approval_request"] = None
525
 
            client["last_checked_ok"] = None
526
 
            client["last_checker_status"] = -2
527
 
        
528
 
        return settings
529
 
    
530
 
    def __init__(self, settings, name = None, server_settings=None):
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
 
449
    
 
450
    def __init__(self, name = None, config=None):
 
451
        """Note: the 'checker' key in 'config' sets the
 
452
        'checker_command' attribute and *not* the 'checker'
 
453
        attribute."""
531
454
        self.name = name
532
 
        if server_settings is None:
533
 
            server_settings = {}
534
 
        self.server_settings = server_settings
535
 
        # adding all client settings
536
 
        for setting, value in settings.iteritems():
537
 
            setattr(self, setting, value)
538
 
        
539
 
        if self.enabled:
540
 
            if not hasattr(self, "last_enabled"):
541
 
                self.last_enabled = datetime.datetime.utcnow()
542
 
            if not hasattr(self, "expires"):
543
 
                self.expires = (datetime.datetime.utcnow()
544
 
                                + self.timeout)
545
 
        else:
546
 
            self.last_enabled = None
547
 
            self.expires = None
548
 
        
 
455
        if config is None:
 
456
            config = {}
549
457
        logger.debug("Creating client %r", self.name)
550
458
        # Uppercase and remove spaces from fingerprint for later
551
459
        # comparison purposes with return value from the fingerprint()
552
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
553
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
554
 
        self.created = settings.get("created",
555
 
                                    datetime.datetime.utcnow())
556
 
        
557
 
        # attributes specific for this server instance
 
464
        if "secret" in config:
 
465
            self.secret = config["secret"].decode("base64")
 
466
        elif "secfile" in config:
 
467
            with open(os.path.expanduser(os.path.expandvars
 
468
                                         (config["secfile"])),
 
469
                      "rb") as secfile:
 
470
                self.secret = secfile.read()
 
471
        else:
 
472
            raise TypeError("No secret or secfile for client %s"
 
473
                            % self.name)
 
474
        self.host = config.get("host", "")
 
475
        self.created = datetime.datetime.utcnow()
 
476
        self.enabled = config.get("enabled", True)
 
477
        self.last_approval_request = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
 
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
 
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
 
487
        self.interval = string_to_delta(config["interval"])
558
488
        self.checker = None
559
489
        self.checker_initiator_tag = None
560
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
561
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
562
497
        self.current_checker_command = None
563
 
        self.approved = None
 
498
        self._approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
564
501
        self.approvals_pending = 0
 
502
        self.approval_delay = string_to_delta(
 
503
            config["approval_delay"])
 
504
        self.approval_duration = string_to_delta(
 
505
            config["approval_duration"])
565
506
        self.changedstate = (multiprocessing_manager
566
507
                             .Condition(multiprocessing_manager
567
508
                                        .Lock()))
587
528
        if getattr(self, "enabled", False):
588
529
            # Already enabled
589
530
            return
 
531
        self.send_changedstate()
590
532
        self.expires = datetime.datetime.utcnow() + self.timeout
591
533
        self.enabled = True
592
534
        self.last_enabled = datetime.datetime.utcnow()
593
535
        self.init_checker()
594
 
        self.send_changedstate()
595
536
    
596
537
    def disable(self, quiet=True):
597
538
        """Disable this client."""
598
539
        if not getattr(self, "enabled", False):
599
540
            return False
600
541
        if not quiet:
 
542
            self.send_changedstate()
 
543
        if not quiet:
601
544
            logger.info("Disabling client %s", self.name)
602
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
545
        if getattr(self, "disable_initiator_tag", False):
603
546
            gobject.source_remove(self.disable_initiator_tag)
604
547
            self.disable_initiator_tag = None
605
548
        self.expires = None
606
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
549
        if getattr(self, "checker_initiator_tag", False):
607
550
            gobject.source_remove(self.checker_initiator_tag)
608
551
            self.checker_initiator_tag = None
609
552
        self.stop_checker()
610
553
        self.enabled = False
611
 
        if not quiet:
612
 
            self.send_changedstate()
613
554
        # Do not run this again if called by a gobject.timeout_add
614
555
        return False
615
556
    
619
560
    def init_checker(self):
620
561
        # Schedule a new checker to be started an 'interval' from now,
621
562
        # and every interval from then on.
622
 
        if self.checker_initiator_tag is not None:
623
 
            gobject.source_remove(self.checker_initiator_tag)
624
563
        self.checker_initiator_tag = (gobject.timeout_add
625
564
                                      (self.interval_milliseconds(),
626
565
                                       self.start_checker))
627
566
        # Schedule a disable() when 'timeout' has passed
628
 
        if self.disable_initiator_tag is not None:
629
 
            gobject.source_remove(self.disable_initiator_tag)
630
567
        self.disable_initiator_tag = (gobject.timeout_add
631
568
                                   (self.timeout_milliseconds(),
632
569
                                    self.disable))
638
575
        self.checker_callback_tag = None
639
576
        self.checker = None
640
577
        if os.WIFEXITED(condition):
641
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
642
579
            if self.last_checker_status == 0:
643
580
                logger.info("Checker for %(name)s succeeded",
644
581
                            vars(self))
651
588
            logger.warning("Checker for %(name)s crashed?",
652
589
                           vars(self))
653
590
    
654
 
    def checked_ok(self):
655
 
        """Assert that the client has been seen, alive and well."""
656
 
        self.last_checked_ok = datetime.datetime.utcnow()
657
 
        self.last_checker_status = 0
658
 
        self.bump_timeout()
659
 
    
660
 
    def bump_timeout(self, timeout=None):
661
 
        """Bump up the timeout for this client."""
 
591
    def checked_ok(self, timeout=None):
 
592
        """Bump up the timeout for this client.
 
593
        
 
594
        This should only be called when the client has been seen,
 
595
        alive and well.
 
596
        """
662
597
        if timeout is None:
663
598
            timeout = self.timeout
 
599
        self.last_checked_ok = datetime.datetime.utcnow()
664
600
        if self.disable_initiator_tag is not None:
665
601
            gobject.source_remove(self.disable_initiator_tag)
666
 
            self.disable_initiator_tag = None
667
602
        if getattr(self, "enabled", False):
668
603
            self.disable_initiator_tag = (gobject.timeout_add
669
 
                                          (timedelta_to_milliseconds
 
604
                                          (_timedelta_to_milliseconds
670
605
                                           (timeout), self.disable))
671
606
            self.expires = datetime.datetime.utcnow() + timeout
672
607
    
679
614
        If a checker already exists, leave it running and do
680
615
        nothing."""
681
616
        # The reason for not killing a running checker is that if we
682
 
        # did that, and if a checker (for some reason) started running
683
 
        # slowly and taking more than 'interval' time, then the client
684
 
        # would inevitably timeout, since no checker would get a
685
 
        # chance to run to completion.  If we instead leave running
 
617
        # did that, then if a checker (for some reason) started
 
618
        # running slowly and taking more than 'interval' time, the
 
619
        # client would inevitably timeout, since no checker would get
 
620
        # a chance to run to completion.  If we instead leave running
686
621
        # checkers alone, the checker would have to take more time
687
622
        # than 'timeout' for the client to be disabled, which is as it
688
623
        # should be.
690
625
        # If a checker exists, make sure it is not a zombie
691
626
        try:
692
627
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
 
        except AttributeError:
694
 
            pass
695
 
        except OSError as error:
696
 
            if error.errno != errno.ECHILD:
697
 
                raise
 
628
        except (AttributeError, OSError) as error:
 
629
            if (isinstance(error, OSError)
 
630
                and error.errno != errno.ECHILD):
 
631
                raise error
698
632
        else:
699
633
            if pid:
700
634
                logger.warning("Checker was a zombie")
703
637
                                      self.current_checker_command)
704
638
        # Start a new checker if needed
705
639
        if self.checker is None:
706
 
            # Escape attributes for the shell
707
 
            escaped_attrs = dict(
708
 
                (attr, re.escape(unicode(getattr(self, attr))))
709
 
                for attr in
710
 
                self.runtime_expansions)
711
640
            try:
712
 
                command = self.checker_command % escaped_attrs
713
 
            except TypeError as error:
714
 
                logger.error('Could not format string "%s"',
715
 
                             self.checker_command, exc_info=error)
716
 
                return True # Try again later
 
641
                # In case checker_command has exactly one % operator
 
642
                command = self.checker_command % self.host
 
643
            except TypeError:
 
644
                # Escape attributes for the shell
 
645
                escaped_attrs = dict(
 
646
                    (attr,
 
647
                     re.escape(unicode(str(getattr(self, attr, "")),
 
648
                                       errors=
 
649
                                       'replace')))
 
650
                    for attr in
 
651
                    self.runtime_expansions)
 
652
                
 
653
                try:
 
654
                    command = self.checker_command % escaped_attrs
 
655
                except TypeError as error:
 
656
                    logger.error('Could not format string "%s":'
 
657
                                 ' %s', self.checker_command, error)
 
658
                    return True # Try again later
717
659
            self.current_checker_command = command
718
660
            try:
719
661
                logger.info("Starting checker %r for %s",
722
664
                # in normal mode, that is already done by daemon(),
723
665
                # and in debug mode we don't want to.  (Stdin is
724
666
                # always replaced by /dev/null.)
725
 
                # The exception is when not debugging but nevertheless
726
 
                # running in the foreground; use the previously
727
 
                # created wnull.
728
 
                popen_args = {}
729
 
                if (not self.server_settings["debug"]
730
 
                    and self.server_settings["foreground"]):
731
 
                    popen_args.update({"stdout": wnull,
732
 
                                       "stderr": wnull })
733
667
                self.checker = subprocess.Popen(command,
734
668
                                                close_fds=True,
735
 
                                                shell=True, cwd="/",
736
 
                                                **popen_args)
737
 
            except OSError as error:
738
 
                logger.error("Failed to start subprocess",
739
 
                             exc_info=error)
740
 
                return True
741
 
            self.checker_callback_tag = (gobject.child_watch_add
742
 
                                         (self.checker.pid,
743
 
                                          self.checker_callback,
744
 
                                          data=command))
745
 
            # The checker may have completed before the gobject
746
 
            # watch was added.  Check for this.
747
 
            try:
 
669
                                                shell=True, cwd="/")
 
670
                self.checker_callback_tag = (gobject.child_watch_add
 
671
                                             (self.checker.pid,
 
672
                                              self.checker_callback,
 
673
                                              data=command))
 
674
                # The checker may have completed before the gobject
 
675
                # watch was added.  Check for this.
748
676
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
677
                if pid:
 
678
                    gobject.source_remove(self.checker_callback_tag)
 
679
                    self.checker_callback(pid, status, command)
749
680
            except OSError as error:
750
 
                if error.errno == errno.ECHILD:
751
 
                    # This should never happen
752
 
                    logger.error("Child process vanished",
753
 
                                 exc_info=error)
754
 
                    return True
755
 
                raise
756
 
            if pid:
757
 
                gobject.source_remove(self.checker_callback_tag)
758
 
                self.checker_callback(pid, status, command)
 
681
                logger.error("Failed to start subprocess: %s",
 
682
                             error)
759
683
        # Re-run this periodically if run by gobject.timeout_add
760
684
        return True
761
685
    
768
692
            return
769
693
        logger.debug("Stopping checker for %(name)s", vars(self))
770
694
        try:
771
 
            self.checker.terminate()
 
695
            os.kill(self.checker.pid, signal.SIGTERM)
772
696
            #time.sleep(0.5)
773
697
            #if self.checker.poll() is None:
774
 
            #    self.checker.kill()
 
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
775
699
        except OSError as error:
776
700
            if error.errno != errno.ESRCH: # No such process
777
701
                raise
794
718
    # "Set" method, so we fail early here:
795
719
    if byte_arrays and signature != "ay":
796
720
        raise ValueError("Byte arrays not supported for non-'ay'"
797
 
                         " signature {0!r}".format(signature))
 
721
                         " signature %r" % signature)
798
722
    def decorator(func):
799
723
        func._dbus_is_property = True
800
724
        func._dbus_interface = dbus_interface
808
732
    return decorator
809
733
 
810
734
 
811
 
def dbus_interface_annotations(dbus_interface):
812
 
    """Decorator for marking functions returning interface annotations
813
 
    
814
 
    Usage:
815
 
    
816
 
    @dbus_interface_annotations("org.example.Interface")
817
 
    def _foo(self):  # Function name does not matter
818
 
        return {"org.freedesktop.DBus.Deprecated": "true",
819
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
820
 
                    "false"}
821
 
    """
822
 
    def decorator(func):
823
 
        func._dbus_is_interface = True
824
 
        func._dbus_interface = dbus_interface
825
 
        func._dbus_name = dbus_interface
826
 
        return func
827
 
    return decorator
828
 
 
829
 
 
830
 
def dbus_annotations(annotations):
831
 
    """Decorator to annotate D-Bus methods, signals or properties
832
 
    Usage:
833
 
    
834
 
    @dbus_service_property("org.example.Interface", signature="b",
835
 
                           access="r")
836
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
 
                        "org.freedesktop.DBus.Property."
838
 
                        "EmitsChangedSignal": "false"})
839
 
    def Property_dbus_property(self):
840
 
        return dbus.Boolean(False)
841
 
    """
842
 
    def decorator(func):
843
 
        func._dbus_annotations = annotations
844
 
        return func
845
 
    return decorator
846
 
 
847
 
 
848
735
class DBusPropertyException(dbus.exceptions.DBusException):
849
736
    """A base class for D-Bus property-related exceptions
850
737
    """
873
760
    """
874
761
    
875
762
    @staticmethod
876
 
    def _is_dbus_thing(thing):
877
 
        """Returns a function testing if an attribute is a D-Bus thing
878
 
        
879
 
        If called like _is_dbus_thing("method") it returns a function
880
 
        suitable for use as predicate to inspect.getmembers().
881
 
        """
882
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
883
 
                                   False)
 
763
    def _is_dbus_property(obj):
 
764
        return getattr(obj, "_dbus_is_property", False)
884
765
    
885
 
    def _get_all_dbus_things(self, thing):
 
766
    def _get_all_dbus_properties(self):
886
767
        """Returns a generator of (name, attribute) pairs
887
768
        """
888
 
        return ((getattr(athing.__get__(self), "_dbus_name",
889
 
                         name),
890
 
                 athing.__get__(self))
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
891
770
                for cls in self.__class__.__mro__
892
 
                for name, athing in
893
 
                inspect.getmembers(cls,
894
 
                                   self._is_dbus_thing(thing)))
 
771
                for name, prop in
 
772
                inspect.getmembers(cls, self._is_dbus_property))
895
773
    
896
774
    def _get_dbus_property(self, interface_name, property_name):
897
775
        """Returns a bound method if one exists which is a D-Bus
899
777
        """
900
778
        for cls in  self.__class__.__mro__:
901
779
            for name, value in (inspect.getmembers
902
 
                                (cls,
903
 
                                 self._is_dbus_thing("property"))):
 
780
                                (cls, self._is_dbus_property)):
904
781
                if (value._dbus_name == property_name
905
782
                    and value._dbus_interface == interface_name):
906
783
                    return value.__get__(self)
934
811
            # The byte_arrays option is not supported yet on
935
812
            # signatures other than "ay".
936
813
            if prop._dbus_signature != "ay":
937
 
                raise ValueError("Byte arrays not supported for non-"
938
 
                                 "'ay' signature {0!r}"
939
 
                                 .format(prop._dbus_signature))
940
 
            value = dbus.ByteArray(b''.join(chr(byte)
941
 
                                            for byte in value))
 
814
                raise ValueError
 
815
            value = dbus.ByteArray(''.join(unichr(byte)
 
816
                                           for byte in value))
942
817
        prop(value)
943
818
    
944
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
950
825
        Note: Will not include properties with access="write".
951
826
        """
952
827
        properties = {}
953
 
        for name, prop in self._get_all_dbus_things("property"):
 
828
        for name, prop in self._get_all_dbus_properties():
954
829
            if (interface_name
955
830
                and interface_name != prop._dbus_interface):
956
831
                # Interface non-empty but did not match
971
846
                         path_keyword='object_path',
972
847
                         connection_keyword='connection')
973
848
    def Introspect(self, object_path, connection):
974
 
        """Overloading of standard D-Bus method.
975
 
        
976
 
        Inserts property tags and interface annotation tags.
 
849
        """Standard D-Bus method, overloaded to insert property tags.
977
850
        """
978
851
        xmlstring = dbus.service.Object.Introspect(self, object_path,
979
852
                                                   connection)
986
859
                e.setAttribute("access", prop._dbus_access)
987
860
                return e
988
861
            for if_tag in document.getElementsByTagName("interface"):
989
 
                # Add property tags
990
862
                for tag in (make_tag(document, name, prop)
991
863
                            for name, prop
992
 
                            in self._get_all_dbus_things("property")
 
864
                            in self._get_all_dbus_properties()
993
865
                            if prop._dbus_interface
994
866
                            == if_tag.getAttribute("name")):
995
867
                    if_tag.appendChild(tag)
996
 
                # Add annotation tags
997
 
                for typ in ("method", "signal", "property"):
998
 
                    for tag in if_tag.getElementsByTagName(typ):
999
 
                        annots = dict()
1000
 
                        for name, prop in (self.
1001
 
                                           _get_all_dbus_things(typ)):
1002
 
                            if (name == tag.getAttribute("name")
1003
 
                                and prop._dbus_interface
1004
 
                                == if_tag.getAttribute("name")):
1005
 
                                annots.update(getattr
1006
 
                                              (prop,
1007
 
                                               "_dbus_annotations",
1008
 
                                               {}))
1009
 
                        for name, value in annots.iteritems():
1010
 
                            ann_tag = document.createElement(
1011
 
                                "annotation")
1012
 
                            ann_tag.setAttribute("name", name)
1013
 
                            ann_tag.setAttribute("value", value)
1014
 
                            tag.appendChild(ann_tag)
1015
 
                # Add interface annotation tags
1016
 
                for annotation, value in dict(
1017
 
                    itertools.chain.from_iterable(
1018
 
                        annotations().iteritems()
1019
 
                        for name, annotations in
1020
 
                        self._get_all_dbus_things("interface")
1021
 
                        if name == if_tag.getAttribute("name")
1022
 
                        )).iteritems():
1023
 
                    ann_tag = document.createElement("annotation")
1024
 
                    ann_tag.setAttribute("name", annotation)
1025
 
                    ann_tag.setAttribute("value", value)
1026
 
                    if_tag.appendChild(ann_tag)
1027
868
                # Add the names to the return values for the
1028
869
                # "org.freedesktop.DBus.Properties" methods
1029
870
                if (if_tag.getAttribute("name")
1044
885
        except (AttributeError, xml.dom.DOMException,
1045
886
                xml.parsers.expat.ExpatError) as error:
1046
887
            logger.error("Failed to override Introspection method",
1047
 
                         exc_info=error)
 
888
                         error)
1048
889
        return xmlstring
1049
890
 
1050
891
 
1051
 
def datetime_to_dbus(dt, variant_level=0):
 
892
def datetime_to_dbus (dt, variant_level=0):
1052
893
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
894
    if dt is None:
1054
895
        return dbus.String("", variant_level = variant_level)
1056
897
                       variant_level=variant_level)
1057
898
 
1058
899
 
1059
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1060
 
    """A class decorator; applied to a subclass of
1061
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1062
 
    interface names according to the "alt_interface_names" mapping.
1063
 
    Usage:
1064
 
    
1065
 
    @alternate_dbus_interfaces({"org.example.Interface":
1066
 
                                    "net.example.AlternateInterface"})
1067
 
    class SampleDBusObject(dbus.service.Object):
1068
 
        @dbus.service.method("org.example.Interface")
1069
 
        def SampleDBusMethod():
1070
 
            pass
1071
 
    
1072
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1073
 
    reachable via two interfaces: "org.example.Interface" and
1074
 
    "net.example.AlternateInterface", the latter of which will have
1075
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1076
 
    "true", unless "deprecate" is passed with a False value.
1077
 
    
1078
 
    This works for methods and signals, and also for D-Bus properties
1079
 
    (from DBusObjectWithProperties) and interfaces (from the
1080
 
    dbus_interface_annotations decorator).
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
901
                                  .__metaclass__):
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
903
    will add additional D-Bus attributes matching a certain pattern.
1081
904
    """
1082
 
    def wrapper(cls):
1083
 
        for orig_interface_name, alt_interface_name in (
1084
 
            alt_interface_names.iteritems()):
1085
 
            attr = {}
1086
 
            interface_names = set()
1087
 
            # Go though all attributes of the class
1088
 
            for attrname, attribute in inspect.getmembers(cls):
 
905
    def __new__(mcs, name, bases, attr):
 
906
        # Go through all the base classes which could have D-Bus
 
907
        # methods, signals, or properties in them
 
908
        for base in (b for b in bases
 
909
                     if issubclass(b, dbus.service.Object)):
 
910
            # Go though all attributes of the base class
 
911
            for attrname, attribute in inspect.getmembers(base):
1089
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
1090
913
                # with the wrong interface name
1091
914
                if (not hasattr(attribute, "_dbus_interface")
1092
915
                    or not attribute._dbus_interface
1093
 
                    .startswith(orig_interface_name)):
 
916
                    .startswith("se.recompile.Mandos")):
1094
917
                    continue
1095
918
                # Create an alternate D-Bus interface name based on
1096
919
                # the current name
1097
920
                alt_interface = (attribute._dbus_interface
1098
 
                                 .replace(orig_interface_name,
1099
 
                                          alt_interface_name))
1100
 
                interface_names.add(alt_interface)
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
1101
923
                # Is this a D-Bus signal?
1102
924
                if getattr(attribute, "_dbus_is_signal", False):
1103
 
                    # Extract the original non-method undecorated
1104
 
                    # function by black magic
 
925
                    # Extract the original non-method function by
 
926
                    # black magic
1105
927
                    nonmethod_func = (dict(
1106
928
                            zip(attribute.func_code.co_freevars,
1107
929
                                attribute.__closure__))["func"]
1118
940
                                nonmethod_func.func_name,
1119
941
                                nonmethod_func.func_defaults,
1120
942
                                nonmethod_func.func_closure)))
1121
 
                    # Copy annotations, if any
1122
 
                    try:
1123
 
                        new_function._dbus_annotations = (
1124
 
                            dict(attribute._dbus_annotations))
1125
 
                    except AttributeError:
1126
 
                        pass
1127
943
                    # Define a creator of a function to call both the
1128
 
                    # original and alternate functions, so both the
1129
 
                    # original and alternate signals gets sent when
1130
 
                    # the function is called
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
1131
946
                    def fixscope(func1, func2):
1132
947
                        """This function is a scope container to pass
1133
948
                        func1 and func2 to the "call_both" function
1140
955
                        return call_both
1141
956
                    # Create the "call_both" function and add it to
1142
957
                    # the class
1143
 
                    attr[attrname] = fixscope(attribute, new_function)
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
1144
960
                # Is this a D-Bus method?
1145
961
                elif getattr(attribute, "_dbus_is_method", False):
1146
962
                    # Create a new, but exactly alike, function
1157
973
                                        attribute.func_name,
1158
974
                                        attribute.func_defaults,
1159
975
                                        attribute.func_closure)))
1160
 
                    # Copy annotations, if any
1161
 
                    try:
1162
 
                        attr[attrname]._dbus_annotations = (
1163
 
                            dict(attribute._dbus_annotations))
1164
 
                    except AttributeError:
1165
 
                        pass
1166
976
                # Is this a D-Bus property?
1167
977
                elif getattr(attribute, "_dbus_is_property", False):
1168
978
                    # Create a new, but exactly alike, function
1182
992
                                        attribute.func_name,
1183
993
                                        attribute.func_defaults,
1184
994
                                        attribute.func_closure)))
1185
 
                    # Copy annotations, if any
1186
 
                    try:
1187
 
                        attr[attrname]._dbus_annotations = (
1188
 
                            dict(attribute._dbus_annotations))
1189
 
                    except AttributeError:
1190
 
                        pass
1191
 
                # Is this a D-Bus interface?
1192
 
                elif getattr(attribute, "_dbus_is_interface", False):
1193
 
                    # Create a new, but exactly alike, function
1194
 
                    # object.  Decorate it to be a new D-Bus interface
1195
 
                    # with the alternate D-Bus interface name.  Add it
1196
 
                    # to the class.
1197
 
                    attr[attrname] = (dbus_interface_annotations
1198
 
                                      (alt_interface)
1199
 
                                      (types.FunctionType
1200
 
                                       (attribute.func_code,
1201
 
                                        attribute.func_globals,
1202
 
                                        attribute.func_name,
1203
 
                                        attribute.func_defaults,
1204
 
                                        attribute.func_closure)))
1205
 
            if deprecate:
1206
 
                # Deprecate all alternate interfaces
1207
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1208
 
                for interface_name in interface_names:
1209
 
                    @dbus_interface_annotations(interface_name)
1210
 
                    def func(self):
1211
 
                        return { "org.freedesktop.DBus.Deprecated":
1212
 
                                     "true" }
1213
 
                    # Find an unused name
1214
 
                    for aname in (iname.format(i)
1215
 
                                  for i in itertools.count()):
1216
 
                        if aname not in attr:
1217
 
                            attr[aname] = func
1218
 
                            break
1219
 
            if interface_names:
1220
 
                # Replace the class with a new subclass of it with
1221
 
                # methods, signals, etc. as created above.
1222
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1223
 
                           (cls,), attr)
1224
 
        return cls
1225
 
    return wrapper
1226
 
 
1227
 
 
1228
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1229
 
                                "se.bsnet.fukt.Mandos"})
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
1230
998
class ClientDBus(Client, DBusObjectWithProperties):
1231
999
    """A Client class using D-Bus
1232
1000
    
1243
1011
    def __init__(self, bus = None, *args, **kwargs):
1244
1012
        self.bus = bus
1245
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
1246
1016
        # Only now, when this client is initialized, can it show up on
1247
1017
        # the D-Bus
1248
1018
        client_object_name = unicode(self.name).translate(
1252
1022
                                 ("/clients/" + client_object_name))
1253
1023
        DBusObjectWithProperties.__init__(self, self.bus,
1254
1024
                                          self.dbus_object_path)
1255
 
    
 
1025
        
1256
1026
    def notifychangeproperty(transform_func,
1257
1027
                             dbus_name, type_func=lambda x: x,
1258
1028
                             variant_level=1):
1281
1051
        
1282
1052
        return property(lambda self: getattr(self, attrname), setter)
1283
1053
    
 
1054
    
1284
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1285
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
1286
1057
                                             "ApprovalPending",
1293
1064
                                       checker is not None)
1294
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1295
1066
                                           "LastCheckedOK")
1296
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1297
 
                                               "LastCheckerStatus")
1298
1067
    last_approval_request = notifychangeproperty(
1299
1068
        datetime_to_dbus, "LastApprovalRequest")
1300
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1301
1070
                                               "ApprovedByDefault")
1302
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1303
1072
                                          "ApprovalDelay",
1304
1073
                                          type_func =
1305
 
                                          timedelta_to_milliseconds)
 
1074
                                          _timedelta_to_milliseconds)
1306
1075
    approval_duration = notifychangeproperty(
1307
 
        dbus.UInt64, "ApprovalDuration",
1308
 
        type_func = timedelta_to_milliseconds)
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
1309
1078
    host = notifychangeproperty(dbus.String, "Host")
1310
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1311
1080
                                   type_func =
1312
 
                                   timedelta_to_milliseconds)
 
1081
                                   _timedelta_to_milliseconds)
1313
1082
    extended_timeout = notifychangeproperty(
1314
 
        dbus.UInt64, "ExtendedTimeout",
1315
 
        type_func = timedelta_to_milliseconds)
1316
 
    interval = notifychangeproperty(dbus.UInt64,
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1317
1086
                                    "Interval",
1318
1087
                                    type_func =
1319
 
                                    timedelta_to_milliseconds)
 
1088
                                    _timedelta_to_milliseconds)
1320
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
1321
1090
    
1322
1091
    del notifychangeproperty
1364
1133
        return r
1365
1134
    
1366
1135
    def _reset_approved(self):
1367
 
        self.approved = None
 
1136
        self._approved = None
1368
1137
        return False
1369
1138
    
1370
1139
    def approve(self, value=True):
1371
 
        self.approved = value
1372
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1140
        self.send_changedstate()
 
1141
        self._approved = value
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
1373
1143
                            (self.approval_duration),
1374
1144
                            self._reset_approved)
1375
 
        self.send_changedstate()
 
1145
    
1376
1146
    
1377
1147
    ## D-Bus methods, signals & properties
1378
1148
    _interface = "se.recompile.Mandos.Client"
1379
1149
    
1380
 
    ## Interfaces
1381
 
    
1382
 
    @dbus_interface_annotations(_interface)
1383
 
    def _foo(self):
1384
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1385
 
                     "false"}
1386
 
    
1387
1150
    ## Signals
1388
1151
    
1389
1152
    # CheckerCompleted - signal
1425
1188
        "D-Bus signal"
1426
1189
        return self.need_approval()
1427
1190
    
 
1191
    # NeRwequest - signal
 
1192
    @dbus.service.signal(_interface, signature="s")
 
1193
    def NewRequest(self, ip):
 
1194
        """D-Bus signal
 
1195
        Is sent after a client request a password.
 
1196
        """
 
1197
        pass
 
1198
    
1428
1199
    ## Methods
1429
1200
    
1430
1201
    # Approve - method
1488
1259
                           access="readwrite")
1489
1260
    def ApprovalDuration_dbus_property(self, value=None):
1490
1261
        if value is None:       # get
1491
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1492
1263
                    self.approval_duration))
1493
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1494
1265
    
1508
1279
    def Host_dbus_property(self, value=None):
1509
1280
        if value is None:       # get
1510
1281
            return dbus.String(self.host)
1511
 
        self.host = unicode(value)
 
1282
        self.host = value
1512
1283
    
1513
1284
    # Created - property
1514
1285
    @dbus_service_property(_interface, signature="s", access="read")
1540
1311
            return
1541
1312
        return datetime_to_dbus(self.last_checked_ok)
1542
1313
    
1543
 
    # LastCheckerStatus - property
1544
 
    @dbus_service_property(_interface, signature="n",
1545
 
                           access="read")
1546
 
    def LastCheckerStatus_dbus_property(self):
1547
 
        return dbus.Int16(self.last_checker_status)
1548
 
    
1549
1314
    # Expires - property
1550
1315
    @dbus_service_property(_interface, signature="s", access="read")
1551
1316
    def Expires_dbus_property(self):
1562
1327
    def Timeout_dbus_property(self, value=None):
1563
1328
        if value is None:       # get
1564
1329
            return dbus.UInt64(self.timeout_milliseconds())
1565
 
        old_timeout = self.timeout
1566
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
1567
 
        # Reschedule disabling
1568
 
        if self.enabled:
1569
 
            now = datetime.datetime.utcnow()
1570
 
            self.expires += self.timeout - old_timeout
1571
 
            if self.expires <= now:
1572
 
                # The timeout has passed
1573
 
                self.disable()
1574
 
            else:
1575
 
                if (getattr(self, "disable_initiator_tag", None)
1576
 
                    is None):
1577
 
                    return
1578
 
                gobject.source_remove(self.disable_initiator_tag)
1579
 
                self.disable_initiator_tag = (
1580
 
                    gobject.timeout_add(
1581
 
                        timedelta_to_milliseconds(self.expires - now),
1582
 
                        self.disable))
 
1331
        if getattr(self, "disable_initiator_tag", None) is None:
 
1332
            return
 
1333
        # Reschedule timeout
 
1334
        gobject.source_remove(self.disable_initiator_tag)
 
1335
        self.disable_initiator_tag = None
 
1336
        self.expires = None
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
 
1342
        if time_to_die <= 0:
 
1343
            # The timeout has passed
 
1344
            self.disable()
 
1345
        else:
 
1346
            self.expires = (datetime.datetime.utcnow()
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
 
1349
            self.disable_initiator_tag = (gobject.timeout_add
 
1350
                                          (time_to_die, self.disable))
1583
1351
    
1584
1352
    # ExtendedTimeout - property
1585
1353
    @dbus_service_property(_interface, signature="t",
1611
1379
    def Checker_dbus_property(self, value=None):
1612
1380
        if value is None:       # get
1613
1381
            return dbus.String(self.checker_command)
1614
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1615
1383
    
1616
1384
    # CheckerRunning - property
1617
1385
    @dbus_service_property(_interface, signature="b",
1646
1414
            raise KeyError()
1647
1415
    
1648
1416
    def __getattribute__(self, name):
1649
 
        if name == '_pipe':
 
1417
        if(name == '_pipe'):
1650
1418
            return super(ProxyClient, self).__getattribute__(name)
1651
1419
        self._pipe.send(('getattr', name))
1652
1420
        data = self._pipe.recv()
1659
1427
            return func
1660
1428
    
1661
1429
    def __setattr__(self, name, value):
1662
 
        if name == '_pipe':
 
1430
        if(name == '_pipe'):
1663
1431
            return super(ProxyClient, self).__setattr__(name, value)
1664
1432
        self._pipe.send(('setattr', name, value))
1665
1433
 
1666
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1667
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1668
1440
    """A class to handle client connections.
1669
1441
    
1705
1477
            logger.debug("Protocol version: %r", line)
1706
1478
            try:
1707
1479
                if int(line.strip().split()[0]) > 1:
1708
 
                    raise RuntimeError(line)
 
1480
                    raise RuntimeError
1709
1481
            except (ValueError, IndexError, RuntimeError) as error:
1710
1482
                logger.error("Unknown protocol version: %s", error)
1711
1483
                return
1730
1502
                    logger.warning("Bad certificate: %s", error)
1731
1503
                    return
1732
1504
                logger.debug("Fingerprint: %s", fpr)
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
1733
1508
                
1734
1509
                try:
1735
1510
                    client = ProxyClient(child_pipe, fpr,
1751
1526
                            client.Rejected("Disabled")
1752
1527
                        return
1753
1528
                    
1754
 
                    if client.approved or not client.approval_delay:
 
1529
                    if client._approved or not client.approval_delay:
1755
1530
                        #We are approved or approval is disabled
1756
1531
                        break
1757
 
                    elif client.approved is None:
 
1532
                    elif client._approved is None:
1758
1533
                        logger.info("Client %s needs approval",
1759
1534
                                    client.name)
1760
1535
                        if self.server.use_dbus:
1773
1548
                    #wait until timeout or approved
1774
1549
                    time = datetime.datetime.now()
1775
1550
                    client.changedstate.acquire()
1776
 
                    client.changedstate.wait(
1777
 
                        float(timedelta_to_milliseconds(delay)
1778
 
                              / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1779
1554
                    client.changedstate.release()
1780
1555
                    time2 = datetime.datetime.now()
1781
1556
                    if (time2 - time) >= delay:
1797
1572
                    try:
1798
1573
                        sent = session.send(client.secret[sent_size:])
1799
1574
                    except gnutls.errors.GNUTLSError as error:
1800
 
                        logger.warning("gnutls send failed",
1801
 
                                       exc_info=error)
 
1575
                        logger.warning("gnutls send failed")
1802
1576
                        return
1803
1577
                    logger.debug("Sent: %d, remaining: %d",
1804
1578
                                 sent, len(client.secret)
1807
1581
                
1808
1582
                logger.info("Sending secret to %s", client.name)
1809
1583
                # bump the timeout using extended_timeout
1810
 
                client.bump_timeout(client.extended_timeout)
 
1584
                client.checked_ok(client.extended_timeout)
1811
1585
                if self.server.use_dbus:
1812
1586
                    # Emit D-Bus signal
1813
1587
                    client.GotSecret()
1818
1592
                try:
1819
1593
                    session.bye()
1820
1594
                except gnutls.errors.GNUTLSError as error:
1821
 
                    logger.warning("GnuTLS bye failed",
1822
 
                                   exc_info=error)
 
1595
                    logger.warning("GnuTLS bye failed")
1823
1596
    
1824
1597
    @staticmethod
1825
1598
    def peer_certificate(session):
1890
1663
    def sub_process_main(self, request, address):
1891
1664
        try:
1892
1665
            self.finish_request(request, address)
1893
 
        except Exception:
 
1666
        except:
1894
1667
            self.handle_error(request, address)
1895
1668
        self.close_request(request)
1896
1669
    
1897
1670
    def process_request(self, request, address):
1898
1671
        """Start a new process to process the request."""
1899
1672
        proc = multiprocessing.Process(target = self.sub_process_main,
1900
 
                                       args = (request, address))
 
1673
                                       args = (request,
 
1674
                                               address))
1901
1675
        proc.start()
1902
1676
        return proc
1903
1677
 
1918
1692
    
1919
1693
    def add_pipe(self, parent_pipe, proc):
1920
1694
        """Dummy function; override as necessary"""
1921
 
        raise NotImplementedError()
 
1695
        raise NotImplementedError
1922
1696
 
1923
1697
 
1924
1698
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1931
1705
        use_ipv6:       Boolean; to use IPv6 or not
1932
1706
    """
1933
1707
    def __init__(self, server_address, RequestHandlerClass,
1934
 
                 interface=None, use_ipv6=True, socketfd=None):
1935
 
        """If socketfd is set, use that file descriptor instead of
1936
 
        creating a new one with socket.socket().
1937
 
        """
 
1708
                 interface=None, use_ipv6=True):
1938
1709
        self.interface = interface
1939
1710
        if use_ipv6:
1940
1711
            self.address_family = socket.AF_INET6
1941
 
        if socketfd is not None:
1942
 
            # Save the file descriptor
1943
 
            self.socketfd = socketfd
1944
 
            # Save the original socket.socket() function
1945
 
            self.socket_socket = socket.socket
1946
 
            # To implement --socket, we monkey patch socket.socket.
1947
 
            # 
1948
 
            # (When socketserver.TCPServer is a new-style class, we
1949
 
            # could make self.socket into a property instead of monkey
1950
 
            # patching socket.socket.)
1951
 
            # 
1952
 
            # Create a one-time-only replacement for socket.socket()
1953
 
            @functools.wraps(socket.socket)
1954
 
            def socket_wrapper(*args, **kwargs):
1955
 
                # Restore original function so subsequent calls are
1956
 
                # not affected.
1957
 
                socket.socket = self.socket_socket
1958
 
                del self.socket_socket
1959
 
                # This time only, return a new socket object from the
1960
 
                # saved file descriptor.
1961
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1962
 
            # Replace socket.socket() function with wrapper
1963
 
            socket.socket = socket_wrapper
1964
 
        # The socketserver.TCPServer.__init__ will call
1965
 
        # socket.socket(), which might be our replacement,
1966
 
        # socket_wrapper(), if socketfd was set.
1967
1712
        socketserver.TCPServer.__init__(self, server_address,
1968
1713
                                        RequestHandlerClass)
1969
 
    
1970
1714
    def server_bind(self):
1971
1715
        """This overrides the normal server_bind() function
1972
1716
        to bind to an interface if one was specified, and also NOT to
1980
1724
                try:
1981
1725
                    self.socket.setsockopt(socket.SOL_SOCKET,
1982
1726
                                           SO_BINDTODEVICE,
1983
 
                                           str(self.interface + '\0'))
 
1727
                                           str(self.interface
 
1728
                                               + '\0'))
1984
1729
                except socket.error as error:
1985
 
                    if error.errno == errno.EPERM:
1986
 
                        logger.error("No permission to bind to"
1987
 
                                     " interface %s", self.interface)
1988
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1730
                    if error[0] == errno.EPERM:
 
1731
                        logger.error("No permission to"
 
1732
                                     " bind to interface %s",
 
1733
                                     self.interface)
 
1734
                    elif error[0] == errno.ENOPROTOOPT:
1989
1735
                        logger.error("SO_BINDTODEVICE not available;"
1990
1736
                                     " cannot bind to interface %s",
1991
1737
                                     self.interface)
1992
 
                    elif error.errno == errno.ENODEV:
1993
 
                        logger.error("Interface %s does not exist,"
1994
 
                                     " cannot bind", self.interface)
1995
1738
                    else:
1996
1739
                        raise
1997
1740
        # Only bind(2) the socket if we really need to.
2000
1743
                if self.address_family == socket.AF_INET6:
2001
1744
                    any_address = "::" # in6addr_any
2002
1745
                else:
2003
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1746
                    any_address = socket.INADDR_ANY
2004
1747
                self.server_address = (any_address,
2005
1748
                                       self.server_address[1])
2006
1749
            elif not self.server_address[1]:
2027
1770
    """
2028
1771
    def __init__(self, server_address, RequestHandlerClass,
2029
1772
                 interface=None, use_ipv6=True, clients=None,
2030
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1773
                 gnutls_priority=None, use_dbus=True):
2031
1774
        self.enabled = False
2032
1775
        self.clients = clients
2033
1776
        if self.clients is None:
2037
1780
        IPv6_TCPServer.__init__(self, server_address,
2038
1781
                                RequestHandlerClass,
2039
1782
                                interface = interface,
2040
 
                                use_ipv6 = use_ipv6,
2041
 
                                socketfd = socketfd)
 
1783
                                use_ipv6 = use_ipv6)
2042
1784
    def server_activate(self):
2043
1785
        if self.enabled:
2044
1786
            return socketserver.TCPServer.server_activate(self)
2057
1799
    
2058
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
2059
1801
                   proc = None, client_object=None):
 
1802
        condition_names = {
 
1803
            gobject.IO_IN: "IN",   # There is data to read.
 
1804
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1805
                                    # blocking).
 
1806
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1807
            gobject.IO_ERR: "ERR", # Error condition.
 
1808
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1809
                                    # broken, usually for pipes and
 
1810
                                    # sockets).
 
1811
            }
 
1812
        conditions_string = ' | '.join(name
 
1813
                                       for cond, name in
 
1814
                                       condition_names.iteritems()
 
1815
                                       if cond & condition)
2060
1816
        # error, or the other end of multiprocessing.Pipe has closed
2061
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2062
1818
            # Wait for other process to exit
2063
1819
            proc.join()
2064
1820
            return False
2122
1878
        return True
2123
1879
 
2124
1880
 
2125
 
def rfc3339_duration_to_delta(duration):
2126
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2127
 
    
2128
 
    >>> rfc3339_duration_to_delta("P7D")
2129
 
    datetime.timedelta(7)
2130
 
    >>> rfc3339_duration_to_delta("PT60S")
2131
 
    datetime.timedelta(0, 60)
2132
 
    >>> rfc3339_duration_to_delta("PT60M")
2133
 
    datetime.timedelta(0, 3600)
2134
 
    >>> rfc3339_duration_to_delta("PT24H")
2135
 
    datetime.timedelta(1)
2136
 
    >>> rfc3339_duration_to_delta("P1W")
2137
 
    datetime.timedelta(7)
2138
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2139
 
    datetime.timedelta(0, 330)
2140
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2141
 
    datetime.timedelta(1, 200)
2142
 
    """
2143
 
    
2144
 
    # Parsing an RFC 3339 duration with regular expressions is not
2145
 
    # possible - there would have to be multiple places for the same
2146
 
    # values, like seconds.  The current code, while more esoteric, is
2147
 
    # cleaner without depending on a parsing library.  If Python had a
2148
 
    # built-in library for parsing we would use it, but we'd like to
2149
 
    # avoid excessive use of external libraries.
2150
 
    
2151
 
    # New type for defining tokens, syntax, and semantics all-in-one
2152
 
    Token = collections.namedtuple("Token",
2153
 
                                   ("regexp", # To match token; if
2154
 
                                              # "value" is not None,
2155
 
                                              # must have a "group"
2156
 
                                              # containing digits
2157
 
                                    "value",  # datetime.timedelta or
2158
 
                                              # None
2159
 
                                    "followers")) # Tokens valid after
2160
 
                                                  # this token
2161
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2162
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2163
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2164
 
    token_second = Token(re.compile(r"(\d+)S"),
2165
 
                         datetime.timedelta(seconds=1),
2166
 
                         frozenset((token_end,)))
2167
 
    token_minute = Token(re.compile(r"(\d+)M"),
2168
 
                         datetime.timedelta(minutes=1),
2169
 
                         frozenset((token_second, token_end)))
2170
 
    token_hour = Token(re.compile(r"(\d+)H"),
2171
 
                       datetime.timedelta(hours=1),
2172
 
                       frozenset((token_minute, token_end)))
2173
 
    token_time = Token(re.compile(r"T"),
2174
 
                       None,
2175
 
                       frozenset((token_hour, token_minute,
2176
 
                                  token_second)))
2177
 
    token_day = Token(re.compile(r"(\d+)D"),
2178
 
                      datetime.timedelta(days=1),
2179
 
                      frozenset((token_time, token_end)))
2180
 
    token_month = Token(re.compile(r"(\d+)M"),
2181
 
                        datetime.timedelta(weeks=4),
2182
 
                        frozenset((token_day, token_end)))
2183
 
    token_year = Token(re.compile(r"(\d+)Y"),
2184
 
                       datetime.timedelta(weeks=52),
2185
 
                       frozenset((token_month, token_end)))
2186
 
    token_week = Token(re.compile(r"(\d+)W"),
2187
 
                       datetime.timedelta(weeks=1),
2188
 
                       frozenset((token_end,)))
2189
 
    token_duration = Token(re.compile(r"P"), None,
2190
 
                           frozenset((token_year, token_month,
2191
 
                                      token_day, token_time,
2192
 
                                      token_week))),
2193
 
    # Define starting values
2194
 
    value = datetime.timedelta() # Value so far
2195
 
    found_token = None
2196
 
    followers = frozenset(token_duration,) # Following valid tokens
2197
 
    s = duration                # String left to parse
2198
 
    # Loop until end token is found
2199
 
    while found_token is not token_end:
2200
 
        # Search for any currently valid tokens
2201
 
        for token in followers:
2202
 
            match = token.regexp.match(s)
2203
 
            if match is not None:
2204
 
                # Token found
2205
 
                if token.value is not None:
2206
 
                    # Value found, parse digits
2207
 
                    factor = int(match.group(1), 10)
2208
 
                    # Add to value so far
2209
 
                    value += factor * token.value
2210
 
                # Strip token from string
2211
 
                s = token.regexp.sub("", s, 1)
2212
 
                # Go to found token
2213
 
                found_token = token
2214
 
                # Set valid next tokens
2215
 
                followers = found_token.followers
2216
 
                break
2217
 
        else:
2218
 
            # No currently valid tokens were found
2219
 
            raise ValueError("Invalid RFC 3339 duration")
2220
 
    # End token found
2221
 
    return value
2222
 
 
2223
 
 
2224
1881
def string_to_delta(interval):
2225
1882
    """Parse a string and return a datetime.timedelta
2226
1883
    
2237
1894
    >>> string_to_delta('5m 30s')
2238
1895
    datetime.timedelta(0, 330)
2239
1896
    """
2240
 
    
2241
 
    try:
2242
 
        return rfc3339_duration_to_delta(interval)
2243
 
    except ValueError:
2244
 
        pass
2245
 
    
2246
1897
    timevalue = datetime.timedelta(0)
2247
1898
    for s in interval.split():
2248
1899
        try:
2259
1910
            elif suffix == "w":
2260
1911
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2261
1912
            else:
2262
 
                raise ValueError("Unknown suffix {0!r}"
2263
 
                                 .format(suffix))
2264
 
        except IndexError as e:
 
1913
                raise ValueError("Unknown suffix %r" % suffix)
 
1914
        except (ValueError, IndexError) as e:
2265
1915
            raise ValueError(*(e.args))
2266
1916
        timevalue += delta
2267
1917
    return timevalue
2280
1930
        sys.exit()
2281
1931
    if not noclose:
2282
1932
        # Close all standard open file descriptors
2283
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1933
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2284
1934
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2285
1935
            raise OSError(errno.ENODEV,
2286
 
                          "{0} not a character device"
2287
 
                          .format(os.devnull))
 
1936
                          "%s not a character device"
 
1937
                          % os.path.devnull)
2288
1938
        os.dup2(null, sys.stdin.fileno())
2289
1939
        os.dup2(null, sys.stdout.fileno())
2290
1940
        os.dup2(null, sys.stderr.fileno())
2299
1949
    
2300
1950
    parser = argparse.ArgumentParser()
2301
1951
    parser.add_argument("-v", "--version", action="version",
2302
 
                        version = "%(prog)s {0}".format(version),
 
1952
                        version = "%%(prog)s %s" % version,
2303
1953
                        help="show version number and exit")
2304
1954
    parser.add_argument("-i", "--interface", metavar="IF",
2305
1955
                        help="Bind to interface IF")
2311
1961
                        help="Run self-test")
2312
1962
    parser.add_argument("--debug", action="store_true",
2313
1963
                        help="Debug mode; run in foreground and log"
2314
 
                        " to terminal", default=None)
 
1964
                        " to terminal")
2315
1965
    parser.add_argument("--debuglevel", metavar="LEVEL",
2316
1966
                        help="Debug level for stdout output")
2317
1967
    parser.add_argument("--priority", help="GnuTLS"
2324
1974
                        " files")
2325
1975
    parser.add_argument("--no-dbus", action="store_false",
2326
1976
                        dest="use_dbus", help="Do not provide D-Bus"
2327
 
                        " system bus interface", default=None)
 
1977
                        " system bus interface")
2328
1978
    parser.add_argument("--no-ipv6", action="store_false",
2329
 
                        dest="use_ipv6", help="Do not use IPv6",
2330
 
                        default=None)
 
1979
                        dest="use_ipv6", help="Do not use IPv6")
2331
1980
    parser.add_argument("--no-restore", action="store_false",
2332
1981
                        dest="restore", help="Do not restore stored"
2333
 
                        " state", default=None)
2334
 
    parser.add_argument("--socket", type=int,
2335
 
                        help="Specify a file descriptor to a network"
2336
 
                        " socket to use instead of creating one")
 
1982
                        " state")
2337
1983
    parser.add_argument("--statedir", metavar="DIR",
2338
1984
                        help="Directory to save/restore state in")
2339
 
    parser.add_argument("--foreground", action="store_true",
2340
 
                        help="Run in foreground", default=None)
2341
1985
    
2342
1986
    options = parser.parse_args()
2343
1987
    
2352
1996
                        "port": "",
2353
1997
                        "debug": "False",
2354
1998
                        "priority":
2355
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
1999
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2356
2000
                        "servicename": "Mandos",
2357
2001
                        "use_dbus": "True",
2358
2002
                        "use_ipv6": "True",
2359
2003
                        "debuglevel": "",
2360
2004
                        "restore": "True",
2361
 
                        "socket": "",
2362
 
                        "statedir": "/var/lib/mandos",
2363
 
                        "foreground": "False",
 
2005
                        "statedir": "/var/lib/mandos"
2364
2006
                        }
2365
2007
    
2366
2008
    # Parse config file for server-global settings
2371
2013
    # Convert the SafeConfigParser object to a dict
2372
2014
    server_settings = server_config.defaults()
2373
2015
    # Use the appropriate methods on the non-string config options
2374
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2016
    for option in ("debug", "use_dbus", "use_ipv6"):
2375
2017
        server_settings[option] = server_config.getboolean("DEFAULT",
2376
2018
                                                           option)
2377
2019
    if server_settings["port"]:
2378
2020
        server_settings["port"] = server_config.getint("DEFAULT",
2379
2021
                                                       "port")
2380
 
    if server_settings["socket"]:
2381
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2382
 
                                                         "socket")
2383
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2384
 
        # over with an opened os.devnull.  But we don't want this to
2385
 
        # happen with a supplied network socket.
2386
 
        if 0 <= server_settings["socket"] <= 2:
2387
 
            server_settings["socket"] = os.dup(server_settings
2388
 
                                               ["socket"])
2389
2022
    del server_config
2390
2023
    
2391
2024
    # Override the settings from the config file with command line
2393
2026
    for option in ("interface", "address", "port", "debug",
2394
2027
                   "priority", "servicename", "configdir",
2395
2028
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2396
 
                   "statedir", "socket", "foreground"):
 
2029
                   "statedir"):
2397
2030
        value = getattr(options, option)
2398
2031
        if value is not None:
2399
2032
            server_settings[option] = value
2402
2035
    for option in server_settings.keys():
2403
2036
        if type(server_settings[option]) is str:
2404
2037
            server_settings[option] = unicode(server_settings[option])
2405
 
    # Force all boolean options to be boolean
2406
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
 
                   "foreground"):
2408
 
        server_settings[option] = bool(server_settings[option])
2409
 
    # Debug implies foreground
2410
 
    if server_settings["debug"]:
2411
 
        server_settings["foreground"] = True
2412
2038
    # Now we have our good server settings in "server_settings"
2413
2039
    
2414
2040
    ##################################################################
2420
2046
    use_ipv6 = server_settings["use_ipv6"]
2421
2047
    stored_state_path = os.path.join(server_settings["statedir"],
2422
2048
                                     stored_state_file)
2423
 
    foreground = server_settings["foreground"]
2424
2049
    
2425
2050
    if debug:
2426
 
        initlogger(debug, logging.DEBUG)
 
2051
        initlogger(logging.DEBUG)
2427
2052
    else:
2428
2053
        if not debuglevel:
2429
 
            initlogger(debug)
 
2054
            initlogger()
2430
2055
        else:
2431
2056
            level = getattr(logging, debuglevel.upper())
2432
 
            initlogger(debug, level)
 
2057
            initlogger(level)
2433
2058
    
2434
2059
    if server_settings["servicename"] != "Mandos":
2435
2060
        syslogger.setFormatter(logging.Formatter
2436
 
                               ('Mandos ({0}) [%(process)d]:'
2437
 
                                ' %(levelname)s: %(message)s'
2438
 
                                .format(server_settings
2439
 
                                        ["servicename"])))
 
2061
                               ('Mandos (%s) [%%(process)d]:'
 
2062
                                ' %%(levelname)s: %%(message)s'
 
2063
                                % server_settings["servicename"]))
2440
2064
    
2441
2065
    # Parse config file with clients
2442
 
    client_config = configparser.SafeConfigParser(Client
2443
 
                                                  .client_defaults)
 
2066
    client_defaults = { "timeout": "5m",
 
2067
                        "extended_timeout": "15m",
 
2068
                        "interval": "2m",
 
2069
                        "checker": "fping -q -- %%(host)s",
 
2070
                        "host": "",
 
2071
                        "approval_delay": "0s",
 
2072
                        "approval_duration": "1s",
 
2073
                        }
 
2074
    client_config = configparser.SafeConfigParser(client_defaults)
2444
2075
    client_config.read(os.path.join(server_settings["configdir"],
2445
2076
                                    "clients.conf"))
2446
2077
    
2455
2086
                              use_ipv6=use_ipv6,
2456
2087
                              gnutls_priority=
2457
2088
                              server_settings["priority"],
2458
 
                              use_dbus=use_dbus,
2459
 
                              socketfd=(server_settings["socket"]
2460
 
                                        or None))
2461
 
    if not foreground:
2462
 
        pidfilename = "/run/mandos.pid"
2463
 
        if not os.path.isdir("/run/."):
2464
 
            pidfilename = "/var/run/mandos.pid"
2465
 
        pidfile = None
 
2089
                              use_dbus=use_dbus)
 
2090
    if not debug:
 
2091
        pidfilename = "/var/run/mandos.pid"
2466
2092
        try:
2467
2093
            pidfile = open(pidfilename, "w")
2468
 
        except IOError as e:
2469
 
            logger.error("Could not open file %r", pidfilename,
2470
 
                         exc_info=e)
 
2094
        except IOError:
 
2095
            logger.error("Could not open file %r", pidfilename)
2471
2096
    
2472
 
    for name in ("_mandos", "mandos", "nobody"):
 
2097
    try:
 
2098
        uid = pwd.getpwnam("_mandos").pw_uid
 
2099
        gid = pwd.getpwnam("_mandos").pw_gid
 
2100
    except KeyError:
2473
2101
        try:
2474
 
            uid = pwd.getpwnam(name).pw_uid
2475
 
            gid = pwd.getpwnam(name).pw_gid
2476
 
            break
 
2102
            uid = pwd.getpwnam("mandos").pw_uid
 
2103
            gid = pwd.getpwnam("mandos").pw_gid
2477
2104
        except KeyError:
2478
 
            continue
2479
 
    else:
2480
 
        uid = 65534
2481
 
        gid = 65534
 
2105
            try:
 
2106
                uid = pwd.getpwnam("nobody").pw_uid
 
2107
                gid = pwd.getpwnam("nobody").pw_gid
 
2108
            except KeyError:
 
2109
                uid = 65534
 
2110
                gid = 65534
2482
2111
    try:
2483
2112
        os.setgid(gid)
2484
2113
        os.setuid(uid)
2485
2114
    except OSError as error:
2486
 
        if error.errno != errno.EPERM:
2487
 
            raise
 
2115
        if error[0] != errno.EPERM:
 
2116
            raise error
2488
2117
    
2489
2118
    if debug:
2490
2119
        # Enable all possible GnuTLS debugging
2501
2130
         .gnutls_global_set_log_function(debug_gnutls))
2502
2131
        
2503
2132
        # Redirect stdin so all checkers get /dev/null
2504
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2133
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2505
2134
        os.dup2(null, sys.stdin.fileno())
2506
2135
        if null > 2:
2507
2136
            os.close(null)
 
2137
    else:
 
2138
        # No console logging
 
2139
        logger.removeHandler(console)
2508
2140
    
2509
2141
    # Need to fork before connecting to D-Bus
2510
 
    if not foreground:
 
2142
    if not debug:
2511
2143
        # Close all input and output, do double fork, etc.
2512
2144
        daemon()
2513
2145
    
2514
 
    # multiprocessing will use threads, so before we use gobject we
2515
 
    # need to inform gobject that threads will be used.
2516
 
    gobject.threads_init()
2517
 
    
2518
2146
    global main_loop
2519
2147
    # From the Avahi example code
2520
 
    DBusGMainLoop(set_as_default=True)
 
2148
    DBusGMainLoop(set_as_default=True )
2521
2149
    main_loop = gobject.MainLoop()
2522
2150
    bus = dbus.SystemBus()
2523
2151
    # End of Avahi example code
2529
2157
                            ("se.bsnet.fukt.Mandos", bus,
2530
2158
                             do_not_queue=True))
2531
2159
        except dbus.exceptions.NameExistsException as e:
2532
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2160
            logger.error(unicode(e) + ", disabling D-Bus")
2533
2161
            use_dbus = False
2534
2162
            server_settings["use_dbus"] = False
2535
2163
            tcp_server.use_dbus = False
2547
2175
    
2548
2176
    client_class = Client
2549
2177
    if use_dbus:
2550
 
        client_class = functools.partial(ClientDBus, bus = bus)
2551
 
    
2552
 
    client_settings = Client.config_parser(client_config)
 
2178
        client_class = functools.partial(ClientDBusTransitional,
 
2179
                                         bus = bus)
 
2180
    
 
2181
    special_settings = {
 
2182
        # Some settings need to be accessd by special methods;
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2184
        "approved_by_default":
 
2185
            lambda section:
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
2187
        "enabled":
 
2188
            lambda section:
 
2189
            client_config.getboolean(section, "enabled"),
 
2190
        }
 
2191
    # Construct a new dict of client settings of this form:
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
2193
    # with exceptions for any special settings as defined above
 
2194
    client_settings = dict((clientname,
 
2195
                           dict((setting,
 
2196
                                 (value
 
2197
                                  if setting not in special_settings
 
2198
                                  else special_settings[setting]
 
2199
                                  (clientname)))
 
2200
                                for setting, value in
 
2201
                                client_config.items(clientname)))
 
2202
                          for clientname in client_config.sections())
 
2203
    
2553
2204
    old_client_settings = {}
2554
 
    clients_data = {}
2555
 
    
2556
 
    # This is used to redirect stdout and stderr for checker processes
2557
 
    global wnull
2558
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2559
 
    # Only used if server is running in foreground but not in debug
2560
 
    # mode
2561
 
    if debug or not foreground:
2562
 
        wnull.close()
 
2205
    clients_data = []
2563
2206
    
2564
2207
    # Get client data and settings from last running state.
2565
2208
    if server_settings["restore"]:
2569
2212
                                                     (stored_state))
2570
2213
            os.remove(stored_state_path)
2571
2214
        except IOError as e:
2572
 
            if e.errno == errno.ENOENT:
2573
 
                logger.warning("Could not load persistent state: {0}"
2574
 
                                .format(os.strerror(e.errno)))
2575
 
            else:
2576
 
                logger.critical("Could not load persistent state:",
2577
 
                                exc_info=e)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2578
2218
                raise
2579
 
        except EOFError as e:
2580
 
            logger.warning("Could not load persistent state: "
2581
 
                           "EOFError:", exc_info=e)
2582
2219
    
2583
 
    with PGPEngine() as pgp:
2584
 
        for client_name, client in clients_data.iteritems():
2585
 
            # Skip removed clients
2586
 
            if client_name not in client_settings:
2587
 
                continue
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
2588
2223
            
2589
2224
            # Decide which value to use after restoring saved state.
2590
2225
            # We have three different values: Old config file,
2599
2234
                    if (name != "secret" and
2600
2235
                        value != old_client_settings[client_name]
2601
2236
                        [name]):
2602
 
                        client[name] = value
 
2237
                        setattr(client, name, value)
2603
2238
                except KeyError:
2604
2239
                    pass
2605
2240
            
2606
2241
            # Clients who has passed its expire date can still be
2607
 
            # enabled if its last checker was successful.  Clients
2608
 
            # whose checker succeeded before we stored its state is
2609
 
            # assumed to have successfully run all checkers during
2610
 
            # downtime.
2611
 
            if client["enabled"]:
2612
 
                if datetime.datetime.utcnow() >= client["expires"]:
2613
 
                    if not client["last_checked_ok"]:
2614
 
                        logger.warning(
2615
 
                            "disabling client {0} - Client never "
2616
 
                            "performed a successful checker"
2617
 
                            .format(client_name))
2618
 
                        client["enabled"] = False
2619
 
                    elif client["last_checker_status"] != 0:
2620
 
                        logger.warning(
2621
 
                            "disabling client {0} - Client "
2622
 
                            "last checker failed with error code {1}"
2623
 
                            .format(client_name,
2624
 
                                    client["last_checker_status"]))
 
2242
            # enabled if its last checker was sucessful.  Clients
 
2243
            # whose checker failed before we stored its state is
 
2244
            # assumed to have failed all checkers during downtime.
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
2246
                if ((datetime.datetime.utcnow()
 
2247
                     - client["last_checked_ok"])
 
2248
                    > client["interval"]):
 
2249
                    if client["last_checker_status"] != 0:
2625
2250
                        client["enabled"] = False
2626
2251
                    else:
2627
2252
                        client["expires"] = (datetime.datetime
2628
2253
                                             .utcnow()
2629
2254
                                             + client["timeout"])
2630
 
                        logger.debug("Last checker succeeded,"
2631
 
                                     " keeping {0} enabled"
2632
 
                                     .format(client_name))
 
2255
            
 
2256
            client["changedstate"] = (multiprocessing_manager
 
2257
                                      .Condition
 
2258
                                      (multiprocessing_manager
 
2259
                                       .Lock()))
 
2260
            if use_dbus:
 
2261
                new_client = (ClientDBusTransitional.__new__
 
2262
                              (ClientDBusTransitional))
 
2263
                tcp_server.clients[client_name] = new_client
 
2264
                new_client.bus = bus
 
2265
                for name, value in client.iteritems():
 
2266
                    setattr(new_client, name, value)
 
2267
                client_object_name = unicode(client_name).translate(
 
2268
                    {ord("."): ord("_"),
 
2269
                     ord("-"): ord("_")})
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
2271
                                               ("/clients/"
 
2272
                                                + client_object_name))
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
2274
                                                  new_client.bus,
 
2275
                                                  new_client
 
2276
                                                  .dbus_object_path)
 
2277
            else:
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
2279
                                                   (Client))
 
2280
                for name, value in client.iteritems():
 
2281
                    setattr(tcp_server.clients[client_name],
 
2282
                            name, value)
 
2283
            
2633
2284
            try:
2634
 
                client["secret"] = (
2635
 
                    pgp.decrypt(client["encrypted_secret"],
2636
 
                                client_settings[client_name]
2637
 
                                ["secret"]))
2638
 
            except PGPError:
 
2285
                tcp_server.clients[client_name].secret = (
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
2287
                                  .encrypted_secret,
 
2288
                                  client_settings[client_name]
 
2289
                                  ["secret"]))
 
2290
            except CryptoError:
2639
2291
                # If decryption fails, we use secret from new settings
2640
 
                logger.debug("Failed to decrypt {0} old secret"
2641
 
                             .format(client_name))
2642
 
                client["secret"] = (
 
2292
                tcp_server.clients[client_name].secret = (
2643
2293
                    client_settings[client_name]["secret"])
2644
2294
    
2645
 
    # Add/remove clients based on new changes made to config
2646
 
    for client_name in (set(old_client_settings)
2647
 
                        - set(client_settings)):
2648
 
        del clients_data[client_name]
2649
 
    for client_name in (set(client_settings)
2650
 
                        - set(old_client_settings)):
2651
 
        clients_data[client_name] = client_settings[client_name]
2652
 
    
2653
 
    # Create all client objects
2654
 
    for client_name, client in clients_data.iteritems():
2655
 
        tcp_server.clients[client_name] = client_class(
2656
 
            name = client_name, settings = client,
2657
 
            server_settings = server_settings)
 
2295
    # Create/remove clients based on new changes made to config
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
2297
        del tcp_server.clients[clientname]
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2300
                                                       = clientname,
 
2301
                                                       config =
 
2302
                                                       client_settings
 
2303
                                                       [clientname]))
2658
2304
    
2659
2305
    if not tcp_server.clients:
2660
2306
        logger.warning("No clients defined")
2661
 
    
2662
 
    if not foreground:
2663
 
        if pidfile is not None:
2664
 
            try:
2665
 
                with pidfile:
2666
 
                    pid = os.getpid()
2667
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2668
 
            except IOError:
2669
 
                logger.error("Could not write to file %r with PID %d",
2670
 
                             pidfilename, pid)
2671
 
        del pidfile
 
2307
        
 
2308
    if not debug:
 
2309
        try:
 
2310
            with pidfile:
 
2311
                pid = os.getpid()
 
2312
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2313
            del pidfile
 
2314
        except IOError:
 
2315
            logger.error("Could not write to file %r with PID %d",
 
2316
                         pidfilename, pid)
 
2317
        except NameError:
 
2318
            # "pidfile" was never created
 
2319
            pass
2672
2320
        del pidfilename
 
2321
        
 
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2673
2323
    
2674
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2675
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2676
2326
    
2677
2327
    if use_dbus:
2678
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2679
 
                                        "se.bsnet.fukt.Mandos"})
2680
 
        class MandosDBusService(DBusObjectWithProperties):
 
2328
        class MandosDBusService(dbus.service.Object):
2681
2329
            """A D-Bus proxy object"""
2682
2330
            def __init__(self):
2683
2331
                dbus.service.Object.__init__(self, bus, "/")
2684
2332
            _interface = "se.recompile.Mandos"
2685
2333
            
2686
 
            @dbus_interface_annotations(_interface)
2687
 
            def _foo(self):
2688
 
                return { "org.freedesktop.DBus.Property"
2689
 
                         ".EmitsChangedSignal":
2690
 
                             "false"}
2691
 
            
2692
2334
            @dbus.service.signal(_interface, signature="o")
2693
2335
            def ClientAdded(self, objpath):
2694
2336
                "D-Bus signal"
2736
2378
            
2737
2379
            del _interface
2738
2380
        
2739
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2740
2384
    
2741
2385
    def cleanup():
2742
2386
        "Cleanup function; run on exit"
2743
2387
        service.cleanup()
2744
2388
        
2745
2389
        multiprocessing.active_children()
2746
 
        wnull.close()
2747
2390
        if not (tcp_server.clients or client_settings):
2748
2391
            return
2749
2392
        
2750
2393
        # Store client before exiting. Secrets are encrypted with key
2751
2394
        # based on what config file has. If config file is
2752
2395
        # removed/edited, old secret will thus be unrecovable.
2753
 
        clients = {}
2754
 
        with PGPEngine() as pgp:
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
2755
2398
            for client in tcp_server.clients.itervalues():
2756
2399
                key = client_settings[client.name]["secret"]
2757
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2758
 
                                                      key)
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
2759
2402
                client_dict = {}
2760
2403
                
2761
 
                # A list of attributes that can not be pickled
2762
 
                # + secret.
2763
 
                exclude = set(("bus", "changedstate", "secret",
2764
 
                               "checker", "server_settings"))
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
2765
2407
                for name, typ in (inspect.getmembers
2766
2408
                                  (dbus.service.Object)):
2767
2409
                    exclude.add(name)
2772
2414
                    if attr not in exclude:
2773
2415
                        client_dict[attr] = getattr(client, attr)
2774
2416
                
2775
 
                clients[client.name] = client_dict
 
2417
                clients.append(client_dict)
2776
2418
                del client_settings[client.name]["secret"]
2777
2419
        
2778
2420
        try:
2779
 
            with (tempfile.NamedTemporaryFile
2780
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2781
 
                   dir=os.path.dirname(stored_state_path),
2782
 
                   delete=False)) as stored_state:
 
2421
            with os.fdopen(os.open(stored_state_path,
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2423
                                   0600), "wb") as stored_state:
2783
2424
                pickle.dump((clients, client_settings), stored_state)
2784
 
                tempname=stored_state.name
2785
 
            os.rename(tempname, stored_state_path)
2786
2425
        except (IOError, OSError) as e:
2787
 
            if not debug:
2788
 
                try:
2789
 
                    os.remove(tempname)
2790
 
                except NameError:
2791
 
                    pass
2792
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2793
 
                logger.warning("Could not save persistent state: {0}"
2794
 
                               .format(os.strerror(e.errno)))
2795
 
            else:
2796
 
                logger.warning("Could not save persistent state:",
2797
 
                               exc_info=e)
 
2426
            logger.warning("Could not save persistent state: {0}"
 
2427
                           .format(e))
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
2798
2429
                raise
2799
2430
        
2800
2431
        # Delete all clients, and settings from config
2828
2459
    service.port = tcp_server.socket.getsockname()[1]
2829
2460
    if use_ipv6:
2830
2461
        logger.info("Now listening on address %r, port %d,"
2831
 
                    " flowinfo %d, scope_id %d",
2832
 
                    *tcp_server.socket.getsockname())
 
2462
                    " flowinfo %d, scope_id %d"
 
2463
                    % tcp_server.socket.getsockname())
2833
2464
    else:                       # IPv4
2834
 
        logger.info("Now listening on address %r, port %d",
2835
 
                    *tcp_server.socket.getsockname())
 
2465
        logger.info("Now listening on address %r, port %d"
 
2466
                    % tcp_server.socket.getsockname())
2836
2467
    
2837
2468
    #service.interface = tcp_server.socket.getsockname()[3]
2838
2469
    
2841
2472
        try:
2842
2473
            service.activate()
2843
2474
        except dbus.exceptions.DBusException as error:
2844
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2475
            logger.critical("DBusException: %s", error)
2845
2476
            cleanup()
2846
2477
            sys.exit(1)
2847
2478
        # End of Avahi example code
2854
2485
        logger.debug("Starting main loop")
2855
2486
        main_loop.run()
2856
2487
    except AvahiError as error:
2857
 
        logger.critical("Avahi Error", exc_info=error)
 
2488
        logger.critical("AvahiError: %s", error)
2858
2489
        cleanup()
2859
2490
        sys.exit(1)
2860
2491
    except KeyboardInterrupt:
2865
2496
    # Must run before the D-Bus bus name gets deregistered
2866
2497
    cleanup()
2867
2498
 
 
2499
 
2868
2500
if __name__ == '__main__':
2869
2501
    main()