/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

Merge

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
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
89
85
    except ImportError:
90
86
        SO_BINDTODEVICE = None
91
87
 
92
 
version = "1.6.0"
 
88
 
 
89
version = "1.4.1"
93
90
stored_state_file = "clients.pickle"
94
91
 
95
92
logger = logging.getLogger()
114
111
        return interface_index
115
112
 
116
113
 
117
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
118
115
    """init logger and add loglevel"""
119
116
    
120
117
    syslogger.setFormatter(logging.Formatter
122
119
                            ' %(message)s'))
123
120
    logger.addHandler(syslogger)
124
121
    
125
 
    if debug:
126
 
        console = logging.StreamHandler()
127
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
128
 
                                               ' [%(process)d]:'
129
 
                                               ' %(levelname)s:'
130
 
                                               ' %(message)s'))
131
 
        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)
132
128
    logger.setLevel(level)
133
129
 
134
130
 
146
142
        self.gnupg.options.meta_interactive = False
147
143
        self.gnupg.options.homedir = self.tempdir
148
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
149
 
                                              '--quiet',
150
 
                                              '--no-use-agent'])
 
145
                                              '--quiet'])
151
146
    
152
147
    def __enter__(self):
153
148
        return self
154
149
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
150
    def __exit__ (self, exc_type, exc_value, traceback):
156
151
        self._cleanup()
157
152
        return False
158
153
    
179
174
    
180
175
    def encrypt(self, data, password):
181
176
        self.gnupg.passphrase = self.password_encode(password)
182
 
        with open(os.devnull, "w") as devnull:
 
177
        with open(os.devnull) as devnull:
183
178
            try:
