/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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 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
68
 
72
69
import dbus
73
70
import dbus.service
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.5.3"
 
88
 
 
89
version = "1.4.1"
92
90
stored_state_file = "clients.pickle"
93
91
 
94
92
logger = logging.getLogger()
113
111
        return interface_index
114
112
 
115
113
 
116
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
117
115
    """init logger and add loglevel"""
118
116
    
119
117
    syslogger.setFormatter(logging.Formatter
121
119
                            ' %(message)s'))
122
120
    logger.addHandler(syslogger)
123
121
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
 
122
    console = logging.StreamHandler()
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                           ' [%(process)d]:'
 
125
                                           ' %(levelname)s:'
 
126
                                           ' %(message)s'))
 
127
    logger.addHandler(console)
131
128
    logger.setLevel(level)
132
129
 
133
130
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
136
132
    pass
137
133
 
138
134
 
139
 
class PGPEngine(object):
 
135
class Crypto(object):
140
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
137
    def __init__(self):
142
138
        self.gnupg = GnuPGInterface.GnuPG()
145
141
        self.gnupg.options.meta_interactive = False
146
142
        self.gnupg.options.homedir = self.tempdir
147
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
 
144
                                              '--quiet'])
150
145
    
151
146
    def __enter__(self):
152
147
        return self
178
173
    
179
174
    def encrypt(self, data, password):
180
175
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
 
176
        with open(os.devnull) as devnull:
182
177
            try:
