/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-05 10:52:11 UTC
  • Revision ID: teddy@recompile.se-20120505105211-58z3hyjfzep3z2q9
* mandos: White space and other misc. format fixes only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
68
66
import binascii
69
67
import tempfile
70
68
import itertools
71
 
import collections
72
69
 
73
70
import dbus
74
71
import dbus.service
79
76
import ctypes.util
80
77
import xml.dom.minidom
81
78
import inspect
 
79
import GnuPGInterface
82
80
 
83
81
try:
84
82
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
86
    except ImportError:
89
87
        SO_BINDTODEVICE = None
90
88
 
91
 
version = "1.6.0"
 
89
version = "1.5.3"
92
90
stored_state_file = "clients.pickle"
93
91
 
94
92
logger = logging.getLogger()
139
137
class PGPEngine(object):
140
138
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
139
    def __init__(self):
 
140
        self.gnupg = GnuPGInterface.GnuPG()
142
141
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--no-use-agent']
 
142
        self.gnupg = GnuPGInterface.GnuPG()
 
143
        self.gnupg.options.meta_interactive = False
 
144
        self.gnupg.options.homedir = self.tempdir
 
145
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
146
                                              '--quiet',
 
147
                                              '--no-use-agent'])
148
148
    
149
149
    def __enter__(self):
150
150
        return self
151
151
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
152
    def __exit__ (self, exc_type, exc_value, traceback):
153
153
        self._cleanup()
154
154
        return False
155
155
    
175
175
        return b"mandos" + binascii.hexlify(password)
176
176
    
177
177
    def encrypt(self, data, password):
178
 
        passphrase = self.password_encode(password)
179
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
180
 
                                         ) as passfile:
181
 
            passfile.write(passphrase)
182
 
            passfile.flush()
183
 
            proc = subprocess.Popen(['gpg', '--symmetric',
184
 
                                     '--passphrase-file',
185
 
                                     passfile.name]
186
 
                                    + self.gnupgargs,
187
 
                                    stdin = subprocess.PIPE,
188
 
                                    stdout = subprocess.PIPE,
189
 
                                    stderr = subprocess.PIPE)
190
 
            ciphertext, err = proc.communicate(input = data)
191
 
        if proc.returncode != 0:
192
 
            raise PGPError(err)
 
178
        self.gnupg.passphrase = self.password_encode(password)
 
179
        with open(os.devnull, "w") as devnull:
 
180
            try:
 
181
                proc = self.gnupg.run(['--symmetric'],
 
182
                                      create_fhs=['stdin', 'stdout'],
 
183
                                      attach_fhs={'stderr': devnull})
 
184
                with contextlib.closing(proc.handles['stdin']) as f:
 
185
                    f.write(data)
 
186
                with contextlib.closing(proc.handles['stdout']) as f:
 
187
                    ciphertext = f.read()
 
188
                proc.wait()
 
189
            except IOError as e:
 
190
                raise PGPError(e)
 
191
        self.gnupg.passphrase = None
193
192
        return ciphertext
194
193
    
195
194
    def decrypt(self, data, password):
196
 
        passphrase = self.password_encode(password)
197
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
198
 
                                         ) as passfile:
199
 
            passfile.write(passphrase)
200
 
            passfile.flush()
201
 
            proc = subprocess.Popen(['gpg', '--decrypt',
202
 
                                     '--passphrase-file',
203
 
                                     passfile.name]
204
 
                                    + self.gnupgargs,
205
 
                                    stdin = subprocess.PIPE,
206
 
                                    stdout = subprocess.PIPE,
207
 
                                    stderr = subprocess.PIPE)
208
 
            decrypted_plaintext, err = proc.communicate(input
209
 
                                                        = data)
210
 
        if proc.returncode != 0:
211
 
            raise PGPError(err)
 
195
        self.gnupg.passphrase = self.password_encode(password)
 
196
        with open(os.devnull, "w") as devnull:
 
197
            try:
 
198
                proc = self.gnupg.run(['--decrypt'],
 
199
                                      create_fhs=['stdin', 'stdout'],
 
200
                                      attach_fhs={'stderr': devnull})
 
201
                with contextlib.closing(proc.handles['stdin']) as f:
 
202
                    f.write(data)
 
203
                with contextlib.closing(proc.handles['stdout']) as f:
 
204
                    decrypted_plaintext = f.read()
 
205
                proc.wait()
 
206
            except IOError as e:
 
207
                raise PGPError(e)
 
208
        self.gnupg.passphrase = None
212
209
        return decrypted_plaintext
213
210
 
214
211
 
234
231
               Used to optionally bind to the specified interface.
235
232
    name: string; Example: 'Mandos'
236
233
    type: string; Example: '_mandos._tcp'.
237
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
238
235
    port: integer; what port to announce
239
236
    TXT: list of strings; TXT record for the service
240
237
    domain: string; Domain to publish on, default to .local if empty.
380
377
                                 self.server_state_changed)
381
378
        self.server_state_changed(self.server.GetState())
382
379
 
383
 
 
384
380
class AvahiServiceToSyslog(AvahiService):
385
381
    def rename(self):
386
382
        """Add the new name to the syslog messages"""
391
387
                                .format(self.name)))
392
388
        return ret
393
389
 
394
 
 
395
390
def timedelta_to_milliseconds(td):
396
391
    "Convert a datetime.timedelta() to milliseconds"