184
179
                proc = self.gnupg.run(['--symmetric'],
185
180
                                      create_fhs=['stdin', 'stdout'],
196
191
    
197
192
    def decrypt(self, data, password):
198
193
        self.gnupg.passphrase = self.password_encode(password)
199
 
        with open(os.devnull, "w") as devnull:
 
194
        with open(os.devnull) as devnull:
200
195
            try:
201
196
                proc = self.gnupg.run(['--decrypt'],
202
197
                                      create_fhs=['stdin', 'stdout'],
203
198
                                      attach_fhs={'stderr': devnull})
204
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
199
                with contextlib.closing(proc.handles['stdin'] ) as f:
205
200
                    f.write(data)
206
201
                with contextlib.closing(proc.handles['stdout']) as f:
207
202
                    decrypted_plaintext = f.read()
212
207
        return decrypted_plaintext
213
208
 
214
209
 
 
210
 
215
211
class AvahiError(Exception):
216
212
    def __init__(self, value, *args, **kwargs):
217
213
        self.value = value
246
242
    server: D-Bus Server
247
243
    bus: dbus.SystemBus()
248
244
    """
249
 
    
250
245
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
246
                 servicetype = None, port = None, TXT = None,
252
247
                 domain = "", host = "", max_renames = 32768,
265
260
        self.server = None
266
261
        self.bus = bus
267
262
        self.entry_group_state_changed_match = None
268
 
    
269
263
    def rename(self):
270
264
        """Derived from the Avahi example code"""
271
265
        if self.rename_count >= self.max_renames:
281
275
        try:
282
276
            self.add()
283
277
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
278
            logger.critical("DBusException: %s", error)
285
279
            self.cleanup()
286
280
            os._exit(1)
287
281
        self.rename_count += 1
288
 
    
289
282
    def remove(self):
290
283
        """Derived from the Avahi example code"""
291
284
        if self.entry_group_state_changed_match is not None:
293
286
            self.entry_group_state_changed_match = None
294
287
        if self.group is not None:
295
288
            self.group.Reset()
296
 
    
297
289
    def add(self):
298
290
        """Derived from the Avahi example code"""
299
291
        self.remove()
316
308
            dbus.UInt16(self.port),
317
309
            avahi.string_array_to_txt_array(self.TXT))
318
310
        self.group.Commit()
319
 
    
320
311
    def entry_group_state_changed(self, state, error):
321
312
        """Derived from the Avahi example code"""
322
313
        logger.debug("Avahi entry group state change: %i", state)
329
320
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
321
            logger.critical("Avahi: Error in group state changed %s",
331
322
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
323
            raise AvahiGroupError("State changed: %s"
 
324
                                  % unicode(error))
335
325
    def cleanup(self):
336
326
        """Derived from the Avahi example code"""
337
327
        if self.group is not None:
342
332
                pass
343
333
            self.group = None
344
334
        self.remove()
345
 
    
346
335
    def server_state_changed(self, state, error=None):
347
336
        """Derived from the Avahi example code"""
348
337
        logger.debug("Avahi server state change: %i", state)
367
356
                logger.debug("Unknown state: %r", state)
368
357
            else:
369
358
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
359
    def activate(self):
372
360
        """Derived from the Avahi example code"""
373
361
        if self.server is None:
380
368
                                 self.server_state_changed)
381
369
        self.server_state_changed(self.server.GetState())
382
370
 
383
 
 
384
371
class AvahiServiceToSyslog(AvahiService):
385
372
    def rename(self):
386
373
        """Add the new name to the syslog messages"""
387
374
        ret = AvahiService.rename(self)
388
375
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
376
                               ('Mandos (%s) [%%(process)d]:'
 
377
                                ' %%(levelname)s: %%(message)s'
 
378
                                % self.name))
392
379
        return ret
393
380
 
394
 
 
395
381
def timedelta_to_milliseconds(td):
396
382
    "Convert a datetime.timedelta() to milliseconds"
397
383
    return ((td.days * 24 * 60 * 60 * 1000)
398
384
            + (td.seconds * 1000)
399
385
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
386
        
402
387
class Client(object):
403
388
    """A representation of a client host served by this server.
404
389
    
427
412
    interval:   datetime.timedelta(); How often to start a new checker
428
413
    last_approval_request: datetime.datetime(); (UTC) or None
429
414
    last_checked_ok: datetime.datetime(); (UTC) or None
 
415
 
430
416
    last_checker_status: integer between 0 and 255 reflecting exit
431
417
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
433
419
    last_enabled: datetime.datetime(); (UTC) or None
434
420
    name:       string; from the config file, used in log messages and
435
421
                        D-Bus identifiers
436
422
    secret:     bytestring; sent verbatim (over TLS) to client
437
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
424
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
440
426
    runtime_expansions: Allowed attributes for runtime expansion.
441
427
    expires:    datetime.datetime(); time (UTC) when a client will be
442
428
                disabled, or None
443
429
    """
444
430
    
445
431
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
449
434
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
453
 
                        "checker": "fping -q -- %%(host)s",
454
 
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
457
 
                        "approved_by_default": "True",
458
 
                        "enabled": "True",
459
 
                        }
460
435
    
461
436
    def timeout_milliseconds(self):
462
437
        "Return the 'timeout' attribute in milliseconds"
473
448
    def approval_delay_milliseconds(self):
474
449
        return timedelta_to_milliseconds(self.approval_delay)
475
450
    
476
 
    @staticmethod
477
 
    def config_parser(config):
478
 
        """Construct a new dict of client settings of this form:
479
 
        { client_name: {setting_name: value, ...}, ...}
480
 
        with exceptions for any special settings as defined above.
481
 
        NOTE: Must be a pure function. Must return the same result
482
 
        value given the same arguments.
483
 
        """
484
 
        settings = {}
485
 
        for client_name in config.sections():
486
 
            section = dict(config.items(client_name))
487
 
            client = settings[client_name] = {}
488
 
            
489
 
            client["host"] = section["host"]
490
 
            # Reformat values from string types to Python types
491
 
            client["approved_by_default"] = config.getboolean(
492
 
                client_name, "approved_by_default")
493
 
            client["enabled"] = config.getboolean(client_name,
494
 
                                                  "enabled")
495
 
            
496
 
            client["fingerprint"] = (section["fingerprint"].upper()
497
 
                                     .replace(" ", ""))
498
 
            if "secret" in section:
499
 
                client["secret"] = section["secret"].decode("base64")
500
 
            elif "secfile" in section:
501
 
                with open(os.path.expanduser(os.path.expandvars
502
 
                                             (section["secfile"])),
503
 
                          "rb") as secfile:
504
 
                    client["secret"] = secfile.read()
505
 
            else:
506
 
                raise TypeError("No secret or secfile for section {0}"
507
 
                                .format(section))
508
 
            client["timeout"] = string_to_delta(section["timeout"])
509
 
            client["extended_timeout"] = string_to_delta(
510
 
                section["extended_timeout"])
511
 
            client["interval"] = string_to_delta(section["interval"])
512
 
            client["approval_delay"] = string_to_delta(
513
 
                section["approval_delay"])
514
 
            client["approval_duration"] = string_to_delta(
515
 
                section["approval_duration"])
516
 
            client["checker_command"] = section["checker"]
517
 
            client["last_approval_request"] = None
518
 
            client["last_checked_ok"] = None
519
 
            client["last_checker_status"] = -2
520
 
        
521
 
        return settings
522
 
    
523
 
    def __init__(self, settings, name = None):
 
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."""
524
455
        self.name = name
525
 
        # adding all client settings
526
 
        for setting, value in settings.iteritems():
527
 
            setattr(self, setting, value)
528
 
        
529
 
        if self.enabled:
530
 
            if not hasattr(self, "last_enabled"):
531
 
                self.last_enabled = datetime.datetime.utcnow()
532
 
            if not hasattr(self, "expires"):
533
 
                self.expires = (datetime.datetime.utcnow()
534
 
                                + self.timeout)
535
 
        else:
536
 
            self.last_enabled = None
537
 
            self.expires = None
538
 
        
 
456
        if config is None:
 
457
            config = {}
539
458
        logger.debug("Creating client %r", self.name)
540
459
        # Uppercase and remove spaces from fingerprint for later
541
460
        # comparison purposes with return value from the fingerprint()
542
461
        # function
 
462
        self.fingerprint = (config["fingerprint"].upper()
 
463
                            .replace(" ", ""))
543
464
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
 
        self.created = settings.get("created",
545
 
                                    datetime.datetime.utcnow())
546
 
        
547
 
        # 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"])
548
489
        self.checker = None
549
490
        self.checker_initiator_tag = None
550
491
        self.disable_initiator_tag = None
 
492
        if self.enabled:
 
493
            self.expires = datetime.datetime.utcnow() + self.timeout
 
494
        else:
 
495
            self.expires = None
551
496
        self.checker_callback_tag = None
 
497
        self.checker_command = config["checker"]
552
498
        self.current_checker_command = None
553
499
        self.approved = None
 
500
        self.approved_by_default = config.get("approved_by_default",
 
501
                                              True)
554
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"])
555
507
        self.changedstate = (multiprocessing_manager
556
508
                             .Condition(multiprocessing_manager
557
509
                                        .Lock()))
577
529
        if getattr(self, "enabled", False):
578
530
            # Already enabled
579
531
            return
 
532
        self.send_changedstate()
580
533
        self.expires = datetime.datetime.utcnow() + self.timeout
581
534
        self.enabled = True
582
535
        self.last_enabled = datetime.datetime.utcnow()
583
536
        self.init_checker()
584
 
        self.send_changedstate()
585
537
    
586
538
    def disable(self, quiet=True):
587
539
        """Disable this client."""
588
540
        if not getattr(self, "enabled", False):
589
541
            return False
590
542
        if not quiet:
 
543
            self.send_changedstate()
 
544
        if not quiet:
591
545
            logger.info("Disabling client %s", self.name)
592
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
546
        if getattr(self, "disable_initiator_tag", False):
593
547
            gobject.source_remove(self.disable_initiator_tag)
594
548
            self.disable_initiator_tag = None
595
549
        self.expires = None
596
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
550
        if getattr(self, "checker_initiator_tag", False):
597
551
            gobject.source_remove(self.checker_initiator_tag)
598
552
            self.checker_initiator_tag = None
599
553
        self.stop_checker()
600
554
        self.enabled = False
601
 
        if not quiet:
602
 
            self.send_changedstate()
603
555
        # Do not run this again if called by a gobject.timeout_add
604
556
        return False
605
557
    
609
561
    def init_checker(self):
610
562
        # Schedule a new checker to be started an 'interval' from now,
611
563
        # and every interval from then on.
612
 
        if self.checker_initiator_tag is not None:
613
 
            gobject.source_remove(self.checker_initiator_tag)
614
564
        self.checker_initiator_tag = (gobject.timeout_add
615
565
                                      (self.interval_milliseconds(),
616
566
                                       self.start_checker))
617
567
        # Schedule a disable() when 'timeout' has passed
618
 
        if self.disable_initiator_tag is not None:
619
 
            gobject.source_remove(self.disable_initiator_tag)
620
568
        self.disable_initiator_tag = (gobject.timeout_add
621
569
                                   (self.timeout_milliseconds(),
622
570
                                    self.disable))
628
576
        self.checker_callback_tag = None
629
577
        self.checker = None
630
578
        if os.WIFEXITED(condition):
631
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
579
            self.last_checker_status =  os.WEXITSTATUS(condition)
632
580
            if self.last_checker_status == 0:
633
581
                logger.info("Checker for %(name)s succeeded",
634
582
                            vars(self))
641
589
            logger.warning("Checker for %(name)s crashed?",
642
590
                           vars(self))
643
591
    
644
 
    def checked_ok(self):
645
 
        """Assert that the client has been seen, alive and well."""
646
 
        self.last_checked_ok = datetime.datetime.utcnow()
647
 
        self.last_checker_status = 0
648
 
        self.bump_timeout()
649
 
    
650
 
    def bump_timeout(self, timeout=None):
651
 
        """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
        """
652
598
        if timeout is None:
653
599
            timeout = self.timeout
 
600
        self.last_checked_ok = datetime.datetime.utcnow()
654
601
        if self.disable_initiator_tag is not None:
655
602
            gobject.source_remove(self.disable_initiator_tag)
656
 
            self.disable_initiator_tag = None
657
603
        if getattr(self, "enabled", False):
658
604
            self.disable_initiator_tag = (gobject.timeout_add
659
605
                                          (timedelta_to_milliseconds
669
615
        If a checker already exists, leave it running and do
670
616
        nothing."""
671
617
        # The reason for not killing a running checker is that if we
672
 
        # did that, and if a checker (for some reason) started running
673
 
        # slowly and taking more than 'interval' time, then the client
674
 
        # would inevitably timeout, since no checker would get a
675
 
        # 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
676
622
        # checkers alone, the checker would have to take more time
677
623
        # than 'timeout' for the client to be disabled, which is as it
678
624
        # should be.
692
638
                                      self.current_checker_command)
693
639
        # Start a new checker if needed
694
640
        if self.checker is None:
695
 
            # Escape attributes for the shell
696
 
            escaped_attrs = dict(
697
 
                (attr, re.escape(unicode(getattr(self, attr))))
698
 
                for attr in
699
 
                self.runtime_expansions)
700
641
            try:
701
 
                command = self.checker_command % escaped_attrs
702
 
            except TypeError as error:
703
 
                logger.error('Could not format string "%s"',
704
 
                             self.checker_command, exc_info=error)
705
 
                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
706
660
            self.current_checker_command = command
707
661
            try:
708
662
                logger.info("Starting checker %r for %s",
714
668
                self.checker = subprocess.Popen(command,
715
669
                                                close_fds=True,
716
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)
717
681
            except OSError as error:
718
 
                logger.error("Failed to start subprocess",
719
 
                             exc_info=error)
720
 
            self.checker_callback_tag = (gobject.child_watch_add
721
 
                                         (self.checker.pid,
722
 
                                          self.checker_callback,
723
 
                                          data=command))
724
 
            # The checker may have completed before the gobject
725
 
            # watch was added.  Check for this.
726
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
 
            if pid:
728
 
                gobject.source_remove(self.checker_callback_tag)
729
 
                self.checker_callback(pid, status, command)
 
682
                logger.error("Failed to start subprocess: %s",
 
683
                             error)
730
684
        # Re-run this periodically if run by gobject.timeout_add
731
685
        return True
732
686
    
739
693
            return
740
694
        logger.debug("Stopping checker for %(name)s", vars(self))
741
695
        try:
742
 
            self.checker.terminate()
 
696
            os.kill(self.checker.pid, signal.SIGTERM)
743
697
            #time.sleep(0.5)
744
698
            #if self.checker.poll() is None:
745
 
            #    self.checker.kill()
 
699
            #    os.kill(self.checker.pid, signal.SIGKILL)
746
700
        except OSError as error:
747
701
            if error.errno != errno.ESRCH: # No such process
748
702
                raise
765
719
    # "Set" method, so we fail early here:
766
720
    if byte_arrays and signature != "ay":
767
721
        raise ValueError("Byte arrays not supported for non-'ay'"
768
 
                         " signature {0!r}".format(signature))
 
722
                         " signature %r" % signature)
769
723
    def decorator(func):
770
724
        func._dbus_is_property = True
771
725
        func._dbus_interface = dbus_interface
779
733
    return decorator
780
734
 
781
735
 
782
 
def dbus_interface_annotations(dbus_interface):
783
 
    """Decorator for marking functions returning interface annotations
784
 
    
785
 
    Usage:
786
 
    
787
 
    @dbus_interface_annotations("org.example.Interface")
788
 
    def _foo(self):  # Function name does not matter
789
 
        return {"org.freedesktop.DBus.Deprecated": "true",
790
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
791
 
                    "false"}
792
 
    """
793
 
    def decorator(func):
794
 
        func._dbus_is_interface = True
795
 
        func._dbus_interface = dbus_interface
796
 
        func._dbus_name = dbus_interface
797
 
        return func
798
 
    return decorator
799
 
 
800
 
 
801
 
def dbus_annotations(annotations):
802
 
    """Decorator to annotate D-Bus methods, signals or properties
803
 
    Usage:
804
 
    
805
 
    @dbus_service_property("org.example.Interface", signature="b",
806
 
                           access="r")
807
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
 
                        "org.freedesktop.DBus.Property."
809
 
                        "EmitsChangedSignal": "false"})
810
 
    def Property_dbus_property(self):
811
 
        return dbus.Boolean(False)
812
 
    """
813
 
    def decorator(func):
814
 
        func._dbus_annotations = annotations
815
 
        return func
816
 
    return decorator
817
 
 
818
 
 
819
736
class DBusPropertyException(dbus.exceptions.DBusException):
820
737
    """A base class for D-Bus property-related exceptions
821
738
    """
844
761
    """
845
762
    
846
763
    @staticmethod
847
 
    def _is_dbus_thing(thing):
848
 
        """Returns a function testing if an attribute is a D-Bus thing
849
 
        
850
 
        If called like _is_dbus_thing("method") it returns a function
851
 
        suitable for use as predicate to inspect.getmembers().
852
 
        """
853
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
854
 
                                   False)
 