183
178
                proc = self.gnupg.run(['--symmetric'],
184
179
                                      create_fhs=['stdin', 'stdout'],
189
184
                    ciphertext = f.read()
190
185
                proc.wait()
191
186
            except IOError as e:
192
 
                raise PGPError(e)
 
187
                raise CryptoError(e)
193
188
        self.gnupg.passphrase = None
194
189
        return ciphertext
195
190
    
196
191
    def decrypt(self, data, password):
197
192
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
 
193
        with open(os.devnull) as devnull:
199
194
            try:
200
195
                proc = self.gnupg.run(['--decrypt'],
201
196
                                      create_fhs=['stdin', 'stdout'],
202
197
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
204
199
                    f.write(data)
205
200
                with contextlib.closing(proc.handles['stdout']) as f:
206
201
                    decrypted_plaintext = f.read()
207
202
                proc.wait()
208
203
            except IOError as e:
209
 
                raise PGPError(e)
 
204
                raise CryptoError(e)
210
205
        self.gnupg.passphrase = None
211
206
        return decrypted_plaintext
212
207
 
213
208
 
 
209
 
214
210
class AvahiError(Exception):
215
211
    def __init__(self, value, *args, **kwargs):
216
212
        self.value = value
245
241
    server: D-Bus Server
246
242
    bus: dbus.SystemBus()
247
243
    """
248
 
    
249
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
245
                 servicetype = None, port = None, TXT = None,
251
246
                 domain = "", host = "", max_renames = 32768,
264
259
        self.server = None
265
260
        self.bus = bus
266
261
        self.entry_group_state_changed_match = None
267
 
    
268
262
    def rename(self):
269
263
        """Derived from the Avahi example code"""
270
264
        if self.rename_count >= self.max_renames:
280
274
        try:
281
275
            self.add()
282
276
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
284
278
            self.cleanup()
285
279
            os._exit(1)
286
280
        self.rename_count += 1
287
 
    
288
281
    def remove(self):
289
282
        """Derived from the Avahi example code"""
290
283
        if self.entry_group_state_changed_match is not None:
292
285
            self.entry_group_state_changed_match = None
293
286
        if self.group is not None:
294
287
            self.group.Reset()
295
 
    
296
288
    def add(self):
297
289
        """Derived from the Avahi example code"""
298
290
        self.remove()
315
307
            dbus.UInt16(self.port),
316
308
            avahi.string_array_to_txt_array(self.TXT))
317
309
        self.group.Commit()
318
 
    
319
310
    def entry_group_state_changed(self, state, error):
320
311
        """Derived from the Avahi example code"""
321
312
        logger.debug("Avahi entry group state change: %i", state)
328
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
320
            logger.critical("Avahi: Error in group state changed %s",
330
321
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
334
324
    def cleanup(self):
335
325
        """Derived from the Avahi example code"""
336
326
        if self.group is not None:
341
331
                pass
342
332
            self.group = None
343
333
        self.remove()
344
 
    
345
334
    def server_state_changed(self, state, error=None):
346
335
        """Derived from the Avahi example code"""
347
336
        logger.debug("Avahi server state change: %i", state)
366
355
                logger.debug("Unknown state: %r", state)
367
356
            else:
368
357
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
358
    def activate(self):
371
359
        """Derived from the Avahi example code"""
372
360
        if self.server is None:
379
367
                                 self.server_state_changed)
380
368
        self.server_state_changed(self.server.GetState())
381
369
 
382
 
 
383
370
class AvahiServiceToSyslog(AvahiService):
384
371
    def rename(self):
385
372
        """Add the new name to the syslog messages"""
386
373
        ret = AvahiService.rename(self)
387
374
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
391
378
        return ret
392
379
 
393
 
 
394
 
def timedelta_to_milliseconds(td):
 
380
def _timedelta_to_milliseconds(td):
395
381
    "Convert a datetime.timedelta() to milliseconds"
396
382
    return ((td.days * 24 * 60 * 60 * 1000)
397
383
            + (td.seconds * 1000)
398
384
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
385
        
401
386
class Client(object):
402
387
    """A representation of a client host served by this server.
403
388
    
404
389
    Attributes:
405
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
390
    _approved:   bool(); 'None' if not yet approved/disapproved
406
391
    approval_delay: datetime.timedelta(); Time to wait for approval
407
392
    approval_duration: datetime.timedelta(); Duration of one approval
408
393
    checker:    subprocess.Popen(); a running checker process used
426
411
    interval:   datetime.timedelta(); How often to start a new checker
427
412
    last_approval_request: datetime.datetime(); (UTC) or None
428
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
429
415
    last_checker_status: integer between 0 and 255 reflecting exit
430
416
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
432
418
    last_enabled: datetime.datetime(); (UTC) or None
433
419
    name:       string; from the config file, used in log messages and
434
420
                        D-Bus identifiers
435
421
    secret:     bytestring; sent verbatim (over TLS) to client
436
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
423
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
439
425
    runtime_expansions: Allowed attributes for runtime expansion.
440
426
    expires:    datetime.datetime(); time (UTC) when a client will be
441
427
                disabled, or None
442
428
    """
443
429
    
444
430
    runtime_expansions = ("approval_delay", "approval_duration",
445
 
                          "created", "enabled", "expires",
446
 
                          "fingerprint", "host", "interval",
447
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
448
433
                          "last_enabled", "name", "timeout")
449
 
    client_defaults = { "timeout": "5m",
450
 
                        "extended_timeout": "15m",
451
 
                        "interval": "2m",
452
 
                        "checker": "fping -q -- %%(host)s",
453
 
                        "host": "",
454
 
                        "approval_delay": "0s",
455
 
                        "approval_duration": "1s",
456
 
                        "approved_by_default": "True",
457
 
                        "enabled": "True",
458
 
                        }
459
434
    
460
435
    def timeout_milliseconds(self):
461
436
        "Return the 'timeout' attribute in milliseconds"
462
 
        return timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
463
438
    
464
439
    def extended_timeout_milliseconds(self):
465
440
        "Return the 'extended_timeout' attribute in milliseconds"
466
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
467
442
    
468
443
    def interval_milliseconds(self):
469
444
        "Return the 'interval' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.interval)
 
445
        return _timedelta_to_milliseconds(self.interval)
471
446
    
472
447
    def approval_delay_milliseconds(self):
473
 
        return timedelta_to_milliseconds(self.approval_delay)
474
 
    
475
 
    @staticmethod
476
 
    def config_parser(config):
477
 
        """Construct a new dict of client settings of this form:
478
 
        { client_name: {setting_name: value, ...}, ...}
479
 
        with exceptions for any special settings as defined above.
480
 
        NOTE: Must be a pure function. Must return the same result
481
 
        value given the same arguments.
482
 
        """
483
 
        settings = {}
484
 
        for client_name in config.sections():
485
 
            section = dict(config.items(client_name))
486
 
            client = settings[client_name] = {}
487
 
            
488
 
            client["host"] = section["host"]
489
 
            # Reformat values from string types to Python types
490
 
            client["approved_by_default"] = config.getboolean(
491
 
                client_name, "approved_by_default")
492
 
            client["enabled"] = config.getboolean(client_name,
493
 
                                                  "enabled")
494
 
            
495
 
            client["fingerprint"] = (section["fingerprint"].upper()
496
 
                                     .replace(" ", ""))
497
 
            if "secret" in section:
498
 
                client["secret"] = section["secret"].decode("base64")
499
 
            elif "secfile" in section:
500
 
                with open(os.path.expanduser(os.path.expandvars
501
 
                                             (section["secfile"])),
502
 
                          "rb") as secfile:
503
 
                    client["secret"] = secfile.read()
504
 
            else:
505
 
                raise TypeError("No secret or secfile for section {0}"
506
 
                                .format(section))
507
 
            client["timeout"] = string_to_delta(section["timeout"])
508
 
            client["extended_timeout"] = string_to_delta(
509
 
                section["extended_timeout"])
510
 
            client["interval"] = string_to_delta(section["interval"])
511
 
            client["approval_delay"] = string_to_delta(
512
 
                section["approval_delay"])
513
 
            client["approval_duration"] = string_to_delta(
514
 
                section["approval_duration"])
515
 
            client["checker_command"] = section["checker"]
516
 
            client["last_approval_request"] = None
517
 
            client["last_checked_ok"] = None
518
 
            client["last_checker_status"] = -2
519
 
        
520
 
        return settings
521
 
    
522
 
    def __init__(self, settings, name = 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."""
523
454
        self.name = name
524
 
        # adding all client settings
525
 
        for setting, value in settings.iteritems():
526
 
            setattr(self, setting, value)
527
 
        
528
 
        if self.enabled:
529
 
            if not hasattr(self, "last_enabled"):
530
 
                self.last_enabled = datetime.datetime.utcnow()
531
 
            if not hasattr(self, "expires"):
532
 
                self.expires = (datetime.datetime.utcnow()
533
 
                                + self.timeout)
534
 
        else:
535
 
            self.last_enabled = None
536
 
            self.expires = None
537
 
        
 
455
        if config is None:
 
456
            config = {}
538
457
        logger.debug("Creating client %r", self.name)
539
458
        # Uppercase and remove spaces from fingerprint for later
540
459
        # comparison purposes with return value from the fingerprint()
541
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
542
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
543
 
        self.created = settings.get("created",
544
 
                                    datetime.datetime.utcnow())
545
 
        
546
 
        # 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"])
547
488
        self.checker = None
548
489
        self.checker_initiator_tag = None
549
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
550
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
551
497
        self.current_checker_command = None
552
 
        self.approved = None
 
498
        self._approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
553
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"])
554
506
        self.changedstate = (multiprocessing_manager
555
507
                             .Condition(multiprocessing_manager
556
508
                                        .Lock()))
576
528
        if getattr(self, "enabled", False):
577
529
            # Already enabled
578
530
            return
 
531
        self.send_changedstate()
579
532
        self.expires = datetime.datetime.utcnow() + self.timeout
580
533
        self.enabled = True
581
534
        self.last_enabled = datetime.datetime.utcnow()
582
535
        self.init_checker()
583
 
        self.send_changedstate()
584
536
    
585
537
    def disable(self, quiet=True):
586
538
        """Disable this client."""
587
539
        if not getattr(self, "enabled", False):
588
540
            return False
589
541
        if not quiet:
 
542
            self.send_changedstate()
 
543
        if not quiet:
590
544
            logger.info("Disabling client %s", self.name)
591
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
545
        if getattr(self, "disable_initiator_tag", False):
592
546
            gobject.source_remove(self.disable_initiator_tag)
593
547
            self.disable_initiator_tag = None
594
548
        self.expires = None
595
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
549
        if getattr(self, "checker_initiator_tag", False):
596
550
            gobject.source_remove(self.checker_initiator_tag)
597
551
            self.checker_initiator_tag = None
598
552
        self.stop_checker()
599
553
        self.enabled = False
600
 
        if not quiet:
601
 
            self.send_changedstate()
602
554
        # Do not run this again if called by a gobject.timeout_add
603
555
        return False
604
556
    
608
560
    def init_checker(self):
609
561
        # Schedule a new checker to be started an 'interval' from now,
610
562
        # and every interval from then on.
611
 
        if self.checker_initiator_tag is not None:
612
 
            gobject.source_remove(self.checker_initiator_tag)
613
563
        self.checker_initiator_tag = (gobject.timeout_add
614
564
                                      (self.interval_milliseconds(),
615
565
                                       self.start_checker))
616
566
        # Schedule a disable() when 'timeout' has passed
617
 
        if self.disable_initiator_tag is not None:
618
 
            gobject.source_remove(self.disable_initiator_tag)
619
567
        self.disable_initiator_tag = (gobject.timeout_add
620
568
                                   (self.timeout_milliseconds(),
621
569
                                    self.disable))
627
575
        self.checker_callback_tag = None
628
576
        self.checker = None
629
577
        if os.WIFEXITED(condition):
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
631
579
            if self.last_checker_status == 0:
632
580
                logger.info("Checker for %(name)s succeeded",
633
581
                            vars(self))
640
588
            logger.warning("Checker for %(name)s crashed?",
641
589
                           vars(self))
642
590
    
643
 
    def checked_ok(self):
644
 
        """Assert that the client has been seen, alive and well."""
645
 
        self.last_checked_ok = datetime.datetime.utcnow()
646
 
        self.last_checker_status = 0
647
 
        self.bump_timeout()
648
 
    
649
 
    def bump_timeout(self, timeout=None):
650
 
        """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
        """
651
597
        if timeout is None:
652
598
            timeout = self.timeout
 
599
        self.last_checked_ok = datetime.datetime.utcnow()
653
600
        if self.disable_initiator_tag is not None:
654
601
            gobject.source_remove(self.disable_initiator_tag)
655
 
            self.disable_initiator_tag = None
656
602
        if getattr(self, "enabled", False):
657
603
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (timedelta_to_milliseconds
 
604
                                          (_timedelta_to_milliseconds
659
605
                                           (timeout), self.disable))
660
606
            self.expires = datetime.datetime.utcnow() + timeout
661
607
    
668
614
        If a checker already exists, leave it running and do
669
615
        nothing."""
670
616
        # The reason for not killing a running checker is that if we
671
 
        # did that, and if a checker (for some reason) started running
672
 
        # slowly and taking more than 'interval' time, then the client
673
 
        # would inevitably timeout, since no checker would get a
674
 
        # 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
675
621
        # checkers alone, the checker would have to take more time
676
622
        # than 'timeout' for the client to be disabled, which is as it
677
623
        # should be.
691
637
                                      self.current_checker_command)
692
638
        # Start a new checker if needed
693
639
        if self.checker is None:
694
 
            # Escape attributes for the shell
695
 
            escaped_attrs = dict(
696
 
                (attr, re.escape(unicode(getattr(self, attr))))
697
 
                for attr in
698
 
                self.runtime_expansions)
699
640
            try:
700
 
                command = self.checker_command % escaped_attrs
701
 
            except TypeError as error:
702
 
                logger.error('Could not format string "%s"',
703
 
                             self.checker_command, exc_info=error)
704
 
                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
705
659
            self.current_checker_command = command
706
660
            try:
707
661
                logger.info("Starting checker %r for %s",
713
667
                self.checker = subprocess.Popen(command,
714
668
                                                close_fds=True,
715
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.
 
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)
716
680
            except OSError as error:
717
 
                logger.error("Failed to start subprocess",
718
 
                             exc_info=error)
719
 
            self.checker_callback_tag = (gobject.child_watch_add
720
 
                                         (self.checker.pid,
721
 
                                          self.checker_callback,
722
 
                                          data=command))
723
 
            # The checker may have completed before the gobject
724
 
            # watch was added.  Check for this.
725
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
726
 
            if pid:
727
 
                gobject.source_remove(self.checker_callback_tag)
728
 
                self.checker_callback(pid, status, command)
 
681
                logger.error("Failed to start subprocess: %s",
 
682
                             error)
729
683
        # Re-run this periodically if run by gobject.timeout_add
730
684
        return True
731
685
    
738
692
            return
739
693
        logger.debug("Stopping checker for %(name)s", vars(self))
740
694
        try:
741
 
            self.checker.terminate()
 
695
            os.kill(self.checker.pid, signal.SIGTERM)
742
696
            #time.sleep(0.5)
743
697
            #if self.checker.poll() is None:
744
 
            #    self.checker.kill()
 
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
745
699
        except OSError as error:
746
700
            if error.errno != errno.ESRCH: # No such process
747
701
                raise
764
718
    # "Set" method, so we fail early here:
765
719
    if byte_arrays and signature != "ay":
766
720
        raise ValueError("Byte arrays not supported for non-'ay'"
767
 
                         " signature {0!r}".format(signature))
 
721
                         " signature %r" % signature)
768
722
    def decorator(func):
769
723
        func._dbus_is_property = True
770
724
        func._dbus_interface = dbus_interface
778
732
    return decorator
779
733
 
780
734
 
781
 
def dbus_interface_annotations(dbus_interface):
782
 
    """Decorator for marking functions returning interface annotations
783
 
    
784
 
    Usage:
785
 
    
786
 
    @dbus_interface_annotations("org.example.Interface")
787
 
    def _foo(self):  # Function name does not matter
788
 
        return {"org.freedesktop.DBus.Deprecated": "true",
789
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
790
 
                    "false"}
791
 
    """
792
 
    def decorator(func):
793
 
        func._dbus_is_interface = True
794
 
        func._dbus_interface = dbus_interface
795
 
        func._dbus_name = dbus_interface
796
 
        return func
797
 
    return decorator
798
 
 
799
 
 
800
 
def dbus_annotations(annotations):
801
 
    """Decorator to annotate D-Bus methods, signals or properties
802
 
    Usage:
803
 
    
804
 
    @dbus_service_property("org.example.Interface", signature="b",
805
 
                           access="r")
806
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
 
                        "org.freedesktop.DBus.Property."
808
 
                        "EmitsChangedSignal": "false"})
