/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: Björn Påhlsson
  • Date: 2011-11-27 19:51:00 UTC
  • mto: (518.2.5 persistent-state-gpgme)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: belorn@recompile.se-20111127195100-fx0mpeia9xihvpmd
renamed variables

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.5"
 
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
 
145
142
        self.gnupg.options.meta_interactive = False
146
143
        self.gnupg.options.homedir = self.tempdir
147
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
 
145
                                              '--quiet'])
150
146
    
151
147
    def __enter__(self):
152
148
        return self
153
149
    
154
 
    def __exit__(self, exc_type, exc_value, traceback):
 
150
    def __exit__ (self, exc_type, exc_value, traceback):
155
151
        self._cleanup()
156
152
        return False
157
153
    
178
174
    
179
175
    def encrypt(self, data, password):
180
176
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
 
177
        with open(os.devnull) as devnull:
182
178
            try:
183
179
                proc = self.gnupg.run(['--symmetric'],
184
180
                                      create_fhs=['stdin', 'stdout'],
195
191
    
196
192
    def decrypt(self, data, password):
197
193
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
 
194
        with open(os.devnull) as devnull:
199
195
            try:
200
196
                proc = self.gnupg.run(['--decrypt'],
201
197
                                      create_fhs=['stdin', 'stdout'],
202
198
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
199
                with contextlib.closing(proc.handles['stdin'] ) as f:
204
200
                    f.write(data)
205
201
                with contextlib.closing(proc.handles['stdout']) as f:
206
202
                    decrypted_plaintext = f.read()
211
207
        return decrypted_plaintext
212
208
 
213
209
 
 
210
 
214
211
class AvahiError(Exception):
215
212
    def __init__(self, value, *args, **kwargs):
216
213
        self.value = value
245
242
    server: D-Bus Server
246
243
    bus: dbus.SystemBus()
247
244
    """
248
 
    
249
245
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
246
                 servicetype = None, port = None, TXT = None,
251
247
                 domain = "", host = "", max_renames = 32768,
264
260
        self.server = None
265
261
        self.bus = bus
266
262
        self.entry_group_state_changed_match = None
267
 
    
268
263
    def rename(self):
269
264
        """Derived from the Avahi example code"""
270
265
        if self.rename_count >= self.max_renames:
280
275
        try:
281
276
            self.add()
282
277
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
278
            logger.critical("DBusException: %s", error)
284
279
            self.cleanup()
285
280
            os._exit(1)
286
281
        self.rename_count += 1
287
 
    
288
282
    def remove(self):
289
283
        """Derived from the Avahi example code"""
290
284
        if self.entry_group_state_changed_match is not None:
292
286
            self.entry_group_state_changed_match = None
293
287
        if self.group is not None:
294
288
            self.group.Reset()
295
 
    
296
289
    def add(self):
297
290
        """Derived from the Avahi example code"""
298
291
        self.remove()
315
308
            dbus.UInt16(self.port),
316
309
            avahi.string_array_to_txt_array(self.TXT))
317
310
        self.group.Commit()
318
 
    
319
311
    def entry_group_state_changed(self, state, error):
320
312
        """Derived from the Avahi example code"""
321
313
        logger.debug("Avahi entry group state change: %i", state)
328
320
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
321
            logger.critical("Avahi: Error in group state changed %s",
330
322
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
323
            raise AvahiGroupError("State changed: %s"
 
324
                                  % unicode(error))
334
325
    def cleanup(self):
335
326
        """Derived from the Avahi example code"""
336
327
        if self.group is not None:
341
332
                pass
342
333
            self.group = None
343
334
        self.remove()
344
 
    
345
335
    def server_state_changed(self, state, error=None):
346
336
        """Derived from the Avahi example code"""
347
337
        logger.debug("Avahi server state change: %i", state)
366
356
                logger.debug("Unknown state: %r", state)
367
357
            else:
368
358
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
359
    def activate(self):
371
360
        """Derived from the Avahi example code"""
372
361
        if self.server is None:
379
368
                                 self.server_state_changed)
380
369
        self.server_state_changed(self.server.GetState())
381
370
 
382
 
 
383
371
class AvahiServiceToSyslog(AvahiService):
384
372
    def rename(self):
385
373
        """Add the new name to the syslog messages"""
386
374
        ret = AvahiService.rename(self)
387
375
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
376
                               ('Mandos (%s) [%%(process)d]:'
 
377
                                ' %%(levelname)s: %%(message)s'
 
378
                                % self.name))
391
379
        return ret
392
380
 
393
 
 
394
 
def timedelta_to_milliseconds(td):
 
381
def _timedelta_to_milliseconds(td):
395
382
    "Convert a datetime.timedelta() to milliseconds"
396
383
    return ((td.days * 24 * 60 * 60 * 1000)
397
384
            + (td.seconds * 1000)
398
385
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
386
        
401
387
class Client(object):
402
388
    """A representation of a client host served by this server.
403
389
    
404
390
    Attributes:
405
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
391
    _approved:   bool(); 'None' if not yet approved/disapproved
406
392
    approval_delay: datetime.timedelta(); Time to wait for approval
407
393
    approval_duration: datetime.timedelta(); Duration of one approval
408
394
    checker:    subprocess.Popen(); a running checker process used
426
412
    interval:   datetime.timedelta(); How often to start a new checker
427
413
    last_approval_request: datetime.datetime(); (UTC) or None
428
414
    last_checked_ok: datetime.datetime(); (UTC) or None
 
415
 
429
416
    last_checker_status: integer between 0 and 255 reflecting exit
430
417
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
432
419
    last_enabled: datetime.datetime(); (UTC) or None
433
420
    name:       string; from the config file, used in log messages and
434
421
                        D-Bus identifiers
435
422
    secret:     bytestring; sent verbatim (over TLS) to client
436
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
424
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
439
426
    runtime_expansions: Allowed attributes for runtime expansion.
440
427
    expires:    datetime.datetime(); time (UTC) when a client will be
441
428
                disabled, or None
442
429
    """
443
430
    
444
431
    runtime_expansions = ("approval_delay", "approval_duration",
445
 
                          "created", "enabled", "expires",
446
 
                          "fingerprint", "host", "interval",
447
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
448
434
                          "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
435
    
460
436
    def timeout_milliseconds(self):
461
437
        "Return the 'timeout' attribute in milliseconds"
462
 
        return timedelta_to_milliseconds(self.timeout)
 
438
        return _timedelta_to_milliseconds(self.timeout)
463
439
    
464
440
    def extended_timeout_milliseconds(self):
465
441
        "Return the 'extended_timeout' attribute in milliseconds"
466
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
442
        return _timedelta_to_milliseconds(self.extended_timeout)
467
443
    
468
444
    def interval_milliseconds(self):
469
445
        "Return the 'interval' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.interval)
 
446
        return _timedelta_to_milliseconds(self.interval)
471
447
    
472
448
    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):
 
449
        return _timedelta_to_milliseconds(self.approval_delay)
 
450
    
 
451
    def __init__(self, name = None, config=None):
 
452
        """Note: the 'checker' key in 'config' sets the
 
453
        'checker_command' attribute and *not* the 'checker'
 
454
        attribute."""
523
455
        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
 
        
 
456
        if config is None:
 
457
            config = {}
538
458
        logger.debug("Creating client %r", self.name)
539
459
        # Uppercase and remove spaces from fingerprint for later
540
460
        # comparison purposes with return value from the fingerprint()
541
461
        # function
 
462
        self.fingerprint = (config["fingerprint"].upper()
 
463
                            .replace(" ", ""))
542
464
        logger.debug("  Fingerprint: %s", self.fingerprint)
543
 
        self.created = settings.get("created",
544
 
                                    datetime.datetime.utcnow())
545
 
        
546
 
        # attributes specific for this server instance
 
465
        if "secret" in config:
 
466
            self.secret = config["secret"].decode("base64")
 
467
        elif "secfile" in config:
 
468
            with open(os.path.expanduser(os.path.expandvars
 
469
                                         (config["secfile"])),
 
470
                      "rb") as secfile:
 
471
                self.secret = secfile.read()
 
472
        else:
 
473
            raise TypeError("No secret or secfile for client %s"
 
474
                            % self.name)
 
475
        self.host = config.get("host", "")
 
476
        self.created = datetime.datetime.utcnow()
 
477
        self.enabled = config.get("enabled", True)
 
478
        self.last_approval_request = None
 
479
        if self.enabled:
 
480
            self.last_enabled = datetime.datetime.utcnow()
 
481
        else:
 
482
            self.last_enabled = None
 
483
        self.last_checked_ok = None
 
484
        self.last_checker_status = None
 
485
        self.timeout = string_to_delta(config["timeout"])
 
486
        self.extended_timeout = string_to_delta(config
 
487
                                                ["extended_timeout"])
 
488
        self.interval = string_to_delta(config["interval"])
547
489
        self.checker = None
548
490
        self.checker_initiator_tag = None
549
491
        self.disable_initiator_tag = None
 
492
        if self.enabled:
 
493
            self.expires = datetime.datetime.utcnow() + self.timeout
 
494
        else:
 
495
            self.expires = None
550
496
        self.checker_callback_tag = None
 
497
        self.checker_command = config["checker"]
551
498
        self.current_checker_command = None
552
 
        self.approved = None
 
499
        self._approved = None
 
500
        self.approved_by_default = config.get("approved_by_default",
 
501
                                              True)
553
502
        self.approvals_pending = 0
 
503
        self.approval_delay = string_to_delta(
 
504
            config["approval_delay"])
 
505
        self.approval_duration = string_to_delta(
 
506
            config["approval_duration"])
554
507
        self.changedstate = (multiprocessing_manager
555
508
                             .Condition(multiprocessing_manager
556
509
                                        .Lock()))
576
529
        if getattr(self, "enabled", False):
577
530
            # Already enabled
578
531
            return
 
532
        self.send_changedstate()
579
533
        self.expires = datetime.datetime.utcnow() + self.timeout
580
534
        self.enabled = True
581
535
        self.last_enabled = datetime.datetime.utcnow()
582
536
        self.init_checker()
583
 
        self.send_changedstate()
584
537
    
585
538
    def disable(self, quiet=True):
586
539
        """Disable this client."""
587
540
        if not getattr(self, "enabled", False):
588
541
            return False
589
542
        if not quiet:
 
543
            self.send_changedstate()
 
544
        if not quiet:
590
545
            logger.info("Disabling client %s", self.name)
591
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
546
        if getattr(self, "disable_initiator_tag", False):
592
547
            gobject.source_remove(self.disable_initiator_tag)
593
548
            self.disable_initiator_tag = None
594
549
        self.expires = None
595
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
550
        if getattr(self, "checker_initiator_tag", False):
596
551
            gobject.source_remove(self.checker_initiator_tag)
597
552
            self.checker_initiator_tag = None
598
553
        self.stop_checker()
599
554
        self.enabled = False
600
 
        if not quiet:
601
 
            self.send_changedstate()
602
555
        # Do not run this again if called by a gobject.timeout_add
603
556
        return False
604
557
    
608
561
    def init_checker(self):
609
562
        # Schedule a new checker to be started an 'interval' from now,
610
563
        # and every interval from then on.
611
 
        if self.checker_initiator_tag is not None:
612
 
            gobject.source_remove(self.checker_initiator_tag)
613
564
        self.checker_initiator_tag = (gobject.timeout_add
614
565
                                      (self.interval_milliseconds(),
615
566
                                       self.start_checker))
616
567
        # 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
568
        self.disable_initiator_tag = (gobject.timeout_add
620
569
                                   (self.timeout_milliseconds(),
621
570
                                    self.disable))
627
576
        self.checker_callback_tag = None
628
577
        self.checker = None
629
578
        if os.WIFEXITED(condition):
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
579
            self.last_checker_status =  os.WEXITSTATUS(condition)
631
580
            if self.last_checker_status == 0:
632
581
                logger.info("Checker for %(name)s succeeded",
633
582
                            vars(self))
640
589
            logger.warning("Checker for %(name)s crashed?",
641
590
                           vars(self))
642
591
    
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."""
 
592
    def checked_ok(self, timeout=None):
 
593
        """Bump up the timeout for this client.
 
594
        
 
595
        This should only be called when the client has been seen,
 
596
        alive and well.
 
597
        """
651
598
        if timeout is None:
652
599
            timeout = self.timeout
 
600
        self.last_checked_ok = datetime.datetime.utcnow()
653
601
        if self.disable_initiator_tag is not None:
654
602
            gobject.source_remove(self.disable_initiator_tag)
655
 
            self.disable_initiator_tag = None
656
603
        if getattr(self, "enabled", False):
657
604
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (timedelta_to_milliseconds
 
605
                                          (_timedelta_to_milliseconds
659
606
                                           (timeout), self.disable))
660
607
            self.expires = datetime.datetime.utcnow() + timeout
661
608
    
668
615
        If a checker already exists, leave it running and do
669
616
        nothing."""
670
617
        # 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
 
618
        # did that, then if a checker (for some reason) started
 
619
        # running slowly and taking more than 'interval' time, the
 
620
        # client would inevitably timeout, since no checker would get
 
621
        # a chance to run to completion.  If we instead leave running
675
622
        # checkers alone, the checker would have to take more time
676
623
        # than 'timeout' for the client to be disabled, which is as it
677
624
        # should be.
691
638
                                      self.current_checker_command)
692
639
        # Start a new checker if needed
693
640
        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
641
            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
 
642
                # In case checker_command has exactly one % operator
 
643
                command = self.checker_command % self.host
 
644
            except TypeError:
 
645
                # Escape attributes for the shell
 
646
                escaped_attrs = dict(
 
647
                    (attr,
 
648
                     re.escape(unicode(str(getattr(self, attr, "")),
 
649
                                       errors=
 
650
                                       'replace')))
 
651
                    for attr in
 
652
                    self.runtime_expansions)
 
653
                
 
654
                try:
 
655
                    command = self.checker_command % escaped_attrs
 
656
                except TypeError as error:
 
657
                    logger.error('Could not format string "%s":'
 
658
                                 ' %s', self.checker_command, error)
 
659
                    return True # Try again later
705
660
            self.current_checker_command = command
706
661
            try:
707
662
                logger.info("Starting checker %r for %s",
713
668
                self.checker = subprocess.Popen(command,
714
669
                                                close_fds=True,
715
670
                                                shell=True, cwd="/")
 
671
                self.checker_callback_tag = (gobject.child_watch_add
 
672
                                             (self.checker.pid,
 
673
                                              self.checker_callback,
 
674
                                              data=command))
 
675
                # The checker may have completed before the gobject
 
676
                # watch was added.  Check for this.
 
677
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
678
                if pid:
 
679
                    gobject.source_remove(self.checker_callback_tag)
 
680
                    self.checker_callback(pid, status, command)
716
681
            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)
 
682
                logger.error("Failed to start subprocess: %s",
 
683
                             error)
729
684
        # Re-run this periodically if run by gobject.timeout_add
730
685
        return True
731
686
    
738
693
            return
739
694
        logger.debug("Stopping checker for %(name)s", vars(self))
740
695
        try:
741
 
            self.checker.terminate()
 
696
            os.kill(self.checker.pid, signal.SIGTERM)
742
697
            #time.sleep(0.5)
743
698
            #if self.checker.poll() is None:
744
 
            #    self.checker.kill()
 
699
            #    os.kill(self.checker.pid, signal.SIGKILL)
745
700
        except OSError as error:
746
701
            if error.errno != errno.ESRCH: # No such process
747
702
                raise
764
719
    # "Set" method, so we fail early here:
765
720
    if byte_arrays and signature != "ay":
766
721
        raise ValueError("Byte arrays not supported for non-'ay'"
767
 
                         " signature {0!r}".format(signature))
 
722
                         " signature %r" % signature)
768
723
    def decorator(func):
769
724
        func._dbus_is_property = True
770
725
        func._dbus_interface = dbus_interface
778
733
    return decorator
779
734
 
780
735
 
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
736
class DBusPropertyException(dbus.exceptions.DBusException):
819
737
    """A base class for D-Bus property-related exceptions
820
738
    """
843
761
    """
844
762
    
845
763
    @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)
 
764
    def _is_dbus_property(obj):
 
765
        return getattr(obj, "_dbus_is_property", False)
854
766
    
855
 
    def _get_all_dbus_things(self, thing):
 
767
    def _get_all_dbus_properties(self):
856
768
        """Returns a generator of (name, attribute) pairs
857
769
        """
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
859
 
                         name),
860
 
                 athing.__get__(self))
 
770
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
771
                for cls in self.__class__.__mro__
862
 
                for name, athing in
863
 
                inspect.getmembers(cls,
864
 
                                   self._is_dbus_thing(thing)))
 
772
                for name, prop in
 
773
                inspect.getmembers(cls, self._is_dbus_property))
865
774
    
866
775
    def _get_dbus_property(self, interface_name, property_name):
867
776
        """Returns a bound method if one exists which is a D-Bus
869
778
        """
870
779
        for cls in  self.__class__.__mro__:
871
780
            for name, value in (inspect.getmembers
872
 
                                (cls,
873
 
                                 self._is_dbus_thing("property"))):
 
781
                                (cls, self._is_dbus_property)):
874
782
                if (value._dbus_name == property_name
875
783
                    and value._dbus_interface == interface_name):
876
784
                    return value.__get__(self)
905
813
            # signatures other than "ay".
906
814
            if prop._dbus_signature != "ay":
907
815
                raise ValueError
908
 
            value = dbus.ByteArray(b''.join(chr(byte)
909
 
                                            for byte in value))
 
816
            value = dbus.ByteArray(''.join(unichr(byte)
 
817
                                           for byte in value))
910
818
        prop(value)
911
819
    
912
820
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
918
826
        Note: Will not include properties with access="write".
919
827
        """
920
828
        properties = {}
921
 
        for name, prop in self._get_all_dbus_things("property"):
 
829
        for name, prop in self._get_all_dbus_properties():
922
830
            if (interface_name
923
831
                and interface_name != prop._dbus_interface):
924
832
                # Interface non-empty but did not match
939
847
                         path_keyword='object_path',
940
848
                         connection_keyword='connection')
941
849
    def Introspect(self, object_path, connection):
942
 
        """Overloading of standard D-Bus method.
943
 
        
944
 
        Inserts property tags and interface annotation tags.
 
850
        """Standard D-Bus method, overloaded to insert property tags.
945
851
        """
946
852
        xmlstring = dbus.service.Object.Introspect(self, object_path,
947
853
                                                   connection)
954
860
                e.setAttribute("access", prop._dbus_access)
955
861
                return e
956
862
            for if_tag in document.getElementsByTagName("interface"):
957
 
                # Add property tags
958
863
                for tag in (make_tag(document, name, prop)
959
864
                            for name, prop
960
 
                            in self._get_all_dbus_things("property")
 
865
                            in self._get_all_dbus_properties()
961
866
                            if prop._dbus_interface
962
867
                            == if_tag.getAttribute("name")):
963
868
                    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
869
                # Add the names to the return values for the
996
870
                # "org.freedesktop.DBus.Properties" methods
997
871
                if (if_tag.getAttribute("name")
1012
886
        except (AttributeError, xml.dom.DOMException,
1013
887
                xml.parsers.expat.ExpatError) as error:
1014
888
            logger.error("Failed to override Introspection method",
1015
 
                         exc_info=error)
 
889
                         error)
1016
890
        return xmlstring
1017
891
 
1018
892
 
1019
 
def datetime_to_dbus(dt, variant_level=0):
 
893
def datetime_to_dbus (dt, variant_level=0):
1020
894
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1021
895
    if dt is None:
1022
896
        return dbus.String("", variant_level = variant_level)
1024
898
                       variant_level=variant_level)
1025
899
 
1026
900
 
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_interfaces({"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).
 
901
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
902
                                  .__metaclass__):
 
903
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
904
    will add additional D-Bus attributes matching a certain pattern.
1049
905
    """
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):
 
906
    def __new__(mcs, name, bases, attr):
 
907
        # Go through all the base classes which could have D-Bus
 
908
        # methods, signals, or properties in them
 
909
        for base in (b for b in bases
 
910
                     if issubclass(b, dbus.service.Object)):
 
911
            # Go though all attributes of the base class
 
912
            for attrname, attribute in inspect.getmembers(base):
1057
913
                # Ignore non-D-Bus attributes, and D-Bus attributes
1058
914
                # with the wrong interface name
1059
915
                if (not hasattr(attribute, "_dbus_interface")
1060
916
                    or not attribute._dbus_interface
1061
 
                    .startswith(orig_interface_name)):
 
917
                    .startswith("se.recompile.Mandos")):
1062
918
                    continue
1063
919
                # Create an alternate D-Bus interface name based on
1064
920
                # the current name
1065
921
                alt_interface = (attribute._dbus_interface
1066
 
                                 .replace(orig_interface_name,
1067
 
                                          alt_interface_name))
1068
 
                interface_names.add(alt_interface)
 
922
                                 .replace("se.recompile.Mandos",
 
923
                                          "se.bsnet.fukt.Mandos"))
1069
924
                # Is this a D-Bus signal?
1070
925
                if getattr(attribute, "_dbus_is_signal", False):
1071
926
                    # Extract the original non-method function by
1086
941
                                nonmethod_func.func_name,
1087
942
                                nonmethod_func.func_defaults,
1088
943
                                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
944
                    # 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
 
945
                    # old and new functions, so both the old and new
 
946
                    # signals gets sent when the function is called
1099
947
                    def fixscope(func1, func2):
1100
948
                        """This function is a scope container to pass
1101
949
                        func1 and func2 to the "call_both" function
1108
956
                        return call_both
1109
957
                    # Create the "call_both" function and add it to
1110
958
                    # the class
1111
 
                    attr[attrname] = fixscope(attribute, new_function)
 
959
                    attr[attrname] = fixscope(attribute,
 
960
                                              new_function)
1112
961
                # Is this a D-Bus method?
1113
962
                elif getattr(attribute, "_dbus_is_method", False):
1114
963
                    # Create a new, but exactly alike, function
1125
974
                                        attribute.func_name,
1126
975
                                        attribute.func_defaults,
1127
976
                                        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
977
                # Is this a D-Bus property?
1135
978
                elif getattr(attribute, "_dbus_is_property", False):
1136
979
                    # Create a new, but exactly alike, function
1150
993
                                        attribute.func_name,
1151
994
                                        attribute.func_defaults,
1152
995
                                        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"})
 
996
        return type.__new__(mcs, name, bases, attr)
 
997
 
 
998
 
1198
999
class ClientDBus(Client, DBusObjectWithProperties):
1199
1000
    """A Client class using D-Bus
1200
1001
    
1211
1012
    def __init__(self, bus = None, *args, **kwargs):
1212
1013
        self.bus = bus
1213
1014
        Client.__init__(self, *args, **kwargs)
 
1015
        
 
1016
        self._approvals_pending = 0
1214
1017
        # Only now, when this client is initialized, can it show up on
1215
1018
        # the D-Bus
1216
1019
        client_object_name = unicode(self.name).translate(
1220
1023
                                 ("/clients/" + client_object_name))
1221
1024
        DBusObjectWithProperties.__init__(self, self.bus,
1222
1025
                                          self.dbus_object_path)
1223
 
    
 
1026
        
1224
1027
    def notifychangeproperty(transform_func,
1225
1028
                             dbus_name, type_func=lambda x: x,
1226
1029
                             variant_level=1):
1249
1052
        
1250
1053
        return property(lambda self: getattr(self, attrname), setter)
1251
1054
    
 
1055
    
1252
1056
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1253
1057
    approvals_pending = notifychangeproperty(dbus.Boolean,
1254
1058
                                             "ApprovalPending",
1261
1065
                                       checker is not None)
1262
1066
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1263
1067
                                           "LastCheckedOK")
1264
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1265
 
                                               "LastCheckerStatus")
1266
1068
    last_approval_request = notifychangeproperty(
1267
1069
        datetime_to_dbus, "LastApprovalRequest")
1268
1070
    approved_by_default = notifychangeproperty(dbus.Boolean,
1269
1071
                                               "ApprovedByDefault")
1270
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1072
    approval_delay = notifychangeproperty(dbus.UInt16,
1271
1073
                                          "ApprovalDelay",
1272
1074
                                          type_func =
1273
 
                                          timedelta_to_milliseconds)
 
1075
                                          _timedelta_to_milliseconds)
1274
1076
    approval_duration = notifychangeproperty(
1275
 
        dbus.UInt64, "ApprovalDuration",
1276
 
        type_func = timedelta_to_milliseconds)
 
1077
        dbus.UInt16, "ApprovalDuration",
 
1078
        type_func = _timedelta_to_milliseconds)
1277
1079
    host = notifychangeproperty(dbus.String, "Host")
1278
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1080
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1279
1081
                                   type_func =
1280
 
                                   timedelta_to_milliseconds)
 
1082
                                   _timedelta_to_milliseconds)
1281
1083
    extended_timeout = notifychangeproperty(
1282
 
        dbus.UInt64, "ExtendedTimeout",
1283
 
        type_func = timedelta_to_milliseconds)
1284
 
    interval = notifychangeproperty(dbus.UInt64,
 
1084
        dbus.UInt16, "ExtendedTimeout",
 
1085
        type_func = _timedelta_to_milliseconds)
 
1086
    interval = notifychangeproperty(dbus.UInt16,
1285
1087
                                    "Interval",
1286
1088
                                    type_func =
1287
 
                                    timedelta_to_milliseconds)
 
1089
                                    _timedelta_to_milliseconds)
1288
1090
    checker_command = notifychangeproperty(dbus.String, "Checker")
1289
1091
    
1290
1092
    del notifychangeproperty
1332
1134
        return r
1333
1135
    
1334
1136
    def _reset_approved(self):
1335
 
        self.approved = None
 
1137
        self._approved = None
1336
1138
        return False
1337
1139
    
1338
1140
    def approve(self, value=True):
1339
 
        self.approved = value
1340
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1141
        self.send_changedstate()
 
1142
        self._approved = value
 
1143
        gobject.timeout_add(_timedelta_to_milliseconds
1341
1144
                            (self.approval_duration),
1342
1145
                            self._reset_approved)
1343
 
        self.send_changedstate()
 
1146
    
1344
1147
    
1345
1148
    ## D-Bus methods, signals & properties
1346
1149
    _interface = "se.recompile.Mandos.Client"
1347
1150
    
1348
 
    ## Interfaces
1349
 
    
1350
 
    @dbus_interface_annotations(_interface)
1351
 
    def _foo(self):
1352
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
 
                     "false"}
1354
 
    
1355
1151
    ## Signals
1356
1152
    
1357
1153
    # CheckerCompleted - signal
1393
1189
        "D-Bus signal"
1394
1190
        return self.need_approval()
1395
1191
    
 
1192
    # NeRwequest - signal
 
1193
    @dbus.service.signal(_interface, signature="s")
 
1194
    def NewRequest(self, ip):
 
1195
        """D-Bus signal
 
1196
        Is sent after a client request a password.
 
1197
        """
 
1198
        pass
 
1199
    
1396
1200
    ## Methods
1397
1201
    
1398
1202
    # Approve - method
1456
1260
                           access="readwrite")
1457
1261
    def ApprovalDuration_dbus_property(self, value=None):
1458
1262
        if value is None:       # get
1459
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1263
            return dbus.UInt64(_timedelta_to_milliseconds(
1460
1264
                    self.approval_duration))
1461
1265
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1462
1266
    
1476
1280
    def Host_dbus_property(self, value=None):
1477
1281
        if value is None:       # get
1478
1282
            return dbus.String(self.host)
1479
 
        self.host = unicode(value)
 
1283
        self.host = value
1480
1284
    
1481
1285
    # Created - property
1482
1286
    @dbus_service_property(_interface, signature="s", access="read")
1508
1312
            return
1509
1313
        return datetime_to_dbus(self.last_checked_ok)
1510
1314
    
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
1315
    # Expires - property
1518
1316
    @dbus_service_property(_interface, signature="s", access="read")
1519
1317
    def Expires_dbus_property(self):
1530
1328
    def Timeout_dbus_property(self, value=None):
1531
1329
        if value is None:       # get
1532
1330
            return dbus.UInt64(self.timeout_milliseconds())
1533
 
        old_timeout = self.timeout
1534
1331
        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))
 
1332
        if getattr(self, "disable_initiator_tag", None) is None:
 
1333
            return
 
1334
        # Reschedule timeout
 
1335
        gobject.source_remove(self.disable_initiator_tag)
 
1336
        self.disable_initiator_tag = None
 
1337
        self.expires = None
 
1338
        time_to_die = _timedelta_to_milliseconds((self
 
1339
                                                  .last_checked_ok
 
1340
                                                  + self.timeout)
 
1341
                                                 - datetime.datetime
 
1342
                                                 .utcnow())
 
1343
        if time_to_die <= 0:
 
1344
            # The timeout has passed
 
1345
            self.disable()
 
1346
        else:
 
1347
            self.expires = (datetime.datetime.utcnow()
 
1348
                            + datetime.timedelta(milliseconds =
 
1349
                                                 time_to_die))
 
1350
            self.disable_initiator_tag = (gobject.timeout_add
 
1351
                                          (time_to_die, self.disable))
1551
1352
    
1552
1353
    # ExtendedTimeout - property
1553
1354
    @dbus_service_property(_interface, signature="t",
1579
1380
    def Checker_dbus_property(self, value=None):
1580
1381
        if value is None:       # get
1581
1382
            return dbus.String(self.checker_command)
1582
 
        self.checker_command = unicode(value)
 
1383
        self.checker_command = value
1583
1384
    
1584
1385
    # CheckerRunning - property
1585
1386
    @dbus_service_property(_interface, signature="b",
1614
1415
            raise KeyError()
1615
1416
    
1616
1417
    def __getattribute__(self, name):
1617
 
        if name == '_pipe':
 
1418
        if(name == '_pipe'):
1618
1419
            return super(ProxyClient, self).__getattribute__(name)
1619
1420
        self._pipe.send(('getattr', name))
1620
1421
        data = self._pipe.recv()
1627
1428
            return func
1628
1429
    
1629
1430
    def __setattr__(self, name, value):
1630
 
        if name == '_pipe':
 
1431
        if(name == '_pipe'):
1631
1432
            return super(ProxyClient, self).__setattr__(name, value)
1632
1433
        self._pipe.send(('setattr', name, value))
1633
1434
 
1634
1435
 
 
1436
class ClientDBusTransitional(ClientDBus):
 
1437
    __metaclass__ = AlternateDBusNamesMetaclass
 
1438
 
 
1439
 
1635
1440
class ClientHandler(socketserver.BaseRequestHandler, object):
1636
1441
    """A class to handle client connections.
1637
1442
    
1698
1503
                    logger.warning("Bad certificate: %s", error)
1699
1504
                    return
1700
1505
                logger.debug("Fingerprint: %s", fpr)
 
1506
                if self.server.use_dbus:
 
1507
                    # Emit D-Bus signal
 
1508
                    client.NewRequest(str(self.client_address))
1701
1509
                
1702
1510
                try:
1703
1511
                    client = ProxyClient(child_pipe, fpr,
1719
1527
                            client.Rejected("Disabled")
1720
1528
                        return
1721
1529
                    
1722
 
                    if client.approved or not client.approval_delay:
 
1530
                    if client._approved or not client.approval_delay:
1723
1531
                        #We are approved or approval is disabled
1724
1532
                        break
1725
 
                    elif client.approved is None:
 
1533
                    elif client._approved is None:
1726
1534
                        logger.info("Client %s needs approval",
1727
1535
                                    client.name)
1728
1536
                        if self.server.use_dbus:
1741
1549
                    #wait until timeout or approved
1742
1550
                    time = datetime.datetime.now()
1743
1551
                    client.changedstate.acquire()
1744
 
                    client.changedstate.wait(
1745
 
                        float(timedelta_to_milliseconds(delay)
1746
 
                              / 1000))
 
1552
                    (client.changedstate.wait
 
1553
                     (float(client._timedelta_to_milliseconds(delay)
 
1554
                            / 1000)))
1747
1555
                    client.changedstate.release()
1748
1556
                    time2 = datetime.datetime.now()
1749
1557
                    if (time2 - time) >= delay:
1765
1573
                    try:
1766
1574
                        sent = session.send(client.secret[sent_size:])
1767
1575
                    except gnutls.errors.GNUTLSError as error:
1768
 
                        logger.warning("gnutls send failed",
1769
 
                                       exc_info=error)
 
1576
                        logger.warning("gnutls send failed")
1770
1577
                        return
1771
1578
                    logger.debug("Sent: %d, remaining: %d",
1772
1579
                                 sent, len(client.secret)
1775
1582
                
1776
1583
                logger.info("Sending secret to %s", client.name)
1777
1584
                # bump the timeout using extended_timeout
1778
 
                client.bump_timeout(client.extended_timeout)
 
1585
                client.checked_ok(client.extended_timeout)
1779
1586
                if self.server.use_dbus:
1780
1587
                    # Emit D-Bus signal
1781
1588
                    client.GotSecret()
1786
1593
                try:
1787
1594
                    session.bye()
1788
1595
                except gnutls.errors.GNUTLSError as error:
1789
 
                    logger.warning("GnuTLS bye failed",
1790
 
                                   exc_info=error)
 
1596
                    logger.warning("GnuTLS bye failed")
1791
1597
    
1792
1598
    @staticmethod
1793
1599
    def peer_certificate(session):
1858
1664
    def sub_process_main(self, request, address):
1859
1665
        try:
1860
1666
            self.finish_request(request, address)
1861
 
        except Exception:
 
1667
        except:
1862
1668
            self.handle_error(request, address)
1863
1669
        self.close_request(request)
1864
1670
    
1865
1671
    def process_request(self, request, address):
1866
1672
        """Start a new process to process the request."""
1867
1673
        proc = multiprocessing.Process(target = self.sub_process_main,
1868
 
                                       args = (request, address))
 
1674
                                       args = (request,
 
1675
                                               address))
1869
1676
        proc.start()
1870
1677
        return proc
1871
1678
 
1899
1706
        use_ipv6:       Boolean; to use IPv6 or not
1900
1707
    """
1901
1708
    def __init__(self, server_address, RequestHandlerClass,
1902
 
                 interface=None, use_ipv6=True, socketfd=None):
1903
 
        """If socketfd is set, use that file descriptor instead of
1904
 
        creating a new one with socket.socket().
1905
 
        """
 
1709
                 interface=None, use_ipv6=True):
1906
1710
        self.interface = interface
1907
1711
        if use_ipv6:
1908
1712
            self.address_family = socket.AF_INET6
1909
 
        if socketfd is not None:
1910
 
            # Save the file descriptor
1911
 
            self.socketfd = socketfd
1912
 
            # Save the original socket.socket() function
1913
 
            self.socket_socket = socket.socket
1914
 
            # To implement --socket, we monkey patch socket.socket.
1915
 
            # 
1916
 
            # (When socketserver.TCPServer is a new-style class, we
1917
 
            # could make self.socket into a property instead of monkey
1918
 
            # patching socket.socket.)
1919
 
            # 
1920
 
            # Create a one-time-only replacement for socket.socket()
1921
 
            @functools.wraps(socket.socket)
1922
 
            def socket_wrapper(*args, **kwargs):
1923
 
                # Restore original function so subsequent calls are
1924
 
                # not affected.
1925
 
                socket.socket = self.socket_socket
1926
 
                del self.socket_socket
1927
 
                # This time only, return a new socket object from the
1928
 
                # saved file descriptor.
1929
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1930
 
            # Replace socket.socket() function with wrapper
1931
 
            socket.socket = socket_wrapper
1932
 
        # The socketserver.TCPServer.__init__ will call
1933
 
        # socket.socket(), which might be our replacement,
1934
 
        # socket_wrapper(), if socketfd was set.
1935
1713
        socketserver.TCPServer.__init__(self, server_address,
1936
1714
                                        RequestHandlerClass)
1937
 
    
1938
1715
    def server_bind(self):
1939
1716
        """This overrides the normal server_bind() function
1940
1717
        to bind to an interface if one was specified, and also NOT to
1951
1728
                                           str(self.interface
1952
1729
                                               + '\0'))
1953
1730
                except socket.error as error:
1954
 
                    if error.errno == errno.EPERM:
 
1731
                    if error[0] == errno.EPERM:
1955
1732
                        logger.error("No permission to"
1956
1733
                                     " bind to interface %s",
1957
1734
                                     self.interface)
1958
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1735
                    elif error[0] == errno.ENOPROTOOPT:
1959
1736
                        logger.error("SO_BINDTODEVICE not available;"
1960
1737
                                     " cannot bind to interface %s",
1961
1738
                                     self.interface)
1962
 
                    elif error.errno == errno.ENODEV:
1963
 
                        logger.error("Interface %s does not"
1964
 
                                     " exist, cannot bind",
1965
 
                                     self.interface)
1966
1739
                    else:
1967
1740
                        raise
1968
1741
        # Only bind(2) the socket if we really need to.
1998
1771
    """
1999
1772
    def __init__(self, server_address, RequestHandlerClass,
2000
1773
                 interface=None, use_ipv6=True, clients=None,
2001
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1774
                 gnutls_priority=None, use_dbus=True):
2002
1775
        self.enabled = False
2003
1776
        self.clients = clients
2004
1777
        if self.clients is None:
2008
1781
        IPv6_TCPServer.__init__(self, server_address,
2009
1782
                                RequestHandlerClass,
2010
1783
                                interface = interface,
2011
 
                                use_ipv6 = use_ipv6,
2012
 
                                socketfd = socketfd)
 
1784
                                use_ipv6 = use_ipv6)
2013
1785
    def server_activate(self):
2014
1786
        if self.enabled:
2015
1787
            return socketserver.TCPServer.server_activate(self)
2028
1800
    
2029
1801
    def handle_ipc(self, source, condition, parent_pipe=None,
2030
1802
                   proc = None, client_object=None):
 
1803
        condition_names = {
 
1804
            gobject.IO_IN: "IN",   # There is data to read.
 
1805
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1806
                                    # blocking).
 
1807
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1808
            gobject.IO_ERR: "ERR", # Error condition.
 
1809
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1810
                                    # broken, usually for pipes and
 
1811
                                    # sockets).
 
1812
            }
 
1813
        conditions_string = ' | '.join(name
 
1814
                                       for cond, name in
 
1815
                                       condition_names.iteritems()
 
1816
                                       if cond & condition)
2031
1817
        # error, or the other end of multiprocessing.Pipe has closed
2032
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1818
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2033
1819
            # Wait for other process to exit
2034
1820
            proc.join()
2035
1821
            return False
2125
1911
            elif suffix == "w":
2126
1912
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2127
1913
            else:
2128
 
                raise ValueError("Unknown suffix {0!r}"
2129
 
                                 .format(suffix))
 
1914
                raise ValueError("Unknown suffix %r" % suffix)
2130
1915
        except (ValueError, IndexError) as e:
2131
1916
            raise ValueError(*(e.args))
2132
1917
        timevalue += delta
2146
1931
        sys.exit()
2147
1932
    if not noclose:
2148
1933
        # Close all standard open file descriptors
2149
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1934
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2150
1935
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2151
1936
            raise OSError(errno.ENODEV,
2152
 
                          "{0} not a character device"
2153
 
                          .format(os.devnull))
 
1937
                          "%s not a character device"
 
1938
                          % os.path.devnull)
2154
1939
        os.dup2(null, sys.stdin.fileno())
2155
1940
        os.dup2(null, sys.stdout.fileno())
2156
1941
        os.dup2(null, sys.stderr.fileno())
2165
1950
    
2166
1951
    parser = argparse.ArgumentParser()
2167
1952
    parser.add_argument("-v", "--version", action="version",
2168
 
                        version = "%(prog)s {0}".format(version),
 
1953
                        version = "%%(prog)s %s" % version,
2169
1954
                        help="show version number and exit")
2170
1955
    parser.add_argument("-i", "--interface", metavar="IF",
2171
1956
                        help="Bind to interface IF")
2196
1981
    parser.add_argument("--no-restore", action="store_false",
2197
1982
                        dest="restore", help="Do not restore stored"
2198
1983
                        " state")
2199
 
    parser.add_argument("--socket", type=int,
2200
 
                        help="Specify a file descriptor to a network"
2201
 
                        " socket to use instead of creating one")
2202
1984
    parser.add_argument("--statedir", metavar="DIR",
2203
1985
                        help="Directory to save/restore state in")
2204
1986
    
2221
2003
                        "use_ipv6": "True",
2222
2004
                        "debuglevel": "",
2223
2005
                        "restore": "True",
2224
 
                        "socket": "",
2225
2006
                        "statedir": "/var/lib/mandos"
2226
2007
                        }
2227
2008
    
2239
2020
    if server_settings["port"]:
2240
2021
        server_settings["port"] = server_config.getint("DEFAULT",
2241
2022
                                                       "port")
2242
 
    if server_settings["socket"]:
2243
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2244
 
                                                         "socket")
2245
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2246
 
        # over with an opened os.devnull.  But we don't want this to
2247
 
        # happen with a supplied network socket.
2248
 
        if 0 <= server_settings["socket"] <= 2:
2249
 
            server_settings["socket"] = os.dup(server_settings
2250
 
                                               ["socket"])
2251
2023
    del server_config
2252
2024
    
2253
2025
    # Override the settings from the config file with command line
2255
2027
    for option in ("interface", "address", "port", "debug",
2256
2028
                   "priority", "servicename", "configdir",
2257
2029
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2258
 
                   "statedir", "socket"):
 
2030
                   "statedir"):
2259
2031
        value = getattr(options, option)
2260
2032
        if value is not None:
2261
2033
            server_settings[option] = value
2277
2049
                                     stored_state_file)
2278
2050
    
2279
2051
    if debug:
2280
 
        initlogger(debug, logging.DEBUG)
 
2052
        initlogger(logging.DEBUG)
2281
2053
    else:
2282
2054
        if not debuglevel:
2283
 
            initlogger(debug)
 
2055
            initlogger()
2284
2056
        else:
2285
2057
            level = getattr(logging, debuglevel.upper())
2286
 
            initlogger(debug, level)
 
2058
            initlogger(level)
2287
2059
    
2288
2060
    if server_settings["servicename"] != "Mandos":
2289
2061
        syslogger.setFormatter(logging.Formatter
2290
 
                               ('Mandos ({0}) [%(process)d]:'
2291
 
                                ' %(levelname)s: %(message)s'
2292
 
                                .format(server_settings
2293
 
                                        ["servicename"])))
 
2062
                               ('Mandos (%s) [%%(process)d]:'
 
2063
                                ' %%(levelname)s: %%(message)s'
 
2064
                                % server_settings["servicename"]))
2294
2065
    
2295
2066
    # Parse config file with clients
2296
 
    client_config = configparser.SafeConfigParser(Client
2297
 
                                                  .client_defaults)
 
2067
    client_defaults = { "timeout": "5m",
 
2068
                        "extended_timeout": "15m",
 
2069
                        "interval": "2m",
 
2070
                        "checker": "fping -q -- %%(host)s",
 
2071
                        "host": "",
 
2072
                        "approval_delay": "0s",
 
2073
                        "approval_duration": "1s",
 
2074
                        }
 
2075
    client_config = configparser.SafeConfigParser(client_defaults)
2298
2076
    client_config.read(os.path.join(server_settings["configdir"],
2299
2077
                                    "clients.conf"))
2300
2078
    
2309
2087
                              use_ipv6=use_ipv6,
2310
2088
                              gnutls_priority=
2311
2089
                              server_settings["priority"],
2312
 
                              use_dbus=use_dbus,
2313
 
                              socketfd=(server_settings["socket"]
2314
 
                                        or None))
 
2090
                              use_dbus=use_dbus)
2315
2091
    if not debug:
2316
2092
        pidfilename = "/var/run/mandos.pid"
2317
2093
        try:
2318
2094
            pidfile = open(pidfilename, "w")
2319
 
        except IOError as e:
2320
 
            logger.error("Could not open file %r", pidfilename,
2321
 
                         exc_info=e)
 
2095
        except IOError:
 
2096
            logger.error("Could not open file %r", pidfilename)
2322
2097
    
2323
 
    for name in ("_mandos", "mandos", "nobody"):
 
2098
    try:
 
2099
        uid = pwd.getpwnam("_mandos").pw_uid
 
2100
        gid = pwd.getpwnam("_mandos").pw_gid
 
2101
    except KeyError:
2324
2102
        try:
2325
 
            uid = pwd.getpwnam(name).pw_uid
2326
 
            gid = pwd.getpwnam(name).pw_gid
2327
 
            break
 
2103
            uid = pwd.getpwnam("mandos").pw_uid
 
2104
            gid = pwd.getpwnam("mandos").pw_gid
2328
2105
        except KeyError:
2329
 
            continue
2330
 
    else:
2331
 
        uid = 65534
2332
 
        gid = 65534
 
2106
            try:
 
2107
                uid = pwd.getpwnam("nobody").pw_uid
 
2108
                gid = pwd.getpwnam("nobody").pw_gid
 
2109
            except KeyError:
 
2110
                uid = 65534
 
2111
                gid = 65534
2333
2112
    try:
2334
2113
        os.setgid(gid)
2335
2114
        os.setuid(uid)
2336
2115
    except OSError as error:
2337
 
        if error.errno != errno.EPERM:
 
2116
        if error[0] != errno.EPERM:
2338
2117
            raise error
2339
2118
    
2340
2119
    if debug:
2352
2131
         .gnutls_global_set_log_function(debug_gnutls))
2353
2132
        
2354
2133
        # Redirect stdin so all checkers get /dev/null
2355
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2134
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2356
2135
        os.dup2(null, sys.stdin.fileno())
2357
2136
        if null > 2:
2358
2137
            os.close(null)
 
2138
    else:
 
2139
        # No console logging
 
2140
        logger.removeHandler(console)
2359
2141
    
2360
2142
    # Need to fork before connecting to D-Bus
2361
2143
    if not debug:
2362
2144
        # Close all input and output, do double fork, etc.
2363
2145
        daemon()
2364
2146
    
2365
 
    # multiprocessing will use threads, so before we use gobject we
2366
 
    # need to inform gobject that threads will be used.
2367
 
    gobject.threads_init()
2368
 
    
2369
2147
    global main_loop
2370
2148
    # From the Avahi example code
2371
 
    DBusGMainLoop(set_as_default=True)
 
2149
    DBusGMainLoop(set_as_default=True )
2372
2150
    main_loop = gobject.MainLoop()
2373
2151
    bus = dbus.SystemBus()
2374
2152
    # End of Avahi example code
2380
2158
                            ("se.bsnet.fukt.Mandos", bus,
2381
2159
                             do_not_queue=True))
2382
2160
        except dbus.exceptions.NameExistsException as e:
2383
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2161
            logger.error(unicode(e) + ", disabling D-Bus")
2384
2162
            use_dbus = False
2385
2163
            server_settings["use_dbus"] = False
2386
2164
            tcp_server.use_dbus = False
2398
2176
    
2399
2177
    client_class = Client
2400
2178
    if use_dbus:
2401
 
        client_class = functools.partial(ClientDBus, bus = bus)
2402
 
    
2403
 
    client_settings = Client.config_parser(client_config)
 
2179
        client_class = functools.partial(ClientDBusTransitional,
 
2180
                                         bus = bus)
 
2181
    
 
2182
    special_settings = {
 
2183
        # Some settings need to be accessd by special methods;
 
2184
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2185
        "approved_by_default":
 
2186
            lambda section:
 
2187
            client_config.getboolean(section, "approved_by_default"),
 
2188
        "enabled":
 
2189
            lambda section:
 
2190
            client_config.getboolean(section, "enabled"),
 
2191
        }
 
2192
    # Construct a new dict of client settings of this form:
 
2193
    # { client_name: {setting_name: value, ...}, ...}
 
2194
    # with exceptions for any special settings as defined above
 
2195
    client_settings = dict((clientname,
 
2196
                           dict((setting,
 
2197
                                 (value
 
2198
                                  if setting not in special_settings
 
2199
                                  else special_settings[setting]
 
2200
                                  (clientname)))
 
2201
                                for setting, value in
 
2202
                                client_config.items(clientname)))
 
2203
                          for clientname in client_config.sections())
 
2204
    
2404
2205
    old_client_settings = {}
2405
 
    clients_data = {}
 
2206
    clients_data = []
2406
2207
    
2407
2208
    # Get client data and settings from last running state.
2408
2209
    if server_settings["restore"]:
2412
2213
                                                     (stored_state))
2413
2214
            os.remove(stored_state_path)
2414
2215
        except IOError as e:
2415
 
            if e.errno == errno.ENOENT:
2416
 
                logger.warning("Could not load persistent state: {0}"
2417
 
                                .format(os.strerror(e.errno)))
2418
 
            else:
2419
 
                logger.critical("Could not load persistent state:",
2420
 
                                exc_info=e)
 
2216
            logger.warning("Could not load persistent state: {0}"
 
2217
                           .format(e))
 
2218
            if e.errno != errno.ENOENT:
2421
2219
                raise
2422
 
        except EOFError as e:
2423
 
            logger.warning("Could not load persistent state: "
2424
 
                           "EOFError:", exc_info=e)
2425
2220
    
2426
2221
    with PGPEngine() as pgp:
2427
 
        for client_name, client in clients_data.iteritems():
 
2222
        for client in clients_data:
 
2223
            client_name = client["name"]
 
2224
            
2428
2225
            # Decide which value to use after restoring saved state.
2429
2226
            # We have three different values: Old config file,
2430
2227
            # new config file, and saved state.
2438
2235
                    if (name != "secret" and
2439
2236
                        value != old_client_settings[client_name]
2440
2237
                        [name]):
2441
 
                        client[name] = value
 
2238
                        setattr(client, name, value)
2442
2239
                except KeyError:
2443
2240
                    pass
2444
2241
            
2445
2242
            # Clients who has passed its expire date can still be
2446
 
            # enabled if its last checker was successful.  Clients
2447
 
            # whose checker succeeded before we stored its state is
2448
 
            # assumed to have successfully run all checkers during
2449
 
            # downtime.
2450
 
            if client["enabled"]:
2451
 
                if datetime.datetime.utcnow() >= client["expires"]:
2452
 
                    if not client["last_checked_ok"]:
2453
 
                        logger.warning(
2454
 
                            "disabling client {0} - Client never "
2455
 
                            "performed a successful checker"
2456
 
                            .format(client_name))
2457
 
                        client["enabled"] = False
2458
 
                    elif client["last_checker_status"] != 0:
2459
 
                        logger.warning(
2460
 
                            "disabling client {0} - Client "
2461
 
                            "last checker failed with error code {1}"
2462
 
                            .format(client_name,
2463
 
                                    client["last_checker_status"]))
 
2243
            # enabled if its last checker was sucessful.  Clients
 
2244
            # whose checker failed before we stored its state is
 
2245
            # assumed to have failed all checkers during downtime.
 
2246
            if client["enabled"] and client["last_checked_ok"]:
 
2247
                if ((datetime.datetime.utcnow()
 
2248
                     - client["last_checked_ok"])
 
2249
                    > client["interval"]):
 
2250
                    if client["last_checker_status"] != 0:
2464
2251
                        client["enabled"] = False
2465
2252
                    else:
2466
2253
                        client["expires"] = (datetime.datetime
2467
2254
                                             .utcnow()
2468
2255
                                             + client["timeout"])
2469
 
                        logger.debug("Last checker succeeded,"
2470
 
                                     " keeping {0} enabled"
2471
 
                                     .format(client_name))
 
2256
            
 
2257
            client["changedstate"] = (multiprocessing_manager
 
2258
                                      .Condition
 
2259
                                      (multiprocessing_manager
 
2260
                                       .Lock()))
 
2261
            if use_dbus:
 
2262
                new_client = (ClientDBusTransitional.__new__
 
2263
                              (ClientDBusTransitional))
 
2264
                tcp_server.clients[client_name] = new_client
 
2265
                new_client.bus = bus
 
2266
                for name, value in client.iteritems():
 
2267
                    setattr(new_client, name, value)
 
2268
                client_object_name = unicode(client_name).translate(
 
2269
                    {ord("."): ord("_"),
 
2270
                     ord("-"): ord("_")})
 
2271
                new_client.dbus_object_path = (dbus.ObjectPath
 
2272
                                               ("/clients/"
 
2273
                                                + client_object_name))
 
2274
                DBusObjectWithProperties.__init__(new_client,
 
2275
                                                  new_client.bus,
 
2276
                                                  new_client
 
2277
                                                  .dbus_object_path)
 
2278
            else:
 
2279
                tcp_server.clients[client_name] = (Client.__new__
 
2280
                                                   (Client))
 
2281
                for name, value in client.iteritems():
 
2282
                    setattr(tcp_server.clients[client_name],
 
2283
                            name, value)
 
2284
            
2472
2285
            try:
2473
 
                client["secret"] = (
2474
 
                    pgp.decrypt(client["encrypted_secret"],
 
2286
                tcp_server.clients[client_name].secret = (
 
2287
                    pgp.decrypt(tcp_server.clients[client_name]
 
2288
                                .encrypted_secret,
2475
2289
                                client_settings[client_name]
2476
2290
                                ["secret"]))
2477
2291
            except PGPError:
2478
2292
                # If decryption fails, we use secret from new settings
2479
 
                logger.debug("Failed to decrypt {0} old secret"
2480
 
                             .format(client_name))
2481
 
                client["secret"] = (
 
2293
                tcp_server.clients[client_name].secret = (
2482
2294
                    client_settings[client_name]["secret"])
2483
2295
    
2484
 
    # Add/remove clients based on new changes made to config
2485
 
    for client_name in (set(old_client_settings)
2486
 
                        - set(client_settings)):
2487
 
        del clients_data[client_name]
2488
 
    for client_name in (set(client_settings)
2489
 
                        - set(old_client_settings)):
2490
 
        clients_data[client_name] = client_settings[client_name]
2491
 
    
2492
 
    # Create all client objects
2493
 
    for client_name, client in clients_data.iteritems():
2494
 
        tcp_server.clients[client_name] = client_class(
2495
 
            name = client_name, settings = client)
 
2296
    # Create/remove clients based on new changes made to config
 
2297
    for clientname in set(old_client_settings) - set(client_settings):
 
2298
        del tcp_server.clients[clientname]
 
2299
    for clientname in set(client_settings) - set(old_client_settings):
 
2300
        tcp_server.clients[clientname] = (client_class(name
 
2301
                                                       = clientname,
 
2302
                                                       config =
 
2303
                                                       client_settings
 
2304
                                                       [clientname]))
2496
2305
    
2497
2306
    if not tcp_server.clients:
2498
2307
        logger.warning("No clients defined")
2499
 
    
 
2308
        
2500
2309
    if not debug:
2501
2310
        try:
2502
2311
            with pidfile:
2510
2319
            # "pidfile" was never created
2511
2320
            pass
2512
2321
        del pidfilename
 
2322
        
 
2323
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2513
2324
    
2514
2325
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2515
2326
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2516
2327
    
2517
2328
    if use_dbus:
2518
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2519
 
                                        "se.bsnet.fukt.Mandos"})
2520
 
        class MandosDBusService(DBusObjectWithProperties):
 
2329
        class MandosDBusService(dbus.service.Object):
2521
2330
            """A D-Bus proxy object"""
2522
2331
            def __init__(self):
2523
2332
                dbus.service.Object.__init__(self, bus, "/")
2524
2333
            _interface = "se.recompile.Mandos"
2525
2334
            
2526
 
            @dbus_interface_annotations(_interface)
2527
 
            def _foo(self):
2528
 
                return { "org.freedesktop.DBus.Property"
2529
 
                         ".EmitsChangedSignal":
2530
 
                             "false"}
2531
 
            
2532
2335
            @dbus.service.signal(_interface, signature="o")
2533
2336
            def ClientAdded(self, objpath):
2534
2337
                "D-Bus signal"
2576
2379
            
2577
2380
            del _interface
2578
2381
        
2579
 
        mandos_dbus_service = MandosDBusService()
 
2382
        class MandosDBusServiceTransitional(MandosDBusService):
 
2383
            __metaclass__ = AlternateDBusNamesMetaclass
 
2384
        mandos_dbus_service = MandosDBusServiceTransitional()
2580
2385
    
2581
2386
    def cleanup():
2582
2387
        "Cleanup function; run on exit"
2589
2394
        # Store client before exiting. Secrets are encrypted with key
2590
2395
        # based on what config file has. If config file is
2591
2396
        # removed/edited, old secret will thus be unrecovable.
2592
 
        clients = {}
 
2397
        clients = []
2593
2398
        with PGPEngine() as pgp:
2594
2399
            for client in tcp_server.clients.itervalues():
2595
2400
                key = client_settings[client.name]["secret"]
2597
2402
                                                      key)
2598
2403
                client_dict = {}
2599
2404
                
2600
 
                # A list of attributes that can not be pickled
2601
 
                # + secret.
2602
 
                exclude = set(("bus", "changedstate", "secret",
2603
 
                               "checker"))
 
2405
                # A list of attributes that will not be stored when
 
2406
                # shutting down.
 
2407
                exclude = set(("bus", "changedstate", "secret"))
2604
2408
                for name, typ in (inspect.getmembers
2605
2409
                                  (dbus.service.Object)):
2606
2410
                    exclude.add(name)
2611
2415
                    if attr not in exclude:
2612
2416
                        client_dict[attr] = getattr(client, attr)
2613
2417
                
2614
 
                clients[client.name] = client_dict
 
2418
                clients.append(client_dict)
2615
2419
                del client_settings[client.name]["secret"]
2616
2420
        
2617
2421
        try:
2618
 
            with (tempfile.NamedTemporaryFile
2619
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2620
 
                   dir=os.path.dirname(stored_state_path),
2621
 
                   delete=False)) as stored_state:
 
2422
            with os.fdopen(os.open(stored_state_path,
 
2423
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2424
                                   0600), "wb") as stored_state:
2622
2425
                pickle.dump((clients, client_settings), stored_state)
2623
 
                tempname=stored_state.name
2624
 
            os.rename(tempname, stored_state_path)
2625
2426
        except (IOError, OSError) as e:
2626
 
            if not debug:
2627
 
                try:
2628
 
                    os.remove(tempname)
2629
 
                except NameError:
2630
 
                    pass
2631
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2632
 
                logger.warning("Could not save persistent state: {0}"
2633
 
                               .format(os.strerror(e.errno)))
2634
 
            else:
2635
 
                logger.warning("Could not save persistent state:",
2636
 
                               exc_info=e)
2637
 
                raise e
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
 
2429
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2430
                raise
2638
2431
        
2639
2432
        # Delete all clients, and settings from config
2640
2433
        while tcp_server.clients:
2667
2460
    service.port = tcp_server.socket.getsockname()[1]
2668
2461
    if use_ipv6:
2669
2462
        logger.info("Now listening on address %r, port %d,"
2670
 
                    " flowinfo %d, scope_id %d",
2671
 
                    *tcp_server.socket.getsockname())
 
2463
                    " flowinfo %d, scope_id %d"
 
2464
                    % tcp_server.socket.getsockname())
2672
2465
    else:                       # IPv4
2673
 
        logger.info("Now listening on address %r, port %d",
2674
 
                    *tcp_server.socket.getsockname())
 
2466
        logger.info("Now listening on address %r, port %d"
 
2467
                    % tcp_server.socket.getsockname())
2675
2468
    
2676
2469
    #service.interface = tcp_server.socket.getsockname()[3]
2677
2470
    
2680
2473
        try:
2681
2474
            service.activate()
2682
2475
        except dbus.exceptions.DBusException as error:
2683
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2476
            logger.critical("DBusException: %s", error)
2684
2477
            cleanup()
2685
2478
            sys.exit(1)
2686
2479
        # End of Avahi example code
2693
2486
        logger.debug("Starting main loop")
2694
2487
        main_loop.run()
2695
2488
    except AvahiError as error:
2696
 
        logger.critical("Avahi Error", exc_info=error)
 
2489
        logger.critical("AvahiError: %s", error)
2697
2490
        cleanup()
2698
2491
        sys.exit(1)
2699
2492
    except KeyboardInterrupt:
2704
2497
    # Must run before the D-Bus bus name gets deregistered
2705
2498
    cleanup()
2706
2499
 
 
2500
 
2707
2501
if __name__ == '__main__':
2708
2502
    main()