/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-27 12:15:06 UTC
  • Revision ID: teddy@recompile.se-20111227121506-2qqqdy8evr9ts2ub
Add TODO entries about new D-Bus features we should use.

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
version = "1.4.1"
93
89
stored_state_file = "clients.pickle"
94
90
 
95
91
logger = logging.getLogger()
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
    
429
414
    last_checked_ok: datetime.datetime(); (UTC) or None
430
415
    last_checker_status: integer between 0 and 255 reflecting exit
431
416
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
433
418
    last_enabled: datetime.datetime(); (UTC) or None
434
419
    name:       string; from the config file, used in log messages and
435
420
                        D-Bus identifiers
436
421
    secret:     bytestring; sent verbatim (over TLS) to client
437
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
423
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
440
425
    runtime_expansions: Allowed attributes for runtime expansion.
441
426
    expires:    datetime.datetime(); time (UTC) when a client will be
442
427
                disabled, or None
443
428
    """
444
429
    
445
430
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
449
433
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
 
434
    client_defaults = { "timeout": "5m",
 
435
                        "extended_timeout": "15m",
 
436
                        "interval": "2m",
453
437
                        "checker": "fping -q -- %%(host)s",
454
438
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
 
439
                        "approval_delay": "0s",
 
440
                        "approval_duration": "1s",
457
441
                        "approved_by_default": "True",
458
442
                        "enabled": "True",
459
443
                        }
472
456
    
473
457
    def approval_delay_milliseconds(self):
474
458
        return timedelta_to_milliseconds(self.approval_delay)
475
 
    
 
459
 
476
460
    @staticmethod
477
461
    def config_parser(config):
478
 
        """Construct a new dict of client settings of this form:
 
462
        """ Construct a new dict of client settings of this form:
479
463
        { 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
 
        """
 
464
        with exceptions for any special settings as defined above"""
484
465
        settings = {}
485
466
        for client_name in config.sections():
486
467
            section = dict(config.items(client_name))
490
471
            # Reformat values from string types to Python types
491
472
            client["approved_by_default"] = config.getboolean(
492
473
                client_name, "approved_by_default")
493
 
            client["enabled"] = config.getboolean(client_name,
494
 
                                                  "enabled")
 
474
            client["enabled"] = config.getboolean(client_name, "enabled")
495
475
            
496
476
            client["fingerprint"] = (section["fingerprint"].upper()
497
477
                                     .replace(" ", ""))
503
483
                          "rb") as secfile:
504
484
                    client["secret"] = secfile.read()
505
485
            else:
506
 
                raise TypeError("No secret or secfile for section {0}"
507
 
                                .format(section))
 
486
                raise TypeError("No secret or secfile for section %s"
 
487
                                % section)
508
488
            client["timeout"] = string_to_delta(section["timeout"])
509
489
            client["extended_timeout"] = string_to_delta(
510
490
                section["extended_timeout"])
516
496
            client["checker_command"] = section["checker"]
517
497
            client["last_approval_request"] = None
518
498
            client["last_checked_ok"] = None
519
 
            client["last_checker_status"] = -2
520
 
        
 
499
            client["last_checker_status"] = None
 
500
            if client["enabled"]:
 
501
                client["last_enabled"] = datetime.datetime.utcnow()
 
502
                client["expires"] = (datetime.datetime.utcnow()
 
503
                                     + client["timeout"])
 
504
            else:
 
505
                client["last_enabled"] = None
 
506
                client["expires"] = None
 
507
 
521
508
        return settings
522
 
    
 
509
        
 
510
        
523
511
    def __init__(self, settings, name = None):
 
512
        """Note: the 'checker' key in 'config' sets the
 
513
        'checker_command' attribute and *not* the 'checker'
 
514
        attribute."""
524
515
        self.name = name
525
516
        # adding all client settings
526
517
        for setting, value in settings.iteritems():
527
518
            setattr(self, setting, value)
528
519
        
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
 
        
539
520
        logger.debug("Creating client %r", self.name)
540
521
        # Uppercase and remove spaces from fingerprint for later
541
522
        # comparison purposes with return value from the fingerprint()
542
523
        # function
543
524
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
 
        self.created = settings.get("created",
545
 
                                    datetime.datetime.utcnow())
546
 
        
 
525
        self.created = settings.get("created", datetime.datetime.utcnow())
 
526
 
547
527
        # attributes specific for this server instance
548
528
        self.checker = None
549
529
        self.checker_initiator_tag = None
577
557
        if getattr(self, "enabled", False):
578
558
            # Already enabled
579
559
            return
 
560
        self.send_changedstate()
580
561
        self.expires = datetime.datetime.utcnow() + self.timeout
581
562
        self.enabled = True
582
563
        self.last_enabled = datetime.datetime.utcnow()
583
564
        self.init_checker()
584
 
        self.send_changedstate()
585
565
    
586
566
    def disable(self, quiet=True):
587
567
        """Disable this client."""
588
568
        if not getattr(self, "enabled", False):
589
569
            return False
590
570
        if not quiet:
 
571
            self.send_changedstate()
 
572
        if not quiet:
591
573
            logger.info("Disabling client %s", self.name)
592
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
574
        if getattr(self, "disable_initiator_tag", False):
593
575
            gobject.source_remove(self.disable_initiator_tag)
594
576
            self.disable_initiator_tag = None
595
577
        self.expires = None
596
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
578
        if getattr(self, "checker_initiator_tag", False):
597
579
            gobject.source_remove(self.checker_initiator_tag)
598
580
            self.checker_initiator_tag = None
599
581
        self.stop_checker()
600
582
        self.enabled = False
601
 
        if not quiet:
602
 
            self.send_changedstate()
603
583
        # Do not run this again if called by a gobject.timeout_add
604
584
        return False
605
585
    
609
589
    def init_checker(self):
610
590
        # Schedule a new checker to be started an 'interval' from now,
611
591
        # and every interval from then on.
612
 
        if self.checker_initiator_tag is not None:
613
 
            gobject.source_remove(self.checker_initiator_tag)
614
592
        self.checker_initiator_tag = (gobject.timeout_add
615
593
                                      (self.interval_milliseconds(),
616
594
                                       self.start_checker))
617
595
        # 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
596
        self.disable_initiator_tag = (gobject.timeout_add
621
597
                                   (self.timeout_milliseconds(),
622
598
                                    self.disable))
641
617
            logger.warning("Checker for %(name)s crashed?",
642
618
                           vars(self))
643
619
    
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."""
 
