/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.0"
 
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
298
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
299
423
                                      until this client is disabled
 
424
    extended_timeout:   extra long timeout when password has been sent
300
425
    runtime_expansions: Allowed attributes for runtime expansion.
 
426
    expires:    datetime.datetime(); time (UTC) when a client will be
 
427
                disabled, or None
301
428
    """
302
429
    
303
430
    runtime_expansions = ("approval_delay", "approval_duration",
305
432
                          "host", "interval", "last_checked_ok",
306
433
                          "last_enabled", "name", "timeout")
307
434
    
308
 
    @staticmethod
309
 
    def _timedelta_to_milliseconds(td):
310
 
        "Convert a datetime.timedelta() to milliseconds"
311
 
        return ((td.days * 24 * 60 * 60 * 1000)
312
 
                + (td.seconds * 1000)
313
 
                + (td.microseconds // 1000))
314
 
    
315
435
    def timeout_milliseconds(self):
316
436
        "Return the 'timeout' attribute in milliseconds"
317
 
        return self._timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
 
438
    
 
439
    def extended_timeout_milliseconds(self):
 
440
        "Return the 'extended_timeout' attribute in milliseconds"
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
318
442
    
319
443
    def interval_milliseconds(self):
320
444
        "Return the 'interval' attribute in milliseconds"
321
 
        return self._timedelta_to_milliseconds(self.interval)
322
 
 
 
445
        return _timedelta_to_milliseconds(self.interval)
 
446
    
323
447
    def approval_delay_milliseconds(self):
324
 
        return self._timedelta_to_milliseconds(self.approval_delay)
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
325
449
    
326
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
450
    def __init__(self, name = None, config=None):
327
451
        """Note: the 'checker' key in 'config' sets the
328
452
        'checker_command' attribute and *not* the 'checker'
329
453
        attribute."""
349
473
                            % self.name)
350
474
        self.host = config.get("host", "")
351
475
        self.created = datetime.datetime.utcnow()
352
 
        self.enabled = False
 
476
        self.enabled = config.get("enabled", True)
353
477
        self.last_approval_request = None
354
 
        self.last_enabled = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
355
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
356
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
357
487
        self.interval = string_to_delta(config["interval"])
358
 
        self.disable_hook = disable_hook
359
488
        self.checker = None
360
489
        self.checker_initiator_tag = None
361
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
362
495
        self.checker_callback_tag = None
363
496
        self.checker_command = config["checker"]
364
497
        self.current_checker_command = None
365
 
        self.last_connect = None
366
498
        self._approved = None
367
499
        self.approved_by_default = config.get("approved_by_default",
368
500
                                              True)
371
503
            config["approval_delay"])
372
504
        self.approval_duration = string_to_delta(
373
505
            config["approval_duration"])
374
 
        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)
375
520
    
 
521
    # Send notice to process children that client state has changed
376
522
    def send_changedstate(self):
377
 
        self.changedstate.acquire()
378
 
        self.changedstate.notify_all()
379
 
        self.changedstate.release()
380
 
        
 
523
        with self.changedstate:
 
524
            self.changedstate.notify_all()
 
525
    
381
526
    def enable(self):
382
527
        """Start this client's checker and timeout hooks"""
383
528
        if getattr(self, "enabled", False):
384
529
            # Already enabled
385
530
            return
386
531
        self.send_changedstate()
 
532
        self.expires = datetime.datetime.utcnow() + self.timeout
 
533
        self.enabled = True
387
534
        self.last_enabled = datetime.datetime.utcnow()
388
 
        # Schedule a new checker to be started an 'interval' from now,
389
 
        # and every interval from then on.
390
 
        self.checker_initiator_tag = (gobject.timeout_add
391
 
                                      (self.interval_milliseconds(),
392
 
                                       self.start_checker))
393
 
        # Schedule a disable() when 'timeout' has passed
394
 
        self.disable_initiator_tag = (gobject.timeout_add
395
 
                                   (self.timeout_milliseconds(),
396
 
                                    self.disable))
397
 
        self.enabled = True
398
 
        # Also start a new checker *right now*.
399
 
        self.start_checker()
 
535
        self.init_checker()
400
536
    
401
537
    def disable(self, quiet=True):
402
538
        """Disable this client."""
409
545
        if getattr(self, "disable_initiator_tag", False):
410
546
            gobject.source_remove(self.disable_initiator_tag)
411
547
            self.disable_initiator_tag = None
 
548
        self.expires = None
412
549
        if getattr(self, "checker_initiator_tag", False):
413
550
            gobject.source_remove(self.checker_initiator_tag)
414
551
            self.checker_initiator_tag = None
415
552
        self.stop_checker()
416
 
        if self.disable_hook:
417
 
            self.disable_hook(self)
418
553
        self.enabled = False
419
554
        # Do not run this again if called by a gobject.timeout_add
420
555
        return False
421
556
    
422
557
    def __del__(self):
423
 
        self.disable_hook = None
424
558
        self.disable()
425
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
    
426
573
    def checker_callback(self, pid, condition, command):
427
574
        """The checker has completed, so take appropriate actions."""
428
575
        self.checker_callback_tag = None
