/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: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
65
68
 
66
69
import dbus
67
70
import dbus.service
72
75
import ctypes.util
73
76
import xml.dom.minidom
74
77
import inspect
 
78
import GnuPGInterface
75
79
 
76
80
try:
77
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
86
        SO_BINDTODEVICE = None
83
87
 
84
88
 
85
 
version = "1.3.1"
 
89
version = "1.4.1"
 
90
stored_state_file = "clients.pickle"
86
91
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
92
logger = logging.getLogger()
89
93
syslogger = (logging.handlers.SysLogHandler
90
94
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
95
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
96
 
 
97
try:
 
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
                      (ctypes.util.find_library("c"))
 
100
                      .if_nametoindex)
 
101
except (OSError, AttributeError):
 
102
    def if_nametoindex(interface):
 
103
        "Get an interface index the hard way, i.e. using fcntl()"
 
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
105
        with contextlib.closing(socket.socket()) as s:
 
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
107
                                struct.pack(str("16s16x"),
 
108
                                            interface))
 
109
        interface_index = struct.unpack(str("I"),
 
110
                                        ifreq[16:20])[0]
 
111
        return interface_index
 
112
 
 
113
 
 
114
def initlogger(level=logging.WARNING):
 
115
    """init logger and add loglevel"""
 
116
    
 
117
    syslogger.setFormatter(logging.Formatter
 
118
                           ('Mandos [%(process)d]: %(levelname)s:'
 
119
                            ' %(message)s'))
 
120
    logger.addHandler(syslogger)
 
121
    
 
122
    console = logging.StreamHandler()
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                           ' [%(process)d]:'
 
125
                                           ' %(levelname)s:'
 
126
                                           ' %(message)s'))
 
127
    logger.addHandler(console)
 
128
    logger.setLevel(level)
 
129
 
 
130
 
 
131
class CryptoError(Exception):
 
132
    pass
 
133
 
 
134
 
 
135
class Crypto(object):
 
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
137
    def __init__(self):
 
138
        self.gnupg = GnuPGInterface.GnuPG()
 
139
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
141
        self.gnupg.options.meta_interactive = False
 
142
        self.gnupg.options.homedir = self.tempdir
 
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
144
                                              '--quiet'])
 
145
    
 
146
    def __enter__(self):
 
147
        return self
 
148
    
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
 
150
        self._cleanup()
 
151
        return False
 
152
    
 
153
    def __del__(self):
 
154
        self._cleanup()
 
155
    
 
156
    def _cleanup(self):
 
157
        if self.tempdir is not None:
 
158
            # Delete contents of tempdir
 
159
            for root, dirs, files in os.walk(self.tempdir,
 
160
                                             topdown = False):
 
161
                for filename in files:
 
162
                    os.remove(os.path.join(root, filename))
 
163
                for dirname in dirs:
 
164
                    os.rmdir(os.path.join(root, dirname))
 
165
            # Remove tempdir
 
166
            os.rmdir(self.tempdir)
 
167
            self.tempdir = None
 
168
    
 
169
    def password_encode(self, password):
 
170
        # Passphrase can not be empty and can not contain newlines or
 
171
        # NUL bytes.  So we prefix it and hex encode it.
 
172
        return b"mandos" + binascii.hexlify(password)
 
173
    
 
174
    def encrypt(self, data, password):
 
175
        self.gnupg.passphrase = self.password_encode(password)
 
176
        with open(os.devnull) as devnull:
 
177
            try:
 
178
                proc = self.gnupg.run(['--symmetric'],
 
179
                                      create_fhs=['stdin', 'stdout'],
 
180
                                      attach_fhs={'stderr': devnull})
 
181
                with contextlib.closing(proc.handles['stdin']) as f:
 
182
                    f.write(data)
 
183
                with contextlib.closing(proc.handles['stdout']) as f:
 
184
                    ciphertext = f.read()
 
185
                proc.wait()
 
186
            except IOError as e:
 
187
                raise CryptoError(e)
 
188
        self.gnupg.passphrase = None
 
189
        return ciphertext
 
190
    
 
191
    def decrypt(self, data, password):
 
192
        self.gnupg.passphrase = self.password_encode(password)
 
193
        with open(os.devnull) as devnull:
 
194
            try:
 
195
                proc = self.gnupg.run(['--decrypt'],
 
196
                                      create_fhs=['stdin', 'stdout'],
 
197
                                      attach_fhs={'stderr': devnull})
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
199
                    f.write(data)
 
200
                with contextlib.closing(proc.handles['stdout']) as f:
 
201
                    decrypted_plaintext = f.read()
 
202
                proc.wait()
 
203
            except IOError as e:
 
204
                raise CryptoError(e)
 
205
        self.gnupg.passphrase = None
 
206
        return decrypted_plaintext
 
207
 
 
208
 
102
209
 
103
210
class AvahiError(Exception):
104
211
    def __init__(self, value, *args, **kwargs):
159
266
                            " after %i retries, exiting.",
160
267
                            self.rename_count)
161
268
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
269
        self.name = unicode(self.server
 
270
                            .GetAlternativeServiceName(self.name))
163
271
        logger.info("Changing Zeroconf service name to %r ...",
164
272
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
273
        self.remove()
170
274
        try:
171
275
            self.add()
191
295
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
296
        self.entry_group_state_changed_match = (
193
297
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
 
298
                'StateChanged', self.entry_group_state_changed))
195
299
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
196
300
                     self.name, self.type)
197
301
        self.group.AddService(
223
327
            try:
224
328
                self.group.Free()
225
329
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
 
330
                    dbus.exceptions.DBusException):
227
331
                pass
228
332
            self.group = None
229
333
        self.remove()
263
367
                                 self.server_state_changed)
264
368
        self.server_state_changed(self.server.GetState())
265
369
 
 
370
class AvahiServiceToSyslog(AvahiService):
 
371
    def rename(self):
 
372
        """Add the new name to the syslog messages"""
 
373
        ret = AvahiService.rename(self)
 