620
    def checked_ok(self, timeout=None):
 
621
        """Bump up the timeout for this client.
 
622
        
 
623
        This should only be called when the client has been seen,
 
624
        alive and well.
 
625
        """
652
626
        if timeout is None:
653
627
            timeout = self.timeout
 
628
        self.last_checked_ok = datetime.datetime.utcnow()
654
629
        if self.disable_initiator_tag is not None:
655
630
            gobject.source_remove(self.disable_initiator_tag)
656
 
            self.disable_initiator_tag = None
657
631
        if getattr(self, "enabled", False):
658
632
            self.disable_initiator_tag = (gobject.timeout_add
659
633
                                          (timedelta_to_milliseconds
669
643
        If a checker already exists, leave it running and do
670
644
        nothing."""
671
645
        # 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
 
646
        # did that, then if a checker (for some reason) started
 
647
        # running slowly and taking more than 'interval' time, the
 
648
        # client would inevitably timeout, since no checker would get
 
649
        # a chance to run to completion.  If we instead leave running
676
650
        # checkers alone, the checker would have to take more time
677
651
        # than 'timeout' for the client to be disabled, which is as it
678
652
        # should be.
692
666
                                      self.current_checker_command)
693
667
        # Start a new checker if needed
694
668
        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
669
            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
 
670
                # In case checker_command has exactly one % operator
 
671
                command = self.checker_command % self.host
 
672
            except TypeError:
 
673
                # Escape attributes for the shell
 
674
                escaped_attrs = dict(
 
675
                    (attr,
 
676
                     re.escape(unicode(str(getattr(self, attr, "")),
 
677
                                       errors=
 
678
                                       'replace')))
 
679
                    for attr in
 
680
                    self.runtime_expansions)
 
681
                
 
682
                try:
 
683
                    command = self.checker_command % escaped_attrs
 
684
                except TypeError as error:
 
685
                    logger.error('Could not format string "%s":'
 
686
                                 ' %s', self.checker_command, error)
 
687
                    return True # Try again later
706
688
            self.current_checker_command = command
707
689
            try:
708
690
                logger.info("Starting checker %r for %s",
714
696
                self.checker = subprocess.Popen(command,
715
697
                                                close_fds=True,
716
698
                                                shell=True, cwd="/")
 
699
                self.checker_callback_tag = (gobject.child_watch_add
 
700
                                             (self.checker.pid,
 
701
                                              self.checker_callback,
 
702
                                              data=command))
 
703
                # The checker may have completed before the gobject
 
704
                # watch was added.  Check for this.
 
705
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
706
                if pid:
 
707
                    gobject.source_remove(self.checker_callback_tag)
 
708
                    self.checker_callback(pid, status, command)
717
709
            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)
 
710
                logger.error("Failed to start subprocess: %s",
 
711
                             error)
730
712
        # Re-run this periodically if run by gobject.timeout_add
731
713
        return True
732
714
    
739
721
            return
740
722
        logger.debug("Stopping checker for %(name)s", vars(self))
741
723
        try:
742
 
            self.checker.terminate()
 
724
            os.kill(self.checker.pid, signal.SIGTERM)
743
725
            #time.sleep(0.5)
744
726
            #if self.checker.poll() is None:
745
 
            #    self.checker.kill()
 
727
            #    os.kill(self.checker.pid, signal.SIGKILL)
746
728
        except OSError as error:
747
729
            if error.errno != errno.ESRCH: # No such process
748
730
                raise
765
747
    # "Set" method, so we fail early here:
766
748
    if byte_arrays and signature != "ay":
767
749
        raise ValueError("Byte arrays not supported for non-'ay'"
768
 
                         " signature {0!r}".format(signature))
 
750
                         " signature %r" % signature)
769
751
    def decorator(func):
770
752
        func._dbus_is_property = True
771
753
        func._dbus_interface = dbus_interface
779
761
    return decorator
780
762
 
781
763
 
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
764
class DBusPropertyException(dbus.exceptions.DBusException):
820
765
    """A base class for D-Bus property-related exceptions
821
766
    """
844
789
    """
845
790
    
846
791
    @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)
 
792
    def _is_dbus_property(obj):
 
793
        return getattr(obj, "_dbus_is_property", False)
855
794
    
856
 
    def _get_all_dbus_things(self, thing):
 
795
    def _get_all_dbus_properties(self):
857
796
        """Returns a generator of (name, attribute) pairs
858
797
        """
859
 
        return ((getattr(athing.__get__(self), "_dbus_name",
860
 
                         name),
861
 
                 athing.__get__(self))
 
798
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
862
799
                for cls in self.__class__.__mro__
863
 
                for name, athing in
864
 
                inspect.getmembers(cls,
865
 
                                   self._is_dbus_thing(thing)))
 
800
                for name, prop in
 
801
                inspect.getmembers(cls, self._is_dbus_property))