764
    def _is_dbus_property(obj):
 
765
        return getattr(obj, "_dbus_is_property", False)
855
766
    
856
 
    def _get_all_dbus_things(self, thing):
 
767
    def _get_all_dbus_properties(self):
857
768
        """Returns a generator of (name, attribute) pairs
858
769
        """
859
 
        return ((getattr(athing.__get__(self), "_dbus_name",
860
 
                         name),
861
 
                 athing.__get__(self))
 
770
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
862
771
                for cls in self.__class__.__mro__
863
 
                for name, athing in
864
 
                inspect.getmembers(cls,
865
 
                                   self._is_dbus_thing(thing)))
 
772
                for name, prop in
 
773
                inspect.getmembers(cls, self._is_dbus_property))
866
774
    
867
775
    def _get_dbus_property(self, interface_name, property_name):
868
776
        """Returns a bound method if one exists which is a D-Bus
870
778
        """
871
779
        for cls in  self.__class__.__mro__:
872
780
            for name, value in (inspect.getmembers
873
 
                                (cls,
874
 
                                 self._is_dbus_thing("property"))):
 
781
                                (cls, self._is_dbus_property)):
875
782
                if (value._dbus_name == property_name
876
783
                    and value._dbus_interface == interface_name):
877
784
                    return value.__get__(self)
906
813
            # signatures other than "ay".
907
814
            if prop._dbus_signature != "ay":
908
815
                raise ValueError
909
 
            value = dbus.ByteArray(b''.join(chr(byte)
910
 
                                            for byte in value))
 
816
            value = dbus.ByteArray(''.join(unichr(byte)
 
817
                                           for byte in value))
911
818
        prop(value)
912
819
    
913
820
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
919
826
        Note: Will not include properties with access="write".
920
827
        """
921
828
        properties = {}
922
 
        for name, prop in self._get_all_dbus_things("property"):
 
829
        for name, prop in self._get_all_dbus_properties():
923
830
            if (interface_name
924
831
                and interface_name != prop._dbus_interface):
925
832
                # Interface non-empty but did not match
940
847
                         path_keyword='object_path',
941
848
                         connection_keyword='connection')
942
849
    def Introspect(self, object_path, connection):
943
 
        """Overloading of standard D-Bus method.
944
 
        
945
 
        Inserts property tags and interface annotation tags.
 
850
        """Standard D-Bus method, overloaded to insert property tags.
946
851
        """
947
852
        xmlstring = dbus.service.Object.Introspect(self, object_path,
948
853
                                                   connection)
955
860
                e.setAttribute("access", prop._dbus_access)
956
861
                return e
957
862
            for if_tag in document.getElementsByTagName("interface"):
958
 
                # Add property tags
959
863
                for tag in (make_tag(document, name, prop)
960
864
                            for name, prop
961
 
                            in self._get_all_dbus_things("property")
 
865
                            in self._get_all_dbus_properties()
962
866
                            if prop._dbus_interface
963
867
                            == if_tag.getAttribute("name")):
964
868
                    if_tag.appendChild(tag)
965
 
                # Add annotation tags
966
 
                for typ in ("method", "signal", "property"):
967
 
                    for tag in if_tag.getElementsByTagName(typ):
968
 
                        annots = dict()
969
 
                        for name, prop in (self.
970
 
                                           _get_all_dbus_things(typ)):
971
 
                            if (name == tag.getAttribute("name")
972
 
                                and prop._dbus_interface
973
 
                                == if_tag.getAttribute("name")):
974
 
                                annots.update(getattr
975
 
                                              (prop,
976
 
                                               "_dbus_annotations",
977
 
                                               {}))
978
 
                        for name, value in annots.iteritems():
979
 
                            ann_tag = document.createElement(
980
 
                                "annotation")
981
 
                            ann_tag.setAttribute("name", name)
982
 
                            ann_tag.setAttribute("value", value)
983
 
                            tag.appendChild(ann_tag)
984
 
                # Add interface annotation tags
985
 
                for annotation, value in dict(
986
 
                    itertools.chain.from_iterable(
987
 
                        annotations().iteritems()
988
 
                        for name, annotations in
989
 
                        self._get_all_dbus_things("interface")
990
 
                        if name == if_tag.getAttribute("name")
991
 
                        )).iteritems():
992
 
                    ann_tag = document.createElement("annotation")
993
 
                    ann_tag.setAttribute("name", annotation)
994
 
                    ann_tag.setAttribute("value", value)
995
 
                    if_tag.appendChild(ann_tag)
996
869
                # Add the names to the return values for the
997
870
                # "org.freedesktop.DBus.Properties" methods
998
871
                if (if_tag.getAttribute("name")
1013
886
        except (AttributeError, xml.dom.DOMException,
1014
887
                xml.parsers.expat.ExpatError) as error:
1015
888
            logger.error("Failed to override Introspection method",
1016
 
                         exc_info=error)
 
889
                         error)
1017
890
        return xmlstring
1018
891
 
1019
892
 
1020
 
def datetime_to_dbus(dt, variant_level=0):
 
893
def datetime_to_dbus (dt, variant_level=0):
1021
894
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1022
895
    if dt is None:
1023
896
        return dbus.String("", variant_level = variant_level)
1025
898
                       variant_level=variant_level)
1026
899
 
1027
900
 
1028
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1029
 
    """A class decorator; applied to a subclass of
1030
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1031
 
    interface names according to the "alt_interface_names" mapping.
1032
 
    Usage:
1033
 
    
1034
 
    @alternate_dbus_interfaces({"org.example.Interface":
1035
 
                                    "net.example.AlternateInterface"})
1036
 
    class SampleDBusObject(dbus.service.Object):
1037
 
        @dbus.service.method("org.example.Interface")
1038
 
        def SampleDBusMethod():
1039
 
            pass
1040
 
    
1041
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1042
 
    reachable via two interfaces: "org.example.Interface" and
1043
 
    "net.example.AlternateInterface", the latter of which will have
1044
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1045
 
    "true", unless "deprecate" is passed with a False value.
1046
 
    
1047
 
    This works for methods and signals, and also for D-Bus properties
1048
 
    (from DBusObjectWithProperties) and interfaces (from the
1049
 
    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.
1050
905
    """
1051
 
    def wrapper(cls):
1052
 
        for orig_interface_name, alt_interface_name in (
1053
 
            alt_interface_names.iteritems()):
1054
 
            attr = {}
1055
 
            interface_names = set()
1056
 
            # Go though all attributes of the class
1057
 
            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):
1058
913
                # Ignore non-D-Bus attributes, and D-Bus attributes
1059
914
                # with the wrong interface name
1060
915
                if (not hasattr(attribute, "_dbus_interface")
1061
916
                    or not attribute._dbus_interface
1062
 
                    .startswith(orig_interface_name)):
 
917
                    .startswith("se.recompile.Mandos")):
1063
918
                    continue
1064
919
                # Create an alternate D-Bus interface name based on
1065
920
                # the current name
1066
921
                alt_interface = (attribute._dbus_interface
1067
 
                                 .replace(orig_interface_name,
1068
 
                                          alt_interface_name))
1069
 
                interface_names.add(alt_interface)
 
922
                                 .replace("se.recompile.Mandos",
 
923
                                          "se.bsnet.fukt.Mandos"))
1070
924
                # Is this a D-Bus signal?
1071
925
                if getattr(attribute, "_dbus_is_signal", False):
1072
926
                    # Extract the original non-method function by
1087
941
                                nonmethod_func.func_name,
1088
942
                                nonmethod_func.func_defaults,
1089
943
                                nonmethod_func.func_closure)))
1090
 
                    # Copy annotations, if any
1091
 
                    try:
1092
 
                        new_function._dbus_annotations = (
1093
 
                            dict(attribute._dbus_annotations))
1094
 
                    except AttributeError:
1095
 
                        pass
1096
944
                    # Define a creator of a function to call both the
1097
 
                    # original and alternate functions, so both the
1098
 
                    # original and alternate signals gets sent when
1099
 
                    # the function is called
 
945
                    # old and new functions, so both the old and new
 
946
                    # signals gets sent when the function is called
1100
947
                    def fixscope(func1, func2):