809
 
    def Property_dbus_property(self):
810
 
        return dbus.Boolean(False)
811
 
    """
812
 
    def decorator(func):
813
 
        func._dbus_annotations = annotations
814
 
        return func
815
 
    return decorator
816
 
 
817
 
 
818
735
class DBusPropertyException(dbus.exceptions.DBusException):
819
736
    """A base class for D-Bus property-related exceptions
820
737
    """
843
760
    """
844
761
    
845
762
    @staticmethod
846
 
    def _is_dbus_thing(thing):
847
 
        """Returns a function testing if an attribute is a D-Bus thing
848
 
        
849
 
        If called like _is_dbus_thing("method") it returns a function
850
 
        suitable for use as predicate to inspect.getmembers().
851
 
        """
852
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
853
 
                                   False)
 
763
    def _is_dbus_property(obj):
 
764
        return getattr(obj, "_dbus_is_property", False)
854
765
    
855
 
    def _get_all_dbus_things(self, thing):
 
766
    def _get_all_dbus_properties(self):
856
767
        """Returns a generator of (name, attribute) pairs
857
768
        """
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
859
 
                         name),
860
 
                 athing.__get__(self))
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
770
                for cls in self.__class__.__mro__
862
 
                for name, athing in
863
 
                inspect.getmembers(cls,
864
 
                                   self._is_dbus_thing(thing)))
 
771
                for name, prop in
 
772
                inspect.getmembers(cls, self._is_dbus_property))
865
773
    
866
774
    def _get_dbus_property(self, interface_name, property_name):
867
775
        """Returns a bound method if one exists which is a D-Bus
869
777
        """
870
778
        for cls in  self.__class__.__mro__:
871
779
            for name, value in (inspect.getmembers
872
 
                                (cls,
873
 
                                 self._is_dbus_thing("property"))):
 
780
                                (cls, self._is_dbus_property)):
874
781
                if (value._dbus_name == property_name
875
782
                    and value._dbus_interface == interface_name):
876
783
                    return value.__get__(self)
905
812
            # signatures other than "ay".
906
813
            if prop._dbus_signature != "ay":
907
814
                raise ValueError
908
 
            value = dbus.ByteArray(b''.join(chr(byte)
909
 
                                            for byte in value))
 
815
            value = dbus.ByteArray(''.join(unichr(byte)
 
816
                                           for byte in value))
910
817
        prop(value)
911
818
    
912
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
918
825
        Note: Will not include properties with access="write".