429
576
        self.checker = None
430
577
        if os.WIFEXITED(condition):
431
 
            exitstatus = os.WEXITSTATUS(condition)
432
 
            if exitstatus == 0:
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
579
            if self.last_checker_status == 0:
433
580
                logger.info("Checker for %(name)s succeeded",
434
581
                            vars(self))
435
582
                self.checked_ok()
437
584
                logger.info("Checker for %(name)s failed",
438
585
                            vars(self))
439
586
        else:
 
587
            self.last_checker_status = -1
440
588
            logger.warning("Checker for %(name)s crashed?",
441
589
                           vars(self))
442
590
    
443
 
    def checked_ok(self):
 
591
    def checked_ok(self, timeout=None):
444
592
        """Bump up the timeout for this client.
445
593
        
446
594
        This should only be called when the client has been seen,
447
595
        alive and well.
448
596
        """
 
597
        if timeout is None:
 
598
            timeout = self.timeout
449
599
        self.last_checked_ok = datetime.datetime.utcnow()
450
 
        gobject.source_remove(self.disable_initiator_tag)
451
 
        self.disable_initiator_tag = (gobject.timeout_add
452
 
                                      (self.timeout_milliseconds(),
453
 
                                       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
454
607
    
455
608
    def need_approval(self):
456
609
        self.last_approval_request = datetime.datetime.utcnow()
496
649
                                       'replace')))
497
650
                    for attr in
498
651
                    self.runtime_expansions)
499
 
 
 
652
                
500
653
                try:
501
654
                    command = self.checker_command % escaped_attrs
502
655
                except TypeError as error:
548
701
                raise
549
702
        self.checker = None
550
703
 
 
704
 
551
705
def dbus_service_property(dbus_interface, signature="v",
552
706
                          access="readwrite", byte_arrays=False):
553
707
    """Decorators for marking methods of a DBusObjectWithProperties to
599
753
 
600
754
class DBusObjectWithProperties(dbus.service.Object):
601
755
    """A D-Bus object with properties.
602
 
 
 
756
    
603
757
    Classes inheriting from this can use the dbus_service_property
604
758
    decorator to expose methods as D-Bus properties.  It exposes the
605
759
    standard Get(), Set(), and GetAll() methods on the D-Bus.
612
766
    def _get_all_dbus_properties(self):
613
767
        """Returns a generator of (name, attribute) pairs
614
768
        """
615
 
        return ((prop._dbus_name, prop)
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
770
                for cls in self.__class__.__mro__
616
771
                for name, prop in
617
 
                inspect.getmembers(self, self._is_dbus_property))
 
772
                inspect.getmembers(cls, self._is_dbus_property))
618
773
    
619
774
    def _get_dbus_property(self, interface_name, property_name):
620
775
        """Returns a bound method if one exists which is a D-Bus
621
776
        property with the specified name and interface.
622
777
        """
623
 
        for name in (property_name,
624
 
                     property_name + "_dbus_property"):
625
 
            prop = getattr(self, name, None)
626
 
            if (prop is None
627
 
                or not self._is_dbus_property(prop)
628
 
                or prop._dbus_name != property_name
629
 
                or (interface_name and prop._dbus_interface
630
 
                    and interface_name != prop._dbus_interface)):
631
 
                continue
632
 
            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
        
633
785
        # No such property
634
786
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
787
                                   + interface_name + "."
669
821
    def GetAll(self, interface_name):
670
822
        """Standard D-Bus property GetAll() method, see D-Bus
671
823
        standard.
672
 
 
 
824
        
673
825
        Note: Will not include properties with access="write".
674
826
        """
675
 
        all = {}
 
827
        properties = {}
676
828
        for name, prop in self._get_all_dbus_properties():
677
829
            if (interface_name
678
830
                and interface_name != prop._dbus_interface):
683
835
                continue
684
836
            value = prop()
685
837
            if not hasattr(value, "variant_level"):
686
 
                all[name] = value
 
838
                properties[name] = value
687
839
                continue
688
 
            all[name] = type(value)(value, variant_level=
689
 
                                    value.variant_level+1)
690
 
        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")
691
843
    
692
844
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
693
845
                         out_signature="s",
737
889
        return xmlstring
738
890
 
739
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
 