397
392
    return ((td.days * 24 * 60 * 60 * 1000)
398
393
            + (td.seconds * 1000)
399
394
            + (td.microseconds // 1000))
400
395
 
401
 
 
402
396
class Client(object):
403
397
    """A representation of a client host served by this server.
404
398
    
440
434
    runtime_expansions: Allowed attributes for runtime expansion.
441
435
    expires:    datetime.datetime(); time (UTC) when a client will be
442
436
                disabled, or None
443
 
    server_settings: The server_settings dict from main()
444
437
    """
445
438
    
446
439
    runtime_expansions = ("approval_delay", "approval_duration",
447
 
                          "created", "enabled", "expires",
448
 
                          "fingerprint", "host", "interval",
449
 
                          "last_approval_request", "last_checked_ok",
 
440
                          "created", "enabled", "fingerprint",
 
441
                          "host", "interval", "last_checked_ok",
450
442
                          "last_enabled", "name", "timeout")
451
 
    client_defaults = { "timeout": "PT5M",
452
 
                        "extended_timeout": "PT15M",
453
 
                        "interval": "PT2M",
 
443
    client_defaults = { "timeout": "5m",
 
444
                        "extended_timeout": "15m",
 
445
                        "interval": "2m",
454
446
                        "checker": "fping -q -- %%(host)s",
455
447
                        "host": "",
456
 
                        "approval_delay": "PT0S",
457
 
                        "approval_duration": "PT1S",
 
448
                        "approval_delay": "0s",
 
449
                        "approval_duration": "1s",
458
450
                        "approved_by_default": "True",
459
451
                        "enabled": "True",
460
452
                        }
521
513
        
522
514
        return settings
523
515
    
524
 
    def __init__(self, settings, name = None, server_settings=None):
 
516
    def __init__(self, settings, name = None):
525
517
        self.name = name
526
 
        if server_settings is None:
527
 
            server_settings = {}
528
 
        self.server_settings = server_settings
529
518
        # adding all client settings
530
519
        for setting, value in settings.iteritems():
531
520
            setattr(self, setting, value)
581
570
        if getattr(self, "enabled", False):
582
571
            # Already enabled
583
572
            return
 
573
        self.send_changedstate()
584
574
        self.expires = datetime.datetime.utcnow() + self.timeout
585
575
        self.enabled = True
586
576
        self.last_enabled = datetime.datetime.utcnow()
587
577
        self.init_checker()
588
 
        self.send_changedstate()
589
578
    
590
579
    def disable(self, quiet=True):
591
580
        """Disable this client."""
592
581
        if not getattr(self, "enabled", False):
593
582
            return False
594
583
        if not quiet:
 
584
            self.send_changedstate()
 
585
        if not quiet:
595
586
            logger.info("Disabling client %s", self.name)
596
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
587
        if getattr(self, "disable_initiator_tag", False):
597
588
            gobject.source_remove(self.disable_initiator_tag)
598
589
            self.disable_initiator_tag = None
599
590
        self.expires = None
600
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
591
        if getattr(self, "checker_initiator_tag", False):
601
592
            gobject.source_remove(self.checker_initiator_tag)
602
593
            self.checker_initiator_tag = None
603
594
        self.stop_checker()
604
595
        self.enabled = False
605
 
        if not quiet:
606
 
            self.send_changedstate()
607
596
        # Do not run this again if called by a gobject.timeout_add
608
597
        return False
609
598
    
613
602
    def init_checker(self):
614
603
        # Schedule a new checker to be started an 'interval' from now,
615
604
        # and every interval from then on.
616
 
        if self.checker_initiator_tag is not None:
617
 
            gobject.source_remove(self.checker_initiator_tag)
618
605
        self.checker_initiator_tag = (gobject.timeout_add
619
606
                                      (self.interval_milliseconds(),
620
607
                                       self.start_checker))
621
608
        # Schedule a disable() when 'timeout' has passed
622
 
        if self.disable_initiator_tag is not None:
623
 
            gobject.source_remove(self.disable_initiator_tag)
624
609
        self.disable_initiator_tag = (gobject.timeout_add
625
610
                                   (self.timeout_milliseconds(),
626
611
                                    self.disable))
657
642
            timeout = self.timeout
658
643
        if self.disable_initiator_tag is not None:
659
644
            gobject.source_remove(self.disable_initiator_tag)
660
 
            self.disable_initiator_tag = None
661
645
        if getattr(self, "enabled", False):
662
646
            self.disable_initiator_tag = (gobject.timeout_add
663
647
                                          (timedelta_to_milliseconds
673
657
        If a checker already exists, leave it running and do
674
658
        nothing."""
675
659
        # The reason for not killing a running checker is that if we
676
 
        # did that, and if a checker (for some reason) started running
677
 
        # slowly and taking more than 'interval' time, then the client
678
 
        # would inevitably timeout, since no checker would get a
679
 
        # chance to run to completion.  If we instead leave running
 
660
        # did that, then if a checker (for some reason) started
 
661
        # running slowly and taking more than 'interval' time, the
 
662
        # client would inevitably timeout, since no checker would get
 
663
        # a chance to run to completion.  If we instead leave running
680
664
        # checkers alone, the checker would have to take more time
681
665
        # than 'timeout' for the client to be disabled, which is as it
682
666
        # should be.
696
680
                                      self.current_checker_command)
697
681
        # Start a new checker if needed
698
682
        if self.checker is None:
699
 
            # Escape attributes for the shell
700
 
            escaped_attrs = dict(
701
 
                (attr, re.escape(unicode(getattr(self, attr))))
702
 
                for attr in
703
 
                self.runtime_expansions)
704
683
            try:
705
 
                command = self.checker_command % escaped_attrs
706
 
            except TypeError as error:
707
 
                logger.error('Could not format string "%s"',
708
 
                             self.checker_command, exc_info=error)
709
 
                return True # Try again later
 
684
                # In case checker_command has exactly one % operator
 
685
                command = self.checker_command % self.host
 
686
            except TypeError:
 
687
                # Escape attributes for the shell
 
688
                escaped_attrs = dict(
 
689
                    (attr,
 
690
                     re.escape(unicode(str(getattr(self, attr, "")),
 
691
                                       errors=
 
692
                                       'replace')))
 
693
                    for attr in
 
694
                    self.runtime_expansions)
 
695
                
 
696
                try:
 
697
                    command = self.checker_command % escaped_attrs
 
698
                except TypeError as error:
 
699
                    logger.error('Could not format string "%s"',
 
700
                                 self.checker_command, exc_info=error)
 
701
                    return True # Try again later
710
702
            self.current_checker_command = command
711
703
            try:
712
704
                logger.info("Starting checker %r for %s",
715
707
                # in normal mode, that is already done by daemon(),
716
708
                # and in debug mode we don't want to.  (Stdin is
717
709
                # always replaced by /dev/null.)
718
 
                # The exception is when not debugging but nevertheless
719
 
                # running in the foreground; use the previously
720
 
                # created wnull.
721
 
                popen_args = {}
722
 
                if (not self.server_settings["debug"]
723
 
                    and self.server_settings["foreground"]):
724
 
                    popen_args.update({"stdout": wnull,
725
 
                                       "stderr": wnull })
726
710
                self.checker = subprocess.Popen(command,
727
711
                                                close_fds=True,
728
 
                                                shell=True, cwd="/",
729
 
                                                **popen_args)
 
712
                                                shell=True, cwd="/")
 
713
                self.checker_callback_tag = (gobject.child_watch_add
 
714
                                             (self.checker.pid,
 
715
                                              self.checker_callback,
 
716
                                              data=command))
 
717
                # The checker may have completed before the gobject
 
718
                # watch was added.  Check for this.
 
719
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
720
                if pid:
 
721
                    gobject.source_remove(self.checker_callback_tag)
 
722
                    self.checker_callback(pid, status, command)
730
723
            except OSError as error:
731
724
                logger.error("Failed to start subprocess",
732
725
                             exc_info=error)
733
 
                return True
734
 
            self.checker_callback_tag = (gobject.child_watch_add
735
 
                                         (self.checker.pid,
736
 
                                          self.checker_callback,
737
 
                                          data=command))
738
 
            # The checker may have completed before the gobject
739
 
            # watch was added.  Check for this.
740
 
            try:
741
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
 
            except OSError as error:
743
 
                if error.errno == errno.ECHILD:
744
 
                    # This should never happen
745
 
                    logger.error("Child process vanished",
746
 
                                 exc_info=error)
747
 
                    return True
748
 
                raise
749
 
            if pid:
750
 
                gobject.source_remove(self.checker_callback_tag)
751
 
                self.checker_callback(pid, status, command)
752
726
        # Re-run this periodically if run by gobject.timeout_add
753
727
        return True
754
728
    
1005
979
                            tag.appendChild(ann_tag)
1006
980
                # Add interface annotation tags
1007
981
                for annotation, value in dict(
1008
 
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
1010
 
                        for name, annotations in
1011
 
                        self._get_all_dbus_things("interface")
1012
 
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
 
982
                    itertools.chain(
 
983
                        *(annotations().iteritems()
 
984
                          for name, annotations in
 
985
                          self._get_all_dbus_things("interface")
 
986
                          if name == if_tag.getAttribute("name")
 
987
                          ))).iteritems():
1014
988
                    ann_tag = document.createElement("annotation")
1015
989
                    ann_tag.setAttribute("name", annotation)
1016
990
                    ann_tag.setAttribute("value", value)
1039
1013
        return xmlstring
1040
1014
 
1041
1015
 
1042
 
def datetime_to_dbus(dt, variant_level=0):
 
1016
def datetime_to_dbus (dt, variant_level=0):
1043
1017
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
1018
    if dt is None:
1045
1019
        return dbus.String("", variant_level = variant_level)
1047
1021
                       variant_level=variant_level)
1048
1022
 
1049
1023
 
1050
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1051
 
    """A class decorator; applied to a subclass of
1052
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1053
 
    interface names according to the "alt_interface_names" mapping.
1054
 
    Usage:
1055
 
    
1056
 
    @alternate_dbus_interfaces({"org.example.Interface":
1057
 
                                    "net.example.AlternateInterface"})
1058
 
    class SampleDBusObject(dbus.service.Object):
1059
 
        @dbus.service.method("org.example.Interface")
1060
 
        def SampleDBusMethod():
1061
 
            pass
1062
 
    
1063
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1064
 
    reachable via two interfaces: "org.example.Interface" and
1065
 
    "net.example.AlternateInterface", the latter of which will have
1066
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1067
 
    "true", unless "deprecate" is passed with a False value.
1068
 
    
1069
 
    This works for methods and signals, and also for D-Bus properties
1070
 
    (from DBusObjectWithProperties) and interfaces (from the
1071
 
    dbus_interface_annotations decorator).
 
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
1025
                                  .__metaclass__):
 
1026
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
1027
    will add additional D-Bus attributes matching a certain pattern.
1072
1028
    """
1073
 
    def wrapper(cls):
1074
 
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
1076
 
            attr = {}
1077
 
            interface_names = set()
1078
 
            # Go though all attributes of the class
1079
 
            for attrname, attribute in inspect.getmembers(cls):
 
1029
    def __new__(mcs, name, bases, attr):
 
1030
        # Go through all the base classes which could have D-Bus
 
1031
        # methods, signals, or properties in them
 
1032
        old_interface_names = []
 
1033
        for base in (b for b in bases
 
1034
                     if issubclass(b, dbus.service.Object)):
 
1035
            # Go though all attributes of the base class
 
1036
            for attrname, attribute in inspect.getmembers(base):
1080
1037
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
1038
                # with the wrong interface name
1082
1039
                if (not hasattr(attribute, "_dbus_interface")
1083
1040
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
1041
                    .startswith("se.recompile.Mandos")):
1085
1042
                    continue
1086
1043
                # Create an alternate D-Bus interface name based on
1087
1044
                # the current name
1088
1045
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
1091
 
                interface_names.add(alt_interface)
 
1046
                                 .replace("se.recompile.Mandos",
 
1047
                                          "se.bsnet.fukt.Mandos"))
 
1048
                if alt_interface != attribute._dbus_interface:
 
1049
                    old_interface_names.append(alt_interface)
1092
1050
                # Is this a D-Bus signal?
1093
1051
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
 
1052
                    # Extract the original non-method function by
 
1053
                    # black magic
1096
1054
                    nonmethod_func = (dict(
1097
1055
                            zip(attribute.func_code.co_freevars,
1098
1056
                                attribute.__closure__))["func"]
1116
1074
                    except AttributeError:
1117
1075
                        pass
1118
1076
                    # Define a creator of a function to call both the
1119
 
                    # original and alternate functions, so both the
1120
 
                    # original and alternate signals gets sent when
1121
 
                    # the function is called
 
1077
                    # old and new functions, so both the old and new
 
1078
                    # signals gets sent when the function is called
1122
1079
                    def fixscope(func1, func2):
1123
1080
                        """This function is a scope container to pass
1124
1081
                        func1 and func2 to the "call_both" function
1131
1088
                        return call_both
1132
1089
                    # Create the "call_both" function and add it to
1133
1090
                    # the class
1134
 
                    attr[attrname] = fixscope(attribute, new_function)
 
1091
                    attr[attrname] = fixscope(attribute,
 
1092
                                              new_function)
1135
1093
                # Is this a D-Bus method?
1136
1094
                elif getattr(attribute, "_dbus_is_method", False):
1137
1095
                    # Create a new, but exactly alike, function
1193
1151
                                        attribute.func_name,
1194
1152
                                        attribute.func_defaults,
1195
1153
                                        attribute.func_closure)))
1196
 
            if deprecate:
1197
 
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1199
 
                for interface_name in interface_names:
1200
 
                    @dbus_interface_annotations(interface_name)
1201
 
                    def func(self):
1202
 
                        return { "org.freedesktop.DBus.Deprecated":
1203
 
                                     "true" }
1204
 
                    # Find an unused name
1205
 
                    for aname in (iname.format(i)
1206
 
                                  for i in itertools.count()):
1207
 
                        if aname not in attr:
1208
 
                            attr[aname] = func
1209
 
                            break
1210
 
            if interface_names:
1211
 
                # Replace the class with a new subclass of it with
1212
 
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1214
 
                           (cls,), attr)