919
826
        """
920
827
        properties = {}
921
 
        for name, prop in self._get_all_dbus_things("property"):
 
828
        for name, prop in self._get_all_dbus_properties():
922
829
            if (interface_name
923
830
                and interface_name != prop._dbus_interface):
924
831
                # Interface non-empty but did not match
939
846
                         path_keyword='object_path',
940
847
                         connection_keyword='connection')
941
848
    def Introspect(self, object_path, connection):
942
 
        """Overloading of standard D-Bus method.
943
 
        
944
 
        Inserts property tags and interface annotation tags.
 
849
        """Standard D-Bus method, overloaded to insert property tags.
945
850
        """
946
851
        xmlstring = dbus.service.Object.Introspect(self, object_path,
947
852
                                                   connection)
954
859
                e.setAttribute("access", prop._dbus_access)
955
860
                return e
956
861
            for if_tag in document.getElementsByTagName("interface"):
957
 
                # Add property tags
958
862
                for tag in (make_tag(document, name, prop)
959
863
                            for name, prop
960
 
                            in self._get_all_dbus_things("property")
 
864
                            in self._get_all_dbus_properties()
961
865
                            if prop._dbus_interface
962
866
                            == if_tag.getAttribute("name")):
963
867
                    if_tag.appendChild(tag)
964
 
                # Add annotation tags
965
 
                for typ in ("method", "signal", "property"):
966
 
                    for tag in if_tag.getElementsByTagName(typ):
967
 
                        annots = dict()
968
 
                        for name, prop in (self.
969
 
                                           _get_all_dbus_things(typ)):
970
 
                            if (name == tag.getAttribute("name")
971
 
                                and prop._dbus_interface
972
 
                                == if_tag.getAttribute("name")):
973
 
                                annots.update(getattr
974
 
                                              (prop,
975
 
                                               "_dbus_annotations",
976
 
                                               {}))
977
 
                        for name, value in annots.iteritems():
978
 
                            ann_tag = document.createElement(
979
 
                                "annotation")
980
 
                            ann_tag.setAttribute("name", name)
981
 
                            ann_tag.setAttribute("value", value)
982
 
                            tag.appendChild(ann_tag)
983
 
                # Add interface annotation tags
984
 
                for annotation, value in dict(
985
 
                    itertools.chain.from_iterable(
986
 
                        annotations().iteritems()
987
 
                        for name, annotations in
988
 
                        self._get_all_dbus_things("interface")
989
 
                        if name == if_tag.getAttribute("name")
990
 
                        )).iteritems():
991
 
                    ann_tag = document.createElement("annotation")
992
 
                    ann_tag.setAttribute("name", annotation)
993
 
                    ann_tag.setAttribute("value", value)
994
 
                    if_tag.appendChild(ann_tag)
995
868
                # Add the names to the return values for the
996
869
                # "org.freedesktop.DBus.Properties" methods
997
870
                if (if_tag.getAttribute("name")
1012
885
        except (AttributeError, xml.dom.DOMException,
1013
886
                xml.parsers.expat.ExpatError) as error:
1014
887
            logger.error("Failed to override Introspection method",
1015
 
                         exc_info=error)
 
888
                         error)
1016
889
        return xmlstring
1017
890
 
1018
891
 
1024
897
                       variant_level=variant_level)
1025
898
 
1026
899
 
1027
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1028
 
    """A class decorator; applied to a subclass of
1029
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1030
 
    interface names according to the "alt_interface_names" mapping.
1031
 
    Usage:
1032
 
    
1033
 
    @alternate_dbus_names({"org.example.Interface":
1034
 
                               "net.example.AlternateInterface"})
1035
 
    class SampleDBusObject(dbus.service.Object):
1036
 
        @dbus.service.method("org.example.Interface")
1037
 
        def SampleDBusMethod():
1038
 
            pass
1039
 
    
1040
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1041
 
    reachable via two interfaces: "org.example.Interface" and
1042
 
    "net.example.AlternateInterface", the latter of which will have
1043
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1044
 
    "true", unless "deprecate" is passed with a False value.
1045
 
    
1046
 
    This works for methods and signals, and also for D-Bus properties
1047
 
    (from DBusObjectWithProperties) and interfaces (from the
1048
 
    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.
1049
904
    """
1050
 
    def wrapper(cls):
1051
 
        for orig_interface_name, alt_interface_name in (
1052
 
            alt_interface_names.iteritems()):
1053
 
            attr = {}
1054
 
            interface_names = set()
1055
 
            # Go though all attributes of the class
1056
 
            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):
1057
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
1058
913
                # with the wrong interface name
1059
914
                if (not hasattr(attribute, "_dbus_interface")
1060
915
                    or not attribute._dbus_interface
1061
 
                    .startswith(orig_interface_name)):
 
916
                    .startswith("se.recompile.Mandos")):
1062
917
                    continue
1063
918
                # Create an alternate D-Bus interface name based on
1064
919
                # the current name
1065
920
                alt_interface = (attribute._dbus_interface
1066
 
                                 .replace(orig_interface_name,
1067
 
                                          alt_interface_name))
1068
 
                interface_names.add(alt_interface)
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
1069
923
                # Is this a D-Bus signal?
1070
924
                if getattr(attribute, "_dbus_is_signal", False):
1071
925
                    # Extract the original non-method function by
1086
940
                                nonmethod_func.func_name,
1087
941
                                nonmethod_func.func_defaults,
1088
942
                                nonmethod_func.func_closure)))
1089
 
                    # Copy annotations, if any
1090
 
                    try:
1091
 
                        new_function._dbus_annotations = (
1092
 
                            dict(attribute._dbus_annotations))
1093
 
                    except AttributeError:
1094
 
                        pass
1095
943
                    # Define a creator of a function to call both the
1096
 
                    # original and alternate functions, so both the
1097
 
                    # original and alternate signals gets sent when
1098
 
                    # the function is called
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
1099
946
                    def fixscope(func1, func2):