740
998
class ClientDBus(Client, DBusObjectWithProperties):
741
999
    """A Client class using D-Bus
742
1000
    
751
1009
    # dbus.service.Object doesn't use super(), so we can't either.
752
1010
    
753
1011
    def __init__(self, bus = None, *args, **kwargs):
 
1012
        self.bus = bus
 
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
754
1015
        self._approvals_pending = 0
755
 
        self.bus = bus
756
 
        Client.__init__(self, *args, **kwargs)
757
1016
        # Only now, when this client is initialized, can it show up on
758
1017
        # the D-Bus
759
1018
        client_object_name = unicode(self.name).translate(
764
1023
        DBusObjectWithProperties.__init__(self, self.bus,
765
1024
                                          self.dbus_object_path)
766
1025
        
767
 
    def _get_approvals_pending(self):
768
 
        return self._approvals_pending
769
 
    def _set_approvals_pending(self, value):
770
 
        old_value = self._approvals_pending
771
 
        self._approvals_pending = value
772
 
        bval = bool(value)
773
 
        if (hasattr(self, "dbus_object_path")
774
 
            and bval is not bool(old_value)):
775
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
776
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
777
 
                                 dbus_bool)
778
 
 
779
 
    approvals_pending = property(_get_approvals_pending,
780
 
                                 _set_approvals_pending)
781
 
    del _get_approvals_pending, _set_approvals_pending
782
 
    
783
 
    @staticmethod
784
 
    def _datetime_to_dbus(dt, variant_level=0):
785
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
786
 
        return dbus.String(dt.isoformat(),
787
 
                           variant_level=variant_level)
788
 
    
789
 
    def enable(self):
790
 
        oldstate = getattr(self, "enabled", False)
791
 
        r = Client.enable(self)
792
 
        if oldstate != self.enabled:
793
 
            # Emit D-Bus signals
794
 
            self.PropertyChanged(dbus.String("Enabled"),
795
 
                                 dbus.Boolean(True, variant_level=1))
796
 
            self.PropertyChanged(
797
 
                dbus.String("LastEnabled"),
798
 
                self._datetime_to_dbus(self.last_enabled,
799
 
                                       variant_level=1))
800
 
        return r
801
 
    
802
 
    def disable(self, quiet = False):
803
 
        oldstate = getattr(self, "enabled", False)
804
 
        r = Client.disable(self, quiet=quiet)
805
 
        if not quiet and oldstate != self.enabled:
806
 
            # Emit D-Bus signal
807
 
            self.PropertyChanged(dbus.String("Enabled"),
808
 
                                 dbus.Boolean(False, variant_level=1))
809
 
        return r
 
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
810
1092
    
811
1093
    def __del__(self, *args, **kwargs):
812
1094
        try:
821
1103
                         *args, **kwargs):
822
1104
        self.checker_callback_tag = None
823
1105
        self.checker = None
824
 
        # Emit D-Bus signal
825
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
826
 
                             dbus.Boolean(False, variant_level=1))
827
1106
        if os.WIFEXITED(condition):
828
1107
            exitstatus = os.WEXITSTATUS(condition)
829
1108
            # Emit D-Bus signal
839
1118
        return Client.checker_callback(self, pid, condition, command,
840
1119
                                       *args, **kwargs)
841
1120
    
842
 
    def checked_ok(self, *args, **kwargs):
843
 
        Client.checked_ok(self, *args, **kwargs)
844
 
        # Emit D-Bus signal
845
 
        self.PropertyChanged(
846
 
            dbus.String("LastCheckedOK"),
847
 
            (self._datetime_to_dbus(self.last_checked_ok,
848
 
                                    variant_level=1)))
849
 
    
850
 
    def need_approval(self, *args, **kwargs):
851
 
        r = Client.need_approval(self, *args, **kwargs)
852
 
        # Emit D-Bus signal
853
 
        self.PropertyChanged(
854
 
            dbus.String("LastApprovalRequest"),
855
 
            (self._datetime_to_dbus(self.last_approval_request,
856
 
                                    variant_level=1)))
857
 
        return r
858
 
    
859
1121
    def start_checker(self, *args, **kwargs):
860
1122
        old_checker = self.checker
861
1123
        if self.checker is not None:
868
1130
            and old_checker_pid != self.checker.pid):
869
1131
            # Emit D-Bus signal
870
1132
            self.CheckerStarted(self.current_checker_command)
871
 
            self.PropertyChanged(
872
 
                dbus.String("CheckerRunning"),
873
 
                dbus.Boolean(True, variant_level=1))
874
1133
        return r
875
1134
    
876
 
    def stop_checker(self, *args, **kwargs):
877
 
        old_checker = getattr(self, "checker", None)
878
 
        r = Client.stop_checker(self, *args, **kwargs)
879
 
        if (old_checker is not None
880
 
            and getattr(self, "checker", None) is None):
881
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
882
 
                                 dbus.Boolean(False, variant_level=1))
883
 
        return r
884
 
 
885
1135
    def _reset_approved(self):
886
1136
        self._approved = None
887
1137
        return False
889
1139
    def approve(self, value=True):
890
1140
        self.send_changedstate()
891
1141
        self._approved = value
892
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
893
1143
                            (self.approval_duration),
894
1144
                            self._reset_approved)
895
1145
    
896
1146
    
897
1147
    ## D-Bus methods, signals & properties
898
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1148
    _interface = "se.recompile.Mandos.Client"
899
1149
    
900
1150
    ## Signals
901
1151
    
938
1188
        "D-Bus signal"
939
1189
        return self.need_approval()
940
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
    
941
1199
    ## Methods
942
1200
    
943
1201
    # Approve - method
987
1245
        if value is None:       # get
988
1246
            return dbus.Boolean(self.approved_by_default)
989
1247
        self.approved_by_default = bool(value)
990
 
        # Emit D-Bus signal
991
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
992
 
                             dbus.Boolean(value, variant_level=1))
993
1248
    
994
1249
    # ApprovalDelay - property
995
1250
    @dbus_service_property(_interface, signature="t",
998
1253
        if value is None:       # get
999
1254
            return dbus.UInt64(self.approval_delay_milliseconds())
1000
1255
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1001
 
        # Emit D-Bus signal
1002
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
1003
 
                             dbus.UInt64(value, variant_level=1))
1004
1256
    
1005
1257
    # ApprovalDuration - property
1006
1258
    @dbus_service_property(_interface, signature="t",
1007
1259
                           access="readwrite")
1008
1260
    def ApprovalDuration_dbus_property(self, value=None):
1009
1261
        if value is None:       # get
1010
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1011
1263
                    self.approval_duration))
1012
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1013
 
        # Emit D-Bus signal
1014
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
1015
 
                             dbus.UInt64(value, variant_level=1))
1016
1265
    
1017
1266
    # Name - property
1018
1267
    @dbus_service_property(_interface, signature="s", access="read")
1031
1280
        if value is None:       # get
1032
1281
            return dbus.String(self.host)
1033
1282
        self.host = value
1034
 
        # Emit D-Bus signal
1035
 
        self.PropertyChanged(dbus.String("Host"),
1036
 
                             dbus.String(value, variant_level=1))
1037
1283
    
1038
1284
    # Created - property
1039
1285
    @dbus_service_property(_interface, signature="s", access="read")
1040
1286
    def Created_dbus_property(self):
1041
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1287
        return datetime_to_dbus(self.created)
1042
1288
    
1043
1289
    # LastEnabled - property
1044
1290
    @dbus_service_property(_interface, signature="s", access="read")
1045
1291
    def LastEnabled_dbus_property(self):
1046
 
        if self.last_enabled is None:
1047
 
            return dbus.String("")
1048
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1292
        return datetime_to_dbus(self.last_enabled)
1049
1293
    
1050
1294
    # Enabled - property
1051
1295
    @dbus_service_property(_interface, signature="b",
1065
1309
        if value is not None:
1066
1310
            self.checked_ok()
1067
1311
            return
1068
 
        if self.last_checked_ok is None:
1069
 
            return dbus.String("")
1070
 
        return dbus.String(self._datetime_to_dbus(self
1071
 
                                                  .last_checked_ok))
 
1312
        return datetime_to_dbus(self.last_checked_ok)
 
1313
    
 
1314
    # Expires - property
 
1315
    @dbus_service_property(_interface, signature="s", access="read")
 
1316
    def Expires_dbus_property(self):
 
1317
        return datetime_to_dbus(self.expires)
1072
1318
    
1073
1319
    # LastApprovalRequest - property
1074
1320
    @dbus_service_property(_interface, signature="s", access="read")
1075
1321
    def LastApprovalRequest_dbus_property(self):
1076
 
        if self.last_approval_request is None:
1077
 
            return dbus.String("")
1078
 
        return dbus.String(self.
1079
 
                           _datetime_to_dbus(self
1080
 
                                             .last_approval_request))
 
1322
        return datetime_to_dbus(self.last_approval_request)
1081
1323
    
1082
1324
    # Timeout - property
1083
1325
    @dbus_service_property(_interface, signature="t",
1086
1328
        if value is None:       # get
1087
1329
            return dbus.UInt64(self.timeout_milliseconds())
1088
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
1089
 
        # Emit D-Bus signal
1090
 
        self.PropertyChanged(dbus.String("Timeout"),
1091
 
                             dbus.UInt64(value, variant_level=1))
1092
1331
        if getattr(self, "disable_initiator_tag", None) is None:
1093
1332
            return
1094
1333
        # Reschedule timeout
1095
1334
        gobject.source_remove(self.disable_initiator_tag)
1096
1335
        self.disable_initiator_tag = None
1097
 
        time_to_die = (self.
1098
 
                       _timedelta_to_milliseconds((self
1099
 
                                                   .last_checked_ok
1100
 
                                                   + self.timeout)
1101
 
                                                  - datetime.datetime
1102
 
                                                  .utcnow()))
 
1336
        self.expires = None
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
1103
1342
        if time_to_die <= 0:
1104
1343
            # The timeout has passed
1105
1344
            self.disable()
1106
1345
        else:
 
1346
            self.expires = (datetime.datetime.utcnow()
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
1107
1349
            self.disable_initiator_tag = (gobject.timeout_add
1108
1350
                                          (time_to_die, self.disable))
1109
1351
    
 
1352
    # ExtendedTimeout - property
 
1353
    @dbus_service_property(_interface, signature="t",
 
1354
                           access="readwrite")
 
1355
    def ExtendedTimeout_dbus_property(self, value=None):
 
1356
        if value is None:       # get
 
1357
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1358
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1359
    
1110
1360
    # Interval - property
1111
1361
    @dbus_service_property(_interface, signature="t",
1112
1362
                           access="readwrite")
1114
1364
        if value is None:       # get
1115
1365
            return dbus.UInt64(self.interval_milliseconds())
1116
1366
        self.interval = datetime.timedelta(0, 0, 0, value)
1117
 
        # Emit D-Bus signal
1118
 
        self.PropertyChanged(dbus.String("Interval"),
1119
 
                             dbus.UInt64(value, variant_level=1))
1120
1367
        if getattr(self, "checker_initiator_tag", None) is None:
1121
1368
            return
1122
 
        # Reschedule checker run
1123
 
        gobject.source_remove(self.checker_initiator_tag)
1124
 
        self.checker_initiator_tag = (gobject.timeout_add
1125
 
                                      (value, self.start_checker))
1126
 
        self.start_checker()    # Start one now, too
1127
 
 
 
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
    
1128
1376
    # Checker - property
1129
1377
    @dbus_service_property(_interface, signature="s",
1130
1378
                           access="readwrite")
1132
1380
        if value is None:       # get
1133
1381
            return dbus.String(self.checker_command)
1134
1382
        self.checker_command = value
1135
 
        # Emit D-Bus signal
1136
 
        self.PropertyChanged(dbus.String("Checker"),
1137
 
                             dbus.String(self.checker_command,
1138
 
                                         variant_level=1))
1139
1383
    
1140
1384
    # CheckerRunning - property
1141
1385
    @dbus_service_property(_interface, signature="b",
1168
1412
        self._pipe.send(('init', fpr, address))
1169
1413
        if not self._pipe.recv():
1170
1414
            raise KeyError()
1171
 
 
 
1415
    
1172
1416
    def __getattribute__(self, name):
1173
1417
        if(name == '_pipe'):
1174
1418
            return super(ProxyClient, self).__getattribute__(name)
1181
1425
                self._pipe.send(('funcall', name, args, kwargs))
1182
1426
                return self._pipe.recv()[1]
1183
1427
            return func
1184
 
 
 
1428
    
1185
1429
    def __setattr__(self, name, value):
1186
1430
        if(name == '_pipe'):
1187
1431
            return super(ProxyClient, self).__setattr__(name, value)
1188
1432
        self._pipe.send(('setattr', name, value))
1189
1433
 
1190
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1191
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1192
1440
    """A class to handle client connections.