374
        syslogger.setFormatter(logging.Formatter
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
 
378
        return ret
266
379
 
 
380
def _timedelta_to_milliseconds(td):
 
381
    "Convert a datetime.timedelta() to milliseconds"
 
382
    return ((td.days * 24 * 60 * 60 * 1000)
 
383
            + (td.seconds * 1000)
 
384
            + (td.microseconds // 1000))
 
385
        
267
386
class Client(object):
268
387
    """A representation of a client host served by this server.
269
388
    
281
400
                     instance %(name)s can be used in the command.
282
401
    checker_initiator_tag: a gobject event source tag, or None
283
402
    created:    datetime.datetime(); (UTC) object creation
 
403
    client_structure: Object describing what attributes a client has
 
404
                      and is used for storing the client at exit
284
405
    current_checker_command: string; current running checker_command
285
 
    disable_hook:  If set, called by disable() as disable_hook(self)
286
406
    disable_initiator_tag: a gobject event source tag, or None
287
407
    enabled:    bool()
288
408
    fingerprint: string (40 or 32 hexadecimal digits); used to
291
411
    interval:   datetime.timedelta(); How often to start a new checker
292
412
    last_approval_request: datetime.datetime(); (UTC) or None
293
413
    last_checked_ok: datetime.datetime(); (UTC) or None
294
 
    last_enabled: datetime.datetime(); (UTC)
 
414
 
 
415
    last_checker_status: integer between 0 and 255 reflecting exit
 
416
                         status of last checker. -1 reflects crashed
 
417
                         checker, or None.
 
418
    last_enabled: datetime.datetime(); (UTC) or None
295
419
    name:       string; from the config file, used in log messages and
296
420
                        D-Bus identifiers
297
421
    secret:     bytestring; sent verbatim (over TLS) to client
308
432
                          "host", "interval", "last_checked_ok",
309
433
                          "last_enabled", "name", "timeout")
310
434
    
311
 
    @staticmethod
312
 
    def _timedelta_to_milliseconds(td):
313
 
        "Convert a datetime.timedelta() to milliseconds"
314
 
        return ((td.days * 24 * 60 * 60 * 1000)
315
 
                + (td.seconds * 1000)
316
 
                + (td.microseconds // 1000))
317
 
    
318
435
    def timeout_milliseconds(self):
319
436
        "Return the 'timeout' attribute in milliseconds"
320
 
        return self._timedelta_to_milliseconds(self.timeout)
321
 
 
 
437
        return _timedelta_to_milliseconds(self.timeout)
 
438
    
322
439
    def extended_timeout_milliseconds(self):
323
440
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return self._timedelta_to_milliseconds(self.extended_timeout)    
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
325
442
    
326
443
    def interval_milliseconds(self):
327
444
        "Return the 'interval' attribute in milliseconds"
328
 
        return self._timedelta_to_milliseconds(self.interval)
329
 
 
 
445
        return _timedelta_to_milliseconds(self.interval)
 
446
    
330
447
    def approval_delay_milliseconds(self):
331
 
        return self._timedelta_to_milliseconds(self.approval_delay)
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
332
449
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
450
    def __init__(self, name = None, config=None):
334
451
        """Note: the 'checker' key in 'config' sets the
335
452
        'checker_command' attribute and *not* the 'checker'
336
453
        attribute."""
356
473
                            % self.name)
357
474
        self.host = config.get("host", "")
358
475
        self.created = datetime.datetime.utcnow()
359
 
        self.enabled = False
 
476
        self.enabled = config.get("enabled", True)
360
477
        self.last_approval_request = None
361
 
        self.last_enabled = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
362
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
363
484
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
365
487
        self.interval = string_to_delta(config["interval"])
366
 
        self.disable_hook = disable_hook
367
488
        self.checker = None
368
489
        self.checker_initiator_tag = None
369
490
        self.disable_initiator_tag = None
370
 
        self.expires = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
371
495
        self.checker_callback_tag = None
372
496
        self.checker_command = config["checker"]
373
497
        self.current_checker_command = None
374
 
        self.last_connect = None
375
498
        self._approved = None
376
499
        self.approved_by_default = config.get("approved_by_default",
377
500
                                              True)
380
503
            config["approval_delay"])
381
504
        self.approval_duration = string_to_delta(
382
505
            config["approval_duration"])
383
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
506
        self.changedstate = (multiprocessing_manager
 
507
                             .Condition(multiprocessing_manager
 
508
                                        .Lock()))
 
509
        self.client_structure = [attr for attr in
 
510
                                 self.__dict__.iterkeys()
 
511
                                 if not attr.startswith("_")]
 
512
        self.client_structure.append("client_structure")
 
513
        
 
514
        for name, t in inspect.getmembers(type(self),
 
515
                                          lambda obj:
 
516
                                              isinstance(obj,
 
517
                                                         property)):
 
518
            if not name.startswith("_"):
 
519
                self.client_structure.append(name)
384
520
    
 
521
    # Send notice to process children that client state has changed
385
522
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
523
        with self.changedstate:
 
524
            self.changedstate.notify_all()
 
525
    
390
526
    def enable(self):
391
527
        """Start this client's checker and timeout hooks"""
392
528
        if getattr(self, "enabled", False):
393
529
            # Already enabled
394
530
            return
395
531
        self.send_changedstate()
 
532
        self.expires = datetime.datetime.utcnow() + self.timeout
 
533
        self.enabled = True
396
534
        self.last_enabled = datetime.datetime.utcnow()
397
 
        # Schedule a new checker to be started an 'interval' from now,
398
 
        # and every interval from then on.
399
 
        self.checker_initiator_tag = (gobject.timeout_add
400
 
                                      (self.interval_milliseconds(),
401
 
                                       self.start_checker))
402
 
        # Schedule a disable() when 'timeout' has passed
403
 
        self.expires = datetime.datetime.utcnow() + self.timeout
404
 
        self.disable_initiator_tag = (gobject.timeout_add
405
 
                                   (self.timeout_milliseconds(),
406
 
                                    self.disable))
407
 
        self.enabled = True
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
535
        self.init_checker()
410
536
    
411
537
    def disable(self, quiet=True):
412
538
        """Disable this client."""
424
550
            gobject.source_remove(self.checker_initiator_tag)
425
551
            self.checker_initiator_tag = None
426
552
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
553
        self.enabled = False
430
554
        # Do not run this again if called by a gobject.timeout_add
431
555
        return False
432
556
    
433
557
    def __del__(self):
434
 
        self.disable_hook = None
435
558
        self.disable()
436
559
    
 
560
    def init_checker(self):
 
561
        # Schedule a new checker to be started an 'interval' from now,
 
562
        # and every interval from then on.
 
563
        self.checker_initiator_tag = (gobject.timeout_add
 
564
                                      (self.interval_milliseconds(),
 
565
                                       self.start_checker))
 
566
        # Schedule a disable() when 'timeout' has passed
 
567
        self.disable_initiator_tag = (gobject.timeout_add
 
568
                                   (self.timeout_milliseconds(),
 
569
                                    self.disable))
 
570
        # Also start a new checker *right now*.
 
571
        self.start_checker()
 
572
    
437
573
    def checker_callback(self, pid, condition, command):
438
574
        """The checker has completed, so take appropriate actions."""
439
575
        self.checker_callback_tag = None
440
576
        self.checker = None
441
577
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
579
            if self.last_checker_status == 0:
444
580
                logger.info("Checker for %(name)s succeeded",
445
581
                            vars(self))
446
582
                self.checked_ok()
448
584
                logger.info("Checker for %(name)s failed",
449
585
                            vars(self))
450
586
        else:
 
587
            self.last_checker_status = -1
451
588
            logger.warning("Checker for %(name)s crashed?",
452
589
                           vars(self))
453
590
    
460
597
        if timeout is None:
461
598
            timeout = self.timeout
462
599
        self.last_checked_ok = datetime.datetime.utcnow()
463
 
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
 
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (self._timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
600
        if self.disable_initiator_tag is not None:
 
601
            gobject.source_remove(self.disable_initiator_tag)
 
602
        if getattr(self, "enabled", False):
 
603
            self.disable_initiator_tag = (gobject.timeout_add
 
604
                                          (_timedelta_to_milliseconds
 
605
                                           (timeout), self.disable))
 
606
            self.expires = datetime.datetime.utcnow() + timeout
468
607
    
469
608
    def need_approval(self):
470
609
        self.last_approval_request = datetime.datetime.utcnow()
510
649
                                       'replace')))
511
650
                    for attr in
512
651
                    self.runtime_expansions)
513
 
 
 
652
                
514
653
                try:
515
654
                    command = self.checker_command % escaped_attrs
516
655
                except TypeError as error:
562
701
                raise
563
702
        self.checker = None
564
703
 
 
704
 
565
705
def dbus_service_property(dbus_interface, signature="v",
566
706
                          access="readwrite", byte_arrays=False):
567
707
    """Decorators for marking methods of a DBusObjectWithProperties to
613
753
 
614
754
class DBusObjectWithProperties(dbus.service.Object):
615
755
    """A D-Bus object with properties.
616
 
 
 
756
    
617
757
    Classes inheriting from this can use the dbus_service_property
618
758
    decorator to expose methods as D-Bus properties.  It exposes the
619
759
    standard Get(), Set(), and GetAll() methods on the D-Bus.
626
766
    def _get_all_dbus_properties(self):
627
767
        """Returns a generator of (name, attribute) pairs
628
768
        """
629
 
        return ((prop._dbus_name, prop)
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
770
                for cls in self.__class__.__mro__
630
771
                for name, prop in
631
 
                inspect.getmembers(self, self._is_dbus_property))
 
772
                inspect.getmembers(cls, self._is_dbus_property))
632
773
    
633
774
    def _get_dbus_property(self, interface_name, property_name):
634
775
        """Returns a bound method if one exists which is a D-Bus
635
776
        property with the specified name and interface.
636
777
        """
637
 
        for name in (property_name,
638
 
                     property_name + "_dbus_property"):
639
 
            prop = getattr(self, name, None)
640
 
            if (prop is None
641
 
                or not self._is_dbus_property(prop)
642
 
                or prop._dbus_name != property_name
643
 
                or (interface_name and prop._dbus_interface
644
 
                    and interface_name != prop._dbus_interface)):
645
 
                continue
646
 
            return prop
 