1101
948
                        """This function is a scope container to pass
1102
949
                        func1 and func2 to the "call_both" function
1109
956
                        return call_both
1110
957
                    # Create the "call_both" function and add it to
1111
958
                    # the class
1112
 
                    attr[attrname] = fixscope(attribute, new_function)
 
959
                    attr[attrname] = fixscope(attribute,
 
960
                                              new_function)
1113
961
                # Is this a D-Bus method?
1114
962
                elif getattr(attribute, "_dbus_is_method", False):
1115
963
                    # Create a new, but exactly alike, function
1126
974
                                        attribute.func_name,
1127
975
                                        attribute.func_defaults,
1128
976
                                        attribute.func_closure)))
1129
 
                    # Copy annotations, if any
1130
 
                    try:
1131
 
                        attr[attrname]._dbus_annotations = (
1132
 
                            dict(attribute._dbus_annotations))
1133
 
                    except AttributeError:
1134
 
                        pass
1135
977
                # Is this a D-Bus property?
1136
978
                elif getattr(attribute, "_dbus_is_property", False):
1137
979
                    # Create a new, but exactly alike, function
1151
993
                                        attribute.func_name,
1152
994
                                        attribute.func_defaults,
1153
995
                                        attribute.func_closure)))
1154
 
                    # Copy annotations, if any
1155
 
                    try:
1156
 
                        attr[attrname]._dbus_annotations = (
1157
 
                            dict(attribute._dbus_annotations))
1158
 
                    except AttributeError:
1159
 
                        pass
1160
 
                # Is this a D-Bus interface?
1161
 
                elif getattr(attribute, "_dbus_is_interface", False):
1162
 
                    # Create a new, but exactly alike, function
1163
 
                    # object.  Decorate it to be a new D-Bus interface
1164
 
                    # with the alternate D-Bus interface name.  Add it
1165
 
                    # to the class.
1166
 
                    attr[attrname] = (dbus_interface_annotations
1167
 
                                      (alt_interface)
1168
 
                                      (types.FunctionType
1169
 
                                       (attribute.func_code,
1170
 
                                        attribute.func_globals,
1171
 
                                        attribute.func_name,
1172
 
                                        attribute.func_defaults,
1173
 
                                        attribute.func_closure)))
1174
 
            if deprecate:
1175
 
                # Deprecate all alternate interfaces
1176
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1177
 
                for interface_name in interface_names:
1178
 
                    @dbus_interface_annotations(interface_name)
1179
 
                    def func(self):
1180
 
                        return { "org.freedesktop.DBus.Deprecated":
1181
 
                                     "true" }
1182
 
                    # Find an unused name
1183
 
                    for aname in (iname.format(i)
1184
 
                                  for i in itertools.count()):
1185
 
                        if aname not in attr:
1186
 
                            attr[aname] = func
1187
 
                            break
1188
 
            if interface_names:
1189
 
                # Replace the class with a new subclass of it with
1190
 
                # methods, signals, etc. as created above.
1191
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1192
 
                           (cls,), attr)
1193
 
        return cls
1194
 
    return wrapper
1195
 
 
1196
 
 
1197
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1198
 
                                "se.bsnet.fukt.Mandos"})
 
996
        return type.__new__(mcs, name, bases, attr)
 
997
 
 
998
 
1199
999
class ClientDBus(Client, DBusObjectWithProperties):
1200
1000
    """A Client class using D-Bus
1201
1001
    
1212
1012
    def __init__(self, bus = None, *args, **kwargs):
1213
1013
        self.bus = bus
1214
1014
        Client.__init__(self, *args, **kwargs)
 
1015
        
 
1016
        self._approvals_pending = 0
1215
1017
        # Only now, when this client is initialized, can it show up on
1216
1018
        # the D-Bus
1217
1019
        client_object_name = unicode(self.name).translate(
1221
1023
                                 ("/clients/" + client_object_name))
1222
1024
        DBusObjectWithProperties.__init__(self, self.bus,
1223
1025
                                          self.dbus_object_path)
1224
 
    
 
1026
        
1225
1027
    def notifychangeproperty(transform_func,
1226
1028
                             dbus_name, type_func=lambda x: x,
1227
1029
                             variant_level=1):
1250
1052
        
1251
1053
        return property(lambda self: getattr(self, attrname), setter)
1252
1054
    
 
1055
    
1253
1056
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1254
1057
    approvals_pending = notifychangeproperty(dbus.Boolean,
1255
1058
                                             "ApprovalPending",
1262
1065
                                       checker is not None)
1263
1066
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1264
1067
                                           "LastCheckedOK")
1265
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1266
 
                                               "LastCheckerStatus")
1267
1068
    last_approval_request = notifychangeproperty(
1268
1069
        datetime_to_dbus, "LastApprovalRequest")
1269
1070
    approved_by_default = notifychangeproperty(dbus.Boolean,
1270
1071
                                               "ApprovedByDefault")
1271
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1072
    approval_delay = notifychangeproperty(dbus.UInt16,
1272
1073
                                          "ApprovalDelay",
1273
1074
                                          type_func =
1274
1075
                                          timedelta_to_milliseconds)
1275
1076
    approval_duration = notifychangeproperty(
1276
 
        dbus.UInt64, "ApprovalDuration",
 
1077
        dbus.UInt16, "ApprovalDuration",
1277
1078
        type_func = timedelta_to_milliseconds)
1278
1079
    host = notifychangeproperty(dbus.String, "Host")
1279
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1080
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1280
1081
                                   type_func =
1281
1082
                                   timedelta_to_milliseconds)
1282
1083
    extended_timeout = notifychangeproperty(
1283
 
        dbus.UInt64, "ExtendedTimeout",
 
1084
        dbus.UInt16, "ExtendedTimeout",
1284
1085
        type_func = timedelta_to_milliseconds)
1285
 
    interval = notifychangeproperty(dbus.UInt64,
 
1086
    interval = notifychangeproperty(dbus.UInt16,
1286
1087
                                    "Interval",
1287
1088
                                    type_func =
1288
1089
                                    timedelta_to_milliseconds)
1337
1138
        return False
1338
1139
    
1339
1140
    def approve(self, value=True):
 
1141
        self.send_changedstate()
1340
1142
        self.approved = value
1341
1143
        gobject.timeout_add(timedelta_to_milliseconds
1342
1144
                            (self.approval_duration),
1343
1145
                            self._reset_approved)
1344
 
        self.send_changedstate()
 
1146
    
1345
1147
    
1346
1148
    ## D-Bus methods, signals & properties
1347
1149
    _interface = "se.recompile.Mandos.Client"
1348
1150
    
1349
 
    ## Interfaces
1350
 
    
1351
 
    @dbus_interface_annotations(_interface)
1352
 
    def _foo(self):
1353
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1354
 
                     "false"}
1355
 
    
1356
1151
    ## Signals
1357
1152
    
1358
1153
    # CheckerCompleted - signal
1394
1189
        "D-Bus signal"
1395
1190
        return self.need_approval()
1396
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
    
1397
1200
    ## Methods
1398
1201
    
1399
1202
    # Approve - method
1477
1280
    def Host_dbus_property(self, value=None):
1478
1281
        if value is None:       # get
1479
1282
            return dbus.String(self.host)
1480
 
        self.host = unicode(value)
 
1283
        self.host = value
1481
1284
    
1482
1285
    # Created - property
1483
1286
    @dbus_service_property(_interface, signature="s", access="read")
1509
1312
            return
1510
1313
        return datetime_to_dbus(self.last_checked_ok)
1511
1314
    
1512
 
    # LastCheckerStatus - property
1513
 
    @dbus_service_property(_interface, signature="n",
1514
 
                           access="read")
1515
 
    def LastCheckerStatus_dbus_property(self):
1516
 
        return dbus.Int16(self.last_checker_status)
1517
 
    
1518
1315
    # Expires - property
1519
1316
    @dbus_service_property(_interface, signature="s", access="read")
1520
1317
    def Expires_dbus_property(self):
1531
1328
    def Timeout_dbus_property(self, value=None):
1532
1329
        if value is None:       # get
1533
1330
            return dbus.UInt64(self.timeout_milliseconds())
1534
 
        old_timeout = self.timeout
1535
1331
        self.timeout = datetime.timedelta(0, 0, 0, value)
1536
 
        # Reschedule disabling
1537
 
        if self.enabled:
1538
 
            now = datetime.datetime.utcnow()
1539
 
            self.expires += self.timeout - old_timeout
1540
 
            if self.expires <= now:
1541
 
                # The timeout has passed
1542
 
                self.disable()
1543
 
            else:
1544
 
                if (getattr(self, "disable_initiator_tag", None)
1545
 
                    is None):
1546
 
                    return
1547
 
                gobject.source_remove(self.disable_initiator_tag)
1548
 
                self.disable_initiator_tag = (
1549
 
                    gobject.timeout_add(
1550
 
                        timedelta_to_milliseconds(self.expires - now),
1551
 
                        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))
1552
1352
    
1553
1353
    # ExtendedTimeout - property
