/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: 2015-05-31 15:56:58 UTC
  • Revision ID: teddy@recompile.se-20150531155658-l7znu7zlqr2dmuwd
mandos: Generate better messages in exceptions.

mandos (ProxyClient.__init__): Include fingerprint in KeyError().
(rfc3339_duration_to_delta): Include duration in ValueError().

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
 
81
import codecs
72
82
 
73
83
import dbus
74
84
import dbus.service
75
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
88
101
    except ImportError:
89
102
        SO_BINDTODEVICE = None
90
103
 
91
 
version = "1.6.8"
 
104
if sys.version_info.major == 2:
 
105
    str = unicode
 
106
 
 
107
version = "1.6.9"
92
108
stored_state_file = "clients.pickle"
93
109
 
94
110
logger = logging.getLogger()
95
111
syslogger = None
96
112
 
97
113
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
 
117
    
102
118
    def if_nametoindex(interface):
103
119
        "Get an interface index the hard way, i.e. using fcntl()"
104
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
113
129
    """init logger and add loglevel"""
114
130
    
115
131
    global syslogger
116
 
    syslogger = (logging.handlers.SysLogHandler
117
 
                 (facility =
118
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
119
 
                  address = "/dev/log"))
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
120
135
    syslogger.setFormatter(logging.Formatter
121
136
                           ('Mandos [%(process)d]: %(levelname)s:'
122
137
                            ' %(message)s'))
139
154
 
140
155
class PGPEngine(object):
141
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
142
158
    def __init__(self):
143
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
160
        self.gnupgargs = ['--batch',
183
199
    
184
200
    def encrypt(self, data, password):
185
201
        passphrase = self.password_encode(password)
186
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
187
 
                                         ) as passfile:
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
188
204
            passfile.write(passphrase)
189
205
            passfile.flush()
190
206
            proc = subprocess.Popen(['gpg', '--symmetric',
201
217
    
202
218
    def decrypt(self, data, password):
203
219
        passphrase = self.password_encode(password)
204
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
205
 
                                         ) as passfile:
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
206
222
            passfile.write(passphrase)
207
223
            passfile.flush()
208
224
            proc = subprocess.Popen(['gpg', '--decrypt',
212
228
                                    stdin = subprocess.PIPE,
213
229
                                    stdout = subprocess.PIPE,
214
230
                                    stderr = subprocess.PIPE)
215
 
            decrypted_plaintext, err = proc.communicate(input
216
 
                                                        = data)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
217
232
        if proc.returncode != 0:
218
233
            raise PGPError(err)
219
234
        return decrypted_plaintext
225
240
        return super(AvahiError, self).__init__(value, *args,
226
241
                                                **kwargs)
227
242
 
 
243
 
228
244
class AvahiServiceError(AvahiError):
229
245
    pass
230
246
 
 
247
 
231
248
class AvahiGroupError(AvahiError):
232
249
    pass
233
250
 
253
270
    bus: dbus.SystemBus()
254
271
    """
255
272
    
256
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
 
                 servicetype = None, port = None, TXT = None,
258
 
                 domain = "", host = "", max_renames = 32768,
259
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
260
284
        self.interface = interface
261
285
        self.name = name
262
286
        self.type = servicetype
272
296
        self.bus = bus
273
297
        self.entry_group_state_changed_match = None
274
298
    
275
 
    def rename(self):
 
299
    def rename(self, remove=True):
276
300
        """Derived from the Avahi example code"""
277
301
        if self.rename_count >= self.max_renames:
278
302
            logger.critical("No suitable Zeroconf service name found"
279
303
                            " after %i retries, exiting.",
280
304
                            self.rename_count)
281
305
            raise AvahiServiceError("Too many renames")
282
 
        self.name = unicode(self.server
283
 
                            .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
284
309
        logger.info("Changing Zeroconf service name to %r ...",
285
310
                    self.name)
286
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
287
313
        try:
288
314
            self.add()
289
315
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
291
 
            self.cleanup()
292
 
            os._exit(1)
293
 
        self.rename_count += 1
 
316
            if (error.get_dbus_name()
 
317
                == "org.freedesktop.Avahi.CollisionError"):
 
318
                logger.info("Local Zeroconf service name collision.")
 
319
                return self.rename(remove=False)
 
320
            else:
 
321
                logger.critical("D-Bus Exception", exc_info=error)
 
322
                self.cleanup()
 
323
                os._exit(1)
294
324
    
295
325
    def remove(self):
296
326
        """Derived from the Avahi example code"""
334
364
            self.rename()
335
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
366
            logger.critical("Avahi: Error in group state changed %s",
337
 
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {!s}"
339
 
                                  .format(error))
 
367
                            str(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
340
369
    
341
370
    def cleanup(self):
342
371
        """Derived from the Avahi example code"""
352
381
    def server_state_changed(self, state, error=None):
353
382
        """Derived from the Avahi example code"""
354
383
        logger.debug("Avahi server state change: %i", state)
355
 
        bad_states = { avahi.SERVER_INVALID:
356
 
                           "Zeroconf server invalid",
357
 
                       avahi.SERVER_REGISTERING: None,
358
 
                       avahi.SERVER_COLLISION:
359
 
                           "Zeroconf server name collision",
360
 
                       avahi.SERVER_FAILURE:
361
 
                           "Zeroconf server failure" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
362
390
        if state in bad_states:
363
391
            if bad_states[state] is not None:
364
392
                if error is None:
383
411
                                    follow_name_owner_changes=True),
384
412
                avahi.DBUS_INTERFACE_SERVER)
385
413
        self.server.connect_to_signal("StateChanged",
386
 
                                 self.server_state_changed)
 
414
                                      self.server_state_changed)
387
415
        self.server_state_changed(self.server.GetState())
388
416
 
389
417
 
390
418
class AvahiServiceToSyslog(AvahiService):
391
 
    def rename(self):
 
419
    def rename(self, *args, **kwargs):
392
420
        """Add the new name to the syslog messages"""
393
 
        ret = AvahiService.rename(self)
394
 
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
421
        ret = AvahiService.rename(self, *args, **kwargs)
 
422
        syslogger.setFormatter(logging.Formatter(
 
423
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
424
            .format(self.name)))
398
425
        return ret
399
426
 
400
427
 
447
474
                          "fingerprint", "host", "interval",
448
475
                          "last_approval_request", "last_checked_ok",
449
476
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
453
 
                        "checker": "fping -q -- %%(host)s",
454
 
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
457
 
                        "approved_by_default": "True",
458
 
                        "enabled": "True",
459
 
                        }
 
477
    client_defaults = {
 
478
        "timeout": "PT5M",
 
479
        "extended_timeout": "PT15M",
 
480
        "interval": "PT2M",
 
481
        "checker": "fping -q -- %%(host)s",
 
482
        "host": "",
 
483
        "approval_delay": "PT0S",
 
484
        "approval_duration": "PT1S",
 
485
        "approved_by_default": "True",
 
486
        "enabled": "True",
 
487
    }
460
488
    
461
489
    @staticmethod
462
490
    def config_parser(config):
478
506
            client["enabled"] = config.getboolean(client_name,
479
507
                                                  "enabled")
480
508
            
 
509
            # Uppercase and remove spaces from fingerprint for later
 
510
            # comparison purposes with return value from the
 
511
            # fingerprint() function
481
512
            client["fingerprint"] = (section["fingerprint"].upper()
482
513
                                     .replace(" ", ""))
483
514
            if "secret" in section:
525
556
            self.expires = None
526
557
        
527
558
        logger.debug("Creating client %r", self.name)
528
 
        # Uppercase and remove spaces from fingerprint for later
529
 
        # comparison purposes with return value from the fingerprint()
530
 
        # function
531
559
        logger.debug("  Fingerprint: %s", self.fingerprint)
532
560
        self.created = settings.get("created",
533
561
                                    datetime.datetime.utcnow())
540
568
        self.current_checker_command = None
541
569
        self.approved = None
542
570
        self.approvals_pending = 0
543
 
        self.changedstate = (multiprocessing_manager
544
 
                             .Condition(multiprocessing_manager
545
 
                                        .Lock()))
546
 
        self.client_structure = [attr for attr in
547
 
                                 self.__dict__.iterkeys()
 
571
        self.changedstate = multiprocessing_manager.Condition(
 
572
            multiprocessing_manager.Lock())
 
573
        self.client_structure = [attr
 
574
                                 for attr in self.__dict__.iterkeys()
548
575
                                 if not attr.startswith("_")]
549
576
        self.client_structure.append("client_structure")
550
577
        
551
 
        for name, t in inspect.getmembers(type(self),
552
 
                                          lambda obj:
553
 
                                              isinstance(obj,
554
 
                                                         property)):
 
578
        for name, t in inspect.getmembers(
 
579
                type(self), lambda obj: isinstance(obj, property)):
555
580
            if not name.startswith("_"):
556
581
                self.client_structure.append(name)
557
582
    
599
624
        # and every interval from then on.
600
625
        if self.checker_initiator_tag is not None:
601
626
            gobject.source_remove(self.checker_initiator_tag)
602
 
        self.checker_initiator_tag = (gobject.timeout_add
603
 
                                      (int(self.interval
604
 
                                           .total_seconds() * 1000),
605
 
                                       self.start_checker))
 
627
        self.checker_initiator_tag = gobject.timeout_add(
 
628
            int(self.interval.total_seconds() * 1000),
 
629
            self.start_checker)
606
630
        # Schedule a disable() when 'timeout' has passed
607
631
        if self.disable_initiator_tag is not None:
608
632
            gobject.source_remove(self.disable_initiator_tag)
609
 
        self.disable_initiator_tag = (gobject.timeout_add
610
 
                                      (int(self.timeout
611
 
                                           .total_seconds() * 1000),
612
 
                                       self.disable))
 
633
        self.disable_initiator_tag = gobject.timeout_add(
 
634
            int(self.timeout.total_seconds() * 1000), self.disable)
613
635
        # Also start a new checker *right now*.
614
636
        self.start_checker()
615
637
    
624
646
                            vars(self))
625
647
                self.checked_ok()
626
648
            else:
627
 
                logger.info("Checker for %(name)s failed",
628
 
                            vars(self))
 
649
                logger.info("Checker for %(name)s failed", vars(self))
629
650
        else:
630
651
            self.last_checker_status = -1
631
652
            logger.warning("Checker for %(name)s crashed?",
645
666
            gobject.source_remove(self.disable_initiator_tag)
646
667
            self.disable_initiator_tag = None
647
668
        if getattr(self, "enabled", False):
648
 
            self.disable_initiator_tag = (gobject.timeout_add
649
 
                                          (int(timeout.total_seconds()
650
 
                                               * 1000), self.disable))
 
669
            self.disable_initiator_tag = gobject.timeout_add(
 
670
                int(timeout.total_seconds() * 1000), self.disable)
651
671
            self.expires = datetime.datetime.utcnow() + timeout
652
672
    
653
673
    def need_approval(self):
684
704
        # Start a new checker if needed
685
705
        if self.checker is None:
686
706
            # Escape attributes for the shell
687
 
            escaped_attrs = { attr:
688
 
                                  re.escape(unicode(getattr(self,
689
 
                                                            attr)))
690
 
                              for attr in self.runtime_expansions }
 
707
            escaped_attrs = {
 
708
                attr: re.escape(str(getattr(self, attr)))
 
709
                for attr in self.runtime_expansions }
691
710
            try:
692
711
                command = self.checker_command % escaped_attrs
693
712
            except TypeError as error:
694
713
                logger.error('Could not format string "%s"',
695
 
                             self.checker_command, exc_info=error)
696
 
                return True # Try again later
 
714
                             self.checker_command,
 
715
                             exc_info=error)
 
716
                return True     # Try again later
697
717
            self.current_checker_command = command
698
718
            try:
699
 
                logger.info("Starting checker %r for %s",
700
 
                            command, self.name)
 
719
                logger.info("Starting checker %r for %s", command,
 
720
                            self.name)
701
721
                # We don't need to redirect stdout and stderr, since
702
722
                # in normal mode, that is already done by daemon(),
703
723
                # and in debug mode we don't want to.  (Stdin is
712
732
                                       "stderr": wnull })
713
733
                self.checker = subprocess.Popen(command,
714
734
                                                close_fds=True,
715
 
                                                shell=True, cwd="/",
 
735
                                                shell=True,
 
736
                                                cwd="/",
716
737
                                                **popen_args)
717
738
            except OSError as error:
718
739
                logger.error("Failed to start subprocess",
719
740
                             exc_info=error)
720
741
                return True
721
 
            self.checker_callback_tag = (gobject.child_watch_add
722
 
                                         (self.checker.pid,
723
 
                                          self.checker_callback,
724
 
                                          data=command))
 
742
            self.checker_callback_tag = gobject.child_watch_add(
 
743
                self.checker.pid, self.checker_callback, data=command)
725
744
            # The checker may have completed before the gobject
726
745
            # watch was added.  Check for this.
727
746
            try:
758
777
        self.checker = None
759
778
 
760
779
 
761
 
def dbus_service_property(dbus_interface, signature="v",
762
 
                          access="readwrite", byte_arrays=False):
 
780
def dbus_service_property(dbus_interface,
 
781
                          signature="v",
 
782
                          access="readwrite",
 
783
                          byte_arrays=False):
763
784
    """Decorators for marking methods of a DBusObjectWithProperties to
764
785
    become properties on the D-Bus.
765
786
    
775
796
    if byte_arrays and signature != "ay":
776
797
        raise ValueError("Byte arrays not supported for non-'ay'"
777
798
                         " signature {!r}".format(signature))
 
799
    
778
800
    def decorator(func):
779
801
        func._dbus_is_property = True
780
802
        func._dbus_interface = dbus_interface
785
807
            func._dbus_name = func._dbus_name[:-14]
786
808
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
787
809
        return func
 
810
    
788
811
    return decorator
789
812
 
790
813
 
799
822
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
800
823
                    "false"}
801
824
    """
 
825
    
802
826
    def decorator(func):
803
827
        func._dbus_is_interface = True
804
828
        func._dbus_interface = dbus_interface
805
829
        func._dbus_name = dbus_interface
806
830
        return func
 
831
    
807
832
    return decorator
808
833
 
809
834
 
811
836
    """Decorator to annotate D-Bus methods, signals or properties
812
837
    Usage:
813
838
    
 
839
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
840
                       "org.freedesktop.DBus.Property."
 
841
                       "EmitsChangedSignal": "false"})