1193
1441
    
1200
1448
                        unicode(self.client_address))
1201
1449
            logger.debug("Pipe FD: %d",
1202
1450
                         self.server.child_pipe.fileno())
1203
 
 
 
1451
            
1204
1452
            session = (gnutls.connection
1205
1453
                       .ClientSession(self.request,
1206
1454
                                      gnutls.connection
1207
1455
                                      .X509Credentials()))
1208
 
 
 
1456
            
1209
1457
            # Note: gnutls.connection.X509Credentials is really a
1210
1458
            # generic GnuTLS certificate credentials object so long as
1211
1459
            # no X.509 keys are added to it.  Therefore, we can use it
1212
1460
            # here despite using OpenPGP certificates.
1213
 
 
 
1461
            
1214
1462
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1215
1463
            #                      "+AES-256-CBC", "+SHA1",
1216
1464
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1222
1470
            (gnutls.library.functions
1223
1471
             .gnutls_priority_set_direct(session._c_object,
1224
1472
                                         priority, None))
1225
 
 
 
1473
            
1226
1474
            # Start communication using the Mandos protocol
1227
1475
            # Get protocol number
1228
1476
            line = self.request.makefile().readline()
1233
1481
            except (ValueError, IndexError, RuntimeError) as error:
1234
1482
                logger.error("Unknown protocol version: %s", error)