1554
1354
    @dbus_service_property(_interface, signature="t",
1580
1380
    def Checker_dbus_property(self, value=None):
1581
1381
        if value is None:       # get
1582
1382
            return dbus.String(self.checker_command)
1583
 
        self.checker_command = unicode(value)
 
1383
        self.checker_command = value
1584
1384
    
1585
1385
    # CheckerRunning - property
1586
1386
    @dbus_service_property(_interface, signature="b",
1633
1433
        self._pipe.send(('setattr', name, value))
1634
1434
 
1635
1435
 
 
1436
class ClientDBusTransitional(ClientDBus):
 
1437
    __metaclass__ = AlternateDBusNamesMetaclass
 
1438
 
 
1439
 
1636
1440
class ClientHandler(socketserver.BaseRequestHandler, object):
1637
1441
    """A class to handle client connections.
1638
1442
    
1706
1510
                except KeyError:
1707
1511
                    return
1708
1512
                
 
1513
                if self.server.use_dbus:
 
1514
                    # Emit D-Bus signal
 
1515
                    client.NewRequest(str(self.client_address))
 
1516
                
1709
1517
                if client.approval_delay:
1710
1518
                    delay = client.approval_delay
1711
1519
                    client.approvals_pending += 1
1742
1550
                    #wait until timeout or approved
1743
1551
                    time = datetime.datetime.now()
1744
1552
                    client.changedstate.acquire()
1745
 
                    client.changedstate.wait(
1746
 
                        float(timedelta_to_milliseconds(delay)
1747
 
                              / 1000))
 
1553
                    (client.changedstate.wait
 
1554
                     (float(client.timedelta_to_milliseconds(delay)
 
1555
                            / 1000)))
1748
1556
                    client.changedstate.release()
1749
1557
                    time2 = datetime.datetime.now()
1750
1558
                    if (time2 - time) >= delay:
1766
1574
                    try:
1767
1575
                        sent = session.send(client.secret[sent_size:])
1768
1576
                    except gnutls.errors.GNUTLSError as error:
1769
 
                        logger.warning("gnutls send failed",
1770
 
                                       exc_info=error)
 
1577
                        logger.warning("gnutls send failed")
1771
1578
                        return
1772
1579
                    logger.debug("Sent: %d, remaining: %d",
1773
1580
                                 sent, len(client.secret)
1776
1583
                
1777
1584
                logger.info("Sending secret to %s", client.name)
1778
1585
                # bump the timeout using extended_timeout
1779
 
                client.bump_timeout(client.extended_timeout)
 
1586
                client.checked_ok(client.extended_timeout)
1780
1587
                if self.server.use_dbus:
1781
1588
                    # Emit D-Bus signal
1782
1589
                    client.GotSecret()
1787
1594
                try:
1788
1595
                    session.bye()
1789
1596
                except gnutls.errors.GNUTLSError as error:
1790
 
                    logger.warning("GnuTLS bye failed",
1791
 
                                   exc_info=error)
 
1597
                    logger.warning("GnuTLS bye failed")
1792
1598
    
1793
1599
    @staticmethod
1794
1600
    def peer_certificate(session):
1859
1665
    def sub_process_main(self, request, address):
1860
1666
        try:
1861
1667
            self.finish_request(request, address)
1862
 
        except Exception:
 
1668
        except:
1863
1669
            self.handle_error(request, address)
1864
1670
        self.close_request(request)
1865
1671
    
1866
1672
    def process_request(self, request, address):
1867
1673
        """Start a new process to process the request."""
1868
1674
        proc = multiprocessing.Process(target = self.sub_process_main,
1869
 
                                       args = (request, address))
 
1675
                                       args = (request,
 
1676
                                               address))
1870
1677
        proc.start()
1871
1678
        return proc
1872
1679
 
1900
1707
        use_ipv6:       Boolean; to use IPv6 or not
1901
1708
    """
1902
1709
    def __init__(self, server_address, RequestHandlerClass,
1903
 
                 interface=None, use_ipv6=True, socketfd=None):
1904
 
        """If socketfd is set, use that file descriptor instead of
1905
 
        creating a new one with socket.socket().
1906
 
        """
 
1710
                 interface=None, use_ipv6=True):
1907
1711
        self.interface = interface
1908
1712
        if use_ipv6:
1909
1713
            self.address_family = socket.AF_INET6
1910
 
        if socketfd is not None:
1911
 
            # Save the file descriptor
1912
 
            self.socketfd = socketfd
1913
 
            # Save the original socket.socket() function
1914
 
            self.socket_socket = socket.socket
1915
 
            # To implement --socket, we monkey patch socket.socket.
1916
 
            # 
1917
 
            # (When socketserver.TCPServer is a new-style class, we
1918
 
            # could make self.socket into a property instead of monkey
1919
 
            # patching socket.socket.)
1920
 
            # 
1921
 
            # Create a one-time-only replacement for socket.socket()
1922
 
            @functools.wraps(socket.socket)
1923
 
            def socket_wrapper(*args, **kwargs):
1924
 
                # Restore original function so subsequent calls are
1925
 
                # not affected.
1926
 
                socket.socket = self.socket_socket
1927
 
                del self.socket_socket
1928
 
                # This time only, return a new socket object from the
1929
 
                # saved file descriptor.
1930
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1931
 
            # Replace socket.socket() function with wrapper
1932
 
            socket.socket = socket_wrapper
1933
 
        # The socketserver.TCPServer.__init__ will call
1934
 
        # socket.socket(), which might be our replacement,
1935
 
        # socket_wrapper(), if socketfd was set.
1936
1714
        socketserver.TCPServer.__init__(self, server_address,
1937
1715
                                        RequestHandlerClass)
1938
 
    
1939
1716
    def server_bind(self):
1940
1717
        """This overrides the normal server_bind() function
1941
1718
        to bind to an interface if one was specified, and also NOT to
1949
1726
                try:
1950
1727
                    self.socket.setsockopt(socket.SOL_SOCKET,
1951
1728
                                           SO_BINDTODEVICE,
1952
 
                                           str(self.interface + '\0'))
 
1729
                                           str(self.interface
 
1730
                                               + '\0'))
1953
1731
                except socket.error as error:
1954
 
                    if error.errno == errno.EPERM:
1955
 
                        logger.error("No permission to bind to"
1956
 
                                     " interface %s", self.interface)
1957
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1732
                    if error[0] == errno.EPERM:
 
1733
                        logger.error("No permission to"
 
1734
                                     " bind to interface %s",
 
1735
                                     self.interface)
 
1736
                    elif error[0] == errno.ENOPROTOOPT:
1958
1737
                        logger.error("SO_BINDTODEVICE not available;"
1959
1738
                                     " cannot bind to interface %s",
1960
1739
                                     self.interface)
1961
 
                    elif error.errno == errno.ENODEV:
1962
 
                        logger.error("Interface %s does not exist,"
1963
 
                                     " cannot bind", self.interface)
1964
1740
                    else:
1965
1741
                        raise
1966
1742
        # Only bind(2) the socket if we really need to.
1996
1772
    """
1997
1773
    def __init__(self, server_address, RequestHandlerClass,
1998
1774
                 interface=None, use_ipv6=True, clients=None,
1999
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1775
                 gnutls_priority=None, use_dbus=True):
2000
1776
        self.enabled = False
2001
1777
        self.clients = clients
2002
1778
        if self.clients is None:
2006
1782
        IPv6_TCPServer.__init__(self, server_address,
2007
1783
                                RequestHandlerClass,
2008
1784
                                interface = interface,
2009
 
                                use_ipv6 = use_ipv6,
2010
 
                                socketfd = socketfd)
 
1785
                                use_ipv6 = use_ipv6)
2011
1786
    def server_activate(self):
2012
1787
        if self.enabled:
2013
1788
            return socketserver.TCPServer.server_activate(self)
2026
1801
    
2027
1802
    def handle_ipc(self, source, condition, parent_pipe=None,
2028
1803
                   proc = None, client_object=None):
 
1804
        condition_names = {
 
1805
            gobject.IO_IN: "IN",   # There is data to read.
 
1806
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1807
                                    # blocking).
 
1808
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1809
            gobject.IO_ERR: "ERR", # Error condition.
 
1810
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1811
                                    # broken, usually for pipes and
 
1812
                                    # sockets).
 
1813
            }
 
1814
        conditions_string = ' | '.join(name
 
1815
                                       for cond, name in
 
1816
                                       condition_names.iteritems()
 
1817
                                       if cond & condition)
2029
1818
        # error, or the other end of multiprocessing.Pipe has closed
2030
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1819
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2031
1820
            # Wait for other process to exit
2032
1821
            proc.join()
2033
1822
            return False
2091
1880
        return True
2092
1881
 
2093
1882
 
2094
 
def rfc3339_duration_to_delta(duration):
2095
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2096
 
    
2097
 
    >>> rfc3339_duration_to_delta("P7D")
2098
 
    datetime.timedelta(7)
2099
 
    >>> rfc3339_duration_to_delta("PT60S")
2100
 
    datetime.timedelta(0, 60)
2101
 
    >>> rfc3339_duration_to_delta("PT60M")
2102
 
    datetime.timedelta(0, 3600)
2103
 
    >>> rfc3339_duration_to_delta("PT24H")
2104
 
    datetime.timedelta(1)
2105
 
    >>> rfc3339_duration_to_delta("P1W")
2106
 
    datetime.timedelta(7)
2107
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2108
 
    datetime.timedelta(0, 330)
2109
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2110
 
    datetime.timedelta(1, 200)