778
        for cls in  self.__class__.__mro__:
 
779
            for name, value in (inspect.getmembers
 
780
                                (cls, self._is_dbus_property)):
 
781
                if (value._dbus_name == property_name
 
782
                    and value._dbus_interface == interface_name):
 
783
                    return value.__get__(self)
 
784
        
647
785
        # No such property
648
786
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
787
                                   + interface_name + "."
683
821
    def GetAll(self, interface_name):
684
822
        """Standard D-Bus property GetAll() method, see D-Bus
685
823
        standard.
686
 
 
 
824
        
687
825
        Note: Will not include properties with access="write".
688
826
        """
689
 
        all = {}
 
827
        properties = {}
690
828
        for name, prop in self._get_all_dbus_properties():
691
829
            if (interface_name
692
830
                and interface_name != prop._dbus_interface):
697
835
                continue
698
836
            value = prop()
699
837
            if not hasattr(value, "variant_level"):
700
 
                all[name] = value
 
838
                properties[name] = value
701
839
                continue
702
 
            all[name] = type(value)(value, variant_level=
703
 
                                    value.variant_level+1)
704
 
        return dbus.Dictionary(all, signature="sv")
 
840
            properties[name] = type(value)(value, variant_level=
 
841
                                           value.variant_level+1)
 
842
        return dbus.Dictionary(properties, signature="sv")
705
843
    
706
844
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
845
                         out_signature="s",
751
889
        return xmlstring
752
890
 
753
891
 
 
892
def datetime_to_dbus (dt, variant_level=0):
 
893
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
894
    if dt is None:
 
895
        return dbus.String("", variant_level = variant_level)
 
896
    return dbus.String(dt.isoformat(),
 
897
                       variant_level=variant_level)
 
898
 
 
899
 
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
901
                                  .__metaclass__):
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
903
    will add additional D-Bus attributes matching a certain pattern.
 
904
    """
 
905
    def __new__(mcs, name, bases, attr):
 
906
        # Go through all the base classes which could have D-Bus
 
907
        # methods, signals, or properties in them
 
908
        for base in (b for b in bases
 
909
                     if issubclass(b, dbus.service.Object)):
 
910
            # Go though all attributes of the base class
 
911
            for attrname, attribute in inspect.getmembers(base):
 
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
913
                # with the wrong interface name
 
914
                if (not hasattr(attribute, "_dbus_interface")
 
915
                    or not attribute._dbus_interface
 
916
                    .startswith("se.recompile.Mandos")):
 
917
                    continue
 
918
                # Create an alternate D-Bus interface name based on
 
919
                # the current name
 
920
                alt_interface = (attribute._dbus_interface
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
 
923
                # Is this a D-Bus signal?
 
924
                if getattr(attribute, "_dbus_is_signal", False):
 
925
                    # Extract the original non-method function by
 
926
                    # black magic
 
927
                    nonmethod_func = (dict(
 
928
                            zip(attribute.func_code.co_freevars,
 
929
                                attribute.__closure__))["func"]
 
930
                                      .cell_contents)
 
931
                    # Create a new, but exactly alike, function
 
932
                    # object, and decorate it to be a new D-Bus signal
 
933
                    # with the alternate D-Bus interface name
 
934
                    new_function = (dbus.service.signal
 
935
                                    (alt_interface,
 
936
                                     attribute._dbus_signature)
 
937
                                    (types.FunctionType(
 
938
                                nonmethod_func.func_code,
 
939
                                nonmethod_func.func_globals,
 
940
                                nonmethod_func.func_name,
 
941
                                nonmethod_func.func_defaults,
 
942
                                nonmethod_func.func_closure)))
 
943
                    # Define a creator of a function to call both the
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
 
946
                    def fixscope(func1, func2):
 
947
                        """This function is a scope container to pass
 
948
                        func1 and func2 to the "call_both" function
 
949
                        outside of its arguments"""
 
950
                        def call_both(*args, **kwargs):
 
951
                            """This function will emit two D-Bus
 
952
                            signals by calling func1 and func2"""
 
953
                            func1(*args, **kwargs)
 
954
                            func2(*args, **kwargs)
 
955
                        return call_both
 
956
                    # Create the "call_both" function and add it to
 
957
                    # the class
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
 
960
                # Is this a D-Bus method?
 
961
                elif getattr(attribute, "_dbus_is_method", False):
 
962
                    # Create a new, but exactly alike, function
 
963
                    # object.  Decorate it to be a new D-Bus method
 
964
                    # with the alternate D-Bus interface name.  Add it
 
965
                    # to the class.
 
966
                    attr[attrname] = (dbus.service.method
 
967
                                      (alt_interface,
 
968
                                       attribute._dbus_in_signature,
 
969
                                       attribute._dbus_out_signature)
 
970
                                      (types.FunctionType
 
971
                                       (attribute.func_code,
 
972
                                        attribute.func_globals,
 
973
                                        attribute.func_name,
 
974
                                        attribute.func_defaults,
 
975
                                        attribute.func_closure)))
 
976
                # Is this a D-Bus property?
 
977
                elif getattr(attribute, "_dbus_is_property", False):
 
978
                    # Create a new, but exactly alike, function
 
979
                    # object, and decorate it to be a new D-Bus
 
980
                    # property with the alternate D-Bus interface
 
981
                    # name.  Add it to the class.
 
982
                    attr[attrname] = (dbus_service_property
 
983
                                      (alt_interface,
 
984
                                       attribute._dbus_signature,
 
985
                                       attribute._dbus_access,
 
986
                                       attribute
 
987
                                       ._dbus_get_args_options
 
988
                                       ["byte_arrays"])
 
989
                                      (types.FunctionType
 
990
                                       (attribute.func_code,
 
991
                                        attribute.func_globals,
 
992
                                        attribute.func_name,
 
993
                                        attribute.func_defaults,
 
994
                                        attribute.func_closure)))
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
754
998
class ClientDBus(Client, DBusObjectWithProperties):
755
999
    """A Client class using D-Bus
756
1000
    
765
1009
    # dbus.service.Object doesn't use super(), so we can't either.
766
1010
    
767
1011
    def __init__(self, bus = None, *args, **kwargs):
 
1012
        self.bus = bus
 
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
768
1015
        self._approvals_pending = 0
769
 
        self.bus = bus
770
 
        Client.__init__(self, *args, **kwargs)
771
1016
        # Only now, when this client is initialized, can it show up on
772
1017
        # the D-Bus
773
1018
        client_object_name = unicode(self.name).translate(
777
1022
                                 ("/clients/" + client_object_name))
778
1023
        DBusObjectWithProperties.__init__(self, self.bus,
779
1024
                                          self.dbus_object_path)
780
 
    def _set_expires(self, value):
781
 
        old_value = getattr(self, "_expires", None)
782
 
        self._expires = value
783
 
        if hasattr(self, "dbus_object_path") and old_value != value:
784
 
            dbus_time = (self._datetime_to_dbus(self._expires,
785
 
                                                variant_level=1))
786
 
            self.PropertyChanged(dbus.String("Expires"),
787
 
                                 dbus_time)
788
 
    expires = property(lambda self: self._expires, _set_expires)
789
 
    del _set_expires
790
 
        
791
 
    def _get_approvals_pending(self):
792
 
        return self._approvals_pending
793
 
    def _set_approvals_pending(self, value):
794
 
        old_value = self._approvals_pending
795
 
        self._approvals_pending = value
796
 
        bval = bool(value)
797
 
        if (hasattr(self, "dbus_object_path")
798
 
            and bval is not bool(old_value)):
799
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
800
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
801
 
                                 dbus_bool)
802
 
 
803
 
    approvals_pending = property(_get_approvals_pending,
804
 
                                 _set_approvals_pending)
805
 
    del _get_approvals_pending, _set_approvals_pending
806
 
    
807
 
    @staticmethod
808
 
    def _datetime_to_dbus(dt, variant_level=0):
809
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
810
 
        if dt is None:
811
 
            return dbus.String("", variant_level = variant_level)
812
 
        return dbus.String(dt.isoformat(),
813
 
                           variant_level=variant_level)
814
 
    
815
 
    def enable(self):