1235
1483
                return
1236
 
 
 
1484
            
1237
1485
            # Start GnuTLS connection
1238
1486
            try:
1239
1487
                session.handshake()
1243
1491
                # established.  Just abandon the request.
1244
1492
                return
1245
1493
            logger.debug("Handshake succeeded")
1246
 
 
 
1494
            
1247
1495
            approval_required = False
1248
1496
            try:
1249
1497
                try:
1254
1502
                    logger.warning("Bad certificate: %s", error)
1255
1503
                    return
1256
1504
                logger.debug("Fingerprint: %s", fpr)
1257
 
 
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
 
1508
                
1258
1509
                try:
1259
1510
                    client = ProxyClient(child_pipe, fpr,
1260
1511
                                         self.client_address)
1272
1523
                                       client.name)
1273
1524
                        if self.server.use_dbus:
1274
1525
                            # Emit D-Bus signal
1275
 
                            client.Rejected("Disabled")                    
 
1526
                            client.Rejected("Disabled")
1276
1527
                        return
1277
1528
                    
1278
1529
                    if client._approved or not client.approval_delay:
1295
1546
                        return
1296
1547
                    
1297
1548
                    #wait until timeout or approved
1298
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1299
1549
                    time = datetime.datetime.now()
1300
1550
                    client.changedstate.acquire()
1301
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1302
1554
                    client.changedstate.release()
1303
1555
                    time2 = datetime.datetime.now()
1304
1556
                    if (time2 - time) >= delay:
1326
1578
                                 sent, len(client.secret)
1327
1579
                                 - (sent_size + sent))
1328
1580
                    sent_size += sent
1329
 
 
 
1581
                
1330
1582
                logger.info("Sending secret to %s", client.name)
1331
 
                # bump the timeout as if seen
1332
 
                client.checked_ok()
 
1583
                # bump the timeout using extended_timeout
 
1584
                client.checked_ok(client.extended_timeout)