866
802
    
867
803
    def _get_dbus_property(self, interface_name, property_name):
868
804
        """Returns a bound method if one exists which is a D-Bus
870
806
        """
871
807
        for cls in  self.__class__.__mro__:
872
808
            for name, value in (inspect.getmembers
873
 
                                (cls,
874
 
                                 self._is_dbus_thing("property"))):
 
809
                                (cls, self._is_dbus_property)):
875
810
                if (value._dbus_name == property_name
876
811
                    and value._dbus_interface == interface_name):
877
812
                    return value.__get__(self)
906
841
            # signatures other than "ay".
907
842
            if prop._dbus_signature != "ay":
908
843
                raise ValueError
909
 
            value = dbus.ByteArray(b''.join(chr(byte)
910
 
                                            for byte in value))
 
844
            value = dbus.ByteArray(''.join(unichr(byte)
 
845
                                           for byte in value))
911
846
        prop(value)
912
847
    
913
848
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
919
854
        Note: Will not include properties with access="write".
920
855
        """
921
856
        properties = {}
922
 
        for name, prop in self._get_all_dbus_things("property"):
 
857
        for name, prop in self._get_all_dbus_properties():
923
858
            if (interface_name
924
859
                and interface_name != prop._dbus_interface):
925
860
                # Interface non-empty but did not match
940
875
                         path_keyword='object_path',
941
876
                         connection_keyword='connection')
942
877
    def Introspect(self, object_path, connection):
943
 
        """Overloading of standard D-Bus method.
944
 
        
945
 
        Inserts property tags and interface annotation tags.
 
878
        """Standard D-Bus method, overloaded to insert property tags.
946
879
        """
947
880
        xmlstring = dbus.service.Object.Introspect(self, object_path,
948
881
                                                   connection)
955
888
                e.setAttribute("access", prop._dbus_access)
956
889
                return e
957
890
            for if_tag in document.getElementsByTagName("interface"):
958
 
                # Add property tags
959
891
                for tag in (make_tag(document, name, prop)
960
892
                            for name, prop
961
 
                            in self._get_all_dbus_things("property")
 
893
                            in self._get_all_dbus_properties()
962
894
                            if prop._dbus_interface
963
895
                            == if_tag.getAttribute("name")):
964
896
                    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
897
                # Add the names to the return values for the
997
898
                # "org.freedesktop.DBus.Properties" methods
998
899
                if (if_tag.getAttribute("name")
1013
914
        except (AttributeError, xml.dom.DOMException,
1014
915
                xml.parsers.expat.ExpatError) as error:
1015
916
            logger.error("Failed to override Introspection method",
1016
 
                         exc_info=error)
 
917
                         error)
1017
918
        return xmlstring
1018
919
 
1019
920
 
1020
 
def datetime_to_dbus(dt, variant_level=0):
 
921
def datetime_to_dbus (dt, variant_level=0):
1021
922
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1022
923
    if dt is None:
1023
924
        return dbus.String("", variant_level = variant_level)
1025
926
                       variant_level=variant_level)
1026
927
 
1027
928
 
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).
 
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
930
                                  .__metaclass__):
 
931
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
932
    will add additional D-Bus attributes matching a certain pattern.
1050
933
    """
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):
 
934
    def __new__(mcs, name, bases, attr):
 
935
        # Go through all the base classes which could have D-Bus
 
936
        # methods, signals, or properties in them
 
937
        for base in (b for b in bases
 
938
                     if issubclass(b, dbus.service.Object)):
 
939
            # Go though all attributes of the base class
 
940
            for attrname, attribute in inspect.getmembers(base):
1058
941
                # Ignore non-D-Bus attributes, and D-Bus attributes
1059
942
                # with the wrong interface name
1060
943
                if (not hasattr(attribute, "_dbus_interface")
1061
944
                    or not attribute._dbus_interface
1062
 
                    .startswith(orig_interface_name)):
 
945
                    .startswith("se.recompile.Mandos")):
1063
946
                    continue
1064
947
                # Create an alternate D-Bus interface name based on
1065
948
                # the current name
1066
949
                alt_interface = (attribute._dbus_interface
1067
 
                                 .replace(orig_interface_name,
1068
 
                                          alt_interface_name))
1069
 
                interface_names.add(alt_interface)
 
950
                                 .replace("se.recompile.Mandos",
 
951
                                          "se.bsnet.fukt.Mandos"))
1070
952
                # Is this a D-Bus signal?
1071
953
                if getattr(attribute, "_dbus_is_signal", False):
1072
954
                    # Extract the original non-method function by
1087
969
                                nonmethod_func.func_name,
1088
970
                                nonmethod_func.func_defaults,
1089
971
                                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
972
                    # 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
 
973
                    # old and new functions, so both the old and new
 
974
                    # signals gets sent when the function is called
1100
975
                    def fixscope(func1, func2):
1101
976
                        """This function is a scope container to pass
1102
977
                        func1 and func2 to the "call_both" function
1109
984
                        return call_both
1110
985
                    # Create the "call_both" function and add it to
1111
986
                    # the class
1112
 
                    attr[attrname] = fixscope(attribute, new_function)
 
987
                    attr[attrname] = fixscope(attribute,
 
988
                                              new_function)
1113
989
                # Is this a D-Bus method?
1114
990
                elif getattr(attribute, "_dbus_is_method", False):
1115
991
                    # Create a new, but exactly alike, function
1126
1002
                                        attribute.func_name,
1127
1003
                                        attribute.func_defaults,
1128
1004
                                        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
1005
                # Is this a D-Bus property?
1136
1006
                elif getattr(attribute, "_dbus_is_property", False):