1215
 
        return cls
1216
 
    return wrapper
1217
 
 
1218
 
 
1219
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
 
                                "se.bsnet.fukt.Mandos"})
 
1154
        # Deprecate all old interfaces
 
1155
        iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
 
1156
        for old_interface_name in old_interface_names:
 
1157
            @dbus_interface_annotations(old_interface_name)
 
1158
            def func(self):
 
1159
                return { "org.freedesktop.DBus.Deprecated": "true" }
 
1160
            # Find an unused name
 
1161
            for aname in (iname.format(i) for i in itertools.count()):
 
1162
                if aname not in attr:
 
1163
                    attr[aname] = func
 
1164
                    break
 
1165
        return type.__new__(mcs, name, bases, attr)
 
1166
 
 
1167
 
1221
1168
class ClientDBus(Client, DBusObjectWithProperties):
1222
1169
    """A Client class using D-Bus
1223
1170
    
1359
1306
        return False
1360
1307
    
1361
1308
    def approve(self, value=True):
 
1309
        self.send_changedstate()
1362
1310
        self.approved = value
1363
1311
        gobject.timeout_add(timedelta_to_milliseconds
1364
1312
                            (self.approval_duration),
1365
1313
                            self._reset_approved)
1366
 
        self.send_changedstate()
1367
1314
    
1368
1315
    ## D-Bus methods, signals & properties
1369
1316
    _interface = "se.recompile.Mandos.Client"
1553
1500
    def Timeout_dbus_property(self, value=None):
1554
1501
        if value is None:       # get
1555
1502
            return dbus.UInt64(self.timeout_milliseconds())
1556
 
        old_timeout = self.timeout
1557
1503
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
 
        # Reschedule disabling
 
1504
        # Reschedule timeout
1559
1505
        if self.enabled:
1560
1506
            now = datetime.datetime.utcnow()
1561
 
            self.expires += self.timeout - old_timeout
1562
 
            if self.expires <= now:
 
1507
            time_to_die = timedelta_to_milliseconds(
 
1508
                (self.last_checked_ok + self.timeout) - now)
 
1509
            if time_to_die <= 0:
1563
1510
                # The timeout has passed
1564
1511
                self.disable()
1565
1512
            else:
 
1513
                self.expires = (now +
 
1514
                                datetime.timedelta(milliseconds =
 
1515
                                                   time_to_die))
1566
1516
                if (getattr(self, "disable_initiator_tag", None)
1567
1517
                    is None):
1568
1518
                    return
1569
1519
                gobject.source_remove(self.disable_initiator_tag)
1570
 
                self.disable_initiator_tag = (
1571
 
                    gobject.timeout_add(
1572
 
                        timedelta_to_milliseconds(self.expires - now),
1573
 
                        self.disable))
 
1520
                self.disable_initiator_tag = (gobject.timeout_add
 
1521
                                              (time_to_die,
 
1522
                                               self.disable))
1574
1523
    
1575
1524
    # ExtendedTimeout - property
1576
1525
    @dbus_service_property(_interface, signature="t",
1655
1604
        self._pipe.send(('setattr', name, value))
1656
1605
 
1657
1606
 
 
1607
class ClientDBusTransitional(ClientDBus):
 
1608
    __metaclass__ = AlternateDBusNamesMetaclass
 
1609
 
 
1610
 
1658
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
1612
    """A class to handle client connections.