1333
1585
                if self.server.use_dbus:
1334
1586
                    # Emit D-Bus signal
1335
1587
                    client.GotSecret()
1402
1654
        # Convert the buffer to a Python bytestring
1403
1655
        fpr = ctypes.string_at(buf, buf_len.value)
1404
1656
        # Convert the bytestring to hexadecimal notation
1405
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1657
        hex_fpr = binascii.hexlify(fpr).upper()
1406
1658
        return hex_fpr
1407
1659
 
1408
1660
 
1414
1666
        except:
1415
1667
            self.handle_error(request, address)
1416
1668
        self.close_request(request)
1417
 
            
 
1669
    
1418
1670
    def process_request(self, request, address):
1419
1671
        """Start a new process to process the request."""
1420
 
        multiprocessing.Process(target = self.sub_process_main,
1421
 
                                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
 
1422
1678
 
1423
1679
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1424
1680
    """ adds a pipe to the MixIn """
1428
1684
        This function creates a new pipe in self.pipe
1429
1685
        """
1430
1686
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1431
 
 
1432
 
        super(MultiprocessingMixInWithPipe,
1433
 
              self).process_request(request, client_address)
 
1687
        
 
1688
        proc = MultiprocessingMixIn.process_request(self, request,
 
1689
                                                    client_address)
1434
1690
        self.child_pipe.close()
1435
 
        self.add_pipe(parent_pipe)
1436
 
 
1437
 
    def add_pipe(self, parent_pipe):
 
1691
        self.add_pipe(parent_pipe, proc)
 
1692
    
 
1693
    def add_pipe(self, parent_pipe, proc):
1438
1694
        """Dummy function; override as necessary"""
1439
1695
        raise NotImplementedError
1440
1696
 
 
1697
 
1441
1698
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1442
1699
                     socketserver.TCPServer, object):
1443
1700
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1517
1774
        self.enabled = False
1518
1775
        self.clients = clients
1519
1776
        if self.clients is None:
1520
 
            self.clients = set()
 
1777
            self.clients = {}
1521
1778
        self.use_dbus = use_dbus
1522
1779
        self.gnutls_priority = gnutls_priority
1523
1780
        IPv6_TCPServer.__init__(self, server_address,
1527
1784
    def server_activate(self):
1528
1785
        if self.enabled:
1529
1786
            return socketserver.TCPServer.server_activate(self)
 
1787
    
1530
1788
    def enable(self):
1531
1789
        self.enabled = True
1532
 
    def add_pipe(self, parent_pipe):
 
1790
    
 
1791
    def add_pipe(self, parent_pipe, proc):
1533
1792
        # Call "handle_ipc" for both data and EOF events
1534
1793
        gobject.io_add_watch(parent_pipe.fileno(),
1535
1794
                             gobject.IO_IN | gobject.IO_HUP,
1536
1795
                             functools.partial(self.handle_ipc,
1537
 
                                               parent_pipe = parent_pipe))
1538
 
        
 
1796
                                               parent_pipe =
 
1797
                                               parent_pipe,
 
1798
                                               proc = proc))
 
1799
    
1539
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
1540
 
                   client_object=None):
 
1801
                   proc = None, client_object=None):
1541
1802
        condition_names = {
1542
1803
            gobject.IO_IN: "IN",   # There is data to read.
1543
1804
            gobject.IO_OUT: "OUT", # Data can be written (without
1552
1813
                                       for cond, name in
1553
1814
                                       condition_names.iteritems()
1554
1815
                                       if cond & condition)
1555
 
        # error or the other end of multiprocessing.Pipe has closed
 
1816
        # error, or the other end of multiprocessing.Pipe has closed
1556
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1818
            # Wait for other process to exit
 
1819
            proc.join()
1557
1820
            return False
1558
1821
        
1559
1822
        # Read a request from the child
1564
1827
            fpr = request[1]
1565
1828
            address = request[2]
1566
1829
            
1567
 
            for c in self.clients:
 
1830
            for c in self.clients.itervalues():
1568
1831
                if c.fingerprint == fpr:
1569
1832
                    client = c
1570
1833
                    break
1573
1836
                            "dress: %s", fpr, address)
1574
1837
                if self.use_dbus:
1575
1838
                    # Emit D-Bus signal
1576
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1839
                    mandos_dbus_service.ClientNotFound(fpr,
 
1840
                                                       address[0])
1577
1841
                parent_pipe.send(False)
1578
1842
                return False
1579
1843
            
1580
1844
            gobject.io_add_watch(parent_pipe.fileno(),
1581
1845
                                 gobject.IO_IN | gobject.IO_HUP,
1582
1846
                                 functools.partial(self.handle_ipc,
1583
 
                                                   parent_pipe = parent_pipe,
1584
 
                                                   client_object = client))
 
1847
                                                   parent_pipe =
 
1848
                                                   parent_pipe,
 
1849
                                                   proc = proc,
 
1850
                                                   client_object =
 
1851
                                                   client))
1585
1852
            parent_pipe.send(True)
1586
 
            # 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
1587
1855
            return False
1588
1856
        if command == 'funcall':
1589
1857
            funcname = request[1]
1590
1858
            args = request[2]
1591
1859
            kwargs = request[3]
1592
1860
            
1593
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1594
 
 
 
1861
            parent_pipe.send(('data', getattr(client_object,
 
1862
                                              funcname)(*args,
 
1863
                                                         **kwargs)))
 
1864
        
1595
1865
        if command == 'getattr':
1596
1866
            attrname = request[1]
1597
1867
            if callable(client_object.__getattribute__(attrname)):
1598
1868
                parent_pipe.send(('function',))
1599
1869
            else:
1600
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1870
                parent_pipe.send(('data', client_object
 
1871
                                  .__getattribute__(attrname)))
1601
1872
        
1602
1873
        if command == 'setattr':
1603
1874
            attrname = request[1]
1604
1875
            value = request[2]
1605
1876
            setattr(client_object, attrname, value)
1606
 
 
 
1877
        
1607
1878
        return True
1608
1879
 
1609
1880
 
1646
1917
    return timevalue
1647
1918
 
1648
1919
 
1649
 
def if_nametoindex(interface):
1650
 
    """Call the C function if_nametoindex(), or equivalent
1651
 
    
1652
 
    Note: This function cannot accept a unicode string."""
1653
 
    global if_nametoindex
1654
 
    try:
1655
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1656
 
                          (ctypes.util.find_library("c"))
1657
 
                          .if_nametoindex)
1658
 
    except (OSError, AttributeError):
1659
 
        logger.warning("Doing if_nametoindex the hard way")
1660
 
        def if_nametoindex(interface):
1661
 
            "Get an interface index the hard way, i.e. using fcntl()"
1662
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1663
 
            with contextlib.closing(socket.socket()) as s:
1664
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1665
 
                                    struct.pack(str("16s16x"),
1666
 
                                                interface))
1667
 
            interface_index = struct.unpack(str("I"),
1668
 
                                            ifreq[16:20])[0]
1669
 
            return interface_index
1670
 
    return if_nametoindex(interface)
1671
 
 
1672
 
 
1673
1920
def daemon(nochdir = False, noclose = False):
1674
1921
    """See daemon(3).  Standard BSD Unix function.
1675
1922
    
1730
1977
                        " system bus interface")