816
 
        oldstate = getattr(self, "enabled", False)
817
 
        r = Client.enable(self)
818
 
        if oldstate != self.enabled:
819
 
            # Emit D-Bus signals
820
 
            self.PropertyChanged(dbus.String("Enabled"),
821
 
                                 dbus.Boolean(True, variant_level=1))
822
 
            self.PropertyChanged(
823
 
                dbus.String("LastEnabled"),
824
 
                self._datetime_to_dbus(self.last_enabled,
825
 
                                       variant_level=1))
826
 
        return r
827
 
    
828
 
    def disable(self, quiet = False):
829
 
        oldstate = getattr(self, "enabled", False)
830
 
        r = Client.disable(self, quiet=quiet)
831
 
        if not quiet and oldstate != self.enabled:
832
 
            # Emit D-Bus signal
833
 
            self.PropertyChanged(dbus.String("Enabled"),
834
 
                                 dbus.Boolean(False, variant_level=1))
835
 
        return r
 
1025
        
 
1026
    def notifychangeproperty(transform_func,
 
1027
                             dbus_name, type_func=lambda x: x,
 
1028
                             variant_level=1):
 
1029
        """ Modify a variable so that it's a property which announces
 
1030
        its changes to DBus.
 
1031
        
 
1032
        transform_fun: Function that takes a value and a variant_level
 
1033
                       and transforms it to a D-Bus type.
 
1034
        dbus_name: D-Bus name of the variable
 
1035
        type_func: Function that transform the value before sending it
 
1036
                   to the D-Bus.  Default: no transform
 
1037
        variant_level: D-Bus variant level.  Default: 1
 
1038
        """
 
1039
        attrname = "_{0}".format(dbus_name)
 
1040
        def setter(self, value):
 
1041
            if hasattr(self, "dbus_object_path"):
 
1042
                if (not hasattr(self, attrname) or
 
1043
                    type_func(getattr(self, attrname, None))
 
1044
                    != type_func(value)):
 
1045
                    dbus_value = transform_func(type_func(value),
 
1046
                                                variant_level
 
1047
                                                =variant_level)
 
1048
                    self.PropertyChanged(dbus.String(dbus_name),
 
1049
                                         dbus_value)
 
1050
            setattr(self, attrname, value)
 
1051
        
 
1052
        return property(lambda self: getattr(self, attrname), setter)
 
1053
    
 
1054
    
 
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1057
                                             "ApprovalPending",
 
1058
                                             type_func = bool)
 
1059
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1060
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1061
                                        "LastEnabled")
 
1062
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1063
                                   type_func = lambda checker:
 
1064
                                       checker is not None)
 
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1066
                                           "LastCheckedOK")
 
1067
    last_approval_request = notifychangeproperty(
 
1068
        datetime_to_dbus, "LastApprovalRequest")
 
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1070
                                               "ApprovedByDefault")
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1072
                                          "ApprovalDelay",
 
1073
                                          type_func =
 
1074
                                          _timedelta_to_milliseconds)
 
1075
    approval_duration = notifychangeproperty(
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
 
1078
    host = notifychangeproperty(dbus.String, "Host")
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1080
                                   type_func =
 
1081
                                   _timedelta_to_milliseconds)
 
1082
    extended_timeout = notifychangeproperty(
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
 
1086
                                    "Interval",
 
1087
                                    type_func =
 
1088
                                    _timedelta_to_milliseconds)
 
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1090
    
 
1091
    del notifychangeproperty
836
1092
    
837
1093
    def __del__(self, *args, **kwargs):
838
1094
        try:
847
1103
                         *args, **kwargs):
848
1104
        self.checker_callback_tag = None
849
1105
        self.checker = None
850
 
        # Emit D-Bus signal
851
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
852
 
                             dbus.Boolean(False, variant_level=1))
853
1106
        if os.WIFEXITED(condition):
854
1107
            exitstatus = os.WEXITSTATUS(condition)
855
1108
            # Emit D-Bus signal
865
1118
        return Client.checker_callback(self, pid, condition, command,
866
1119
                                       *args, **kwargs)
867
1120
    
868
 
    def checked_ok(self, *args, **kwargs):
869
 
        Client.checked_ok(self, *args, **kwargs)
870
 
        # Emit D-Bus signal
871
 
        self.PropertyChanged(
872
 
            dbus.String("LastCheckedOK"),
873
 
            (self._datetime_to_dbus(self.last_checked_ok,
874
 
                                    variant_level=1)))
875
 
    
876
 
    def need_approval(self, *args, **kwargs):
877
 
        r = Client.need_approval(self, *args, **kwargs)
878
 
        # Emit D-Bus signal
879
 
        self.PropertyChanged(
880
 
            dbus.String("LastApprovalRequest"),
881
 
            (self._datetime_to_dbus(self.last_approval_request,
882
 
                                    variant_level=1)))
883
 
        return r
884
 
    
885
1121
    def start_checker(self, *args, **kwargs):
886
1122
        old_checker = self.checker
887
1123
        if self.checker is not None:
894
1130
            and old_checker_pid != self.checker.pid):
895
1131
            # Emit D-Bus signal
896
1132
            self.CheckerStarted(self.current_checker_command)
897
 
            self.PropertyChanged(
898
 
                dbus.String("CheckerRunning"),
899
 
                dbus.Boolean(True, variant_level=1))
900
1133
        return r
901
1134
    
902
 
    def stop_checker(self, *args, **kwargs):
903
 
        old_checker = getattr(self, "checker", None)
904
 
        r = Client.stop_checker(self, *args, **kwargs)
905
 
        if (old_checker is not None
906
 
            and getattr(self, "checker", None) is None):
907
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
908
 
                                 dbus.Boolean(False, variant_level=1))
909
 
        return r
910
 
 
911
1135
    def _reset_approved(self):
912
1136
        self._approved = None
913
1137
        return False
915
1139
    def approve(self, value=True):
916
1140
        self.send_changedstate()
917
1141
        self._approved = value
918
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
919
1143
                            (self.approval_duration),
920
1144
                            self._reset_approved)
921
1145
    
922
1146
    
923
1147
    ## D-Bus methods, signals & properties
924
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1148
    _interface = "se.recompile.Mandos.Client"
925
1149
    
926
1150
    ## Signals
927
1151
    
964
1188
        "D-Bus signal"
965
1189
        return self.need_approval()
966
1190
    
 
1191
    # NeRwequest - signal
 
1192
    @dbus.service.signal(_interface, signature="s")
 
1193
    def NewRequest(self, ip):
 
1194
        """D-Bus signal
 
1195
        Is sent after a client request a password.
 
1196
        """
 
1197
        pass
 
1198
    
967
1199
    ## Methods
968
1200
    
969
1201
    # Approve - method
1012
1244
    def ApprovedByDefault_dbus_property(self, value=None):
1013
1245
        if value is None:       # get
1014
1246
            return dbus.Boolean(self.approved_by_default)
1015
 
        old_value = self.approved_by_default
1016
1247
        self.approved_by_default = bool(value)
1017
 
        # Emit D-Bus signal
1018
 
        if old_value != self.approved_by_default:
1019
 
            self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
 
                                 dbus.Boolean(value, variant_level=1))
1021
1248
    
1022
1249
    # ApprovalDelay - property
1023
1250
    @dbus_service_property(_interface, signature="t",
1025
1252
    def ApprovalDelay_dbus_property(self, value=None):
1026
1253
        if value is None:       # get
1027
1254
            return dbus.UInt64(self.approval_delay_milliseconds())
1028
 
        old_value = self.approval_delay
1029
1255
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
 
        # Emit D-Bus signal
1031
 
        if old_value != self.approval_delay:
1032
 
            self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
 
                                 dbus.UInt64(value, variant_level=1))
1034
1256
    
1035
1257
    # ApprovalDuration - property
1036
1258
    @dbus_service_property(_interface, signature="t",
1037
1259
                           access="readwrite")
1038
1260
    def ApprovalDuration_dbus_property(self, value=None):
1039
1261
        if value is None:       # get
1040
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1041
1263
                    self.approval_duration))
1042
 
        old_value = self.approval_duration
1043
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
 
        # Emit D-Bus signal