1100
947
                        """This function is a scope container to pass
1101
948
                        func1 and func2 to the "call_both" function
1108
955
                        return call_both
1109
956
                    # Create the "call_both" function and add it to
1110
957
                    # the class
1111
 
                    attr[attrname] = fixscope(attribute, new_function)
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
1112
960
                # Is this a D-Bus method?
1113
961
                elif getattr(attribute, "_dbus_is_method", False):
1114
962
                    # Create a new, but exactly alike, function
1125
973
                                        attribute.func_name,
1126
974
                                        attribute.func_defaults,
1127
975
                                        attribute.func_closure)))
1128
 
                    # Copy annotations, if any
1129
 
                    try:
1130
 
                        attr[attrname]._dbus_annotations = (
1131
 
                            dict(attribute._dbus_annotations))
1132
 
                    except AttributeError:
1133
 
                        pass
1134
976
                # Is this a D-Bus property?
1135
977
                elif getattr(attribute, "_dbus_is_property", False):
1136
978
                    # Create a new, but exactly alike, function
1150
992
                                        attribute.func_name,
1151
993
                                        attribute.func_defaults,
1152
994
                                        attribute.func_closure)))
1153
 
                    # Copy annotations, if any
1154
 
                    try:
1155
 
                        attr[attrname]._dbus_annotations = (
1156
 
                            dict(attribute._dbus_annotations))
1157
 
                    except AttributeError:
1158
 
                        pass
1159
 
                # Is this a D-Bus interface?
1160
 
                elif getattr(attribute, "_dbus_is_interface", False):
1161
 
                    # Create a new, but exactly alike, function
1162
 
                    # object.  Decorate it to be a new D-Bus interface
1163
 
                    # with the alternate D-Bus interface name.  Add it
1164
 
                    # to the class.
1165
 
                    attr[attrname] = (dbus_interface_annotations
1166
 
                                      (alt_interface)
1167
 
                                      (types.FunctionType
1168
 
                                       (attribute.func_code,
1169
 
                                        attribute.func_globals,
1170
 
                                        attribute.func_name,
1171
 
                                        attribute.func_defaults,
1172
 
                                        attribute.func_closure)))
1173
 
            if deprecate:
1174
 
                # Deprecate all alternate interfaces
1175
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1176
 
                for interface_name in interface_names:
1177
 
                    @dbus_interface_annotations(interface_name)
1178
 
                    def func(self):
1179
 
                        return { "org.freedesktop.DBus.Deprecated":
1180
 
                                     "true" }
1181
 
                    # Find an unused name
1182
 
                    for aname in (iname.format(i)
1183
 
                                  for i in itertools.count()):
1184
 
                        if aname not in attr:
1185
 
                            attr[aname] = func
1186
 
                            break
1187
 
            if interface_names:
1188
 
                # Replace the class with a new subclass of it with
1189
 
                # methods, signals, etc. as created above.
1190
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1191
 
                           (cls,), attr)
1192
 
        return cls
1193
 
    return wrapper
1194
 
 
1195
 
 
1196
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1197
 
                                "se.bsnet.fukt.Mandos"})
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
1198
998
class ClientDBus(Client, DBusObjectWithProperties):
1199
999
    """A Client class using D-Bus
1200
1000
    
1211
1011
    def __init__(self, bus = None, *args, **kwargs):
1212
1012
        self.bus = bus
1213
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
1214
1016
        # Only now, when this client is initialized, can it show up on
1215
1017
        # the D-Bus
1216
1018
        client_object_name = unicode(self.name).translate(
1220
1022
                                 ("/clients/" + client_object_name))
1221
1023
        DBusObjectWithProperties.__init__(self, self.bus,
1222
1024
                                          self.dbus_object_path)
1223
 
    
 
1025
        
1224
1026
    def notifychangeproperty(transform_func,
1225
1027
                             dbus_name, type_func=lambda x: x,
1226
1028
                             variant_level=1):
1249
1051
        
1250
1052
        return property(lambda self: getattr(self, attrname), setter)
1251
1053
    
 
1054
    
1252
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1253
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
1254
1057
                                             "ApprovalPending",
1261
1064
                                       checker is not None)
1262
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1263
1066
                                           "LastCheckedOK")
1264
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1265
 
                                               "LastCheckerStatus")
1266
1067
    last_approval_request = notifychangeproperty(
1267
1068
        datetime_to_dbus, "LastApprovalRequest")
1268
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1269
1070
                                               "ApprovedByDefault")
1270
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1271
1072
                                          "ApprovalDelay",
1272
1073
                                          type_func =
1273
 
                                          timedelta_to_milliseconds)
 
1074
                                          _timedelta_to_milliseconds)
1274
1075
    approval_duration = notifychangeproperty(
1275
 
        dbus.UInt64, "ApprovalDuration",
1276
 
        type_func = timedelta_to_milliseconds)
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
1277
1078
    host = notifychangeproperty(dbus.String, "Host")
1278
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1279
1080
                                   type_func =
1280
 
                                   timedelta_to_milliseconds)
 
1081
                                   _timedelta_to_milliseconds)
1281
1082
    extended_timeout = notifychangeproperty(
1282
 
        dbus.UInt64, "ExtendedTimeout",
1283
 
        type_func = timedelta_to_milliseconds)
1284
 
    interval = notifychangeproperty(dbus.UInt64,
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1285
1086
                                    "Interval",
1286
1087
                                    type_func =
1287
 
                                    timedelta_to_milliseconds)
 
1088
                                    _timedelta_to_milliseconds)
1288
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
1289
1090
    
1290
1091
    del notifychangeproperty
1332
1133
        return r
1333
1134
    
1334
1135
    def _reset_approved(self):
1335
 
        self.approved = None
 
1136
        self._approved = None
1336
1137
        return False
1337
1138
    
1338
1139
    def approve(self, value=True):
1339
 
        self.approved = value
1340
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1140
        self.send_changedstate()
 
1141
        self._approved = value
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
1341
1143
                            (self.approval_duration),
1342
1144
                            self._reset_approved)
1343
 
        self.send_changedstate()
 
1145
    
1344
1146
    
1345
1147
    ## D-Bus methods, signals & properties
1346
1148
    _interface = "se.recompile.Mandos.Client"
1347
1149
    
1348
 
    ## Interfaces
1349
 
    
1350
 
    @dbus_interface_annotations(_interface)
1351
 
    def _foo(self):
1352
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
 
                     "false"}
1354
 
    
1355
1150
    ## Signals
1356
1151
    
1357
1152
    # CheckerCompleted - signal
1393
1188
        "D-Bus signal"
1394
1189
        return self.need_approval()
1395
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
    
1396
1199
    ## Methods
1397
1200
    
1398
1201
    # Approve - method
1456
1259
                           access="readwrite")
1457
1260
    def ApprovalDuration_dbus_property(self, value=None):
1458
1261
        if value is None:       # get
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1460
1263
                    self.approval_duration))
1461
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1462
1265
    
1476
1279
    def Host_dbus_property(self, value=None):
1477
1280
        if value is None:       # get
1478
1281
            return dbus.String(self.host)
1479
 
        self.host = unicode(value)
 
1282
        self.host = value
1480
1283
    
1481
1284
    # Created - property
1482
1285
    @dbus_service_property(_interface, signature="s", access="read")
1508
1311
            return
1509
1312
        return datetime_to_dbus(self.last_checked_ok)
1510
1313
    
1511
 
    # LastCheckerStatus - property
1512
 
    @dbus_service_property(_interface, signature="n",
1513
 
                           access="read")
1514
 
    def LastCheckerStatus_dbus_property(self):
1515
 
        return dbus.Int16(self.last_checker_status)
1516
 
    
1517
1314
    # Expires - property
1518
1315
    @dbus_service_property(_interface, signature="s", access="read")
1519
1316
    def Expires_dbus_property(self):
1530
1327
    def Timeout_dbus_property(self, value=None):
1531
1328
        if value is None:       # get
1532
1329
            return dbus.UInt64(self.timeout_milliseconds())
1533
 
        old_timeout = self.timeout
1534
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
1535
 
        # Reschedule disabling