1137
1007
                    # Create a new, but exactly alike, function
1151
1021
                                        attribute.func_name,
1152
1022
                                        attribute.func_defaults,
1153
1023
                                        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"})
 
1024
        return type.__new__(mcs, name, bases, attr)
 
1025
 
 
1026
 
1199
1027
class ClientDBus(Client, DBusObjectWithProperties):
1200
1028
    """A Client class using D-Bus
1201
1029
    
1212
1040
    def __init__(self, bus = None, *args, **kwargs):
1213
1041
        self.bus = bus
1214
1042
        Client.__init__(self, *args, **kwargs)
 
1043
        self._approvals_pending = 0
 
1044
        
 
1045
        self._approvals_pending = 0
1215
1046
        # Only now, when this client is initialized, can it show up on
1216
1047
        # the D-Bus
1217
1048
        client_object_name = unicode(self.name).translate(
1221
1052
                                 ("/clients/" + client_object_name))
1222
1053
        DBusObjectWithProperties.__init__(self, self.bus,
1223
1054
                                          self.dbus_object_path)
1224
 
    
 
1055
        
1225
1056
    def notifychangeproperty(transform_func,
1226
1057
                             dbus_name, type_func=lambda x: x,
1227
1058
                             variant_level=1):
1250
1081
        
1251
1082
        return property(lambda self: getattr(self, attrname), setter)
1252
1083
    
 
1084
    
1253
1085
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1254
1086
    approvals_pending = notifychangeproperty(dbus.Boolean,
1255
1087
                                             "ApprovalPending",
1262
1094
                                       checker is not None)
1263
1095
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1264
1096
                                           "LastCheckedOK")
1265
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1266
 
                                               "LastCheckerStatus")
1267
1097
    last_approval_request = notifychangeproperty(
1268
1098
        datetime_to_dbus, "LastApprovalRequest")
1269
1099
    approved_by_default = notifychangeproperty(dbus.Boolean,
1337
1167
        return False
1338
1168
    
1339
1169
    def approve(self, value=True):
 
1170
        self.send_changedstate()
1340
1171
        self.approved = value
1341
1172
        gobject.timeout_add(timedelta_to_milliseconds
1342
1173
                            (self.approval_duration),
1343
1174
                            self._reset_approved)
1344
 
        self.send_changedstate()
 
1175
    
1345
1176
    
1346
1177
    ## D-Bus methods, signals & properties
1347
1178
    _interface = "se.recompile.Mandos.Client"
1348
1179
    
1349
 
    ## Interfaces
1350
 
    
1351
 
    @dbus_interface_annotations(_interface)
1352
 
    def _foo(self):
1353
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1354
 
                     "false"}
1355
 
    
1356
1180
    ## Signals
1357
1181
    
1358
1182
    # CheckerCompleted - signal
1394
1218
        "D-Bus signal"
1395
1219
        return self.need_approval()
1396
1220
    
 
1221
    # NeRwequest - signal
 
1222
    @dbus.service.signal(_interface, signature="s")
 
1223
    def NewRequest(self, ip):
 
1224
        """D-Bus signal
 
1225
        Is sent after a client request a password.
 
1226
        """
 
1227
        pass
 
1228
    
1397
1229
    ## Methods
1398
1230
    
1399
1231
    # Approve - method
1509
1341
            return
1510
1342
        return datetime_to_dbus(self.last_checked_ok)
1511
1343
    
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
1344
    # Expires - property
1519
1345
    @dbus_service_property(_interface, signature="s", access="read")
1520
1346
    def Expires_dbus_property(self):
1531
1357
    def Timeout_dbus_property(self, value=None):
1532
1358
        if value is None:       # get
1533
1359
            return dbus.UInt64(self.timeout_milliseconds())
1534
 
        old_timeout = self.timeout
1535
1360
        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))
 
1361
        if getattr(self, "disable_initiator_tag", None) is None:
 
1362
            return
 
1363
        # Reschedule timeout
 
1364
        gobject.source_remove(self.disable_initiator_tag)
 
1365
        self.disable_initiator_tag = None
 
1366
        self.expires = None
 
1367
        time_to_die = timedelta_to_milliseconds((self
 
1368
                                                 .last_checked_ok
 
1369
                                                 + self.timeout)
 
1370
                                                - datetime.datetime
 
1371
                                                .utcnow())
 
1372
        if time_to_die <= 0:
 
1373
            # The timeout has passed
 
1374
            self.disable()
 
1375
        else:
 
1376
            self.expires = (datetime.datetime.utcnow()
 
1377
                            + datetime.timedelta(milliseconds =
 
1378
                                                 time_to_die))
 
1379
            self.disable_initiator_tag = (gobject.timeout_add
 
1380
                                          (time_to_die, self.disable))
1552
1381
    
1553
1382
    # ExtendedTimeout - property
1554
1383
    @dbus_service_property(_interface, signature="t",
1633
1462
        self._pipe.send(('setattr', name, value))
1634
1463
 
1635
1464
 
 
1465
class ClientDBusTransitional(ClientDBus):
 
1466
    __metaclass__ = AlternateDBusNamesMetaclass
 
1467
 
 
1468
 
1636
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
1637
1470
    """A class to handle client connections.
1638
1471
    
1706
1539
                except KeyError:
1707
1540
                    return
1708
1541
                
 
1542
                if self.server.use_dbus:
 
1543
                    # Emit D-Bus signal
 
1544
                    client.NewRequest(str(self.client_address))
 
1545
                
1709
1546
                if client.approval_delay:
1710
1547
                    delay = client.approval_delay
1711
1548
                    client.approvals_pending += 1
1742
1579
                    #wait until timeout or approved