814
842
    @dbus_service_property("org.example.Interface", signature="b",
815
843
                           access="r")
816
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
 
                        "org.freedesktop.DBus.Property."
818
 
                        "EmitsChangedSignal": "false"})
819
844
    def Property_dbus_property(self):
820
845
        return dbus.Boolean(False)
821
846
    """
 
847
    
822
848
    def decorator(func):
823
849
        func._dbus_annotations = annotations
824
850
        return func
 
851
    
825
852
    return decorator
826
853
 
827
854
 
830
857
    """
831
858
    pass
832
859
 
 
860
 
833
861
class DBusPropertyAccessException(DBusPropertyException):
834
862
    """A property's access permissions disallows an operation.
835
863
    """
863
891
    def _get_all_dbus_things(self, thing):
864
892
        """Returns a generator of (name, attribute) pairs
865
893
        """
866
 
        return ((getattr(athing.__get__(self), "_dbus_name",
867
 
                         name),
 
894
        return ((getattr(athing.__get__(self), "_dbus_name", name),
868
895
                 athing.__get__(self))
869
896
                for cls in self.__class__.__mro__
870
897
                for name, athing in
871
 
                inspect.getmembers(cls,
872
 
                                   self._is_dbus_thing(thing)))
 
898
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
873
899
    
874
900
    def _get_dbus_property(self, interface_name, property_name):
875
901
        """Returns a bound method if one exists which is a D-Bus
876
902
        property with the specified name and interface.
877
903
        """
878
 
        for cls in  self.__class__.__mro__:
879
 
            for name, value in (inspect.getmembers
880
 
                                (cls,
881
 
                                 self._is_dbus_thing("property"))):
 
904
        for cls in self.__class__.__mro__:
 
905
            for name, value in inspect.getmembers(
 
906
                    cls, self._is_dbus_thing("property")):
882
907
                if (value._dbus_name == property_name
883
908
                    and value._dbus_interface == interface_name):
884
909
                    return value.__get__(self)
885
910
        
886
911
        # No such property
887
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
888
 
                                   + interface_name + "."
889
 
                                   + property_name)
 
912
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
913
            self.dbus_object_path, interface_name, property_name))
890
914
    
891
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
915
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
916
                         in_signature="ss",
892
917
                         out_signature="v")
893
918
    def Get(self, interface_name, property_name):
894
919
        """Standard D-Bus property Get() method, see D-Bus standard.
919
944
                                            for byte in value))
920
945
        prop(value)
921
946
    
922
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
947
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
948
                         in_signature="s",
923
949
                         out_signature="a{sv}")
924
950
    def GetAll(self, interface_name):
925
951
        """Standard D-Bus property GetAll() method, see D-Bus
940
966
            if not hasattr(value, "variant_level"):
941
967
                properties[name] = value
942
968
                continue
943
 
            properties[name] = type(value)(value, variant_level=
944
 
                                           value.variant_level+1)
 
969
            properties[name] = type(value)(
 
970
                value, variant_level = value.variant_level + 1)
945
971
        return dbus.Dictionary(properties, signature="sv")
946
972
    
 
973
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
974
    def PropertiesChanged(self, interface_name, changed_properties,
 
975
                          invalidated_properties):
 
976
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
977
        standard.
 
978
        """
 
979
        pass
 
980
    
947
981
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
948
982
                         out_signature="s",
949
983
                         path_keyword='object_path',
957
991
                                                   connection)
958
992
        try:
959
993
            document = xml.dom.minidom.parseString(xmlstring)
 
994
            
960
995
            def make_tag(document, name, prop):
961
996
                e = document.createElement("property")
962
997
                e.setAttribute("name", name)
963
998
                e.setAttribute("type", prop._dbus_signature)
964
999
                e.setAttribute("access", prop._dbus_access)
965
1000
                return e
 
1001
            
966
1002
            for if_tag in document.getElementsByTagName("interface"):
967
1003
                # Add property tags
968
1004
                for tag in (make_tag(document, name, prop)
980
1016
                            if (name == tag.getAttribute("name")
981
1017
                                and prop._dbus_interface
982
1018
                                == if_tag.getAttribute("name")):
983
 
                                annots.update(getattr
984
 
                                              (prop,
985
 
                                               "_dbus_annotations",
986
 
                                               {}))
 
1019
                                annots.update(getattr(
 
1020
                                    prop, "_dbus_annotations", {}))
987
1021
                        for name, value in annots.items():
988
1022
                            ann_tag = document.createElement(
989
1023
                                "annotation")
994
1028
                for annotation, value in dict(
995
1029
                    itertools.chain.from_iterable(
996
1030
                        annotations().items()
997
 
                        for name, annotations in
998
 
                        self._get_all_dbus_things("interface")
 
1031
                        for name, annotations
 
1032
                        in self._get_all_dbus_things("interface")
999
1033
                        if name == if_tag.getAttribute("name")
1000
1034
                        )).items():
1001
1035
                    ann_tag = document.createElement("annotation")
1030
1064
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1031
1065
    if dt is None:
1032
1066
        return dbus.String("", variant_level = variant_level)
1033
 
    return dbus.String(dt.isoformat(),
1034
 
                       variant_level=variant_level)
 
1067
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1035
1068
 
1036
1069
 
1037
1070
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
1090
    (from DBusObjectWithProperties) and interfaces (from the
1058
1091
    dbus_interface_annotations decorator).
1059
1092
    """
 
1093
    
1060
1094
    def wrapper(cls):
1061
1095
        for orig_interface_name, alt_interface_name in (
1062
 
            alt_interface_names.items()):
 
1096
                alt_interface_names.items()):
1063
1097
            attr = {}
1064
1098
            interface_names = set()
1065
1099
            # Go though all attributes of the class
1067
1101
                # Ignore non-D-Bus attributes, and D-Bus attributes
1068
1102
                # with the wrong interface name
1069
1103
                if (not hasattr(attribute, "_dbus_interface")
1070
 
                    or not attribute._dbus_interface
1071
 
                    .startswith(orig_interface_name)):
 
1104
                    or not attribute._dbus_interface.startswith(
 
1105
                        orig_interface_name)):
1072
1106
                    continue
1073
1107
                # Create an alternate D-Bus interface name based on
1074
1108
                # the current name
1075
 
                alt_interface = (attribute._dbus_interface
1076
 
                                 .replace(orig_interface_name,
1077
 
                                          alt_interface_name))
 
1109
                alt_interface = attribute._dbus_interface.replace(
 
1110
                    orig_interface_name, alt_interface_name)
1078
1111
                interface_names.add(alt_interface)
1079
1112
                # Is this a D-Bus signal?
1080
1113
                if getattr(attribute, "_dbus_is_signal", False):
1081
1114
                    # Extract the original non-method undecorated
1082
1115
                    # function by black magic
1083
1116
                    nonmethod_func = (dict(
1084
 
                            zip(attribute.func_code.co_freevars,
1085
 
                                attribute.__closure__))["func"]
1086
 
                                      .cell_contents)
 
1117
                        zip(attribute.func_code.co_freevars,
 
1118
                            attribute.__closure__))
 
1119
                                      ["func"].cell_contents)
1087
1120
                    # Create a new, but exactly alike, function
1088
1121
                    # object, and decorate it to be a new D-Bus signal
1089
1122
                    # with the alternate D-Bus interface name
1090
 
                    new_function = (dbus.service.signal
1091
 
                                    (alt_interface,
1092
 
                                     attribute._dbus_signature)
 
1123
                    new_function = (dbus.service.signal(
 
1124
                        alt_interface, attribute._dbus_signature)
1093
1125
                                    (types.FunctionType(
1094
 
                                nonmethod_func.func_code,
1095
 
                                nonmethod_func.func_globals,
1096
 
                                nonmethod_func.func_name,
1097
 
                                nonmethod_func.func_defaults,
1098
 
                                nonmethod_func.func_closure)))
 
1126
                                        nonmethod_func.func_code,
 
1127
                                        nonmethod_func.func_globals,
 
1128
                                        nonmethod_func.func_name,
 
1129
                                        nonmethod_func.func_defaults,
 
1130
                                        nonmethod_func.func_closure)))
1099
1131
                    # Copy annotations, if any
1100
1132
                    try:
1101
 
                        new_function._dbus_annotations = (
1102
 
                            dict(attribute._dbus_annotations))
 
1133
                        new_function._dbus_annotations = dict(
 
1134
                            attribute._dbus_annotations)
1103
1135
                    except AttributeError:
1104
1136
                        pass
1105
1137
                    # Define a creator of a function to call both the
1110
1142
                        """This function is a scope container to pass
1111
1143
                        func1 and func2 to the "call_both" function
1112
1144
                        outside of its arguments"""
 
1145
                        
1113
1146
                        def call_both(*args, **kwargs):
1114
1147
                            """This function will emit two D-Bus
1115
1148
                            signals by calling func1 and func2"""
1116
1149
                            func1(*args, **kwargs)
1117
1150
                            func2(*args, **kwargs)
 
1151
                        
1118
1152
                        return call_both
1119
1153
                    # Create the "call_both" function and add it to
1120
1154
                    # the class
1125
1159
                    # object.  Decorate it to be a new D-Bus method
1126
1160
                    # with the alternate D-Bus interface name.  Add it
1127
1161
                    # to the class.
1128
 
                    attr[attrname] = (dbus.service.method
1129
 
                                      (alt_interface,
1130
 
                                       attribute._dbus_in_signature,
1131
 
                                       attribute._dbus_out_signature)
1132
 
                                      (types.FunctionType
1133
 
                                       (attribute.func_code,
1134
 
                                        attribute.func_globals,
1135
 
                                        attribute.func_name,
1136
 
                                        attribute.func_defaults,
1137
 
                                        attribute.func_closure)))
 
1162
                    attr[attrname] = (
 
1163
                        dbus.service.method(
 
1164
                            alt_interface,
 
1165
                            attribute._dbus_in_signature,
 
1166
                            attribute._dbus_out_signature)
 
1167
                        (types.FunctionType(attribute.func_code,
 
1168
                                            attribute.func_globals,
 
1169
                                            attribute.func_name,
 
1170
                                            attribute.func_defaults,
 
1171
                                            attribute.func_closure)))
1138
1172
                    # Copy annotations, if any
1139
1173
                    try:
1140
 
                        attr[attrname]._dbus_annotations = (
1141
 
                            dict(attribute._dbus_annotations))
 
1174
                        attr[attrname]._dbus_annotations = dict(
 
1175
                            attribute._dbus_annotations)
1142
1176
                    except AttributeError:
1143
1177
                        pass
1144
1178
                # Is this a D-Bus property?
1147
1181
                    # object, and decorate it to be a new D-Bus
1148
1182
                    # property with the alternate D-Bus interface
1149
1183
                    # name.  Add it to the class.
1150
 
                    attr[attrname] = (dbus_service_property
1151
 
                                      (alt_interface,
1152
 
                                       attribute._dbus_signature,
1153
 
                                       attribute._dbus_access,
1154
 
                                       attribute
1155
 
                                       ._dbus_get_args_options
1156
 
                                       ["byte_arrays"])
1157
 
                                      (types.FunctionType
1158
 
                                       (attribute.func_code,
1159
 
                                        attribute.func_globals,
1160
 
                                        attribute.func_name,
1161
 
                                        attribute.func_defaults,
1162
 
                                        attribute.func_closure)))
 
1184
                    attr[attrname] = (dbus_service_property(
 
1185
                        alt_interface, attribute._dbus_signature,
 
1186
                        attribute._dbus_access,
 
1187
                        attribute._dbus_get_args_options
 
1188
                        ["byte_arrays"])
 
1189
                                      (types.FunctionType(
 
1190
                                          attribute.func_code,
 
1191
                                          attribute.func_globals,
 
1192
                                          attribute.func_name,
 
1193
                                          attribute.func_defaults,
 
1194
                                          attribute.func_closure)))
1163
1195
                    # Copy annotations, if any
1164
1196
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
 
1197
                        attr[attrname]._dbus_annotations = dict(
 
1198
                            attribute._dbus_annotations)
1167
1199
                    except AttributeError:
1168
1200
                        pass
1169
1201
                # Is this a D-Bus interface?
1172
1204
                    # object.  Decorate it to be a new D-Bus interface
1173
1205
                    # with the alternate D-Bus interface name.  Add it
1174
1206
                    # to the class.
1175
 
                    attr[attrname] = (dbus_interface_annotations
1176
 
                                      (alt_interface)
1177
 
                                      (types.FunctionType
1178
 
                                       (attribute.func_code,
1179
 
                                        attribute.func_globals,
1180
 
                                        attribute.func_name,
1181
 
                                        attribute.func_defaults,
1182
 
                                        attribute.func_closure)))
 
1207
                    attr[attrname] = (
 
1208
                        dbus_interface_annotations(alt_interface)
 
1209
                        (types.FunctionType(attribute.func_code,
 
1210
                                            attribute.func_globals,
 
1211
                                            attribute.func_name,
 
1212
                                            attribute.func_defaults,
 
1213
                                            attribute.func_closure)))
1183
1214
            if deprecate:
1184
1215
                # Deprecate all alternate interfaces
1185
1216
                iname="_AlternateDBusNames_interface_annotation{}"
1186
1217
                for interface_name in interface_names:
 
1218
                    
1187
1219
                    @dbus_interface_annotations(interface_name)
1188
1220
                    def func(self):
1189
1221
                        return { "org.freedesktop.DBus.Deprecated":
1190
 
                                     "true" }
 
1222
                                 "true" }
1191
1223
                    # Find an unused name
1192
1224
                    for aname in (iname.format(i)
1193
1225
                                  for i in itertools.count()):
1198
1230
                # Replace the class with a new subclass of it with
1199
1231
                # methods, signals, etc. as created above.
1200
1232
                cls = type(b"{}Alternate".format(cls.__name__),
1201
 
                           (cls,), attr)
 
1233
                           (cls, ), attr)
1202
1234
        return cls
 
1235
    
1203
1236
    return wrapper
1204
1237
 
1205
1238
 
1206
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
 
                                "se.bsnet.fukt.Mandos"})
 
1240
                            "se.bsnet.fukt.Mandos"})
1208
1241
class ClientDBus(Client, DBusObjectWithProperties):
1209
1242
    """A Client class using D-Bus
1210
1243
    
1214
1247
    """
1215
1248
    
1216
1249
    runtime_expansions = (Client.runtime_expansions
1217
 
                          + ("dbus_object_path",))
 
1250
                          + ("dbus_object_path", ))
 
1251
    
 
1252
    _interface = "se.recompile.Mandos.Client"
1218
1253
    
1219
1254
    # dbus.service.Object doesn't use super(), so we can't either.
1220
1255
    
1223
1258
        Client.__init__(self, *args, **kwargs)
1224
1259
        # Only now, when this client is initialized, can it show up on
1225
1260
        # the D-Bus
1226
 
        client_object_name = unicode(self.name).translate(
 
1261
        client_object_name = str(self.name).translate(
1227
1262
            {ord("."): ord("_"),
1228
1263
             ord("-"): ord("_")})
1229
 
        self.dbus_object_path = (dbus.ObjectPath
1230
 
                                 ("/clients/" + client_object_name))
 
1264
        self.dbus_object_path = dbus.ObjectPath(
 
1265
            "/clients/" + client_object_name)
1231
1266
        DBusObjectWithProperties.__init__(self, self.bus,
1232
1267
                                          self.dbus_object_path)
1233
1268
    
1234
 
    def notifychangeproperty(transform_func,
1235
 
                             dbus_name, type_func=lambda x: x,
1236
 
                             variant_level=1):
 
1269
    def notifychangeproperty(transform_func, dbus_name,
 
1270
                             type_func=lambda x: x,
 
1271
                             variant_level=1,
 
1272
                             invalidate_only=False,
 
1273
                             _interface=_interface):
1237
1274
        """ Modify a variable so that it's a property which announces
1238
1275
        its changes to DBus.
1239
1276
        
1245
1282
        variant_level: D-Bus variant level.  Default: 1
1246
1283
        """
1247
1284
        attrname = "_{}".format(dbus_name)
 
1285
        
1248
1286
        def setter(self, value):
1249
1287
            if hasattr(self, "dbus_object_path"):
1250
1288
                if (not hasattr(self, attrname) or
1251
1289
                    type_func(getattr(self, attrname, None))
1252
1290
                    != type_func(value)):
1253
 
                    dbus_value = transform_func(type_func(value),
1254
 
                                                variant_level
1255
 
                                                =variant_level)
1256
 
                    self.PropertyChanged(dbus.String(dbus_name),
1257
 
                                         dbus_value)
 
1291
                    if invalidate_only:
 
1292
                        self.PropertiesChanged(
 
1293
                            _interface, dbus.Dictionary(),
 
1294
                            dbus.Array((dbus_name, )))
 
1295
                    else:
 
1296
                        dbus_value = transform_func(
 
1297
                            type_func(value),
 
1298
                            variant_level = variant_level)
 
1299
                        self.PropertyChanged(dbus.String(dbus_name),
 
1300
                                             dbus_value)
 
1301
                        self.PropertiesChanged(
 
1302
                            _interface,
 
1303
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1304
                                              dbus_value }),
 
1305
                            dbus.Array())
1258
1306
            setattr(self, attrname, value)
1259
1307
        
1260
1308
        return property(lambda self: getattr(self, attrname), setter)
1266
1314
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1267
1315
    last_enabled = notifychangeproperty(datetime_to_dbus,
1268
1316
                                        "LastEnabled")
1269
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1270
 
                                   type_func = lambda checker:
1271
 
                                       checker is not None)
 
1317
    checker = notifychangeproperty(
 
1318
        dbus.Boolean, "CheckerRunning",
 
1319
        type_func = lambda checker: checker is not None)
1272
1320
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1321
                                           "LastCheckedOK")
1274
1322
    last_checker_status = notifychangeproperty(dbus.Int16,
1277
1325
        datetime_to_dbus, "LastApprovalRequest")
1278
1326
    approved_by_default = notifychangeproperty(dbus.Boolean,
1279
1327
                                               "ApprovedByDefault")
1280
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1281
 
                                          "ApprovalDelay",
1282
 
                                          type_func =
1283
 
                                          lambda td: td.total_seconds()
1284
 
                                          * 1000)
 
1328
    approval_delay = notifychangeproperty(
 
1329
        dbus.UInt64, "ApprovalDelay",
 
1330
        type_func = lambda td: td.total_seconds() * 1000)
1285
1331
    approval_duration = notifychangeproperty(
1286
1332
        dbus.UInt64, "ApprovalDuration",
1287
1333
        type_func = lambda td: td.total_seconds() * 1000)
1288
1334
    host = notifychangeproperty(dbus.String, "Host")
1289
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1290
 
                                   type_func = lambda td:
1291
 
                                       td.total_seconds() * 1000)
 
1335
    timeout = notifychangeproperty(
 
1336
        dbus.UInt64, "Timeout",
 
1337
        type_func = lambda td: td.total_seconds() * 1000)
1292
1338
    extended_timeout = notifychangeproperty(
1293
1339
        dbus.UInt64, "ExtendedTimeout",
1294
1340
        type_func = lambda td: td.total_seconds() * 1000)
1295
 
    interval = notifychangeproperty(dbus.UInt64,
1296
 
                                    "Interval",
1297
 
                                    type_func =
1298
 
                                    lambda td: td.total_seconds()
1299
 
                                    * 1000)
 
1341
    interval = notifychangeproperty(
 
1342
        dbus.UInt64, "Interval",
 
1343
        type_func = lambda td: td.total_seconds() * 1000)
1300
1344
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1345
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1346
                                  invalidate_only=True)
1301
1347
    
1302
1348
    del notifychangeproperty
1303
1349
    
1350
1396
        self.send_changedstate()
1351
1397
    
1352
1398
    ## D-Bus methods, signals & properties
1353
 
    _interface = "se.recompile.Mandos.Client"
1354
1399
    
1355
1400
    ## Interfaces
1356
1401
    
1357
 
    @dbus_interface_annotations(_interface)
1358
 
    def _foo(self):
1359
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1360
 
                     "false"}
1361
 
    
1362
1402
    ## Signals
1363
1403
    
1364
1404
    # CheckerCompleted - signal
1374
1414
        pass
1375
1415
    
1376
1416
    # PropertyChanged - signal
 
1417
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1377
1418
    @dbus.service.signal(_interface, signature="sv")
1378
1419
    def PropertyChanged(self, property, value):
1379
1420
        "D-Bus signal"
1443
1484
        return dbus.Boolean(bool(self.approvals_pending))
1444
1485
    
1445
1486
    # ApprovedByDefault - property
1446
 
    @dbus_service_property(_interface, signature="b",
 
1487
    @dbus_service_property(_interface,
 
1488
                           signature="b",
1447
1489
                           access="readwrite")
1448
1490
    def ApprovedByDefault_dbus_property(self, value=None):
1449
1491
        if value is None:       # get
1451
1493
        self.approved_by_default = bool(value)
1452
1494
    
1453
1495
    # ApprovalDelay - property
1454
 
    @dbus_service_property(_interface, signature="t",
 
1496
    @dbus_service_property(_interface,
 
1497
                           signature="t",
1455
1498
                           access="readwrite")
1456
1499
    def ApprovalDelay_dbus_property(self, value=None):
1457
1500
        if value is None:       # get
1460
1503
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1461
1504
    
1462
1505
    # ApprovalDuration - property
1463
 
    @dbus_service_property(_interface, signature="t",
 
1506
    @dbus_service_property(_interface,
 
1507
                           signature="t",
1464
1508
                           access="readwrite")
1465
1509
    def ApprovalDuration_dbus_property(self, value=None):
1466
1510
        if value is None:       # get
1479
1523
        return dbus.String(self.fingerprint)
1480
1524
    
1481
1525
    # Host - property
1482
 
    @dbus_service_property(_interface, signature="s",
 
1526
    @dbus_service_property(_interface,
 
1527
                           signature="s",
1483
1528
                           access="readwrite")
1484
1529
    def Host_dbus_property(self, value=None):
1485
1530
        if value is None:       # get
1486
1531
            return dbus.String(self.host)
1487
 
        self.host = unicode(value)
 
1532
        self.host = str(value)
1488
1533
    
1489
1534
    # Created - property
1490
1535
    @dbus_service_property(_interface, signature="s", access="read")
1497
1542
        return datetime_to_dbus(self.last_enabled)
1498
1543
    
1499
1544
    # Enabled - property
1500
 
    @dbus_service_property(_interface, signature="b",
 
1545
    @dbus_service_property(_interface,
 
1546
                           signature="b",
1501
1547
                           access="readwrite")
1502
1548
    def Enabled_dbus_property(self, value=None):
1503
1549
        if value is None:       # get
1508
1554
            self.disable()
1509
1555
    
1510
1556
    # LastCheckedOK - property
1511
 
    @dbus_service_property(_interface, signature="s",
 
1557
    @dbus_service_property(_interface,
 
1558
                           signature="s",
1512
1559
                           access="readwrite")
1513
1560
    def LastCheckedOK_dbus_property(self, value=None):
1514
1561
        if value is not None:
1517
1564
        return datetime_to_dbus(self.last_checked_ok)
1518
1565
    
1519
1566
    # LastCheckerStatus - property
1520
 
    @dbus_service_property(_interface, signature="n",
1521
 
                           access="read")
 
1567
    @dbus_service_property(_interface, signature="n", access="read")
1522
1568
    def LastCheckerStatus_dbus_property(self):
1523
1569
        return dbus.Int16(self.last_checker_status)
1524
1570
    
1533
1579
        return datetime_to_dbus(self.last_approval_request)
1534
1580
    
1535
1581
    # Timeout - property
1536
 
    @dbus_service_property(_interface, signature="t",
 
1582
    @dbus_service_property(_interface,
 
1583
                           signature="t",
1537
1584
                           access="readwrite")
1538
1585
    def Timeout_dbus_property(self, value=None):
1539
1586
        if value is None:       # get
1552
1599
                    is None):
1553
1600
                    return
1554
1601
                gobject.source_remove(self.disable_initiator_tag)
1555
 
                self.disable_initiator_tag = (
1556
 
                    gobject.timeout_add(
1557
 
                        int((self.expires - now).total_seconds()
1558
 
                            * 1000), self.disable))
 
1602
                self.disable_initiator_tag = gobject.timeout_add(
 
1603
                    int((self.expires - now).total_seconds() * 1000),
 
1604
                    self.disable)
1559
1605
    
1560
1606
    # ExtendedTimeout - property
1561
 
    @dbus_service_property(_interface, signature="t",
 
1607
    @dbus_service_property(_interface,
 
1608
                           signature="t",
1562
1609
                           access="readwrite")
1563
1610
    def ExtendedTimeout_dbus_property(self, value=None):
1564
1611
        if value is None:       # get
1567
1614
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1568
1615
    
1569
1616
    # Interval - property
1570
 
    @dbus_service_property(_interface, signature="t",
 
1617
    @dbus_service_property(_interface,
 
1618
                           signature="t",
1571
1619
                           access="readwrite")
1572
1620
    def Interval_dbus_property(self, value=None):
1573
1621
        if value is None:       # get
1578
1626
        if self.enabled:
1579
1627
            # Reschedule checker run
1580
1628
            gobject.source_remove(self.checker_initiator_tag)
1581
 
            self.checker_initiator_tag = (gobject.timeout_add
1582
 
                                          (value, self.start_checker))
1583
 
            self.start_checker()    # Start one now, too
 
1629
            self.checker_initiator_tag = gobject.timeout_add(
 
1630
                value, self.start_checker)
 
1631
            self.start_checker() # Start one now, too
1584
1632
    
1585
1633
    # Checker - property
1586
 
    @dbus_service_property(_interface, signature="s",
 
1634
    @dbus_service_property(_interface,
 
1635
                           signature="s",
1587
1636
                           access="readwrite")
1588
1637
    def Checker_dbus_property(self, value=None):
1589
1638
        if value is None:       # get
1590
1639
            return dbus.String(self.checker_command)
1591
 
        self.checker_command = unicode(value)
 
1640
        self.checker_command = str(value)
1592
1641
    
1593
1642
    # CheckerRunning - property
1594
 
    @dbus_service_property(_interface, signature="b",
 
1643
    @dbus_service_property(_interface,
 
1644
                           signature="b",
1595
1645
                           access="readwrite")
1596
1646
    def CheckerRunning_dbus_property(self, value=None):
1597
1647
        if value is None:       # get
1607
1657
        return self.dbus_object_path # is already a dbus.ObjectPath
1608
1658
    
1609
1659
    # Secret = property
1610
 
    @dbus_service_property(_interface, signature="ay",
1611
 
                           access="write", byte_arrays=True)
 
1660
    @dbus_service_property(_interface,
 
1661
                           signature="ay",
 
1662
                           access="write",
 
1663
                           byte_arrays=True)
1612
1664
    def Secret_dbus_property(self, value):
1613
1665
        self.secret = bytes(value)
1614
1666
    
1620
1672
        self._pipe = child_pipe
1621
1673
        self._pipe.send(('init', fpr, address))
1622
1674
        if not self._pipe.recv():
1623
 
            raise KeyError()
 
1675
            raise KeyError(fpr)
1624
1676
    
1625
1677
    def __getattribute__(self, name):
1626
1678
        if name == '_pipe':
1630
1682
        if data[0] == 'data':
1631
1683
            return data[1]
1632
1684
        if data[0] == 'function':
 
1685
            
1633
1686
            def func(*args, **kwargs):
1634
1687
                self._pipe.send(('funcall', name, args, kwargs))
1635
1688
                return self._pipe.recv()[1]
 
1689
            
1636
1690
            return func
1637
1691
    
1638
1692
    def __setattr__(self, name, value):
1650
1704
    def handle(self):
1651
1705
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1652
1706
            logger.info("TCP connection from: %s",
1653
 
                        unicode(self.client_address))
 
1707
                        str(self.client_address))
1654
1708
            logger.debug("Pipe FD: %d",
1655
1709
                         self.server.child_pipe.fileno())
1656
1710
            
1657
 
            session = (gnutls.connection
1658
 
                       .ClientSession(self.request,
1659
 
                                      gnutls.connection
1660
 
                                      .X509Credentials()))
 
1711
            session = gnutls.connection.ClientSession(
 
1712
                self.request, gnutls.connection .X509Credentials())
1661
1713
            
1662
1714
            # Note: gnutls.connection.X509Credentials is really a
1663
1715
            # generic GnuTLS certificate credentials object so long as
1672
1724
            priority = self.server.gnutls_priority
1673
1725
            if priority is None:
1674
1726
                priority = "NORMAL"
1675
 
            (gnutls.library.functions
1676
 
             .gnutls_priority_set_direct(session._c_object,
1677
 
                                         priority, None))
 
1727
            gnutls.library.functions.gnutls_priority_set_direct(
 
1728
                session._c_object, priority, None)
1678
1729
            
1679
1730
            # Start communication using the Mandos protocol
1680
1731
            # Get protocol number
1700
1751
            approval_required = False
1701
1752
            try:
1702
1753
                try:
1703
 
                    fpr = self.fingerprint(self.peer_certificate
1704
 
                                           (session))
 
1754
                    fpr = self.fingerprint(
 
1755
                        self.peer_certificate(session))
1705
1756
                except (TypeError,
1706
1757
                        gnutls.errors.GNUTLSError) as error:
1707
1758
                    logger.warning("Bad certificate: %s", error)
1722
1773
                while True:
1723
1774
                    if not client.enabled:
1724
1775
                        logger.info("Client %s is disabled",
1725
 
                                       client.name)
 
1776
                                    client.name)
1726
1777
                        if self.server.use_dbus:
1727
1778
                            # Emit D-Bus signal
1728
1779
                            client.Rejected("Disabled")
1775
1826
                        logger.warning("gnutls send failed",
1776
1827
                                       exc_info=error)
1777
1828
                        return
1778
 
                    logger.debug("Sent: %d, remaining: %d",
1779
 
                                 sent, len(client.secret)
1780
 
                                 - (sent_size + sent))
 
1829
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1830
                                 len(client.secret) - (sent_size
 
1831
                                                       + sent))
1781
1832
                    sent_size += sent
1782
1833
                
1783
1834
                logger.info("Sending secret to %s", client.name)
1800
1851
    def peer_certificate(session):
1801
1852
        "Return the peer's OpenPGP certificate as a bytestring"
1802
1853
        # If not an OpenPGP certificate...
1803
 
        if (gnutls.library.functions
1804
 
            .gnutls_certificate_type_get(session._c_object)
 
1854
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1855
                session._c_object)
1805
1856
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1806
1857
            # ...do the normal thing
1807
1858
            return session.peer_certificate
1821
1872
    def fingerprint(openpgp):
1822
1873
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1823
1874
        # New GnuTLS "datum" with the OpenPGP public key
1824
 
        datum = (gnutls.library.types
1825
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1826
 
                                             ctypes.POINTER
1827
 
                                             (ctypes.c_ubyte)),
1828
 
                                 ctypes.c_uint(len(openpgp))))
 
1875
        datum = gnutls.library.types.gnutls_datum_t(
 
1876
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1877
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1878
            ctypes.c_uint(len(openpgp)))
1829
1879
        # New empty GnuTLS certificate
1830
1880
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1831
 
        (gnutls.library.functions
1832
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1881
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1882
            ctypes.byref(crt))
1833
1883
        # Import the OpenPGP public key into the certificate
1834
 
        (gnutls.library.functions
1835
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1836
 
                                    gnutls.library.constants
1837
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1884
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1885
            crt, ctypes.byref(datum),
 
1886
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1838
1887
        # Verify the self signature in the key
1839
1888
        crtverify = ctypes.c_uint()
1840
 
        (gnutls.library.functions
1841
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1842
 
                                         ctypes.byref(crtverify)))
 
1889
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1890
            crt, 0, ctypes.byref(crtverify))
1843
1891
        if crtverify.value != 0:
1844
1892
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1845
 
            raise (gnutls.errors.CertificateSecurityError
1846
 
                   ("Verify failed"))
 
1893
            raise gnutls.errors.CertificateSecurityError(
 
1894
                "Verify failed")
1847
1895
        # New buffer for the fingerprint
1848
1896
        buf = ctypes.create_string_buffer(20)
1849
1897
        buf_len = ctypes.c_size_t()
1850
1898
        # Get the fingerprint from the certificate into the buffer
1851
 
        (gnutls.library.functions
1852
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1853
 
                                             ctypes.byref(buf_len)))
 
1899
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1900
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1854
1901
        # Deinit the certificate
1855
1902
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1856
1903
        # Convert the buffer to a Python bytestring
1862
1909
 
1863
1910
class MultiprocessingMixIn(object):
1864
1911
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1912
    
1865
1913
    def sub_process_main(self, request, address):
1866
1914
        try:
1867
1915
            self.finish_request(request, address)
1879
1927
 
1880
1928
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1881
1929
    """ adds a pipe to the MixIn """
 
1930
    
1882
1931
    def process_request(self, request, client_address):
1883
1932
        """Overrides and wraps the original process_request().
1884
1933
        
1905
1954
        interface:      None or a network interface name (string)
1906
1955
        use_ipv6:       Boolean; to use IPv6 or not
1907
1956
    """
 
1957
    
1908
1958
    def __init__(self, server_address, RequestHandlerClass,
1909
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1959
                 interface=None,
 
1960
                 use_ipv6=True,
 
1961
                 socketfd=None):
1910
1962
        """If socketfd is set, use that file descriptor instead of
1911
1963
        creating a new one with socket.socket().
1912
1964
        """
1953
2005
                             self.interface)
1954
2006
            else:
1955
2007
                try:
1956
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1957
 
                                           SO_BINDTODEVICE,
1958
 
                                           (self.interface + "\0")
1959
 
                                           .encode("utf-8"))
 
2008
                    self.socket.setsockopt(
 
2009
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2010
                        (self.interface + "\0").encode("utf-8"))
1960
2011
                except socket.error as error:
1961
2012
                    if error.errno == errno.EPERM:
1962
2013
                        logger.error("No permission to bind to"
1980
2031
                self.server_address = (any_address,
1981
2032
                                       self.server_address[1])
1982
2033
            elif not self.server_address[1]:
1983
 
                self.server_address = (self.server_address[0],
1984
 
                                       0)
 
2034
                self.server_address = (self.server_address[0], 0)
1985
2035
#                 if self.interface:
1986
2036
#                     self.server_address = (self.server_address[0],
1987
2037
#                                            0, # port
2001
2051
    
2002
2052
    Assumes a gobject.MainLoop event loop.
2003
2053
    """
 
2054
    
2004
2055
    def __init__(self, server_address, RequestHandlerClass,
2005
 
                 interface=None, use_ipv6=True, clients=None,
2006
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2056
                 interface=None,
 
2057
                 use_ipv6=True,
 
2058
                 clients=None,
 
2059
                 gnutls_priority=None,
 
2060
                 use_dbus=True,
 
2061
                 socketfd=None):
2007
2062
        self.enabled = False
2008
2063
        self.clients = clients
2009
2064
        if self.clients is None:
2015
2070
                                interface = interface,
2016
2071
                                use_ipv6 = use_ipv6,
2017
2072
                                socketfd = socketfd)
 
2073
    
2018
2074
    def server_activate(self):
2019
2075
        if self.enabled:
2020
2076
            return socketserver.TCPServer.server_activate(self)
2024
2080
    
2025
2081
    def add_pipe(self, parent_pipe, proc):
2026
2082
        # Call "handle_ipc" for both data and EOF events
2027
 
        gobject.io_add_watch(parent_pipe.fileno(),
2028
 
                             gobject.IO_IN | gobject.IO_HUP,
2029
 
                             functools.partial(self.handle_ipc,
2030
 
                                               parent_pipe =
2031
 
                                               parent_pipe,
2032
 
                                               proc = proc))
 
2083
        gobject.io_add_watch(
 
2084
            parent_pipe.fileno(),
 
2085
            gobject.IO_IN | gobject.IO_HUP,
 
2086
            functools.partial(self.handle_ipc,
 
2087
                              parent_pipe = parent_pipe,
 
2088
                              proc = proc))
2033
2089
    
2034
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2035
 
                   proc = None, client_object=None):
 
2090
    def handle_ipc(self, source, condition,
 
2091
                   parent_pipe=None,
 
2092
                   proc = None,
 
2093
                   client_object=None):
2036
2094
        # error, or the other end of multiprocessing.Pipe has closed
2037
2095
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2038
2096
            # Wait for other process to exit
2061
2119
                parent_pipe.send(False)
2062
2120
                return False
2063
2121
            
2064
 
            gobject.io_add_watch(parent_pipe.fileno(),
2065
 
                                 gobject.IO_IN | gobject.IO_HUP,
2066
 
                                 functools.partial(self.handle_ipc,
2067
 
                                                   parent_pipe =
2068
 
                                                   parent_pipe,
2069
 
                                                   proc = proc,
2070
 
                                                   client_object =
2071
 
                                                   client))
 
2122
            gobject.io_add_watch(
 
2123
                parent_pipe.fileno(),
 
2124
                gobject.IO_IN | gobject.IO_HUP,
 
2125
                functools.partial(self.handle_ipc,
 
2126
                                  parent_pipe = parent_pipe,
 
2127
                                  proc = proc,
 
2128
                                  client_object = client))
2072
2129
            parent_pipe.send(True)
2073
2130
            # remove the old hook in favor of the new above hook on
2074
2131
            # same fileno
2080
2137
            
2081
2138
            parent_pipe.send(('data', getattr(client_object,
2082
2139
                                              funcname)(*args,
2083
 
                                                         **kwargs)))
 
2140
                                                        **kwargs)))
2084
2141
        
2085
2142
        if command == 'getattr':
2086
2143
            attrname = request[1]
2087
2144
            if callable(client_object.__getattribute__(attrname)):
2088
 
                parent_pipe.send(('function',))
 
2145
                parent_pipe.send(('function', ))
2089
2146
            else:
2090
 
                parent_pipe.send(('data', client_object
2091
 
                                  .__getattribute__(attrname)))
 
2147
                parent_pipe.send((
 
2148
                    'data', client_object.__getattribute__(attrname)))
2092
2149
        
2093
2150
        if command == 'setattr':
2094
2151
            attrname = request[1]
2134
2191
                                              # None
2135
2192
                                    "followers")) # Tokens valid after
2136
2193
                                                  # this token
 
2194
    Token = collections.namedtuple("Token", (
 
2195
        "regexp",  # To match token; if "value" is not None, must have
 
2196
                   # a "group" containing digits
 
2197
        "value",   # datetime.timedelta or None
 
2198
        "followers"))           # Tokens valid after this token
2137
2199
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2138
2200
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2139
2201
    token_end = Token(re.compile(r"$"), None, frozenset())
2140
2202
    token_second = Token(re.compile(r"(\d+)S"),
2141
2203
                         datetime.timedelta(seconds=1),
2142
 
                         frozenset((token_end,)))
 
2204
                         frozenset((token_end, )))
2143
2205
    token_minute = Token(re.compile(r"(\d+)M"),
2144
2206
                         datetime.timedelta(minutes=1),
2145
2207
                         frozenset((token_second, token_end)))
2161
2223
                       frozenset((token_month, token_end)))
2162
2224
    token_week = Token(re.compile(r"(\d+)W"),
2163
2225
                       datetime.timedelta(weeks=1),
2164
 
                       frozenset((token_end,)))
 
2226
                       frozenset((token_end, )))
2165
2227
    token_duration = Token(re.compile(r"P"), None,
2166
2228
                           frozenset((token_year, token_month,
2167
2229
                                      token_day, token_time,
2192
2254
                break
2193
2255
        else:
2194
2256
            # No currently valid tokens were found
2195
 
            raise ValueError("Invalid RFC 3339 duration")
 
2257
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2258
                             .format(duration))
2196
2259
    # End token found
2197
2260
    return value
2198
2261
 
2235
2298
            elif suffix == "w":
2236
2299
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2237
2300
            else:
2238
 
                raise ValueError("Unknown suffix {!r}"
2239
 
                                 .format(suffix))
 
2301
                raise ValueError("Unknown suffix {!r}".format(suffix))
2240
2302
        except IndexError as e:
2241
2303
            raise ValueError(*(e.args))
2242
2304
        timevalue += delta
2258
2320
        # Close all standard open file descriptors
2259
2321
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2260
2322
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2261
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2323
            raise OSError(errno.ENODEV,
 
2324
                          "{} not a character device"
2262
2325
                          .format(os.devnull))
2263
2326
        os.dup2(null, sys.stdin.fileno())
2264
2327
        os.dup2(null, sys.stdout.fileno())
2330
2393
                        "port": "",
2331
2394
                        "debug": "False",
2332
2395
                        "priority":
2333
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2396
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2397
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2334
2398
                        "servicename": "Mandos",
2335
2399
                        "use_dbus": "True",
2336
2400
                        "use_ipv6": "True",
2340
2404
                        "statedir": "/var/lib/mandos",
2341
2405
                        "foreground": "False",
2342
2406
                        "zeroconf": "True",
2343
 
                        }
 
2407
                    }
2344
2408
    
2345
2409
    # Parse config file for server-global settings
2346
2410
    server_config = configparser.SafeConfigParser(server_defaults)
2347
2411
    del server_defaults
2348
 
    server_config.read(os.path.join(options.configdir,
2349
 
                                    "mandos.conf"))
 
2412
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2350
2413
    # Convert the SafeConfigParser object to a dict
2351
2414
    server_settings = server_config.defaults()
2352
2415
    # Use the appropriate methods on the non-string config options
2370
2433
    # Override the settings from the config file with command line
2371
2434
    # options, if set.
2372
2435
    for option in ("interface", "address", "port", "debug",
2373
 
                   "priority", "servicename", "configdir",
2374
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2375
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2436
                   "priority", "servicename", "configdir", "use_dbus",
 
2437
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2438
                   "socket", "foreground", "zeroconf"):
2376
2439
        value = getattr(options, option)
2377
2440
        if value is not None:
2378
2441
            server_settings[option] = value
2393
2456
    
2394
2457
    ##################################################################
2395
2458
    
2396
 
    if (not server_settings["zeroconf"] and
2397
 
        not (server_settings["port"]
2398
 
             or server_settings["socket"] != "")):
2399
 
            parser.error("Needs port or socket to work without"
2400
 
                         " Zeroconf")
 
2459
    if (not server_settings["zeroconf"]
 
2460
        and not (server_settings["port"]
 
2461
                 or server_settings["socket"] != "")):
 
2462
        parser.error("Needs port or socket to work without Zeroconf")
2401
2463
    
2402
2464
    # For convenience
2403
2465
    debug = server_settings["debug"]
2419
2481
            initlogger(debug, level)
2420
2482
    
2421
2483
    if server_settings["servicename"] != "Mandos":
2422
 
        syslogger.setFormatter(logging.Formatter
2423
 
                               ('Mandos ({}) [%(process)d]:'
2424
 
                                ' %(levelname)s: %(message)s'
2425
 
                                .format(server_settings
2426
 
                                        ["servicename"])))
 
2484
        syslogger.setFormatter(
 
2485
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2486
                              ' %(levelname)s: %(message)s'.format(
 
2487
                                  server_settings["servicename"])))
2427
2488
    
2428
2489
    # Parse config file with clients
2429
2490
    client_config = configparser.SafeConfigParser(Client
2437
2498
    socketfd = None
2438
2499
    if server_settings["socket"] != "":
2439
2500
        socketfd = server_settings["socket"]
2440
 
    tcp_server = MandosServer((server_settings["address"],
2441
 
                               server_settings["port"]),
2442
 
                              ClientHandler,
2443
 
                              interface=(server_settings["interface"]
2444
 
                                         or None),
2445
 
                              use_ipv6=use_ipv6,
2446
 
                              gnutls_priority=
2447
 
                              server_settings["priority"],
2448
 
                              use_dbus=use_dbus,
2449
 
                              socketfd=socketfd)
 
2501
    tcp_server = MandosServer(
 
2502
        (server_settings["address"], server_settings["port"]),
 
2503
        ClientHandler,
 
2504
        interface=(server_settings["interface"] or None),
 
2505
        use_ipv6=use_ipv6,
 
2506
        gnutls_priority=server_settings["priority"],
 
2507
        use_dbus=use_dbus,
 
2508
        socketfd=socketfd)
2450
2509
    if not foreground:
2451
2510
        pidfilename = "/run/mandos.pid"
2452
2511
        if not os.path.isdir("/run/."):
2453
2512
            pidfilename = "/var/run/mandos.pid"
2454
2513
        pidfile = None
2455
2514
        try:
2456
 
            pidfile = open(pidfilename, "w")
 
2515
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2516
        except IOError as e:
2458
2517
            logger.error("Could not open file %r", pidfilename,
2459
2518
                         exc_info=e)
2486
2545
        def debug_gnutls(level, string):
2487
2546
            logger.debug("GnuTLS: %s", string[:-1])
2488
2547
        
2489
 
        (gnutls.library.functions
2490
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2548
        gnutls.library.functions.gnutls_global_set_log_function(
 
2549
            debug_gnutls)
2491
2550
        
2492
2551
        # Redirect stdin so all checkers get /dev/null
2493
2552
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2513
2572
    if use_dbus:
2514
2573
        try:
2515
2574
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
 
                                            bus, do_not_queue=True)
2517
 
            old_bus_name = (dbus.service.BusName
2518
 
                            ("se.bsnet.fukt.Mandos", bus,
2519
 
                             do_not_queue=True))
2520
 
        except dbus.exceptions.NameExistsException as e:
 
2575
                                            bus,
 
2576
                                            do_not_queue=True)
 
2577
            old_bus_name = dbus.service.BusName(
 
2578
                "se.bsnet.fukt.Mandos", bus,
 
2579
                do_not_queue=True)
 
2580
        except dbus.exceptions.DBusException as e:
2521
2581
            logger.error("Disabling D-Bus:", exc_info=e)
2522
2582
            use_dbus = False
2523
2583
            server_settings["use_dbus"] = False
2524
2584
            tcp_server.use_dbus = False
2525
2585
    if zeroconf:
2526
2586
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2527
 
        service = AvahiServiceToSyslog(name =
2528
 
                                       server_settings["servicename"],
2529
 
                                       servicetype = "_mandos._tcp",
2530
 
                                       protocol = protocol, bus = bus)
 
2587
        service = AvahiServiceToSyslog(
 
2588
            name = server_settings["servicename"],
 
2589
            servicetype = "_mandos._tcp",
 
2590
            protocol = protocol,
 
2591
            bus = bus)
2531
2592
        if server_settings["interface"]:
2532
 
            service.interface = (if_nametoindex
2533
 
                                 (server_settings["interface"]
2534
 
                                  .encode("utf-8")))
 
2593
            service.interface = if_nametoindex(
 
2594
                server_settings["interface"].encode("utf-8"))
2535
2595
    
2536
2596
    global multiprocessing_manager
2537
2597
    multiprocessing_manager = multiprocessing.Manager()
2556
2616
    if server_settings["restore"]:
2557
2617
        try:
2558
2618
            with open(stored_state_path, "rb") as stored_state:
2559
 
                clients_data, old_client_settings = (pickle.load
2560
 
                                                     (stored_state))
 
2619
                clients_data, old_client_settings = pickle.load(
 
2620
                    stored_state)
2561
2621
            os.remove(stored_state_path)
2562
2622
        except IOError as e:
2563
2623
            if e.errno == errno.ENOENT:
2564
 
                logger.warning("Could not load persistent state: {}"
2565
 
                                .format(os.strerror(e.errno)))
 
2624
                logger.warning("Could not load persistent state:"
 
2625
                               " {}".format(os.strerror(e.errno)))
2566
2626
            else:
2567
2627
                logger.critical("Could not load persistent state:",
2568
2628
                                exc_info=e)
2569
2629
                raise
2570
2630
        except EOFError as e:
2571
2631
            logger.warning("Could not load persistent state: "
2572
 
                           "EOFError:", exc_info=e)
 
2632
                           "EOFError:",
 
2633
                           exc_info=e)
2573
2634
    
2574
2635
    with PGPEngine() as pgp:
2575
2636
        for client_name, client in clients_data.items():
2587
2648
                    # For each value in new config, check if it
2588
2649
                    # differs from the old config value (Except for
2589
2650
                    # the "secret" attribute)
2590
 
                    if (name != "secret" and
2591
 
                        value != old_client_settings[client_name]
2592
 
                        [name]):
 
2651
                    if (name != "secret"
 
2652
                        and (value !=
 
2653
                             old_client_settings[client_name][name])):
2593
2654
                        client[name] = value
2594
2655
                except KeyError:
2595
2656
                    pass
2604
2665
                    if not client["last_checked_ok"]:
2605
2666
                        logger.warning(
2606
2667
                            "disabling client {} - Client never "
2607
 
                            "performed a successful checker"
2608
 
                            .format(client_name))
 
2668
                            "performed a successful checker".format(
 
2669
                                client_name))
2609
2670
                        client["enabled"] = False
2610
2671
                    elif client["last_checker_status"] != 0:
2611
2672
                        logger.warning(
2612
2673
                            "disabling client {} - Client last"
2613
 
                            " checker failed with error code {}"
2614
 
                            .format(client_name,
2615
 
                                    client["last_checker_status"]))
 
2674
                            " checker failed with error code"
 
2675
                            " {}".format(
 
2676
                                client_name,
 
2677
                                client["last_checker_status"]))
2616
2678
                        client["enabled"] = False
2617
2679
                    else:
2618
 
                        client["expires"] = (datetime.datetime
2619
 
                                             .utcnow()
2620
 
                                             + client["timeout"])
 
2680
                        client["expires"] = (
 
2681
                            datetime.datetime.utcnow()
 
2682
                            + client["timeout"])
2621
2683
                        logger.debug("Last checker succeeded,"
2622
 
                                     " keeping {} enabled"
2623
 
                                     .format(client_name))
 
2684
                                     " keeping {} enabled".format(
 
2685
                                         client_name))
2624
2686
            try:
2625
 
                client["secret"] = (
2626
 
                    pgp.decrypt(client["encrypted_secret"],
2627
 
                                client_settings[client_name]
2628
 
                                ["secret"]))
 
2687
                client["secret"] = pgp.decrypt(
 
2688
                    client["encrypted_secret"],
 
2689
                    client_settings[client_name]["secret"])
2629
2690
            except PGPError:
2630
2691
                # If decryption fails, we use secret from new settings
2631
 
                logger.debug("Failed to decrypt {} old secret"
2632
 
                             .format(client_name))
2633
 
                client["secret"] = (
2634
 
                    client_settings[client_name]["secret"])
 
2692
                logger.debug("Failed to decrypt {} old secret".format(
 
2693
                    client_name))
 
2694
                client["secret"] = (client_settings[client_name]
 
2695
                                    ["secret"])
2635
2696
    
2636
2697
    # Add/remove clients based on new changes made to config
2637
2698
    for client_name in (set(old_client_settings)
2644
2705
    # Create all client objects
2645
2706
    for client_name, client in clients_data.items():
2646
2707
        tcp_server.clients[client_name] = client_class(
2647
 
            name = client_name, settings = client,
 
2708
            name = client_name,
 
2709
            settings = client,
2648
2710
            server_settings = server_settings)
2649
2711
    
2650
2712
    if not tcp_server.clients:
2652
2714
    
2653
2715
    if not foreground:
2654
2716
        if pidfile is not None:
 
2717
            pid = os.getpid()
2655
2718
            try:
2656
2719
                with pidfile:
2657
 
                    pid = os.getpid()
2658
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2720
                    print(pid, file=pidfile)
2659
2721
            except IOError:
2660
2722
                logger.error("Could not write to file %r with PID %d",
2661
2723
                             pidfilename, pid)
2666
2728
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2667
2729
    
2668
2730
    if use_dbus:
2669
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2670
 
                                        "se.bsnet.fukt.Mandos"})
 
2731
        
 
2732
        @alternate_dbus_interfaces(
 
2733
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2671
2734
        class MandosDBusService(DBusObjectWithProperties):
2672
2735
            """A D-Bus proxy object"""
 
2736
            
2673
2737
            def __init__(self):
2674
2738
                dbus.service.Object.__init__(self, bus, "/")
 
2739
            
2675
2740
            _interface = "se.recompile.Mandos"
2676
2741
            
2677
2742
            @dbus_interface_annotations(_interface)
2678
2743
            def _foo(self):
2679
 
                return { "org.freedesktop.DBus.Property"
2680
 
                         ".EmitsChangedSignal":
2681
 
                             "false"}
 
2744
                return {
 
2745
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2746
                    "false" }
2682
2747
            
2683
2748
            @dbus.service.signal(_interface, signature="o")
2684
2749
            def ClientAdded(self, objpath):
2698
2763
            @dbus.service.method(_interface, out_signature="ao")
2699
2764
            def GetAllClients(self):
2700
2765
                "D-Bus method"
2701
 
                return dbus.Array(c.dbus_object_path
2702
 
                                  for c in
 
2766
                return dbus.Array(c.dbus_object_path for c in
2703
2767
                                  tcp_server.clients.itervalues())
2704
2768
            
2705
2769
            @dbus.service.method(_interface,
2707
2771
            def GetAllClientsWithProperties(self):
2708
2772
                "D-Bus method"
2709
2773
                return dbus.Dictionary(
2710
 
                    ((c.dbus_object_path, c.GetAll(""))
2711
 
                     for c in tcp_server.clients.itervalues()),
 
2774
                    { c.dbus_object_path: c.GetAll("")
 
2775
                      for c in tcp_server.clients.itervalues() },
2712
2776
                    signature="oa{sv}")
2713
2777
            
2714
2778
            @dbus.service.method(_interface, in_signature="o")
2754
2818
                # + secret.
2755
2819
                exclude = { "bus", "changedstate", "secret",
2756
2820
                            "checker", "server_settings" }
2757
 
                for name, typ in (inspect.getmembers
2758
 
                                  (dbus.service.Object)):
 
2821
                for name, typ in inspect.getmembers(dbus.service
 
2822
                                                    .Object):
2759
2823
                    exclude.add(name)
2760
2824
                
2761
2825
                client_dict["encrypted_secret"] = (client
2768
2832
                del client_settings[client.name]["secret"]
2769
2833
        
2770
2834
        try:
2771
 
            with (tempfile.NamedTemporaryFile
2772
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2773
 
                   dir=os.path.dirname(stored_state_path),
2774
 
                   delete=False)) as stored_state:
 
2835
            with tempfile.NamedTemporaryFile(
 
2836
                    mode='wb',
 
2837
                    suffix=".pickle",
 
2838
                    prefix='clients-',
 
2839
                    dir=os.path.dirname(stored_state_path),
 
2840
                    delete=False) as stored_state:
2775
2841
                pickle.dump((clients, client_settings), stored_state)
2776
 
                tempname=stored_state.name
 
2842
                tempname = stored_state.name
2777
2843
            os.rename(tempname, stored_state_path)
2778
2844
        except (IOError, OSError) as e:
2779
2845
            if not debug:
2798
2864
            client.disable(quiet=True)
2799
2865
            if use_dbus:
2800
2866
                # Emit D-Bus signal
2801
 
                mandos_dbus_service.ClientRemoved(client
2802
 
                                                  .dbus_object_path,
2803
 
                                                  client.name)
 
2867
                mandos_dbus_service.ClientRemoved(
 
2868
                    client.dbus_object_path, client.name)
2804
2869
        client_settings.clear()
2805
2870
    
2806
2871
    atexit.register(cleanup)
2859
2924
    # Must run before the D-Bus bus name gets deregistered
2860
2925
    cleanup()
2861
2926
 
 
2927
 
2862
2928
if __name__ == '__main__':
2863
2929
    main()