1536
 
        if self.enabled:
1537
 
            now = datetime.datetime.utcnow()
1538
 
            self.expires += self.timeout - old_timeout
1539
 
            if self.expires <= now:
1540
 
                # The timeout has passed
1541
 
                self.disable()
1542
 
            else:
1543
 
                if (getattr(self, "disable_initiator_tag", None)
1544
 
                    is None):
1545
 
                    return
1546
 
                gobject.source_remove(self.disable_initiator_tag)
1547
 
                self.disable_initiator_tag = (
1548
 
                    gobject.timeout_add(
1549
 
                        timedelta_to_milliseconds(self.expires - now),
1550
 
                        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))
1551
1351
    
1552
1352
    # ExtendedTimeout - property
1553
1353
    @dbus_service_property(_interface, signature="t",
1579
1379
    def Checker_dbus_property(self, value=None):
1580
1380
        if value is None:       # get
1581
1381
            return dbus.String(self.checker_command)
1582
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1583
1383
    
1584
1384
    # CheckerRunning - property
1585
1385
    @dbus_service_property(_interface, signature="b",
1614
1414
            raise KeyError()
1615
1415
    
1616
1416
    def __getattribute__(self, name):
1617
 
        if name == '_pipe':
 
1417
        if(name == '_pipe'):
1618
1418
            return super(ProxyClient, self).__getattribute__(name)
1619
1419
        self._pipe.send(('getattr', name))
1620
1420
        data = self._pipe.recv()
1627
1427
            return func
1628
1428
    
1629
1429
    def __setattr__(self, name, value):
1630
 
        if name == '_pipe':
 
1430
        if(name == '_pipe'):
1631
1431
            return super(ProxyClient, self).__setattr__(name, value)
1632
1432
        self._pipe.send(('setattr', name, value))
1633
1433
 
1634
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1635
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1636
1440
    """A class to handle client connections.
1637
1441
    
1698
1502
                    logger.warning("Bad certificate: %s", error)
1699
1503
                    return
1700
1504
                logger.debug("Fingerprint: %s", fpr)
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
1701
1508
                
1702
1509
                try:
1703
1510
                    client = ProxyClient(child_pipe, fpr,
1719
1526
                            client.Rejected("Disabled")
1720
1527
                        return
1721
1528
                    
1722
 
                    if client.approved or not client.approval_delay:
 
1529
                    if client._approved or not client.approval_delay:
1723
1530
                        #We are approved or approval is disabled
1724
1531
                        break
1725
 
                    elif client.approved is None:
 
1532
                    elif client._approved is None:
1726
1533
                        logger.info("Client %s needs approval",
1727
1534
                                    client.name)
1728
1535
                        if self.server.use_dbus:
1741
1548
                    #wait until timeout or approved
1742
1549
                    time = datetime.datetime.now()
1743
1550
                    client.changedstate.acquire()
1744
 
                    client.changedstate.wait(
1745
 
                        float(timedelta_to_milliseconds(delay)
1746
 
                              / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1747
1554
                    client.changedstate.release()
1748
1555
                    time2 = datetime.datetime.now()
1749
1556
                    if (time2 - time) >= delay:
1765
1572
                    try:
1766
1573
                        sent = session.send(client.secret[sent_size:])
1767
1574
                    except gnutls.errors.GNUTLSError as error:
1768
 
                        logger.warning("gnutls send failed",
1769
 
                                       exc_info=error)
 
1575
                        logger.warning("gnutls send failed")
1770
1576
                        return
1771
1577
                    logger.debug("Sent: %d, remaining: %d",
1772
1578
                                 sent, len(client.secret)
1775
1581
                
1776
1582
                logger.info("Sending secret to %s", client.name)
1777
1583
                # bump the timeout using extended_timeout
1778
 
                client.bump_timeout(client.extended_timeout)
 
1584
                client.checked_ok(client.extended_timeout)
1779
1585
                if self.server.use_dbus:
1780
1586
                    # Emit D-Bus signal
1781
1587
                    client.GotSecret()
1786
1592
                try:
1787
1593
                    session.bye()
1788
1594
                except gnutls.errors.GNUTLSError as error:
1789
 
                    logger.warning("GnuTLS bye failed",
1790
 
                                   exc_info=error)
 
1595
                    logger.warning("GnuTLS bye failed")
1791
1596
    
1792
1597
    @staticmethod
1793
1598
    def peer_certificate(session):
1858
1663
    def sub_process_main(self, request, address):
1859
1664
        try:
1860
1665
            self.finish_request(request, address)
1861
 
        except Exception:
 
1666
        except:
1862
1667
            self.handle_error(request, address)
1863
1668
        self.close_request(request)
1864
1669
    
1865
1670
    def process_request(self, request, address):
1866
1671
        """Start a new process to process the request."""
1867
1672
        proc = multiprocessing.Process(target = self.sub_process_main,
1868
 
                                       args = (request, address))
 
1673
                                       args = (request,
 
1674
                                               address))
1869
1675
        proc.start()
1870
1676
        return proc
1871
1677
 
1921
1727
                                           str(self.interface
1922
1728
                                               + '\0'))
1923
1729
                except socket.error as error:
1924
 
                    if error.errno == errno.EPERM:
 
1730
                    if error[0] == errno.EPERM:
1925
1731
                        logger.error("No permission to"
1926
1732
                                     " bind to interface %s",
1927
1733
                                     self.interface)
1928
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1734
                    elif error[0] == errno.ENOPROTOOPT:
1929
1735
                        logger.error("SO_BINDTODEVICE not available;"
1930
1736
                                     " cannot bind to interface %s",
1931
1737
                                     self.interface)
1932
 
                    elif error.errno == errno.ENODEV:
1933
 
                        logger.error("Interface %s does not"
1934
 
                                     " exist, cannot bind",
1935
 
                                     self.interface)
1936
1738
                    else:
1937
1739
                        raise
1938
1740
        # Only bind(2) the socket if we really need to.
1997
1799
    
1998
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
1999
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)
2000
1816
        # error, or the other end of multiprocessing.Pipe has closed
2001
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2002
1818
            # Wait for other process to exit
2003
1819
            proc.join()
2004
1820
            return False
2094
1910
            elif suffix == "w":
2095
1911
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2096
1912
            else:
2097
 
                raise ValueError("Unknown suffix {0!r}"
2098
 
                                 .format(suffix))
 
1913
                raise ValueError("Unknown suffix %r" % suffix)
2099
1914
        except (ValueError, IndexError) as e:
2100
1915
            raise ValueError(*(e.args))
2101
1916
        timevalue += delta
2115
1930
        sys.exit()
2116
1931
    if not noclose:
2117
1932
        # Close all standard open file descriptors
2118
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1933
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2119
1934
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2120
1935
            raise OSError(errno.ENODEV,
2121
 
                          "{0} not a character device"
2122
 
                          .format(os.devnull))
 
1936
                          "%s not a character device"
 
1937
                          % os.path.devnull)
2123
1938
        os.dup2(null, sys.stdin.fileno())
2124
1939
        os.dup2(null, sys.stdout.fileno())
2125
1940
        os.dup2(null, sys.stderr.fileno())
2134
1949
    
2135
1950
    parser = argparse.ArgumentParser()
2136
1951
    parser.add_argument("-v", "--version", action="version",
2137
 
                        version = "%(prog)s {0}".format(version),
 
1952
                        version = "%%(prog)s %s" % version,
2138
1953
                        help="show version number and exit")
2139
1954
    parser.add_argument("-i", "--interface", metavar="IF",
2140
1955
                        help="Bind to interface IF")
2233
2048
                                     stored_state_file)
2234
2049
    
2235
2050
    if debug:
2236
 
        initlogger(debug, logging.DEBUG)
 
2051
        initlogger(logging.DEBUG)
2237
2052
    else:
2238
2053
        if not debuglevel:
2239
 
            initlogger(debug)
 
2054
            initlogger()
2240
2055
        else:
2241
2056
            level = getattr(logging, debuglevel.upper())
2242
 
            initlogger(debug, level)
 
2057
            initlogger(level)
2243
2058
    
2244
2059
    if server_settings["servicename"] != "Mandos":
2245
2060
        syslogger.setFormatter(logging.Formatter
2246
 
                               ('Mandos ({0}) [%(process)d]:'
2247
 
                                ' %(levelname)s: %(message)s'
2248
 
                                .format(server_settings
2249
 
                                        ["servicename"])))
 
2061
                               ('Mandos (%s) [%%(process)d]:'
 
2062
                                ' %%(levelname)s: %%(message)s'
 
2063
                                % server_settings["servicename"]))
2250
2064
    
2251
2065
    # Parse config file with clients
2252
 
    client_config = configparser.SafeConfigParser(Client
2253
 
                                                  .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)
2254
2075
    client_config.read(os.path.join(server_settings["configdir"],
2255
2076
                                    "clients.conf"))
2256
2077
    
2270
2091
        pidfilename = "/var/run/mandos.pid"
2271
2092
        try:
2272
2093
            pidfile = open(pidfilename, "w")
2273
 
        except IOError as e:
2274
 
            logger.error("Could not open file %r", pidfilename,
2275
 
                         exc_info=e)
 
2094
        except IOError:
 
2095
            logger.error("Could not open file %r", pidfilename)
2276
2096
    
2277
 
    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:
2278
2101
        try:
2279
 
            uid = pwd.getpwnam(name).pw_uid
2280
 
            gid = pwd.getpwnam(name).pw_gid
2281
 
            break
 
2102
            uid = pwd.getpwnam("mandos").pw_uid
 
2103
            gid = pwd.getpwnam("mandos").pw_gid
2282
2104
        except KeyError:
2283
 
            continue
2284
 
    else:
2285
 
        uid = 65534
2286
 
        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
2287
2111
    try:
2288
2112
        os.setgid(gid)
2289
2113
        os.setuid(uid)
2290
2114
    except OSError as error:
2291
 
        if error.errno != errno.EPERM:
 
2115
        if error[0] != errno.EPERM:
2292
2116
            raise error
2293
2117
    
2294
2118
    if debug:
2306
2130
         .gnutls_global_set_log_function(debug_gnutls))
2307
2131
        
2308
2132
        # Redirect stdin so all checkers get /dev/null
2309
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2133
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2310
2134
        os.dup2(null, sys.stdin.fileno())
2311
2135
        if null > 2:
2312
2136
            os.close(null)
 
2137
    else:
 
2138
        # No console logging
 
2139
        logger.removeHandler(console)
2313
2140
    
2314
2141
    # Need to fork before connecting to D-Bus
2315
2142
    if not debug:
2316
2143
        # Close all input and output, do double fork, etc.
2317
2144
        daemon()
2318
2145
    
2319
 
    gobject.threads_init()
2320
 
    
2321
2146
    global main_loop
2322
2147
    # From the Avahi example code
2323
 
    DBusGMainLoop(set_as_default=True)
 
2148
    DBusGMainLoop(set_as_default=True )
2324
2149
    main_loop = gobject.MainLoop()
2325
2150
    bus = dbus.SystemBus()
2326
2151
    # End of Avahi example code
2332
2157
                            ("se.bsnet.fukt.Mandos", bus,
2333
2158
                             do_not_queue=True))
2334
2159
        except dbus.exceptions.NameExistsException as e:
2335
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2160
            logger.error(unicode(e) + ", disabling D-Bus")
2336
2161
            use_dbus = False
2337
2162
            server_settings["use_dbus"] = False
2338
2163
            tcp_server.use_dbus = False
2350
2175
    
2351
2176
    client_class = Client
2352
2177
    if use_dbus:
2353
 
        client_class = functools.partial(ClientDBus, bus = bus)
2354
 
    
2355
 
    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
    
2356
2204
    old_client_settings = {}
2357
 
    clients_data = {}
 
2205
    clients_data = []
2358
2206
    
2359
2207
    # Get client data and settings from last running state.
2360
2208
    if server_settings["restore"]:
2364
2212
                                                     (stored_state))
2365
2213
            os.remove(stored_state_path)
2366
2214
        except IOError as e:
2367
 
            if e.errno == errno.ENOENT:
2368
 
                logger.warning("Could not load persistent state: {0}"
2369
 
                                .format(os.strerror(e.errno)))
2370
 
            else:
2371
 
                logger.critical("Could not load persistent state:",
2372
 
                                exc_info=e)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2373
2218
                raise
2374
 
        except EOFError as e:
2375
 
            logger.warning("Could not load persistent state: "
2376
 
                           "EOFError:", exc_info=e)
2377
2219
    
2378
 
    with PGPEngine() as pgp:
2379
 
        for client_name, client in clients_data.iteritems():
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
 
2223
            
2380
2224
            # Decide which value to use after restoring saved state.
2381
2225
            # We have three different values: Old config file,
2382
2226
            # new config file, and saved state.
2390
2234
                    if (name != "secret" and
2391
2235
                        value != old_client_settings[client_name]
2392
2236
                        [name]):
2393
 
                        client[name] = value
 
2237
                        setattr(client, name, value)
2394
2238
                except KeyError:
2395
2239
                    pass
2396
2240
            
2397
2241
            # Clients who has passed its expire date can still be
2398
 
            # enabled if its last checker was successful.  Clients
2399
 
            # whose checker succeeded before we stored its state is
2400
 
            # assumed to have successfully run all checkers during
2401
 
            # downtime.
2402
 
            if client["enabled"]:
2403
 
                if datetime.datetime.utcnow() >= client["expires"]:
2404
 
                    if not client["last_checked_ok"]:
2405
 
                        logger.warning(
2406
 
                            "disabling client {0} - Client never "
2407
 
                            "performed a successful checker"
2408
 
                            .format(client_name))
2409
 
                        client["enabled"] = False
2410
 
                    elif client["last_checker_status"] != 0:
2411
 
                        logger.warning(
2412
 
                            "disabling client {0} - Client "
2413
 
                            "last checker failed with error code {1}"
2414
 
                            .format(client_name,
2415
 
                                    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:
2416
2250
                        client["enabled"] = False
2417
2251
                    else:
2418
2252
                        client["expires"] = (datetime.datetime
2419
2253
                                             .utcnow()
2420
2254
                                             + client["timeout"])
2421
 
                        logger.debug("Last checker succeeded,"
2422
 
                                     " keeping {0} enabled"
2423
 
                                     .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
            
2424
2284
            try:
2425
 
                client["secret"] = (
2426
 
                    pgp.decrypt(client["encrypted_secret"],
2427
 
                                client_settings[client_name]
2428
 
                                ["secret"]))
2429
 
            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:
2430
2291
                # If decryption fails, we use secret from new settings
2431
 
                logger.debug("Failed to decrypt {0} old secret"
2432
 
                             .format(client_name))
2433
 
                client["secret"] = (
 
2292
                tcp_server.clients[client_name].secret = (
2434
2293
                    client_settings[client_name]["secret"])
2435
2294
    
2436
 
    # Add/remove clients based on new changes made to config
2437
 
    for client_name in (set(old_client_settings)
2438
 
                        - set(client_settings)):
2439
 
        del clients_data[client_name]
2440
 
    for client_name in (set(client_settings)
2441
 
                        - set(old_client_settings)):
2442
 
        clients_data[client_name] = client_settings[client_name]
2443
 
    
2444
 
    # Create all client objects
2445
 
    for client_name, client in clients_data.iteritems():
2446
 
        tcp_server.clients[client_name] = client_class(
2447
 
            name = client_name, settings = client)
 
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]))
2448
2304
    
2449
2305
    if not tcp_server.clients:
2450
2306
        logger.warning("No clients defined")
2451
 
    
 
2307
        
2452
2308
    if not debug:
2453
2309
        try:
2454
2310
            with pidfile:
2462
2318
            # "pidfile" was never created
2463
2319
            pass
2464
2320
        del pidfilename
 
2321
        
 
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2465
2323
    
2466
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2467
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2468
2326
    
2469
2327
    if use_dbus:
2470
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2471
 
                                        "se.bsnet.fukt.Mandos"})
2472
 
        class MandosDBusService(DBusObjectWithProperties):
 
2328
        class MandosDBusService(dbus.service.Object):
2473
2329
            """A D-Bus proxy object"""
2474
2330
            def __init__(self):
2475
2331
                dbus.service.Object.__init__(self, bus, "/")
2476
2332
            _interface = "se.recompile.Mandos"
2477
2333
            
2478
 
            @dbus_interface_annotations(_interface)
2479
 
            def _foo(self):
2480
 
                return { "org.freedesktop.DBus.Property"
2481
 
                         ".EmitsChangedSignal":
2482
 
                             "false"}
2483
 
            
2484
2334
            @dbus.service.signal(_interface, signature="o")
2485
2335
            def ClientAdded(self, objpath):
2486
2336
                "D-Bus signal"
2528
2378
            
2529
2379
            del _interface
2530
2380
        
2531
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2532
2384
    
2533
2385
    def cleanup():
2534
2386
        "Cleanup function; run on exit"
2541
2393
        # Store client before exiting. Secrets are encrypted with key
2542
2394
        # based on what config file has. If config file is
2543
2395
        # removed/edited, old secret will thus be unrecovable.
2544
 
        clients = {}
2545
 
        with PGPEngine() as pgp:
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
2546
2398
            for client in tcp_server.clients.itervalues():
2547
2399
                key = client_settings[client.name]["secret"]
2548
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2549
 
                                                      key)
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
2550
2402
                client_dict = {}
2551
2403
                
2552
 
                # A list of attributes that can not be pickled
2553
 
                # + secret.
2554
 
                exclude = set(("bus", "changedstate", "secret",
2555
 
                               "checker"))
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
2556
2407
                for name, typ in (inspect.getmembers
2557
2408
                                  (dbus.service.Object)):
2558
2409
                    exclude.add(name)
2563
2414
                    if attr not in exclude:
2564
2415
                        client_dict[attr] = getattr(client, attr)
2565
2416
                
2566
 
                clients[client.name] = client_dict
 
2417
                clients.append(client_dict)
2567
2418
                del client_settings[client.name]["secret"]
2568
2419
        
2569
2420
        try:
2570
 
            with (tempfile.NamedTemporaryFile
2571
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2572
 
                   dir=os.path.dirname(stored_state_path),
2573
 
                   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:
2574
2424
                pickle.dump((clients, client_settings), stored_state)
2575
 
                tempname=stored_state.name
2576
 
            os.rename(tempname, stored_state_path)
2577
2425
        except (IOError, OSError) as e:
2578
 
            if not debug:
2579
 
                try:
2580
 
                    os.remove(tempname)
2581
 
                except NameError:
2582
 
                    pass
2583
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2584
 
                logger.warning("Could not save persistent state: {0}"
2585
 
                               .format(os.strerror(e.errno)))
2586
 
            else:
2587
 
                logger.warning("Could not save persistent state:",
2588
 
                               exc_info=e)
2589
 
                raise e
 
2426
            logger.warning("Could not save persistent state: {0}"
 
2427
                           .format(e))
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2429
                raise
2590
2430
        
2591
2431
        # Delete all clients, and settings from config
2592
2432
        while tcp_server.clients:
2619
2459
    service.port = tcp_server.socket.getsockname()[1]
2620
2460
    if use_ipv6:
2621
2461
        logger.info("Now listening on address %r, port %d,"
2622
 
                    " flowinfo %d, scope_id %d",
2623
 
                    *tcp_server.socket.getsockname())
 
2462
                    " flowinfo %d, scope_id %d"
 
2463
                    % tcp_server.socket.getsockname())
2624
2464
    else:                       # IPv4
2625
 
        logger.info("Now listening on address %r, port %d",
2626
 
                    *tcp_server.socket.getsockname())
 
2465
        logger.info("Now listening on address %r, port %d"
 
2466
                    % tcp_server.socket.getsockname())
2627
2467
    
2628
2468
    #service.interface = tcp_server.socket.getsockname()[3]
2629
2469
    
2632
2472
        try:
2633
2473
            service.activate()
2634
2474
        except dbus.exceptions.DBusException as error:
2635
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2475
            logger.critical("DBusException: %s", error)
2636
2476
            cleanup()
2637
2477
            sys.exit(1)
2638
2478
        # End of Avahi example code
2645
2485
        logger.debug("Starting main loop")
2646
2486
        main_loop.run()
2647
2487
    except AvahiError as error:
2648
 
        logger.critical("Avahi Error", exc_info=error)
 
2488
        logger.critical("AvahiError: %s", error)
2649
2489
        cleanup()
2650
2490
        sys.exit(1)
2651
2491
    except KeyboardInterrupt:
2656
2496
    # Must run before the D-Bus bus name gets deregistered
2657
2497
    cleanup()
2658
2498
 
 
2499
 
2659
2500
if __name__ == '__main__':
2660
2501
    main()