2111
 
    """
2112
 
    
2113
 
    # Parsing an RFC 3339 duration with regular expressions is not
2114
 
    # possible - there would have to be multiple places for the same
2115
 
    # values, like seconds.  The current code, while more esoteric, is
2116
 
    # cleaner without depending on a parsing library.  If Python had a
2117
 
    # built-in library for parsing we would use it, but we'd like to
2118
 
    # avoid excessive use of external libraries.
2119
 
    
2120
 
    # New type for defining tokens, syntax, and semantics all-in-one
2121
 
    Token = collections.namedtuple("Token",
2122
 
                                   ("regexp", # To match token; if
2123
 
                                              # "value" is not None,
2124
 
                                              # must have a "group"
2125
 
                                              # containing digits
2126
 
                                    "value",  # datetime.timedelta or
2127
 
                                              # None
2128
 
                                    "followers")) # Tokens valid after
2129
 
                                                  # this token
2130
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2131
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2132
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2133
 
    token_second = Token(re.compile(r"(\d+)S"),
2134
 
                         datetime.timedelta(seconds=1),
2135
 
                         frozenset((token_end,)))
2136
 
    token_minute = Token(re.compile(r"(\d+)M"),
2137
 
                         datetime.timedelta(minutes=1),
2138
 
                         frozenset((token_second, token_end)))
2139
 
    token_hour = Token(re.compile(r"(\d+)H"),
2140
 
                       datetime.timedelta(hours=1),
2141
 
                       frozenset((token_minute, token_end)))
2142
 
    token_time = Token(re.compile(r"T"),
2143
 
                       None,
2144
 
                       frozenset((token_hour, token_minute,
2145
 
                                  token_second)))
2146
 
    token_day = Token(re.compile(r"(\d+)D"),
2147
 
                      datetime.timedelta(days=1),
2148
 
                      frozenset((token_time, token_end)))
2149
 
    token_month = Token(re.compile(r"(\d+)M"),
2150
 
                        datetime.timedelta(weeks=4),
2151
 
                        frozenset((token_day, token_end)))
2152
 
    token_year = Token(re.compile(r"(\d+)Y"),
2153
 
                       datetime.timedelta(weeks=52),
2154
 
                       frozenset((token_month, token_end)))
2155
 
    token_week = Token(re.compile(r"(\d+)W"),
2156
 
                       datetime.timedelta(weeks=1),
2157
 
                       frozenset((token_end,)))
2158
 
    token_duration = Token(re.compile(r"P"), None,
2159
 
                           frozenset((token_year, token_month,
2160
 
                                      token_day, token_time,
2161
 
                                      token_week))),
2162
 
    # Define starting values
2163
 
    value = datetime.timedelta() # Value so far
2164
 
    found_token = None
2165
 
    followers = frozenset(token_duration,) # Following valid tokens
2166
 
    s = duration                # String left to parse
2167
 
    # Loop until end token is found
2168
 
    while found_token is not token_end:
2169
 
        # Search for any currently valid tokens
2170
 
        for token in followers:
2171
 
            match = token.regexp.match(s)
2172
 
            if match is not None:
2173
 
                # Token found
2174
 
                if token.value is not None:
2175
 
                    # Value found, parse digits
2176
 
                    factor = int(match.group(1), 10)
2177
 
                    # Add to value so far
2178
 
                    value += factor * token.value
2179
 
                # Strip token from string
2180
 
                s = token.regexp.sub("", s, 1)
2181
 
                # Go to found token
2182
 
                found_token = token
2183
 
                # Set valid next tokens
2184
 
                followers = found_token.followers
2185
 
                break
2186
 
        else:
2187
 
            # No currently valid tokens were found
2188
 
            raise ValueError("Invalid RFC 3339 duration")
2189
 
    # End token found
2190
 
    return value
2191
 
 
2192
 
 
2193
1883
def string_to_delta(interval):
2194
1884
    """Parse a string and return a datetime.timedelta
2195
1885
    
2206
1896
    >>> string_to_delta('5m 30s')
2207
1897
    datetime.timedelta(0, 330)