1660
1613
    
1764
1717
                    #wait until timeout or approved
1765
1718
                    time = datetime.datetime.now()
1766
1719
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1720
                    (client.changedstate.wait
 
1721
                     (float(client.timedelta_to_milliseconds(delay)
 
1722
                            / 1000)))
1770
1723
                    client.changedstate.release()
1771
1724
                    time2 = datetime.datetime.now()
1772
1725
                    if (time2 - time) >= delay:
1888
1841
    def process_request(self, request, address):
1889
1842
        """Start a new process to process the request."""
1890
1843
        proc = multiprocessing.Process(target = self.sub_process_main,
1891
 
                                       args = (request, address))
 
1844
                                       args = (request,
 
1845
                                               address))
1892
1846
        proc.start()
1893
1847
        return proc
1894
1848
 
1922
1876
        use_ipv6:       Boolean; to use IPv6 or not
1923
1877
    """
1924
1878
    def __init__(self, server_address, RequestHandlerClass,
1925
 
                 interface=None, use_ipv6=True, socketfd=None):
1926
 
        """If socketfd is set, use that file descriptor instead of
1927
 
        creating a new one with socket.socket().
1928
 
        """
 
1879
                 interface=None, use_ipv6=True):
1929
1880
        self.interface = interface
1930
1881
        if use_ipv6:
1931
1882
            self.address_family = socket.AF_INET6
1932
 
        if socketfd is not None:
1933
 
            # Save the file descriptor
1934
 
            self.socketfd = socketfd
1935
 
            # Save the original socket.socket() function
1936
 
            self.socket_socket = socket.socket
1937
 
            # To implement --socket, we monkey patch socket.socket.
1938
 
            # 
1939
 
            # (When socketserver.TCPServer is a new-style class, we
1940
 
            # could make self.socket into a property instead of monkey
1941
 
            # patching socket.socket.)
1942
 
            # 
1943
 
            # Create a one-time-only replacement for socket.socket()
1944
 
            @functools.wraps(socket.socket)
1945
 
            def socket_wrapper(*args, **kwargs):
1946
 
                # Restore original function so subsequent calls are
1947
 
                # not affected.
1948
 
                socket.socket = self.socket_socket
1949
 
                del self.socket_socket
1950
 
                # This time only, return a new socket object from the
1951
 
                # saved file descriptor.
1952
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1953
 
            # Replace socket.socket() function with wrapper
1954
 
            socket.socket = socket_wrapper
1955
 
        # The socketserver.TCPServer.__init__ will call
1956
 
        # socket.socket(), which might be our replacement,
1957
 
        # socket_wrapper(), if socketfd was set.
1958
1883
        socketserver.TCPServer.__init__(self, server_address,
1959
1884
                                        RequestHandlerClass)
1960
 
    
1961
1885
    def server_bind(self):
1962
1886
        """This overrides the normal server_bind() function