1731
1978
    parser.add_argument("--no-ipv6", action="store_false",
1732
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
    
1733
1986
    options = parser.parse_args()
1734
1987
    
1735
1988
    if options.check:
1748
2001
                        "use_dbus": "True",
1749
2002
                        "use_ipv6": "True",
1750
2003
                        "debuglevel": "",
 
2004
                        "restore": "True",
 
2005
                        "statedir": "/var/lib/mandos"
1751
2006
                        }
1752
2007
    
1753
2008
    # Parse config file for server-global settings
1770
2025
    # options, if set.
1771
2026
    for option in ("interface", "address", "port", "debug",
1772
2027
                   "priority", "servicename", "configdir",
1773
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2028
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2029
                   "statedir"):
1774
2030
        value = getattr(options, option)
1775
2031
        if value is not None:
1776
2032
            server_settings[option] = value
1788
2044
    debuglevel = server_settings["debuglevel"]
1789
2045
    use_dbus = server_settings["use_dbus"]
1790
2046
    use_ipv6 = server_settings["use_ipv6"]
1791
 
 
 
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
    
1792
2059
    if server_settings["servicename"] != "Mandos":
1793
2060
        syslogger.setFormatter(logging.Formatter
1794
2061
                               ('Mandos (%s) [%%(process)d]:'
1796
2063
                                % server_settings["servicename"]))
1797
2064
    
1798
2065
    # Parse config file with clients