2208
1898
    """
2209
 
    
2210
 
    try:
2211
 
        return rfc3339_duration_to_delta(interval)
2212
 
    except ValueError:
2213
 
        pass
2214
 
    
2215
1899
    timevalue = datetime.timedelta(0)
2216
1900
    for s in interval.split():
2217
1901
        try:
2228
1912
            elif suffix == "w":
2229
1913
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2230
1914
            else:
2231
 
                raise ValueError("Unknown suffix {0!r}"
2232
 
                                 .format(suffix))
 
1915
                raise ValueError("Unknown suffix %r" % suffix)
2233
1916
        except (ValueError, IndexError) as e:
2234
1917
            raise ValueError(*(e.args))
2235
1918
        timevalue += delta
2249
1932
        sys.exit()
2250
1933
    if not noclose:
2251
1934
        # Close all standard open file descriptors
2252
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1935
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2253
1936
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2254
1937
            raise OSError(errno.ENODEV,
2255
 
                          "{0} not a character device"
2256
 
                          .format(os.devnull))
 
1938
                          "%s not a character device"
 
1939
                          % os.path.devnull)
2257
1940
        os.dup2(null, sys.stdin.fileno())
2258
1941
        os.dup2(null, sys.stdout.fileno())
2259
1942
        os.dup2(null, sys.stderr.fileno())
2268
1951
    
2269
1952
    parser = argparse.ArgumentParser()
2270
1953
    parser.add_argument("-v", "--version", action="version",
2271
 
                        version = "%(prog)s {0}".format(version),
 
1954
                        version = "%%(prog)s %s" % version,
2272
1955
                        help="show version number and exit")
2273
1956
    parser.add_argument("-i", "--interface", metavar="IF",
2274
1957
                        help="Bind to interface IF")
2299
1982
    parser.add_argument("--no-restore", action="store_false",
2300
1983
                        dest="restore", help="Do not restore stored"
2301
1984
                        " state")
2302
 
    parser.add_argument("--socket", type=int,
2303
 
                        help="Specify a file descriptor to a network"
2304
 
                        " socket to use instead of creating one")
2305
1985
    parser.add_argument("--statedir", metavar="DIR",
2306
1986
                        help="Directory to save/restore state in")
2307
 
    parser.add_argument("--foreground", action="store_true",
2308
 
                        help="Run in foreground")
2309
1987
    
2310
1988
    options = parser.parse_args()
2311
1989
    
2326
2004
                        "use_ipv6": "True",
2327
2005
                        "debuglevel": "",
2328
2006
                        "restore": "True",
2329
 
                        "socket": "",
2330
 
                        "statedir": "/var/lib/mandos",
2331
 
                        "foreground": "False",
 
2007
                        "statedir": "/var/lib/mandos"
2332
2008
                        }
2333
2009
    
2334
2010
    # Parse config file for server-global settings
2339
2015
    # Convert the SafeConfigParser object to a dict
2340
2016
    server_settings = server_config.defaults()
2341
2017
    # Use the appropriate methods on the non-string config options
2342
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2018
    for option in ("debug", "use_dbus", "use_ipv6"):
2343
2019
        server_settings[option] = server_config.getboolean("DEFAULT",
2344
2020
                                                           option)
2345
2021
    if server_settings["port"]:
2346
2022
        server_settings["port"] = server_config.getint("DEFAULT",
2347
2023
                                                       "port")
2348
 
    if server_settings["socket"]:
2349
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2350
 
                                                         "socket")
2351
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2352
 
        # over with an opened os.devnull.  But we don't want this to
2353
 
        # happen with a supplied network socket.
2354
 
        if 0 <= server_settings["socket"] <= 2:
2355
 
            server_settings["socket"] = os.dup(server_settings
2356
 
                                               ["socket"])
2357
2024
    del server_config
2358
2025
    
2359
2026
    # Override the settings from the config file with command line
2361
2028
    for option in ("interface", "address", "port", "debug",
2362
2029
                   "priority", "servicename", "configdir",
2363
2030
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2364
 
                   "statedir", "socket", "foreground"):
 
2031
                   "statedir"):
2365
2032
        value = getattr(options, option)
2366
2033
        if value is not None:
2367
2034
            server_settings[option] = value
2370
2037
    for option in server_settings.keys():
2371
2038
        if type(server_settings[option]) is str:
2372
2039
            server_settings[option] = unicode(server_settings[option])
2373
 
    # Debug implies foreground
2374
 
    if server_settings["debug"]:
2375
 
        server_settings["foreground"] = True
2376
2040
    # Now we have our good server settings in "server_settings"
2377
2041
    
2378
2042
    ##################################################################
2384
2048
    use_ipv6 = server_settings["use_ipv6"]
2385
2049
    stored_state_path = os.path.join(server_settings["statedir"],
2386
2050
                                     stored_state_file)
2387
 
    foreground = server_settings["foreground"]
2388
2051
    
2389
2052
    if debug:
2390
 
        initlogger(debug, logging.DEBUG)
 
2053
        initlogger(logging.DEBUG)
2391
2054
    else:
2392
2055
        if not debuglevel:
2393
 
            initlogger(debug)
 
2056
            initlogger()
2394
2057
        else:
2395
2058
            level = getattr(logging, debuglevel.upper())
2396
 
            initlogger(debug, level)
 
2059
            initlogger(level)
2397
2060
    
2398
2061
    if server_settings["servicename"] != "Mandos":
2399
2062
        syslogger.setFormatter(logging.Formatter
2400
 
                               ('Mandos ({0}) [%(process)d]:'
2401
 
                                ' %(levelname)s: %(message)s'
2402
 
                                .format(server_settings
2403
 
                                        ["servicename"])))
 
2063
                               ('Mandos (%s) [%%(process)d]:'
 
2064
                                ' %%(levelname)s: %%(message)s'
 
2065
                                % server_settings["servicename"]))
2404
2066
    
2405
2067
    # Parse config file with clients
2406
 
    client_config = configparser.SafeConfigParser(Client
2407
 
                                                  .client_defaults)
 
2068
    client_defaults = { "timeout": "5m",
 
2069
                        "extended_timeout": "15m",
 
2070
                        "interval": "2m",
 
2071
                        "checker": "fping -q -- %%(host)s",
 
2072
                        "host": "",
 
2073
                        "approval_delay": "0s",
 
2074
                        "approval_duration": "1s",
 
2075
                        }
 
2076
    client_config = configparser.SafeConfigParser(client_defaults)
2408
2077
    client_config.read(os.path.join(server_settings["configdir"],
2409
2078
                                    "clients.conf"))
2410
2079
    
2419
2088
                              use_ipv6=use_ipv6,
2420
2089
                              gnutls_priority=
2421
2090
                              server_settings["priority"],
2422
 
                              use_dbus=use_dbus,
2423
 
                              socketfd=(server_settings["socket"]
2424
 
                                        or None))
2425
 
    if not foreground:
 
2091
                              use_dbus=use_dbus)
 
2092
    if not debug:
2426
2093
        pidfilename = "/var/run/mandos.pid"
2427
 
        pidfile = None
2428
2094
        try:
2429
2095
            pidfile = open(pidfilename, "w")
2430
 
        except IOError as e:
2431
 
            logger.error("Could not open file %r", pidfilename,
2432
 
                         exc_info=e)
 
2096
        except IOError:
 
2097
            logger.error("Could not open file %r", pidfilename)
2433
2098
    
2434
 
    for name in ("_mandos", "mandos", "nobody"):
 
2099
    try:
 
2100
        uid = pwd.getpwnam("_mandos").pw_uid
 
2101
        gid = pwd.getpwnam("_mandos").pw_gid
 
2102
    except KeyError:
2435
2103
        try:
2436
 
            uid = pwd.getpwnam(name).pw_uid
2437
 
            gid = pwd.getpwnam(name).pw_gid
2438
 
            break
 
2104
            uid = pwd.getpwnam("mandos").pw_uid
 
2105
            gid = pwd.getpwnam("mandos").pw_gid
2439
2106
        except KeyError:
2440
 
            continue
2441
 
    else:
2442
 
        uid = 65534
2443
 
        gid = 65534
 
2107
            try:
 
2108
                uid = pwd.getpwnam("nobody").pw_uid
 
2109
                gid = pwd.getpwnam("nobody").pw_gid
 
2110
            except KeyError:
 
2111
                uid = 65534
 
2112
                gid = 65534
2444
2113
    try:
2445
2114
        os.setgid(gid)
2446
2115
        os.setuid(uid)
2447
2116
    except OSError as error:
2448
 
        if error.errno != errno.EPERM:
 
2117
        if error[0] != errno.EPERM:
2449
2118
            raise error
2450
2119
    
2451
2120
    if debug:
2463
2132
         .gnutls_global_set_log_function(debug_gnutls))
2464
2133
        
2465
2134
        # Redirect stdin so all checkers get /dev/null
2466
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2135
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2467
2136
        os.dup2(null, sys.stdin.fileno())
2468
2137
        if null > 2:
2469
2138
            os.close(null)
 
2139
    else:
 
2140
        # No console logging
 
2141
        logger.removeHandler(console)
2470
2142
    
2471
2143
    # Need to fork before connecting to D-Bus
2472
 
    if not foreground:
 
2144
    if not debug:
2473
2145
        # Close all input and output, do double fork, etc.
2474
2146
        daemon()
2475
2147
    
2476
 
    # multiprocessing will use threads, so before we use gobject we
2477
 
    # need to inform gobject that threads will be used.
2478
 
    gobject.threads_init()
2479
 
    
2480
2148
    global main_loop
2481
2149
    # From the Avahi example code
2482
 
    DBusGMainLoop(set_as_default=True)
 
2150
    DBusGMainLoop(set_as_default=True )
2483
2151
    main_loop = gobject.MainLoop()
2484
2152
    bus = dbus.SystemBus()
2485
2153
    # End of Avahi example code
2491
2159
                            ("se.bsnet.fukt.Mandos", bus,
2492
2160
                             do_not_queue=True))
2493
2161
        except dbus.exceptions.NameExistsException as e:
2494
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2162
            logger.error(unicode(e) + ", disabling D-Bus")
2495
2163
            use_dbus = False
2496
2164
            server_settings["use_dbus"] = False
2497
2165
            tcp_server.use_dbus = False
2509
2177
    
2510
2178
    client_class = Client
2511
2179
    if use_dbus:
2512
 
        client_class = functools.partial(ClientDBus, bus = bus)
2513
 
    
2514
 
    client_settings = Client.config_parser(client_config)
 
2180
        client_class = functools.partial(ClientDBusTransitional,
 
2181
                                         bus = bus)
 
2182
    
 
2183
    special_settings = {
 
2184
        # Some settings need to be accessd by special methods;
 
2185
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2186
        "approved_by_default":
 
2187
            lambda section:
 
2188
            client_config.getboolean(section, "approved_by_default"),
 
2189
        "enabled":
 
2190
            lambda section:
 
2191
            client_config.getboolean(section, "enabled"),
 
2192
        }
 
2193
    # Construct a new dict of client settings of this form:
 
2194
    # { client_name: {setting_name: value, ...}, ...}
 
2195
    # with exceptions for any special settings as defined above
 
2196
    client_settings = dict((clientname,
 
2197
                           dict((setting,
 
2198
                                 (value
 
2199
                                  if setting not in special_settings
 
2200
                                  else special_settings[setting]
 
2201
                                  (clientname)))
 
2202
                                for setting, value in
 
2203
                                client_config.items(clientname)))
 
2204
                          for clientname in client_config.sections())
 
2205
    
2515
2206
    old_client_settings = {}
2516
 
    clients_data = {}
 
2207
    clients_data = []
2517
2208
    
2518
2209
    # Get client data and settings from last running state.
2519
2210
    if server_settings["restore"]:
2523
2214
                                                     (stored_state))
2524
2215
            os.remove(stored_state_path)
2525
2216
        except IOError as e:
2526
 
            if e.errno == errno.ENOENT:
2527
 
                logger.warning("Could not load persistent state: {0}"
2528
 
                                .format(os.strerror(e.errno)))
2529
 
            else:
2530
 
                logger.critical("Could not load persistent state:",
2531
 
                                exc_info=e)
 
2217
            logger.warning("Could not load persistent state: {0}"
 
2218
                           .format(e))
 
2219
            if e.errno != errno.ENOENT:
2532
2220
                raise
2533
 
        except EOFError as e:
2534
 
            logger.warning("Could not load persistent state: "
2535
 
                           "EOFError:", exc_info=e)
2536
2221
    
2537
2222
    with PGPEngine() as pgp:
2538
 
        for client_name, client in clients_data.iteritems():
 
2223
        for client in clients_data:
 
2224
            client_name = client["name"]
 
2225
            
2539
2226
            # Decide which value to use after restoring saved state.
2540
2227
            # We have three different values: Old config file,
2541
2228
            # new config file, and saved state.
2549
2236
                    if (name != "secret" and
2550
2237
                        value != old_client_settings[client_name]
2551
2238
                        [name]):
2552
 
                        client[name] = value
 
2239
                        setattr(client, name, value)
2553
2240
                except KeyError:
2554
2241
                    pass
2555
2242
            
2556
2243
            # Clients who has passed its expire date can still be
2557
 
            # enabled if its last checker was successful.  Clients
2558
 
            # whose checker succeeded before we stored its state is
2559
 
            # assumed to have successfully run all checkers during
2560
 
            # downtime.
2561
 
            if client["enabled"]:
2562
 
                if datetime.datetime.utcnow() >= client["expires"]:
2563
 
                    if not client["last_checked_ok"]:
2564
 
                        logger.warning(
2565
 
                            "disabling client {0} - Client never "
2566
 
                            "performed a successful checker"
2567
 
                            .format(client_name))
2568
 
                        client["enabled"] = False
2569
 
                    elif client["last_checker_status"] != 0:
2570
 
                        logger.warning(
2571
 
                            "disabling client {0} - Client "
2572
 
                            "last checker failed with error code {1}"
2573
 
                            .format(client_name,
2574
 
                                    client["last_checker_status"]))
 
2244
            # enabled if its last checker was sucessful.  Clients
 
2245
            # whose checker failed before we stored its state is
 
2246
            # assumed to have failed all checkers during downtime.
 
2247
            if client["enabled"] and client["last_checked_ok"]:
 
2248
                if ((datetime.datetime.utcnow()
 
2249
                     - client["last_checked_ok"])
 
2250
                    > client["interval"]):
 
2251
                    if client["last_checker_status"] != 0:
2575
2252
                        client["enabled"] = False
2576
2253
                    else:
2577
2254
                        client["expires"] = (datetime.datetime
2578
2255
                                             .utcnow()
2579
2256
                                             + client["timeout"])
2580
 
                        logger.debug("Last checker succeeded,"
2581
 
                                     " keeping {0} enabled"
2582
 
                                     .format(client_name))
 
2257
            
 
2258
            client["changedstate"] = (multiprocessing_manager
 
2259
                                      .Condition
 
2260
                                      (multiprocessing_manager
 
2261
                                       .Lock()))
 
2262
            if use_dbus:
 
2263
                new_client = (ClientDBusTransitional.__new__
 
2264
                              (ClientDBusTransitional))
 
2265
                tcp_server.clients[client_name] = new_client
 
2266
                new_client.bus = bus
 
2267
                for name, value in client.iteritems():
 
2268
                    setattr(new_client, name, value)
 
2269
                client_object_name = unicode(client_name).translate(
 
2270
                    {ord("."): ord("_"),
 
2271
                     ord("-"): ord("_")})
 
2272
                new_client.dbus_object_path = (dbus.ObjectPath
 
2273
                                               ("/clients/"
 
2274
                                                + client_object_name))
 
2275
                DBusObjectWithProperties.__init__(new_client,
 
2276
                                                  new_client.bus,
 
2277
                                                  new_client
 
2278
                                                  .dbus_object_path)
 
2279
            else:
 
2280
                tcp_server.clients[client_name] = (Client.__new__
 
2281
                                                   (Client))
 
2282
                for name, value in client.iteritems():
 
2283
                    setattr(tcp_server.clients[client_name],
 
2284
                            name, value)
 
2285
            
2583
2286
            try:
2584
 
                client["secret"] = (
2585
 
                    pgp.decrypt(client["encrypted_secret"],
 
2287
                tcp_server.clients[client_name].secret = (
 
2288
                    pgp.decrypt(tcp_server.clients[client_name]
 
2289
                                .encrypted_secret,
2586
2290
                                client_settings[client_name]
2587
2291
                                ["secret"]))
2588
2292
            except PGPError:
2589
2293
                # If decryption fails, we use secret from new settings
2590
2294
                logger.debug("Failed to decrypt {0} old secret"
2591
2295
                             .format(client_name))
2592
 
                client["secret"] = (
 
2296
                tcp_server.clients[client_name].secret = (
2593
2297
                    client_settings[client_name]["secret"])
2594
2298
    
2595
 
    # Add/remove clients based on new changes made to config
2596
 
    for client_name in (set(old_client_settings)
2597
 
                        - set(client_settings)):
2598
 
        del clients_data[client_name]
2599
 
    for client_name in (set(client_settings)
2600
 
                        - set(old_client_settings)):
2601
 
        clients_data[client_name] = client_settings[client_name]
2602
 
    
2603
 
    # Create all client objects
2604
 
    for client_name, client in clients_data.iteritems():
2605
 
        tcp_server.clients[client_name] = client_class(
2606
 
            name = client_name, settings = client)
 
2299
    # Create/remove clients based on new changes made to config
 
2300
    for clientname in set(old_client_settings) - set(client_settings):
 
2301
        del tcp_server.clients[clientname]
 
2302
    for clientname in set(client_settings) - set(old_client_settings):
 
2303
        tcp_server.clients[clientname] = (client_class(name
 
2304
                                                       = clientname,
 
2305
                                                       config =
 
2306
                                                       client_settings
 
2307
                                                       [clientname]))
2607
2308
    
2608
2309
    if not tcp_server.clients:
2609
2310
        logger.warning("No clients defined")
2610
 
    
2611
 
    if not foreground:
2612
 
        if pidfile is not None:
2613
 
            try:
2614
 
                with pidfile:
2615
 
                    pid = os.getpid()
2616
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2617
 
            except IOError:
2618
 
                logger.error("Could not write to file %r with PID %d",
2619
 
                             pidfilename, pid)
2620
 
        del pidfile
 
2311
        
 
2312
    if not debug:
 
2313
        try:
 
2314
            with pidfile:
 
2315
                pid = os.getpid()
 
2316
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2317
            del pidfile
 
2318
        except IOError:
 
2319
            logger.error("Could not write to file %r with PID %d",
 
2320
                         pidfilename, pid)
 
2321
        except NameError:
 
2322
            # "pidfile" was never created
 
2323
            pass
2621
2324
        del pidfilename
 
2325
        
 
2326
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2622
2327
    
2623
2328
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2624
2329
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2625
2330
    
2626
2331
    if use_dbus:
2627
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2628
 
                                        "se.bsnet.fukt.Mandos"})
2629
 
        class MandosDBusService(DBusObjectWithProperties):
 
2332
        class MandosDBusService(dbus.service.Object):
2630
2333
            """A D-Bus proxy object"""
2631
2334
            def __init__(self):
2632
2335
                dbus.service.Object.__init__(self, bus, "/")
2633
2336
            _interface = "se.recompile.Mandos"
2634
2337
            
2635
 
            @dbus_interface_annotations(_interface)
2636
 
            def _foo(self):
2637
 
                return { "org.freedesktop.DBus.Property"
2638
 
                         ".EmitsChangedSignal":
2639
 
                             "false"}
2640
 
            
2641
2338
            @dbus.service.signal(_interface, signature="o")
2642
2339
            def ClientAdded(self, objpath):
2643
2340
                "D-Bus signal"
2685
2382
            
2686
2383
            del _interface
2687
2384
        
2688
 
        mandos_dbus_service = MandosDBusService()
 
2385
        class MandosDBusServiceTransitional(MandosDBusService):
 
2386
            __metaclass__ = AlternateDBusNamesMetaclass
 
2387
        mandos_dbus_service = MandosDBusServiceTransitional()
2689
2388
    
2690
2389
    def cleanup():
2691
2390
        "Cleanup function; run on exit"
2698
2397
        # Store client before exiting. Secrets are encrypted with key
2699
2398
        # based on what config file has. If config file is
2700
2399
        # removed/edited, old secret will thus be unrecovable.
2701
 
        clients = {}
 
2400
        clients = []
2702
2401
        with PGPEngine() as pgp:
2703
2402
            for client in tcp_server.clients.itervalues():
2704
2403
                key = client_settings[client.name]["secret"]
2706
2405
                                                      key)
2707
2406
                client_dict = {}
2708
2407
                
2709
 
                # A list of attributes that can not be pickled
2710
 
                # + secret.
2711
 
                exclude = set(("bus", "changedstate", "secret",
2712
 
                               "checker"))
 
2408
                # A list of attributes that will not be stored when
 
2409
                # shutting down.
 
2410
                exclude = set(("bus", "changedstate", "secret"))
2713
2411
                for name, typ in (inspect.getmembers
2714
2412
                                  (dbus.service.Object)):
2715
2413
                    exclude.add(name)
2720
2418
                    if attr not in exclude:
2721
2419
                        client_dict[attr] = getattr(client, attr)
2722
2420
                
2723
 
                clients[client.name] = client_dict
 
2421
                clients.append(client_dict)
2724
2422
                del client_settings[client.name]["secret"]
2725
2423
        
2726
2424
        try:
2727
 
            with (tempfile.NamedTemporaryFile
2728
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2729
 
                   dir=os.path.dirname(stored_state_path),
2730
 
                   delete=False)) as stored_state:
 
2425
            with os.fdopen(os.open(stored_state_path,
 
2426
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2427
                                   0600), "wb") as stored_state:
2731
2428
                pickle.dump((clients, client_settings), stored_state)
2732
 
                tempname=stored_state.name
2733
 
            os.rename(tempname, stored_state_path)
2734
2429
        except (IOError, OSError) as e:
2735
 
            if not debug:
2736
 
                try:
2737
 
                    os.remove(tempname)
2738
 
                except NameError:
2739
 
                    pass
2740
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2741
 
                logger.warning("Could not save persistent state: {0}"
2742
 
                               .format(os.strerror(e.errno)))
2743
 
            else:
2744
 
                logger.warning("Could not save persistent state:",
2745
 
                               exc_info=e)
2746
 
                raise e
 
2430
            logger.warning("Could not save persistent state: {0}"
 
2431
                           .format(e))
 
2432
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2433
                raise
2747
2434
        
2748
2435
        # Delete all clients, and settings from config
2749
2436
        while tcp_server.clients:
2776
2463
    service.port = tcp_server.socket.getsockname()[1]
2777
2464
    if use_ipv6:
2778
2465
        logger.info("Now listening on address %r, port %d,"
2779
 
                    " flowinfo %d, scope_id %d",
2780
 
                    *tcp_server.socket.getsockname())
 
2466
                    " flowinfo %d, scope_id %d"
 
2467
                    % tcp_server.socket.getsockname())
2781
2468
    else:                       # IPv4
2782
 
        logger.info("Now listening on address %r, port %d",
2783
 
                    *tcp_server.socket.getsockname())
 
2469
        logger.info("Now listening on address %r, port %d"
 
2470
                    % tcp_server.socket.getsockname())
2784
2471
    
2785
2472
    #service.interface = tcp_server.socket.getsockname()[3]
2786
2473
    
2789
2476
        try:
2790
2477
            service.activate()
2791
2478
        except dbus.exceptions.DBusException as error:
2792
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2479
            logger.critical("DBusException: %s", error)
2793
2480
            cleanup()
2794
2481
            sys.exit(1)
2795
2482
        # End of Avahi example code
2802
2489
        logger.debug("Starting main loop")
2803
2490
        main_loop.run()
2804
2491
    except AvahiError as error:
2805
 
        logger.critical("Avahi Error", exc_info=error)
 
2492
        logger.critical("AvahiError: %s", error)
2806
2493
        cleanup()
2807
2494
        sys.exit(1)
2808
2495
    except KeyboardInterrupt:
2813
2500
    # Must run before the D-Bus bus name gets deregistered
2814
2501
    cleanup()
2815
2502
 
 
2503
 
2816
2504
if __name__ == '__main__':
2817
2505
    main()