1963
1887
        to bind to an interface if one was specified, and also NOT to
1971
1895
                try:
1972
1896
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1897
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1898
                                           str(self.interface
 
1899
                                               + '\0'))
1975
1900
                except socket.error as error:
1976
 
                    if error.errno == errno.EPERM:
1977
 
                        logger.error("No permission to bind to"
1978
 
                                     " interface %s", self.interface)
1979
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1901
                    if error[0] == errno.EPERM:
 
1902
                        logger.error("No permission to"
 
1903
                                     " bind to interface %s",
 
1904
                                     self.interface)
 
1905
                    elif error[0] == errno.ENOPROTOOPT:
1980
1906
                        logger.error("SO_BINDTODEVICE not available;"
1981
1907
                                     " cannot bind to interface %s",
1982
1908
                                     self.interface)
1983
 
                    elif error.errno == errno.ENODEV:
1984
 
                        logger.error("Interface %s does not exist,"
1985
 
                                     " cannot bind", self.interface)
1986
1909
                    else:
1987
1910
                        raise
1988
1911
        # Only bind(2) the socket if we really need to.
1991
1914
                if self.address_family == socket.AF_INET6:
1992
1915
                    any_address = "::" # in6addr_any
1993
1916
                else:
1994
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1917
                    any_address = socket.INADDR_ANY
1995
1918
                self.server_address = (any_address,
1996
1919
                                       self.server_address[1])
1997
1920
            elif not self.server_address[1]:
2018
1941
    """
2019
1942
    def __init__(self, server_address, RequestHandlerClass,
2020
1943
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1944
                 gnutls_priority=None, use_dbus=True):
2022
1945
        self.enabled = False
2023
1946
        self.clients = clients
2024
1947
        if self.clients is None:
2028
1951
        IPv6_TCPServer.__init__(self, server_address,
2029
1952
                                RequestHandlerClass,
2030
1953
                                interface = interface,
2031
 
                                use_ipv6 = use_ipv6,
2032
 
                                socketfd = socketfd)
 
1954
                                use_ipv6 = use_ipv6)
2033
1955
    def server_activate(self):
2034
1956
        if self.enabled:
2035
1957
            return socketserver.TCPServer.server_activate(self)
2048
1970
    
2049
1971
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
1972
                   proc = None, client_object=None):
 
1973
        condition_names = {
 
1974
            gobject.IO_IN: "IN",   # There is data to read.
 
1975
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1976
                                    # blocking).
 
1977
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1978
            gobject.IO_ERR: "ERR", # Error condition.
 
1979
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1980
                                    # broken, usually for pipes and
 
1981
                                    # sockets).
 
1982
            }
 
1983
        conditions_string = ' | '.join(name
 
1984
                                       for cond, name in
 
1985
                                       condition_names.iteritems()
 
1986
                                       if cond & condition)
2051
1987
        # error, or the other end of multiprocessing.Pipe has closed
2052
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1988
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2053
1989
            # Wait for other process to exit
2054
1990
            proc.join()
2055
1991
            return False
2113
2049
        return True
2114
2050
 
2115
2051
 
2116
 
def rfc3339_duration_to_delta(duration):
2117
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2118
 
    
2119
 
    >>> rfc3339_duration_to_delta("P7D")
2120
 
    datetime.timedelta(7)
2121
 
    >>> rfc3339_duration_to_delta("PT60S")
2122
 
    datetime.timedelta(0, 60)
2123
 
    >>> rfc3339_duration_to_delta("PT60M")
2124
 
    datetime.timedelta(0, 3600)
2125
 
    >>> rfc3339_duration_to_delta("PT24H")
2126
 
    datetime.timedelta(1)
2127
 
    >>> rfc3339_duration_to_delta("P1W")
2128
 
    datetime.timedelta(7)
2129
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2130
 
    datetime.timedelta(0, 330)
2131
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2132
 
    datetime.timedelta(1, 200)
2133
 
    """
2134
 
    
2135
 
    # Parsing an RFC 3339 duration with regular expressions is not
2136
 
    # possible - there would have to be multiple places for the same
2137
 
    # values, like seconds.  The current code, while more esoteric, is
2138
 
    # cleaner without depending on a parsing library.  If Python had a
2139
 
    # built-in library for parsing we would use it, but we'd like to
2140
 
    # avoid excessive use of external libraries.
2141
 
    
2142
 
    # New type for defining tokens, syntax, and semantics all-in-one
2143
 
    Token = collections.namedtuple("Token",
2144
 
                                   ("regexp", # To match token; if
2145
 
                                              # "value" is not None,
2146
 
                                              # must have a "group"
2147
 
                                              # containing digits
2148
 
                                    "value",  # datetime.timedelta or
2149
 
                                              # None
2150
 
                                    "followers")) # Tokens valid after
2151
 
                                                  # this token
2152
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2154
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2155
 
    token_second = Token(re.compile(r"(\d+)S"),
2156
 
                         datetime.timedelta(seconds=1),
2157
 
                         frozenset((token_end,)))
2158
 
    token_minute = Token(re.compile(r"(\d+)M"),
2159
 
                         datetime.timedelta(minutes=1),
2160
 
                         frozenset((token_second, token_end)))
2161
 
    token_hour = Token(re.compile(r"(\d+)H"),
2162
 
                       datetime.timedelta(hours=1),
2163
 
                       frozenset((token_minute, token_end)))
2164
 
    token_time = Token(re.compile(r"T"),
2165
 
                       None,
2166
 
                       frozenset((token_hour, token_minute,
2167
 
                                  token_second)))
2168
 
    token_day = Token(re.compile(r"(\d+)D"),
2169
 
                      datetime.timedelta(days=1),
2170
 
                      frozenset((token_time, token_end)))
2171
 
    token_month = Token(re.compile(r"(\d+)M"),
2172
 
                        datetime.timedelta(weeks=4),
2173
 
                        frozenset((token_day, token_end)))
2174
 
    token_year = Token(re.compile(r"(\d+)Y"),
2175
 
                       datetime.timedelta(weeks=52),
2176
 
                       frozenset((token_month, token_end)))
2177
 
    token_week = Token(re.compile(r"(\d+)W"),
2178
 
                       datetime.timedelta(weeks=1),
2179
 
                       frozenset((token_end,)))
2180
 
    token_duration = Token(re.compile(r"P"), None,
2181
 
                           frozenset((token_year, token_month,
2182
 
                                      token_day, token_time,
2183
 
                                      token_week))),
2184
 
    # Define starting values
2185
 
    value = datetime.timedelta() # Value so far
2186
 
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
2188
 
    s = duration                # String left to parse
2189
 
    # Loop until end token is found
2190
 
    while found_token is not token_end:
2191
 
        # Search for any currently valid tokens
2192
 
        for token in followers:
2193
 
            match = token.regexp.match(s)
2194
 
            if match is not None:
2195
 
                # Token found
2196
 
                if token.value is not None:
2197
 
                    # Value found, parse digits
2198
 
                    factor = int(match.group(1), 10)
2199
 
                    # Add to value so far
2200
 
                    value += factor * token.value
2201
 
                # Strip token from string
2202
 
                s = token.regexp.sub("", s, 1)
2203
 
                # Go to found token
2204
 
                found_token = token
2205
 
                # Set valid next tokens
2206
 
                followers = found_token.followers
2207
 
                break
2208
 
        else:
2209
 
            # No currently valid tokens were found
2210
 
            raise ValueError("Invalid RFC 3339 duration")
2211
 
    # End token found
2212
 
    return value
2213
 
 
2214
 
 
2215
2052
def string_to_delta(interval):
2216
2053
    """Parse a string and return a datetime.timedelta
2217
2054
    
2228
2065
    >>> string_to_delta('5m 30s')
2229
2066
    datetime.timedelta(0, 330)
2230
2067
    """
2231
 
    
2232
 
    try:
2233
 
        return rfc3339_duration_to_delta(interval)
2234
 
    except ValueError:
2235
 
        pass
2236
 
    
2237
2068
    timevalue = datetime.timedelta(0)
2238
2069
    for s in interval.split():
2239
2070
        try:
2302
2133
                        help="Run self-test")
2303
2134
    parser.add_argument("--debug", action="store_true",
2304
2135
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal", default=None)
 
2136
                        " to terminal")
2306
2137
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
2138
                        help="Debug level for stdout output")
2308
2139
    parser.add_argument("--priority", help="GnuTLS"
2315
2146
                        " files")
2316
2147
    parser.add_argument("--no-dbus", action="store_false",
2317
2148
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface", default=None)
 
2149
                        " system bus interface")
2319
2150
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6",
2321
 
                        default=None)
 
2151
                        dest="use_ipv6", help="Do not use IPv6")
2322
2152
    parser.add_argument("--no-restore", action="store_false",
2323
2153
                        dest="restore", help="Do not restore stored"
2324
 
                        " state", default=None)
2325
 
    parser.add_argument("--socket", type=int,
2326
 
                        help="Specify a file descriptor to a network"
2327
 
                        " socket to use instead of creating one")
 
2154
                        " state")
2328
2155
    parser.add_argument("--statedir", metavar="DIR",
2329
2156
                        help="Directory to save/restore state in")
2330
 
    parser.add_argument("--foreground", action="store_true",
2331
 
                        help="Run in foreground", default=None)
2332
2157
    
2333
2158
    options = parser.parse_args()
2334
2159
    
2343
2168
                        "port": "",
2344
2169
                        "debug": "False",
2345
2170
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
2171
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2347
2172
                        "servicename": "Mandos",
2348
2173
                        "use_dbus": "True",
2349
2174
                        "use_ipv6": "True",
2350
2175
                        "debuglevel": "",
2351
2176
                        "restore": "True",
2352
 
                        "socket": "",
2353
 
                        "statedir": "/var/lib/mandos",
2354
 
                        "foreground": "False",
 
2177
                        "statedir": "/var/lib/mandos"
2355
2178
                        }
2356
2179
    
2357
2180
    # Parse config file for server-global settings
2362
2185
    # Convert the SafeConfigParser object to a dict
2363
2186
    server_settings = server_config.defaults()
2364
2187
    # Use the appropriate methods on the non-string config options
2365
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2188
    for option in ("debug", "use_dbus", "use_ipv6"):
2366
2189
        server_settings[option] = server_config.getboolean("DEFAULT",
2367
2190
                                                           option)
2368
2191
    if server_settings["port"]:
2369
2192
        server_settings["port"] = server_config.getint("DEFAULT",
2370
2193
                                                       "port")
2371
 
    if server_settings["socket"]:
2372
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2373
 
                                                         "socket")
2374
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2375
 
        # over with an opened os.devnull.  But we don't want this to
2376
 
        # happen with a supplied network socket.
2377
 
        if 0 <= server_settings["socket"] <= 2:
2378
 
            server_settings["socket"] = os.dup(server_settings
2379
 
                                               ["socket"])
2380
2194
    del server_config
2381
2195
    
2382
2196
    # Override the settings from the config file with command line
2384
2198
    for option in ("interface", "address", "port", "debug",
2385
2199
                   "priority", "servicename", "configdir",
2386
2200
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
2201
                   "statedir"):
2388
2202
        value = getattr(options, option)
2389
2203
        if value is not None:
2390
2204
            server_settings[option] = value
2393
2207
    for option in server_settings.keys():
2394
2208
        if type(server_settings[option]) is str:
2395
2209
            server_settings[option] = unicode(server_settings[option])
2396
 
    # Force all boolean options to be boolean
2397
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
2399
 
        server_settings[option] = bool(server_settings[option])
2400
 
    # Debug implies foreground
2401
 
    if server_settings["debug"]:
2402
 
        server_settings["foreground"] = True
2403
2210
    # Now we have our good server settings in "server_settings"
2404
2211
    
2405
2212
    ##################################################################
2411
2218
    use_ipv6 = server_settings["use_ipv6"]
2412
2219
    stored_state_path = os.path.join(server_settings["statedir"],
2413
2220
                                     stored_state_file)
2414
 
    foreground = server_settings["foreground"]
2415
2221
    
2416
2222
    if debug:
2417
2223
        initlogger(debug, logging.DEBUG)
2446
2252
                              use_ipv6=use_ipv6,
2447
2253
                              gnutls_priority=
2448
2254
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
2452
 
    if not foreground:
 
2255
                              use_dbus=use_dbus)
 
2256
    if not debug:
2453
2257
        pidfilename = "/var/run/mandos.pid"
2454
 
        pidfile = None
2455
2258
        try:
2456
2259
            pidfile = open(pidfilename, "w")
2457
2260
        except IOError as e:
2472
2275
        os.setgid(gid)
2473
2276
        os.setuid(uid)
2474
2277
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
 
2278
        if error[0] != errno.EPERM:
2476
2279
            raise error
2477
2280
    
2478
2281
    if debug:
2496
2299
            os.close(null)
2497
2300
    
2498
2301
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2302
    if not debug:
2500
2303
        # Close all input and output, do double fork, etc.
2501
2304
        daemon()
2502
2305
    
2503
 
    # multiprocessing will use threads, so before we use gobject we
2504
 
    # need to inform gobject that threads will be used.
2505
2306
    gobject.threads_init()
2506
2307
    
2507
2308
    global main_loop
2536
2337
    
2537
2338
    client_class = Client
2538
2339
    if use_dbus:
2539
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2340
        client_class = functools.partial(ClientDBusTransitional,
 
2341
                                         bus = bus)
2540
2342
    
2541
2343
    client_settings = Client.config_parser(client_config)
2542
2344
    old_client_settings = {}
2543
2345
    clients_data = {}
2544
2346
    
2545
 
    # This is used to redirect stdout and stderr for checker processes
2546
 
    global wnull
2547
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2548
 
    # Only used if server is running in foreground but not in debug
2549
 
    # mode
2550
 
    if debug or not foreground:
2551
 
        wnull.close()
2552
 
    
2553
2347
    # Get client data and settings from last running state.
2554
2348
    if server_settings["restore"]:
2555
2349
        try:
2571
2365
    
2572
2366
    with PGPEngine() as pgp:
2573
2367
        for client_name, client in clients_data.iteritems():
2574
 
            # Skip removed clients
2575
 
            if client_name not in client_settings:
2576
 
                continue
2577
 
            
2578
2368
            # Decide which value to use after restoring saved state.
2579
2369
            # We have three different values: Old config file,
2580
2370
            # new config file, and saved state.
2642
2432
    # Create all client objects
2643
2433
    for client_name, client in clients_data.iteritems():
2644
2434
        tcp_server.clients[client_name] = client_class(
2645
 
            name = client_name, settings = client,
2646
 
            server_settings = server_settings)
 
2435
            name = client_name, settings = client)
2647
2436
    
2648
2437
    if not tcp_server.clients:
2649
2438
        logger.warning("No clients defined")
2650
2439
    
2651
 
    if not foreground:
2652
 
        if pidfile is not None:
2653
 
            try:
2654
 
                with pidfile:
2655
 
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2657
 
            except IOError:
2658
 
                logger.error("Could not write to file %r with PID %d",
2659
 
                             pidfilename, pid)
2660
 
        del pidfile
 
2440
    if not debug:
 
2441
        try:
 
2442
            with pidfile:
 
2443
                pid = os.getpid()
 
2444
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2445
            del pidfile
 
2446
        except IOError:
 
2447
            logger.error("Could not write to file %r with PID %d",
 
2448
                         pidfilename, pid)
 
2449
        except NameError:
 
2450
            # "pidfile" was never created
 
2451
            pass
2661
2452
        del pidfilename
 
2453
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2662
2454
    
2663
2455
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
2456
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2457
    
2666
2458
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
2669
2459
        class MandosDBusService(DBusObjectWithProperties):
2670
2460
            """A D-Bus proxy object"""
2671
2461
            def __init__(self):
2725
2515
            
2726
2516
            del _interface
2727
2517
        
2728
 
        mandos_dbus_service = MandosDBusService()
 
2518
        class MandosDBusServiceTransitional(MandosDBusService):
 
2519
            __metaclass__ = AlternateDBusNamesMetaclass
 
2520
        mandos_dbus_service = MandosDBusServiceTransitional()
2729
2521
    
2730
2522
    def cleanup():
2731
2523
        "Cleanup function; run on exit"
2732
2524
        service.cleanup()
2733
2525
        
2734
2526
        multiprocessing.active_children()
2735
 
        wnull.close()
2736
2527
        if not (tcp_server.clients or client_settings):
2737
2528
            return
2738
2529
        
2750
2541
                # A list of attributes that can not be pickled
2751
2542
                # + secret.
2752
2543
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
 
2544
                               "checker"))
2754
2545
                for name, typ in (inspect.getmembers
2755
2546
                                  (dbus.service.Object)):
2756
2547
                    exclude.add(name)
2765
2556
                del client_settings[client.name]["secret"]
2766
2557
        
2767
2558
        try:
2768
 
            with (tempfile.NamedTemporaryFile
2769
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2770
 
                   dir=os.path.dirname(stored_state_path),
2771
 
                   delete=False)) as stored_state:
 
2559
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2560
                                                prefix="clients-",
 
2561
                                                dir=os.path.dirname
 
2562
                                                (stored_state_path))
 
2563
            with os.fdopen(tempfd, "wb") as stored_state:
2772
2564
                pickle.dump((clients, client_settings), stored_state)
2773
 
                tempname=stored_state.name
2774
2565
            os.rename(tempname, stored_state_path)
2775
2566
        except (IOError, OSError) as e:
2776
2567
            if not debug: