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