1743
1580
                    time = datetime.datetime.now()
1744
1581
                    client.changedstate.acquire()
1745
 
                    client.changedstate.wait(
1746
 
                        float(timedelta_to_milliseconds(delay)
1747
 
                              / 1000))
 
1582
                    (client.changedstate.wait
 
1583
                     (float(client.timedelta_to_milliseconds(delay)
 
1584
                            / 1000)))
1748
1585
                    client.changedstate.release()
1749
1586
                    time2 = datetime.datetime.now()
1750
1587
                    if (time2 - time) >= delay:
1766
1603
                    try:
1767
1604
                        sent = session.send(client.secret[sent_size:])
1768
1605
                    except gnutls.errors.GNUTLSError as error:
1769
 
                        logger.warning("gnutls send failed",
1770
 
                                       exc_info=error)
 
1606
                        logger.warning("gnutls send failed")
1771
1607
                        return
1772
1608
                    logger.debug("Sent: %d, remaining: %d",
1773
1609
                                 sent, len(client.secret)
1776
1612
                
1777
1613
                logger.info("Sending secret to %s", client.name)
1778
1614
                # bump the timeout using extended_timeout
1779
 
                client.bump_timeout(client.extended_timeout)
 
1615
                client.checked_ok(client.extended_timeout)
1780
1616
                if self.server.use_dbus:
1781
1617
                    # Emit D-Bus signal
1782
1618
                    client.GotSecret()
1787
1623
                try:
1788
1624
                    session.bye()
1789
1625
                except gnutls.errors.GNUTLSError as error:
1790
 
                    logger.warning("GnuTLS bye failed",
1791
 
                                   exc_info=error)
 
1626
                    logger.warning("GnuTLS bye failed")
1792
1627
    
1793
1628
    @staticmethod
1794
1629
    def peer_certificate(session):
1866
1701
    def process_request(self, request, address):
1867
1702
        """Start a new process to process the request."""
1868
1703
        proc = multiprocessing.Process(target = self.sub_process_main,
1869
 
                                       args = (request, address))
 
1704
                                       args = (request,
 
1705
                                               address))
1870
1706
        proc.start()
1871
1707
        return proc
1872
1708
 
1900
1736
        use_ipv6:       Boolean; to use IPv6 or not
1901
1737
    """
1902
1738
    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
 
        """
 
1739
                 interface=None, use_ipv6=True):
1907
1740
        self.interface = interface
1908
1741
        if use_ipv6:
1909
1742
            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
1743
        socketserver.TCPServer.__init__(self, server_address,
1937
1744
                                        RequestHandlerClass)
1938
 
    
1939
1745
    def server_bind(self):
1940
1746
        """This overrides the normal server_bind() function
1941
1747
        to bind to an interface if one was specified, and also NOT to
1949
1755
                try:
1950
1756
                    self.socket.setsockopt(socket.SOL_SOCKET,
1951
1757
                                           SO_BINDTODEVICE,
1952
 
                                           str(self.interface + '\0'))
 
1758
                                           str(self.interface
 
1759
                                               + '\0'))
1953
1760
                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:
 
1761
                    if error[0] == errno.EPERM:
 
1762
                        logger.error("No permission to"
 
1763
                                     " bind to interface %s",
 
1764
                                     self.interface)
 
1765
                    elif error[0] == errno.ENOPROTOOPT:
1958
1766
                        logger.error("SO_BINDTODEVICE not available;"
1959
1767
                                     " cannot bind to interface %s",
1960
1768
                                     self.interface)
1961
 
                    elif error.errno == errno.ENODEV:
1962
 
                        logger.error("Interface %s does not exist,"
1963
 
                                     " cannot bind", self.interface)
1964
1769
                    else:
1965
1770
                        raise
1966
1771
        # Only bind(2) the socket if we really need to.
1996
1801
    """
1997
1802
    def __init__(self, server_address, RequestHandlerClass,
1998
1803
                 interface=None, use_ipv6=True, clients=None,
1999
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1804
                 gnutls_priority=None, use_dbus=True):
2000
1805
        self.enabled = False
2001
1806
        self.clients = clients
2002
1807
        if self.clients is None:
2006
1811
        IPv6_TCPServer.__init__(self, server_address,
2007
1812
                                RequestHandlerClass,
2008
1813
                                interface = interface,
2009
 
                                use_ipv6 = use_ipv6,
2010
 
                                socketfd = socketfd)
 
1814
                                use_ipv6 = use_ipv6)
2011
1815
    def server_activate(self):
2012
1816
        if self.enabled:
2013
1817
            return socketserver.TCPServer.server_activate(self)
2026
1830
    
2027
1831
    def handle_ipc(self, source, condition, parent_pipe=None,
2028
1832
                   proc = None, client_object=None):
 
1833
        condition_names = {
 
1834
            gobject.IO_IN: "IN",   # There is data to read.
 
1835
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1836
                                    # blocking).
 
1837
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1838
            gobject.IO_ERR: "ERR", # Error condition.
 
1839
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1840
                                    # broken, usually for pipes and
 
1841
                                    # sockets).
 
1842
            }
 
1843
        conditions_string = ' | '.join(name
 
1844
                                       for cond, name in
 
1845
                                       condition_names.iteritems()
 
1846
                                       if cond & condition)
2029
1847
        # error, or the other end of multiprocessing.Pipe has closed
2030
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1848
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2031
1849
            # Wait for other process to exit
2032
1850
            proc.join()
2033
1851
            return False
2091
1909
        return True
2092
1910
 
2093
1911
 
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
1912
def string_to_delta(interval):
2194
1913
    """Parse a string and return a datetime.timedelta
2195
1914
    
2206
1925
    >>> string_to_delta('5m 30s')
2207
1926
    datetime.timedelta(0, 330)
2208
1927
    """