1045
 
        if old_value != self.approval_duration:
1046
 
            self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
 
                                 dbus.UInt64(value, variant_level=1))
1048
1265
    
1049
1266
    # Name - property
1050
1267
    @dbus_service_property(_interface, signature="s", access="read")
1062
1279
    def Host_dbus_property(self, value=None):
1063
1280
        if value is None:       # get
1064
1281
            return dbus.String(self.host)
1065
 
        old_value = self.host
1066
1282
        self.host = value
1067
 
        # Emit D-Bus signal
1068
 
        if old_value != self.host:
1069
 
            self.PropertyChanged(dbus.String("Host"),
1070
 
                                 dbus.String(value, variant_level=1))
1071
1283
    
1072
1284
    # Created - property
1073
1285
    @dbus_service_property(_interface, signature="s", access="read")
1074
1286
    def Created_dbus_property(self):
1075
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1287
        return datetime_to_dbus(self.created)
1076
1288
    
1077
1289
    # LastEnabled - property
1078
1290
    @dbus_service_property(_interface, signature="s", access="read")
1079
1291
    def LastEnabled_dbus_property(self):
1080
 
        return self._datetime_to_dbus(self.last_enabled)
 
1292
        return datetime_to_dbus(self.last_enabled)
1081
1293
    
1082
1294
    # Enabled - property
1083
1295
    @dbus_service_property(_interface, signature="b",
1097
1309
        if value is not None:
1098
1310
            self.checked_ok()
1099
1311
            return
1100
 
        return self._datetime_to_dbus(self.last_checked_ok)
 
1312
        return datetime_to_dbus(self.last_checked_ok)
1101
1313
    
1102
1314
    # Expires - property
1103
1315
    @dbus_service_property(_interface, signature="s", access="read")
1104
1316
    def Expires_dbus_property(self):
1105
 
        return self._datetime_to_dbus(self.expires)
 
1317
        return datetime_to_dbus(self.expires)
1106
1318
    
1107
1319
    # LastApprovalRequest - property
1108
1320
    @dbus_service_property(_interface, signature="s", access="read")
1109
1321
    def LastApprovalRequest_dbus_property(self):
1110
 
        return self._datetime_to_dbus(self.last_approval_request)
 
1322
        return datetime_to_dbus(self.last_approval_request)
1111
1323
    
1112
1324
    # Timeout - property
1113
1325
    @dbus_service_property(_interface, signature="t",
1115
1327
    def Timeout_dbus_property(self, value=None):
1116
1328
        if value is None:       # get
1117
1329
            return dbus.UInt64(self.timeout_milliseconds())
1118
 
        old_value = self.timeout
1119
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
1120
 
        # Emit D-Bus signal
1121
 
        if old_value != self.timeout:
1122
 
            self.PropertyChanged(dbus.String("Timeout"),
1123
 
                                 dbus.UInt64(value, variant_level=1))
1124
1331
        if getattr(self, "disable_initiator_tag", None) is None:
1125
1332
            return
1126
1333
        # Reschedule timeout
1127
1334
        gobject.source_remove(self.disable_initiator_tag)
1128
1335
        self.disable_initiator_tag = None
1129
1336
        self.expires = None
1130
 
        time_to_die = (self.
1131
 
                       _timedelta_to_milliseconds((self
1132
 
                                                   .last_checked_ok
1133
 
                                                   + self.timeout)
1134
 
                                                  - datetime.datetime
1135
 
                                                  .utcnow()))
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
1136
1342
        if time_to_die <= 0:
1137
1343
            # The timeout has passed
1138
1344
            self.disable()
1139
1345
        else:
1140
1346
            self.expires = (datetime.datetime.utcnow()
1141
 
                            + datetime.timedelta(milliseconds = time_to_die))
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
1142
1349
            self.disable_initiator_tag = (gobject.timeout_add
1143
1350
                                          (time_to_die, self.disable))
1144
 
 
 
1351
    
1145
1352
    # ExtendedTimeout - property
1146
1353
    @dbus_service_property(_interface, signature="t",
1147
1354
                           access="readwrite")
1148
1355
    def ExtendedTimeout_dbus_property(self, value=None):
1149
1356
        if value is None:       # get
1150
1357
            return dbus.UInt64(self.extended_timeout_milliseconds())
1151
 
        old_value = self.extended_timeout
1152
1358
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1153
 
        # Emit D-Bus signal
1154
 
        if old_value != self.extended_timeout:
1155
 
            self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
 
                                 dbus.UInt64(value, variant_level=1))
1157
 
 
 
1359
    
1158
1360
    # Interval - property
1159
1361
    @dbus_service_property(_interface, signature="t",
1160
1362
                           access="readwrite")
1161
1363
    def Interval_dbus_property(self, value=None):
1162
1364
        if value is None:       # get
1163
1365
            return dbus.UInt64(self.interval_milliseconds())
1164
 
        old_value = self.interval
1165
1366
        self.interval = datetime.timedelta(0, 0, 0, value)
1166
 
        # Emit D-Bus signal
1167
 
        if old_value != self.interval:
1168
 
            self.PropertyChanged(dbus.String("Interval"),
1169
 
                                 dbus.UInt64(value, variant_level=1))
1170
1367
        if getattr(self, "checker_initiator_tag", None) is None:
1171
1368
            return
1172
 
        # Reschedule checker run
1173
 
        gobject.source_remove(self.checker_initiator_tag)
1174
 
        self.checker_initiator_tag = (gobject.timeout_add
1175
 
                                      (value, self.start_checker))
1176
 
        self.start_checker()    # Start one now, too
1177
 
 
 
1369
        if self.enabled:
 
1370
            # Reschedule checker run
 
1371
            gobject.source_remove(self.checker_initiator_tag)
 
1372
            self.checker_initiator_tag = (gobject.timeout_add
 
1373
                                          (value, self.start_checker))
 
1374
            self.start_checker()    # Start one now, too
 
1375
    
1178
1376
    # Checker - property
1179
1377
    @dbus_service_property(_interface, signature="s",
1180
1378
                           access="readwrite")
1181
1379
    def Checker_dbus_property(self, value=None):
1182
1380
        if value is None:       # get
1183
1381
            return dbus.String(self.checker_command)
1184
 
        old_value = self.checker_command
1185
1382
        self.checker_command = value
1186
 
        # Emit D-Bus signal
1187
 
        if old_value != self.checker_command:
1188
 
            self.PropertyChanged(dbus.String("Checker"),
1189
 
                                 dbus.String(self.checker_command,
1190
 
                                             variant_level=1))
1191
1383
    
1192
1384
    # CheckerRunning - property
1193
1385
    @dbus_service_property(_interface, signature="b",
1220
1412
        self._pipe.send(('init', fpr, address))
1221
1413
        if not self._pipe.recv():
1222
1414
            raise KeyError()
1223
 
 
 
1415
    
1224
1416
    def __getattribute__(self, name):
1225
1417
        if(name == '_pipe'):
1226
1418
            return super(ProxyClient, self).__getattribute__(name)
1233
1425
                self._pipe.send(('funcall', name, args, kwargs))
1234
1426
                return self._pipe.recv()[1]
1235
1427
            return func
1236
 
 
 
1428
    
1237
1429
    def __setattr__(self, name, value):
1238
1430
        if(name == '_pipe'):
1239
1431
            return super(ProxyClient, self).__setattr__(name, value)
1240
1432
        self._pipe.send(('setattr', name, value))
1241
1433
 
1242
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1243
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1244
1440
    """A class to handle client connections.
1245
1441
    
1252
1448
                        unicode(self.client_address))
1253
1449
            logger.debug("Pipe FD: %d",
1254
1450
                         self.server.child_pipe.fileno())
1255
 
 
 
1451
            
1256
1452
            session = (gnutls.connection
1257
1453
                       .ClientSession(self.request,
1258
1454
                                      gnutls.connection
1259
1455
                                      .X509Credentials()))
1260
 
 
 
1456
            
1261
1457
            # Note: gnutls.connection.X509Credentials is really a
1262
1458
            # generic GnuTLS certificate credentials object so long as
1263
1459
            # no X.509 keys are added to it.  Therefore, we can use it
1264
1460
            # here despite using OpenPGP certificates.
1265
 
 
 
1461
            
1266
1462
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
1463
            #                      "+AES-256-CBC", "+SHA1",
1268
1464
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1274
1470
            (gnutls.library.functions
1275
1471
             .gnutls_priority_set_direct(session._c_object,
1276
1472
                                         priority, None))
1277
 
 
 
1473
            
1278
1474
            # Start communication using the Mandos protocol
1279
1475
            # Get protocol number
1280
1476
            line = self.request.makefile().readline()
1285
1481
            except (ValueError, IndexError, RuntimeError) as error:
1286
1482
                logger.error("Unknown protocol version: %s", error)
1287
1483
                return
1288
 
 
 
1484
            
1289
1485
            # Start GnuTLS connection
1290
1486
            try:
1291
1487
                session.handshake()
1295
1491
                # established.  Just abandon the request.
1296
1492
                return
1297
1493
            logger.debug("Handshake succeeded")
1298
 
 
 
1494
            
1299
1495
            approval_required = False
1300
1496
            try:
1301
1497
                try:
1306
1502
                    logger.warning("Bad certificate: %s", error)
1307
1503
                    return
1308
1504
                logger.debug("Fingerprint: %s", fpr)
1309
 
 
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
 
1508
                
1310
1509
                try:
1311
1510
                    client = ProxyClient(child_pipe, fpr,
1312
1511
                                         self.client_address)
1324
1523
                                       client.name)
1325
1524
                        if self.server.use_dbus:
1326
1525
                            # Emit D-Bus signal
1327
 
                            client.Rejected("Disabled")                    
 
1526
                            client.Rejected("Disabled")
1328
1527
                        return
1329
1528
                    
1330
1529
                    if client._approved or not client.approval_delay:
1347
1546
                        return
1348
1547
                    
1349
1548
                    #wait until timeout or approved
1350
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1351
1549
                    time = datetime.datetime.now()
1352
1550
                    client.changedstate.acquire()
1353
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1354
1554
                    client.changedstate.release()
1355
1555
                    time2 = datetime.datetime.now()
1356
1556
                    if (time2 - time) >= delay:
1378
1578
                                 sent, len(client.secret)
1379
1579
                                 - (sent_size + sent))
1380
1580
                    sent_size += sent
1381
 
 
 
1581
                
1382
1582
                logger.info("Sending secret to %s", client.name)
1383
 
                # bump the timeout as if seen
 
1583
                # bump the timeout using extended_timeout
1384
1584
                client.checked_ok(client.extended_timeout)
1385
1585
                if self.server.use_dbus:
1386
1586
                    # Emit D-Bus signal
1454
1654
        # Convert the buffer to a Python bytestring
1455
1655
        fpr = ctypes.string_at(buf, buf_len.value)
1456
1656
        # Convert the bytestring to hexadecimal notation
1457
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1657
        hex_fpr = binascii.hexlify(fpr).upper()
1458
1658
        return hex_fpr
1459
1659
 
1460
1660
 
1466
1666
        except:
1467
1667
            self.handle_error(request, address)
1468
1668
        self.close_request(request)
1469
 
            
 
1669
    
1470
1670
    def process_request(self, request, address):
1471
1671
        """Start a new process to process the request."""
1472
 
        multiprocessing.Process(target = self.sub_process_main,
1473
 
                                args = (request, address)).start()
 
1672
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1673
                                       args = (request,
 
1674
                                               address))
 
1675
        proc.start()
 
1676
        return proc
 
1677
 
1474
1678
 
1475
1679
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1476
1680
    """ adds a pipe to the MixIn """
1480
1684
        This function creates a new pipe in self.pipe
1481
1685
        """
1482
1686
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1483
 
 
1484
 
        super(MultiprocessingMixInWithPipe,
1485
 
              self).process_request(request, client_address)
 
1687
        
 
1688
        proc = MultiprocessingMixIn.process_request(self, request,
 
1689
                                                    client_address)
1486
1690
        self.child_pipe.close()
1487
 
        self.add_pipe(parent_pipe)
1488
 
 
1489
 
    def add_pipe(self, parent_pipe):
 
1691
        self.add_pipe(parent_pipe, proc)
 
1692
    
 
1693
    def add_pipe(self, parent_pipe, proc):
1490
1694
        """Dummy function; override as necessary"""
1491
1695
        raise NotImplementedError
1492
1696
 
 
1697
 
1493
1698
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1494
1699
                     socketserver.TCPServer, object):
1495
1700
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1569
1774
        self.enabled = False
1570
1775
        self.clients = clients
1571
1776
        if self.clients is None:
1572
 
            self.clients = set()
 
1777
            self.clients = {}
1573
1778
        self.use_dbus = use_dbus
1574
1779
        self.gnutls_priority = gnutls_priority
1575
1780
        IPv6_TCPServer.__init__(self, server_address,
1579
1784
    def server_activate(self):
1580
1785
        if self.enabled:
1581
1786
            return socketserver.TCPServer.server_activate(self)
 
1787
    
1582
1788
    def enable(self):
1583
1789
        self.enabled = True
1584
 
    def add_pipe(self, parent_pipe):
 
1790
    
 
1791
    def add_pipe(self, parent_pipe, proc):
1585
1792
        # Call "handle_ipc" for both data and EOF events
1586
1793
        gobject.io_add_watch(parent_pipe.fileno(),
1587
1794
                             gobject.IO_IN | gobject.IO_HUP,
1588
1795
                             functools.partial(self.handle_ipc,
1589
 
                                               parent_pipe = parent_pipe))
1590
 
        
 
1796
                                               parent_pipe =
 
1797
                                               parent_pipe,
 
1798
                                               proc = proc))
 
1799
    
1591
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
1592
 
                   client_object=None):
 
1801
                   proc = None, client_object=None):
1593
1802
        condition_names = {
1594
1803
            gobject.IO_IN: "IN",   # There is data to read.
1595
1804
            gobject.IO_OUT: "OUT", # Data can be written (without
1604
1813
                                       for cond, name in
1605
1814
                                       condition_names.iteritems()
1606
1815
                                       if cond & condition)
1607
 
        # error or the other end of multiprocessing.Pipe has closed
 
1816
        # error, or the other end of multiprocessing.Pipe has closed
1608
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1818
            # Wait for other process to exit
 
1819
            proc.join()
1609
1820
            return False
1610
1821
        
1611
1822
        # Read a request from the child
1616
1827
            fpr = request[1]
1617
1828
            address = request[2]
1618
1829
            
1619
 
            for c in self.clients:
 
1830
            for c in self.clients.itervalues():
1620
1831
                if c.fingerprint == fpr:
1621
1832
                    client = c
1622
1833
                    break
1625
1836
                            "dress: %s", fpr, address)
1626
1837
                if self.use_dbus:
1627
1838
                    # Emit D-Bus signal
1628
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1839
                    mandos_dbus_service.ClientNotFound(fpr,
 
1840
                                                       address[0])
1629
1841
                parent_pipe.send(False)
1630
1842
                return False
1631
1843
            
1632
1844
            gobject.io_add_watch(parent_pipe.fileno(),
1633
1845
                                 gobject.IO_IN | gobject.IO_HUP,
1634
1846
                                 functools.partial(self.handle_ipc,
1635
 
                                                   parent_pipe = parent_pipe,
1636
 
                                                   client_object = client))
 
1847
                                                   parent_pipe =
 
1848
                                                   parent_pipe,
 
1849
                                                   proc = proc,
 
1850
                                                   client_object =
 
1851
                                                   client))
1637
1852
            parent_pipe.send(True)
1638
 
            # remove the old hook in favor of the new above hook on same fileno
 
1853
            # remove the old hook in favor of the new above hook on
 
1854
            # same fileno
1639
1855
            return False
1640
1856
        if command == 'funcall':
1641
1857
            funcname = request[1]
1642
1858
            args = request[2]
1643
1859
            kwargs = request[3]
1644
1860
            
1645
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1646
 
 
 
1861
            parent_pipe.send(('data', getattr(client_object,
 
1862
                                              funcname)(*args,
 
1863
                                                         **kwargs)))
 
1864
        
1647
1865
        if command == 'getattr':
1648
1866
            attrname = request[1]
1649
1867
            if callable(client_object.__getattribute__(attrname)):
1650
1868
                parent_pipe.send(('function',))
1651
1869
            else:
1652
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1870
                parent_pipe.send(('data', client_object
 
1871
                                  .__getattribute__(attrname)))
1653
1872
        
1654
1873
        if command == 'setattr':
1655
1874
            attrname = request[1]
1656
1875
            value = request[2]
1657
1876
            setattr(client_object, attrname, value)
1658
 
 
 
1877
        
1659
1878
        return True
1660
1879
 
1661
1880
 
1698
1917
    return timevalue
1699
1918
 
1700
1919
 
1701
 
def if_nametoindex(interface):
1702
 
    """Call the C function if_nametoindex(), or equivalent
1703
 
    
1704
 
    Note: This function cannot accept a unicode string."""
1705
 
    global if_nametoindex
1706
 
    try:
1707
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1708
 
                          (ctypes.util.find_library("c"))
1709
 
                          .if_nametoindex)
1710
 
    except (OSError, AttributeError):
1711
 
        logger.warning("Doing if_nametoindex the hard way")
1712
 
        def if_nametoindex(interface):
1713
 
            "Get an interface index the hard way, i.e. using fcntl()"
1714
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1715
 
            with contextlib.closing(socket.socket()) as s:
1716
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
 
                                    struct.pack(str("16s16x"),
1718
 
                                                interface))
1719
 
            interface_index = struct.unpack(str("I"),
1720
 
                                            ifreq[16:20])[0]
1721
 
            return interface_index
1722
 
    return if_nametoindex(interface)
1723
 
 
1724
 
 
1725
1920
def daemon(nochdir = False, noclose = False):
1726
1921
    """See daemon(3).  Standard BSD Unix function.
1727
1922
    
1782
1977
                        " system bus interface")
1783
1978
    parser.add_argument("--no-ipv6", action="store_false",
1784
1979
                        dest="use_ipv6", help="Do not use IPv6")
 
1980
    parser.add_argument("--no-restore", action="store_false",
 
1981
                        dest="restore", help="Do not restore stored"
 
1982
                        " state")
 
1983
    parser.add_argument("--statedir", metavar="DIR",
 
1984
                        help="Directory to save/restore state in")
 
1985
    
1785
1986
    options = parser.parse_args()
1786
1987
    
1787
1988
    if options.check:
1800
2001
                        "use_dbus": "True",
1801
2002
                        "use_ipv6": "True",
1802
2003
                        "debuglevel": "",
 
2004
                        "restore": "True",
 
2005
                        "statedir": "/var/lib/mandos"
1803
2006
                        }
1804
2007
    
1805
2008
    # Parse config file for server-global settings
1822
2025
    # options, if set.
1823
2026
    for option in ("interface", "address", "port", "debug",
1824
2027
                   "priority", "servicename", "configdir",
1825
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2028
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2029
                   "statedir"):
1826
2030
        value = getattr(options, option)
1827
2031
        if value is not None:
1828
2032
            server_settings[option] = value
1840
2044
    debuglevel = server_settings["debuglevel"]
1841
2045
    use_dbus = server_settings["use_dbus"]
1842
2046
    use_ipv6 = server_settings["use_ipv6"]
1843
 
 
 
2047
    stored_state_path = os.path.join(server_settings["statedir"],
 
2048
                                     stored_state_file)
 
2049
    
 
2050
    if debug:
 
2051
        initlogger(logging.DEBUG)
 
2052
    else:
 
2053
        if not debuglevel:
 
2054
            initlogger()
 
2055
        else:
 
2056
            level = getattr(logging, debuglevel.upper())
 
2057
            initlogger(level)
 
2058
    
1844
2059
    if server_settings["servicename"] != "Mandos":
1845
2060
        syslogger.setFormatter(logging.Formatter
1846
2061
                               ('Mandos (%s) [%%(process)d]:'
1900
2115
        if error[0] != errno.EPERM:
1901
2116
            raise error
1902
2117
    
1903
 
    if not debug and not debuglevel:
1904
 
        syslogger.setLevel(logging.WARNING)
1905
 
        console.setLevel(logging.WARNING)
1906
 
    if debuglevel:
1907
 
        level = getattr(logging, debuglevel.upper())
1908
 
        syslogger.setLevel(level)
1909
 
        console.setLevel(level)
1910
 
 
1911
2118
    if debug:
1912
2119
        # Enable all possible GnuTLS debugging
1913
2120
        
1944
2151
    # End of Avahi example code
1945
2152
    if use_dbus:
1946
2153
        try:
1947
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2154
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1948
2155
                                            bus, do_not_queue=True)
 
2156
            old_bus_name = (dbus.service.BusName
 
2157
                            ("se.bsnet.fukt.Mandos", bus,
 
2158
                             do_not_queue=True))
1949
2159
        except dbus.exceptions.NameExistsException as e:
1950
2160
            logger.error(unicode(e) + ", disabling D-Bus")
1951
2161
            use_dbus = False
1952
2162
            server_settings["use_dbus"] = False
1953
2163
            tcp_server.use_dbus = False
1954
2164
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
 
    service = AvahiService(name = server_settings["servicename"],
1956
 
                           servicetype = "_mandos._tcp",
1957
 
                           protocol = protocol, bus = bus)
 
2165
    service = AvahiServiceToSyslog(name =
 
2166
                                   server_settings["servicename"],
 
2167
                                   servicetype = "_mandos._tcp",
 
2168
                                   protocol = protocol, bus = bus)
1958
2169
    if server_settings["interface"]:
1959
2170
        service.interface = (if_nametoindex
1960
2171
                             (str(server_settings["interface"])))
1964
2175
    
1965
2176
    client_class = Client
1966
2177
    if use_dbus:
1967
 
        client_class = functools.partial(ClientDBus, bus = bus)
1968
 
    def client_config_items(config, section):
1969
 
        special_settings = {
1970
 
            "approved_by_default":
1971
 
                lambda: config.getboolean(section,
1972
 
                                          "approved_by_default"),
1973
 
            }
1974
 
        for name, value in config.items(section):
 
2178
        client_class = functools.partial(ClientDBusTransitional,
 
2179
                                         bus = bus)
 
2180
    
 
2181
    special_settings = {
 
2182
        # Some settings need to be accessd by special methods;
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2184
        "approved_by_default":
 
2185
            lambda section:
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
2187
        "enabled":
 
2188
            lambda section:
 
2189
            client_config.getboolean(section, "enabled"),
 
2190
        }
 
2191
    # Construct a new dict of client settings of this form:
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
2193
    # with exceptions for any special settings as defined above
 
2194
    client_settings = dict((clientname,
 
2195
                           dict((setting,
 
2196
                                 (value
 
2197
                                  if setting not in special_settings
 
2198
                                  else special_settings[setting]
 
2199
                                  (clientname)))
 
2200
                                for setting, value in
 
2201
                                client_config.items(clientname)))
 
2202
                          for clientname in client_config.sections())
 
2203
    
 
2204
    old_client_settings = {}
 
2205
    clients_data = []
 
2206
    
 
2207
    # Get client data and settings from last running state.
 
2208
    if server_settings["restore"]:
 
2209
        try:
 
2210
            with open(stored_state_path, "rb") as stored_state:
 
2211
                clients_data, old_client_settings = (pickle.load
 
2212
                                                     (stored_state))
 
2213
            os.remove(stored_state_path)
 
2214
        except IOError as e:
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
 
2218
                raise
 
2219
    
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
 
2223
            
 
2224
            # Decide which value to use after restoring saved state.
 
2225
            # We have three different values: Old config file,
 
2226
            # new config file, and saved state.
 
2227
            # New config value takes precedence if it differs from old
 
2228
            # config value, otherwise use saved state.
 
2229
            for name, value in client_settings[client_name].items():
 
2230
                try:
 
2231
                    # For each value in new config, check if it
 
2232
                    # differs from the old config value (Except for
 
2233
                    # the "secret" attribute)
 
2234
                    if (name != "secret" and
 
2235
                        value != old_client_settings[client_name]
 
2236
                        [name]):
 
2237
                        setattr(client, name, value)
 
2238
                except KeyError:
 
2239
                    pass
 
2240
            
 
2241
            # Clients who has passed its expire date can still be
 
2242
            # enabled if its last checker was sucessful.  Clients
 
2243
            # whose checker failed before we stored its state is
 
2244
            # assumed to have failed all checkers during downtime.
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
2246
                if ((datetime.datetime.utcnow()
 
2247
                     - client["last_checked_ok"])
 
2248
                    > client["interval"]):
 
2249
                    if client["last_checker_status"] != 0:
 
2250
                        client["enabled"] = False
 
2251
                    else:
 
2252
                        client["expires"] = (datetime.datetime
 
2253
                                             .utcnow()
 
2254
                                             + client["timeout"])
 
2255
            
 
2256
            client["changedstate"] = (multiprocessing_manager
 
2257
                                      .Condition
 
2258
                                      (multiprocessing_manager
 
2259
                                       .Lock()))
 
2260
            if use_dbus:
 
2261
                new_client = (ClientDBusTransitional.__new__
 
2262
                              (ClientDBusTransitional))
 
2263
                tcp_server.clients[client_name] = new_client
 
2264
                new_client.bus = bus
 
2265
                for name, value in client.iteritems():
 
2266
                    setattr(new_client, name, value)
 
2267
                client_object_name = unicode(client_name).translate(
 
2268
                    {ord("."): ord("_"),
 
2269
                     ord("-"): ord("_")})
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
2271
                                               ("/clients/"
 
2272
                                                + client_object_name))
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
2274
                                                  new_client.bus,
 
2275
                                                  new_client
 
2276
                                                  .dbus_object_path)
 
2277
            else:
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
2279
                                                   (Client))
 
2280
                for name, value in client.iteritems():
 
2281
                    setattr(tcp_server.clients[client_name],
 
2282
                            name, value)
 
2283
            
1975
2284
            try:
1976
 
                yield (name, special_settings[name]())
1977
 
            except KeyError:
1978
 
                yield (name, value)
1979
 
    
1980
 
    tcp_server.clients.update(set(
1981
 
            client_class(name = section,
1982
 
                         config= dict(client_config_items(
1983
 
                        client_config, section)))
1984
 
            for section in client_config.sections()))
 
2285
                tcp_server.clients[client_name].secret = (
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
2287
                                  .encrypted_secret,
 
2288
                                  client_settings[client_name]
 
2289
                                  ["secret"]))
 
2290
            except CryptoError:
 
2291
                # If decryption fails, we use secret from new settings
 
2292
                tcp_server.clients[client_name].secret = (
 
2293
                    client_settings[client_name]["secret"])
 
2294
    
 
2295
    # Create/remove clients based on new changes made to config
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
2297
        del tcp_server.clients[clientname]
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2300
                                                       = clientname,
 
2301
                                                       config =
 
2302
                                                       client_settings
 
2303
                                                       [clientname]))
 
2304
    
1985
2305
    if not tcp_server.clients:
1986
2306
        logger.warning("No clients defined")
1987
2307
        
2000
2320
        del pidfilename
2001
2321
        
2002
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2003
 
 
 
2323
    
2004
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2005
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2006
2326
    
2009
2329
            """A D-Bus proxy object"""
2010
2330
            def __init__(self):
2011
2331
                dbus.service.Object.__init__(self, bus, "/")
2012
 
            _interface = "se.bsnet.fukt.Mandos"
 
2332
            _interface = "se.recompile.Mandos"
2013
2333
            
2014
2334
            @dbus.service.signal(_interface, signature="o")
2015
2335
            def ClientAdded(self, objpath):
2030
2350
            def GetAllClients(self):
2031
2351
                "D-Bus method"
2032
2352
                return dbus.Array(c.dbus_object_path
2033
 
                                  for c in tcp_server.clients)
 
2353
                                  for c in
 
2354
                                  tcp_server.clients.itervalues())
2034
2355
            
2035
2356
            @dbus.service.method(_interface,
2036
2357
                                 out_signature="a{oa{sv}}")
2038
2359
                "D-Bus method"
2039
2360
                return dbus.Dictionary(
2040
2361
                    ((c.dbus_object_path, c.GetAll(""))
2041
 
                     for c in tcp_server.clients),
 
2362
                     for c in tcp_server.clients.itervalues()),
2042
2363
                    signature="oa{sv}")
2043
2364
            
2044
2365
            @dbus.service.method(_interface, in_signature="o")
2045
2366
            def RemoveClient(self, object_path):
2046
2367
                "D-Bus method"
2047
 
                for c in tcp_server.clients:
 
2368
                for c in tcp_server.clients.itervalues():
2048
2369
                    if c.dbus_object_path == object_path:
2049
 
                        tcp_server.clients.remove(c)
 
2370
                        del tcp_server.clients[c.name]
2050
2371
                        c.remove_from_connection()
2051
2372
                        # Don't signal anything except ClientRemoved
2052
2373
                        c.disable(quiet=True)
2057
2378
            
2058
2379
            del _interface
2059
2380
        
2060
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2061
2384
    
2062
2385
    def cleanup():
2063
2386
        "Cleanup function; run on exit"
2064
2387
        service.cleanup()
2065
2388
        
 
2389
        multiprocessing.active_children()
 
2390
        if not (tcp_server.clients or client_settings):
 
2391
            return
 
2392
        
 
2393
        # Store client before exiting. Secrets are encrypted with key
 
2394
        # based on what config file has. If config file is
 
2395
        # removed/edited, old secret will thus be unrecovable.
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
 
2398
            for client in tcp_server.clients.itervalues():
 
2399
                key = client_settings[client.name]["secret"]
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
 
2402
                client_dict = {}
 
2403
                
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
 
2407
                for name, typ in (inspect.getmembers
 
2408
                                  (dbus.service.Object)):
 
2409
                    exclude.add(name)
 
2410
                
 
2411
                client_dict["encrypted_secret"] = (client
 
2412
                                                   .encrypted_secret)
 
2413
                for attr in client.client_structure:
 
2414
                    if attr not in exclude:
 
2415
                        client_dict[attr] = getattr(client, attr)
 
2416
                
 
2417
                clients.append(client_dict)
 
2418
                del client_settings[client.name]["secret"]
 
2419
        
 
2420
        try:
 
2421
            with os.fdopen(os.open(stored_state_path,
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2423
                                   0600), "wb") as stored_state:
 
2424
                pickle.dump((clients, client_settings), stored_state)
 
2425
        except (IOError, OSError) as e:
 
2426
            logger.warning("Could not save persistent state: {0}"
 
2427
                           .format(e))
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2429
                raise
 
2430
        
 
2431
        # Delete all clients, and settings from config
2066
2432
        while tcp_server.clients:
2067
 
            client = tcp_server.clients.pop()
 
2433
            name, client = tcp_server.clients.popitem()
2068
2434
            if use_dbus:
2069
2435
                client.remove_from_connection()
2070
 
            client.disable_hook = None
2071
2436
            # Don't signal anything except ClientRemoved
2072
2437
            client.disable(quiet=True)
2073
2438
            if use_dbus:
2074
2439
                # Emit D-Bus signal
2075
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2440
                mandos_dbus_service.ClientRemoved(client
 
2441
                                                  .dbus_object_path,
2076
2442
                                                  client.name)
 
2443
        client_settings.clear()
2077
2444
    
2078
2445
    atexit.register(cleanup)
2079
2446
    
2080
 
    for client in tcp_server.clients:
 
2447
    for client in tcp_server.clients.itervalues():
2081
2448
        if use_dbus:
2082
2449
            # Emit D-Bus signal
2083
2450
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2084
 
        client.enable()
 
2451
        # Need to initiate checking of clients
 
2452
        if client.enabled:
 
2453
            client.init_checker()
2085
2454
    
2086
2455
    tcp_server.enable()
2087
2456
    tcp_server.server_activate()
2127
2496
    # Must run before the D-Bus bus name gets deregistered
2128
2497
    cleanup()
2129
2498
 
 
2499
 
2130
2500
if __name__ == '__main__':
2131
2501
    main()