1799
 
    client_defaults = { "timeout": "1h",
1800
 
                        "interval": "5m",
 
2066
    client_defaults = { "timeout": "5m",
 
2067
                        "extended_timeout": "15m",
 
2068
                        "interval": "2m",
1801
2069
                        "checker": "fping -q -- %%(host)s",
1802
2070
                        "host": "",
1803
2071
                        "approval_delay": "0s",
1847
2115
        if error[0] != errno.EPERM:
1848
2116
            raise error
1849
2117
    
1850
 
    if not debug and not debuglevel:
1851
 
        syslogger.setLevel(logging.WARNING)
1852
 
        console.setLevel(logging.WARNING)
1853
 
    if debuglevel:
1854
 
        level = getattr(logging, debuglevel.upper())
1855
 
        syslogger.setLevel(level)
1856
 
        console.setLevel(level)
1857
 
 
1858
2118
    if debug:
1859
2119
        # Enable all possible GnuTLS debugging
1860
2120
        
1891
2151
    # End of Avahi example code
1892
2152
    if use_dbus:
1893
2153
        try:
1894
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2154
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1895
2155
                                            bus, do_not_queue=True)
 
2156
            old_bus_name = (dbus.service.BusName
 
2157
                            ("se.bsnet.fukt.Mandos", bus,
 
2158
                             do_not_queue=True))
1896
2159
        except dbus.exceptions.NameExistsException as e:
1897
2160
            logger.error(unicode(e) + ", disabling D-Bus")
1898
2161
            use_dbus = False
1899
2162
            server_settings["use_dbus"] = False
1900
2163
            tcp_server.use_dbus = False
1901
2164
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1902
 
    service = AvahiService(name = server_settings["servicename"],
1903
 
                           servicetype = "_mandos._tcp",
1904
 
                           protocol = protocol, bus = bus)
 
2165
    service = AvahiServiceToSyslog(name =
 
2166
                                   server_settings["servicename"],
 
2167
                                   servicetype = "_mandos._tcp",
 
2168
                                   protocol = protocol, bus = bus)
1905
2169
    if server_settings["interface"]:
1906
2170
        service.interface = (if_nametoindex
1907
2171
                             (str(server_settings["interface"])))
1911
2175
    
1912
2176
    client_class = Client
1913
2177
    if use_dbus:
1914
 
        client_class = functools.partial(ClientDBus, bus = bus)
1915
 
    def client_config_items(config, section):
1916
 
        special_settings = {
1917
 
            "approved_by_default":
1918
 
                lambda: config.getboolean(section,
1919
 
                                          "approved_by_default"),
1920
 
            }
1921
 
        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
            
1922
2284
            try:
1923
 
                yield (name, special_settings[name]())
1924
 
            except KeyError:
1925
 
                yield (name, value)
1926
 
    
1927
 
    tcp_server.clients.update(set(
1928
 
            client_class(name = section,
1929
 
                         config= dict(client_config_items(
1930
 
                        client_config, section)))
1931
 
            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
    
1932
2305
    if not tcp_server.clients:
1933
2306
        logger.warning("No clients defined")
1934
2307
        
1947
2320
        del pidfilename
1948
2321
        
1949
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1950
 
 
 
2323
    
1951
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1952
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1953
2326
    
1956
2329
            """A D-Bus proxy object"""
1957
2330
            def __init__(self):
1958
2331
                dbus.service.Object.__init__(self, bus, "/")
1959
 
            _interface = "se.bsnet.fukt.Mandos"
 
2332
            _interface = "se.recompile.Mandos"
1960
2333
            
1961
2334
            @dbus.service.signal(_interface, signature="o")
1962
2335
            def ClientAdded(self, objpath):
1977
2350
            def GetAllClients(self):
1978
2351
                "D-Bus method"
1979
2352
                return dbus.Array(c.dbus_object_path
1980
 
                                  for c in tcp_server.clients)
 
2353
                                  for c in
 
2354
                                  tcp_server.clients.itervalues())
1981
2355
            
1982
2356
            @dbus.service.method(_interface,
1983
2357
                                 out_signature="a{oa{sv}}")
1985
2359
                "D-Bus method"
1986
2360
                return dbus.Dictionary(
1987
2361
                    ((c.dbus_object_path, c.GetAll(""))
1988
 
                     for c in tcp_server.clients),
 
2362
                     for c in tcp_server.clients.itervalues()),
1989
2363
                    signature="oa{sv}")
1990
2364
            
1991
2365
            @dbus.service.method(_interface, in_signature="o")
1992
2366
            def RemoveClient(self, object_path):
1993
2367
                "D-Bus method"
1994
 
                for c in tcp_server.clients:
 
2368
                for c in tcp_server.clients.itervalues():
1995
2369
                    if c.dbus_object_path == object_path:
1996
 
                        tcp_server.clients.remove(c)
 
2370
                        del tcp_server.clients[c.name]
1997
2371
                        c.remove_from_connection()
1998
2372
                        # Don't signal anything except ClientRemoved
1999
2373
                        c.disable(quiet=True)
2004
2378
            
2005
2379
            del _interface
2006
2380
        
2007
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2008
2384
    
2009
2385
    def cleanup():
2010
2386
        "Cleanup function; run on exit"
2011
2387
        service.cleanup()
2012
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
2013
2432
        while tcp_server.clients:
2014
 
            client = tcp_server.clients.pop()
 
2433
            name, client = tcp_server.clients.popitem()
2015
2434
            if use_dbus:
2016
2435
                client.remove_from_connection()
2017
 
            client.disable_hook = None
2018
2436
            # Don't signal anything except ClientRemoved
2019
2437
            client.disable(quiet=True)
2020
2438
            if use_dbus:
2021
2439
                # Emit D-Bus signal
2022
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2440
                mandos_dbus_service.ClientRemoved(client
 
2441
                                                  .dbus_object_path,
2023
2442
                                                  client.name)
 
2443
        client_settings.clear()
2024
2444
    
2025
2445
    atexit.register(cleanup)
2026
2446
    
2027
 
    for client in tcp_server.clients:
 
2447
    for client in tcp_server.clients.itervalues():
2028
2448
        if use_dbus:
2029
2449
            # Emit D-Bus signal
2030
2450
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2031
 
        client.enable()
 
2451
        # Need to initiate checking of clients
 
2452
        if client.enabled:
 
2453
            client.init_checker()
2032
2454
    
2033
2455
    tcp_server.enable()
2034
2456
    tcp_server.server_activate()
2074
2496
    # Must run before the D-Bus bus name gets deregistered
2075
2497
    cleanup()
2076
2498
 
 
2499
 
2077
2500
if __name__ == '__main__':
2078
2501
    main()