2209
 
    
2210
 
    try:
2211
 
        return rfc3339_duration_to_delta(interval)
2212
 
    except ValueError:
2213
 
        pass
2214
 
    
2215
1928
    timevalue = datetime.timedelta(0)
2216
1929
    for s in interval.split():
2217
1930
        try:
2228
1941
            elif suffix == "w":
2229
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2230
1943
            else:
2231
 
                raise ValueError("Unknown suffix {0!r}"
2232
 
                                 .format(suffix))
 
1944
                raise ValueError("Unknown suffix %r" % suffix)
2233
1945
        except (ValueError, IndexError) as e:
2234
1946
            raise ValueError(*(e.args))
2235
1947
        timevalue += delta
2249
1961
        sys.exit()
2250
1962
    if not noclose:
2251
1963
        # Close all standard open file descriptors
2252
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1964
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2253
1965
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2254
1966
            raise OSError(errno.ENODEV,
2255
 
                          "{0} not a character device"
2256
 
                          .format(os.devnull))
 
1967
                          "%s not a character device"
 
1968
                          % os.path.devnull)
2257
1969
        os.dup2(null, sys.stdin.fileno())
2258
1970
        os.dup2(null, sys.stdout.fileno())
2259
1971
        os.dup2(null, sys.stderr.fileno())
2268
1980
    
2269
1981
    parser = argparse.ArgumentParser()
2270
1982
    parser.add_argument("-v", "--version", action="version",
2271
 
                        version = "%(prog)s {0}".format(version),
 
1983
                        version = "%%(prog)s %s" % version,
2272
1984
                        help="show version number and exit")
2273
1985
    parser.add_argument("-i", "--interface", metavar="IF",
2274
1986
                        help="Bind to interface IF")
2299
2011
    parser.add_argument("--no-restore", action="store_false",
2300
2012
                        dest="restore", help="Do not restore stored"
2301
2013
                        " 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
2014
    parser.add_argument("--statedir", metavar="DIR",
2306
2015
                        help="Directory to save/restore state in")
2307
 
    parser.add_argument("--foreground", action="store_true",
2308
 
                        help="Run in foreground")
2309
2016
    
2310
2017
    options = parser.parse_args()
2311
2018
    
2326
2033
                        "use_ipv6": "True",
2327
2034
                        "debuglevel": "",
2328
2035
                        "restore": "True",
2329
 
                        "socket": "",
2330
 
                        "statedir": "/var/lib/mandos",
2331
 
                        "foreground": "False",
 
2036
                        "statedir": "/var/lib/mandos"
2332
2037
                        }
2333
2038
    
2334
2039
    # Parse config file for server-global settings
2339
2044
    # Convert the SafeConfigParser object to a dict
2340
2045
    server_settings = server_config.defaults()
2341
2046
    # Use the appropriate methods on the non-string config options
2342
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2047
    for option in ("debug", "use_dbus", "use_ipv6"):
2343
2048
        server_settings[option] = server_config.getboolean("DEFAULT",
2344
2049
                                                           option)
2345
2050
    if server_settings["port"]:
2346
2051
        server_settings["port"] = server_config.getint("DEFAULT",
2347
2052
                                                       "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
2053
    del server_config
2358
2054
    
2359
2055
    # Override the settings from the config file with command line
2361
2057
    for option in ("interface", "address", "port", "debug",
2362
2058
                   "priority", "servicename", "configdir",
2363
2059
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2364
 
                   "statedir", "socket", "foreground"):
 
2060
                   "statedir"):
2365
2061
        value = getattr(options, option)
2366
2062
        if value is not None:
2367
2063
            server_settings[option] = value
2370
2066
    for option in server_settings.keys():
2371
2067
        if type(server_settings[option]) is str:
2372
2068
            server_settings[option] = unicode(server_settings[option])
2373
 
    # Debug implies foreground
2374
 
    if server_settings["debug"]:
2375
 
        server_settings["foreground"] = True
2376
2069
    # Now we have our good server settings in "server_settings"
2377
2070
    
2378
2071
    ##################################################################
2384
2077
    use_ipv6 = server_settings["use_ipv6"]
2385
2078
    stored_state_path = os.path.join(server_settings["statedir"],
2386
2079
                                     stored_state_file)
2387
 
    foreground = server_settings["foreground"]
2388
2080
    
2389
2081
    if debug:
2390
2082
        initlogger(debug, logging.DEBUG)
2397
2089
    
2398
2090
    if server_settings["servicename"] != "Mandos":
2399
2091
        syslogger.setFormatter(logging.Formatter
2400
 
                               ('Mandos ({0}) [%(process)d]:'
2401
 
                                ' %(levelname)s: %(message)s'
2402
 
                                .format(server_settings
2403
 
                                        ["servicename"])))
 
2092
                               ('Mandos (%s) [%%(process)d]:'
 
2093
                                ' %%(levelname)s: %%(message)s'
 
2094
                                % server_settings["servicename"]))
2404
2095
    
2405
2096
    # Parse config file with clients
2406
 
    client_config = configparser.SafeConfigParser(Client
2407
 
                                                  .client_defaults)
 
2097
    client_config = configparser.SafeConfigParser(Client.client_defaults)
2408
2098
    client_config.read(os.path.join(server_settings["configdir"],
2409
2099
                                    "clients.conf"))
2410
2100
    
2419
2109
                              use_ipv6=use_ipv6,
2420
2110
                              gnutls_priority=
2421
2111
                              server_settings["priority"],
2422
 
                              use_dbus=use_dbus,
2423
 
                              socketfd=(server_settings["socket"]
2424
 
                                        or None))
2425
 
    if not foreground:
 
2112
                              use_dbus=use_dbus)
 
2113
    if not debug:
2426
2114
        pidfilename = "/var/run/mandos.pid"
2427
 
        pidfile = None
2428
2115
        try:
2429
2116
            pidfile = open(pidfilename, "w")
2430
 
        except IOError as e:
2431
 
            logger.error("Could not open file %r", pidfilename,
2432
 
                         exc_info=e)
 
2117
        except IOError:
 
2118
            logger.error("Could not open file %r", pidfilename)
2433
2119
    
2434
 
    for name in ("_mandos", "mandos", "nobody"):
 
2120
    try:
 
2121
        uid = pwd.getpwnam("_mandos").pw_uid
 
2122
        gid = pwd.getpwnam("_mandos").pw_gid
 
2123
    except KeyError:
2435
2124
        try:
2436
 
            uid = pwd.getpwnam(name).pw_uid
2437
 
            gid = pwd.getpwnam(name).pw_gid
2438
 
            break
 
2125
            uid = pwd.getpwnam("mandos").pw_uid
 
2126
            gid = pwd.getpwnam("mandos").pw_gid
2439
2127
        except KeyError:
2440
 
            continue
2441
 
    else:
2442
 
        uid = 65534
2443
 
        gid = 65534
 
2128
            try:
 
2129
                uid = pwd.getpwnam("nobody").pw_uid
 
2130
                gid = pwd.getpwnam("nobody").pw_gid
 
2131
            except KeyError:
 
2132
                uid = 65534
 
2133
                gid = 65534
2444
2134
    try:
2445
2135
        os.setgid(gid)
2446
2136
        os.setuid(uid)
2447
2137
    except OSError as error:
2448
 
        if error.errno != errno.EPERM:
 
2138
        if error[0] != errno.EPERM:
2449
2139
            raise error
2450
2140
    
2451
2141
    if debug:
2463
2153
         .gnutls_global_set_log_function(debug_gnutls))
2464
2154
        
2465
2155
        # Redirect stdin so all checkers get /dev/null
2466
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2156
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2467
2157
        os.dup2(null, sys.stdin.fileno())
2468
2158
        if null > 2:
2469
2159
            os.close(null)
2470
2160
    
2471
2161
    # Need to fork before connecting to D-Bus
2472
 
    if not foreground:
 
2162
    if not debug:
2473
2163
        # Close all input and output, do double fork, etc.
2474
2164
        daemon()
2475
2165
    
2476
 
    # multiprocessing will use threads, so before we use gobject we
2477
 
    # need to inform gobject that threads will be used.
2478
2166
    gobject.threads_init()
2479
2167
    
2480
2168
    global main_loop
2481
2169
    # From the Avahi example code
2482
 
    DBusGMainLoop(set_as_default=True)
 
2170
    DBusGMainLoop(set_as_default=True )
2483
2171
    main_loop = gobject.MainLoop()
2484
2172
    bus = dbus.SystemBus()
2485
2173
    # End of Avahi example code
2491
2179
                            ("se.bsnet.fukt.Mandos", bus,
2492
2180
                             do_not_queue=True))
2493
2181
        except dbus.exceptions.NameExistsException as e:
2494
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2182
            logger.error(unicode(e) + ", disabling D-Bus")
2495
2183
            use_dbus = False
2496
2184
            server_settings["use_dbus"] = False
2497
2185
            tcp_server.use_dbus = False
2509
2197
    
2510
2198
    client_class = Client
2511
2199
    if use_dbus:
2512
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2200
        client_class = functools.partial(ClientDBusTransitional,
 
2201
                                         bus = bus)
2513
2202
    
2514
2203
    client_settings = Client.config_parser(client_config)
2515
2204
    old_client_settings = {}
2523
2212
                                                     (stored_state))
2524
2213
            os.remove(stored_state_path)
2525
2214
        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)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2532
2218
                raise
2533
2219
        except EOFError as e:
2534
2220
            logger.warning("Could not load persistent state: "
2535
 
                           "EOFError:", exc_info=e)
 
2221
                           "EOFError: {0}".format(e))
2536
2222
    
2537
2223
    with PGPEngine() as pgp:
2538
2224
        for client_name, client in clients_data.iteritems():
2555
2241
            
2556
2242
            # Clients who has passed its expire date can still be
2557
2243
            # 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.
 
2244
            # whose checker failed before we stored its state is
 
2245
            # assumed to have failed all checkers during downtime.
2561
2246
            if client["enabled"]:
2562
2247
                if datetime.datetime.utcnow() >= client["expires"]:
2563
2248
                    if not client["last_checked_ok"]:
2564
2249
                        logger.warning(
2565
2250
                            "disabling client {0} - Client never "
2566
 
                            "performed a successful checker"
2567
 
                            .format(client_name))
 
2251
                            "performed a successfull checker"
 
2252
                            .format(client["name"]))
2568
2253
                        client["enabled"] = False
2569
2254
                    elif client["last_checker_status"] != 0:
2570
2255
                        logger.warning(
2571
2256
                            "disabling client {0} - Client "
2572
2257
                            "last checker failed with error code {1}"
2573
 
                            .format(client_name,
 
2258
                            .format(client["name"],
2574
2259
                                    client["last_checker_status"]))
2575
2260
                        client["enabled"] = False
2576
2261
                    else:
2577
2262
                        client["expires"] = (datetime.datetime
2578
2263
                                             .utcnow()
2579
2264
                                             + client["timeout"])
2580
 
                        logger.debug("Last checker succeeded,"
2581
 
                                     " keeping {0} enabled"
2582
 
                                     .format(client_name))
 
2265
                    
2583
2266
            try:
2584
2267
                client["secret"] = (
2585
2268
                    pgp.decrypt(client["encrypted_secret"],
2591
2274
                             .format(client_name))
2592
2275
                client["secret"] = (
2593
2276
                    client_settings[client_name]["secret"])
 
2277
 
2594
2278
    
2595
2279
    # Add/remove clients based on new changes made to config
2596
 
    for client_name in (set(old_client_settings)
2597
 
                        - set(client_settings)):
 
2280
    for client_name in set(old_client_settings) - set(client_settings):
2598
2281
        del clients_data[client_name]
2599
 
    for client_name in (set(client_settings)
2600
 
                        - set(old_client_settings)):
 
2282
    for client_name in set(client_settings) - set(old_client_settings):
2601
2283
        clients_data[client_name] = client_settings[client_name]
2602
 
    
2603
 
    # Create all client objects
 
2284
 
 
2285
    # Create clients all clients
2604
2286
    for client_name, client in clients_data.iteritems():
2605
2287
        tcp_server.clients[client_name] = client_class(
2606
2288
            name = client_name, settings = client)
2607
2289
    
2608
2290
    if not tcp_server.clients:
2609
2291
        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
 
2292
        
 
2293
    if not debug:
 
2294
        try:
 
2295
            with pidfile:
 
2296
                pid = os.getpid()
 
2297
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2298
            del pidfile
 
2299
        except IOError:
 
2300
            logger.error("Could not write to file %r with PID %d",
 
2301
                         pidfilename, pid)
 
2302
        except NameError:
 
2303
            # "pidfile" was never created
 
2304
            pass
2621
2305
        del pidfilename
 
2306
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2622
2307
    
2623
2308
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2624
2309
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2625
2310
    
2626
2311
    if use_dbus:
2627
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2628
 
                                        "se.bsnet.fukt.Mandos"})
2629
 
        class MandosDBusService(DBusObjectWithProperties):
 
2312
        class MandosDBusService(dbus.service.Object):
2630
2313
            """A D-Bus proxy object"""
2631
2314
            def __init__(self):
2632
2315
                dbus.service.Object.__init__(self, bus, "/")
2633
2316
            _interface = "se.recompile.Mandos"
2634
2317
            
2635
 
            @dbus_interface_annotations(_interface)
2636
 
            def _foo(self):
2637
 
                return { "org.freedesktop.DBus.Property"
2638
 
                         ".EmitsChangedSignal":
2639
 
                             "false"}
2640
 
            
2641
2318
            @dbus.service.signal(_interface, signature="o")
2642
2319
            def ClientAdded(self, objpath):
2643
2320
                "D-Bus signal"
2685
2362
            
2686
2363
            del _interface
2687
2364
        
2688
 
        mandos_dbus_service = MandosDBusService()
 
2365
        class MandosDBusServiceTransitional(MandosDBusService):
 
2366
            __metaclass__ = AlternateDBusNamesMetaclass
 
2367
        mandos_dbus_service = MandosDBusServiceTransitional()
2689
2368
    
2690
2369
    def cleanup():
2691
2370
        "Cleanup function; run on exit"
2724
2403
                del client_settings[client.name]["secret"]
2725
2404
        
2726
2405
        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:
 
2406
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2407
                                                prefix="clients-",
 
2408
                                                dir=os.path.dirname
 
2409
                                                (stored_state_path))
 
2410
            with os.fdopen(tempfd, "wb") as stored_state:
2731
2411
                pickle.dump((clients, client_settings), stored_state)
2732
 
                tempname=stored_state.name
2733
2412
            os.rename(tempname, stored_state_path)
2734
2413
        except (IOError, OSError) as e:
 
2414
            logger.warning("Could not save persistent state: {0}"
 
2415
                           .format(e))
2735
2416
            if not debug:
2736
2417
                try:
2737
2418
                    os.remove(tempname)
2738
2419
                except NameError:
2739
2420
                    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)
 
2421
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2422
                                   errno.EEXIST)):
2746
2423
                raise e
2747
2424
        
2748
2425
        # Delete all clients, and settings from config
2776
2453
    service.port = tcp_server.socket.getsockname()[1]
2777
2454
    if use_ipv6:
2778
2455
        logger.info("Now listening on address %r, port %d,"
2779
 
                    " flowinfo %d, scope_id %d",
2780
 
                    *tcp_server.socket.getsockname())
 
2456
                    " flowinfo %d, scope_id %d"
 
2457
                    % tcp_server.socket.getsockname())
2781
2458
    else:                       # IPv4
2782
 
        logger.info("Now listening on address %r, port %d",
2783
 
                    *tcp_server.socket.getsockname())
 
2459
        logger.info("Now listening on address %r, port %d"
 
2460
                    % tcp_server.socket.getsockname())
2784
2461
    
2785
2462
    #service.interface = tcp_server.socket.getsockname()[3]
2786
2463
    
2789
2466
        try:
2790
2467
            service.activate()
2791
2468
        except dbus.exceptions.DBusException as error:
2792
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2469
            logger.critical("DBusException: %s", error)
2793
2470
            cleanup()
2794
2471
            sys.exit(1)
2795
2472
        # End of Avahi example code
2802
2479
        logger.debug("Starting main loop")
2803
2480
        main_loop.run()
2804
2481
    except AvahiError as error:
2805
 
        logger.critical("Avahi Error", exc_info=error)
 
2482
        logger.critical("AvahiError: %s", error)
2806
2483
        cleanup()
2807
2484
        sys.exit(1)
2808
2485
    except KeyboardInterrupt: