/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: Björn Påhlsson
  • Date: 2011-06-18 22:51:12 UTC
  • mto: This revision was merged to the branch mainline in revision 485.
  • Revision ID: belorn@fukt.bsnet.se-20110618225112-rnt2m4ek32758f80
using scandir instead of readdir

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@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.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
68
65
 
69
66
import dbus
70
67
import dbus.service
75
72
import ctypes.util
76
73
import xml.dom.minidom
77
74
import inspect
78
 
import GnuPGInterface
79
75
 
80
76
try:
81
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
82
        SO_BINDTODEVICE = None
87
83
 
88
84
 
89
 
version = "1.4.1"
90
 
stored_state_file = "clients.pickle"
 
85
version = "1.3.0"
91
86
 
92
 
logger = logging.getLogger()
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
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 PGPError(Exception):
132
 
    """Exception if encryption/decryption fails"""
133
 
    pass
134
 
 
135
 
 
136
 
class PGPEngine(object):
137
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
138
 
    def __init__(self):
139
 
        self.gnupg = GnuPGInterface.GnuPG()
140
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
 
        self.gnupg = GnuPGInterface.GnuPG()
142
 
        self.gnupg.options.meta_interactive = False
143
 
        self.gnupg.options.homedir = self.tempdir
144
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
145
 
                                              '--quiet'])
146
 
    
147
 
    def __enter__(self):
148
 
        return self
149
 
    
150
 
    def __exit__ (self, exc_type, exc_value, traceback):
151
 
        self._cleanup()
152
 
        return False
153
 
    
154
 
    def __del__(self):
155
 
        self._cleanup()
156
 
    
157
 
    def _cleanup(self):
158
 
        if self.tempdir is not None:
159
 
            # Delete contents of tempdir
160
 
            for root, dirs, files in os.walk(self.tempdir,
161
 
                                             topdown = False):
162
 
                for filename in files:
163
 
                    os.remove(os.path.join(root, filename))
164
 
                for dirname in dirs:
165
 
                    os.rmdir(os.path.join(root, dirname))
166
 
            # Remove tempdir
167
 
            os.rmdir(self.tempdir)
168
 
            self.tempdir = None
169
 
    
170
 
    def password_encode(self, password):
171
 
        # Passphrase can not be empty and can not contain newlines or
172
 
        # NUL bytes.  So we prefix it and hex encode it.
173
 
        return b"mandos" + binascii.hexlify(password)
174
 
    
175
 
    def encrypt(self, data, password):
176
 
        self.gnupg.passphrase = self.password_encode(password)
177
 
        with open(os.devnull) as devnull:
178
 
            try:
179
 
                proc = self.gnupg.run(['--symmetric'],
180
 
                                      create_fhs=['stdin', 'stdout'],
181
 
                                      attach_fhs={'stderr': devnull})
182
 
                with contextlib.closing(proc.handles['stdin']) as f:
183
 
                    f.write(data)
184
 
                with contextlib.closing(proc.handles['stdout']) as f:
185
 
                    ciphertext = f.read()
186
 
                proc.wait()
187
 
            except IOError as e:
188
 
                raise PGPError(e)
189
 
        self.gnupg.passphrase = None
190
 
        return ciphertext
191
 
    
192
 
    def decrypt(self, data, password):
193
 
        self.gnupg.passphrase = self.password_encode(password)
194
 
        with open(os.devnull) as devnull:
195
 
            try:
196
 
                proc = self.gnupg.run(['--decrypt'],
197
 
                                      create_fhs=['stdin', 'stdout'],
198
 
                                      attach_fhs={'stderr': devnull})
199
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
200
 
                    f.write(data)
201
 
                with contextlib.closing(proc.handles['stdout']) as f:
202
 
                    decrypted_plaintext = f.read()
203
 
                proc.wait()
204
 
            except IOError as e:
205
 
                raise PGPError(e)
206
 
        self.gnupg.passphrase = None
207
 
        return decrypted_plaintext
208
 
 
209
 
 
 
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)
210
102
 
211
103
class AvahiError(Exception):
212
104
    def __init__(self, value, *args, **kwargs):
267
159
                            " after %i retries, exiting.",
268
160
                            self.rename_count)
269
161
            raise AvahiServiceError("Too many renames")
270
 
        self.name = unicode(self.server
271
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
272
163
        logger.info("Changing Zeroconf service name to %r ...",
273
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
274
169
        self.remove()
275
170
        try:
276
171
            self.add()
296
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
297
192
        self.entry_group_state_changed_match = (
298
193
            self.group.connect_to_signal(
299
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
300
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
301
196
                     self.name, self.type)
302
197
        self.group.AddService(
328
223
            try:
329
224
                self.group.Free()
330
225
            except (dbus.exceptions.UnknownMethodException,
331
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
332
227
                pass
333
228
            self.group = None
334
229
        self.remove()
368
263
                                 self.server_state_changed)
369
264
        self.server_state_changed(self.server.GetState())
370
265
 
371
 
class AvahiServiceToSyslog(AvahiService):
372
 
    def rename(self):
373
 
        """Add the new name to the syslog messages"""
374
 
        ret = AvahiService.rename(self)
375
 
        syslogger.setFormatter(logging.Formatter
376
 
                               ('Mandos (%s) [%%(process)d]:'
377
 
                                ' %%(levelname)s: %%(message)s'
378
 
                                % self.name))
379
 
        return ret
380
266
 
381
 
def timedelta_to_milliseconds(td):
382
 
    "Convert a datetime.timedelta() to milliseconds"
383
 
    return ((td.days * 24 * 60 * 60 * 1000)
384
 
            + (td.seconds * 1000)
385
 
            + (td.microseconds // 1000))
386
 
        
387
267
class Client(object):
388
268
    """A representation of a client host served by this server.
389
269
    
390
270
    Attributes:
391
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
271
    _approved:   bool(); 'None' if not yet approved/disapproved
392
272
    approval_delay: datetime.timedelta(); Time to wait for approval
393
273
    approval_duration: datetime.timedelta(); Duration of one approval
394
274
    checker:    subprocess.Popen(); a running checker process used
401
281
                     instance %(name)s can be used in the command.
402
282
    checker_initiator_tag: a gobject event source tag, or None
403
283
    created:    datetime.datetime(); (UTC) object creation
404
 
    client_structure: Object describing what attributes a client has
405
 
                      and is used for storing the client at exit
406
284
    current_checker_command: string; current running checker_command
 
285
    disable_hook:  If set, called by disable() as disable_hook(self)
407
286
    disable_initiator_tag: a gobject event source tag, or None
408
287
    enabled:    bool()
409
288
    fingerprint: string (40 or 32 hexadecimal digits); used to
412
291
    interval:   datetime.timedelta(); How often to start a new checker
413
292
    last_approval_request: datetime.datetime(); (UTC) or None
414
293
    last_checked_ok: datetime.datetime(); (UTC) or None
415
 
 
416
 
    last_checker_status: integer between 0 and 255 reflecting exit
417
 
                         status of last checker. -1 reflects crashed
418
 
                         checker, or None.
419
 
    last_enabled: datetime.datetime(); (UTC) or None
 
294
    last_enabled: datetime.datetime(); (UTC)
420
295
    name:       string; from the config file, used in log messages and
421
296
                        D-Bus identifiers
422
297
    secret:     bytestring; sent verbatim (over TLS) to client
423
298
    timeout:    datetime.timedelta(); How long from last_checked_ok
424
299
                                      until this client is disabled
425
 
    extended_timeout:   extra long timeout when password has been sent
426
300
    runtime_expansions: Allowed attributes for runtime expansion.
427
 
    expires:    datetime.datetime(); time (UTC) when a client will be
428
 
                disabled, or None
429
301
    """
430
302
    
431
303
    runtime_expansions = ("approval_delay", "approval_duration",
433
305
                          "host", "interval", "last_checked_ok",
434
306
                          "last_enabled", "name", "timeout")
435
307
    
 
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
    
436
315
    def timeout_milliseconds(self):
437
316
        "Return the 'timeout' attribute in milliseconds"
438
 
        return timedelta_to_milliseconds(self.timeout)
439
 
    
440
 
    def extended_timeout_milliseconds(self):
441
 
        "Return the 'extended_timeout' attribute in milliseconds"
442
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
317
        return self._timedelta_to_milliseconds(self.timeout)
443
318
    
444
319
    def interval_milliseconds(self):
445
320
        "Return the 'interval' attribute in milliseconds"
446
 
        return timedelta_to_milliseconds(self.interval)
447
 
    
 
321
        return self._timedelta_to_milliseconds(self.interval)
 
322
 
448
323
    def approval_delay_milliseconds(self):
449
 
        return timedelta_to_milliseconds(self.approval_delay)
 
324
        return self._timedelta_to_milliseconds(self.approval_delay)
450
325
    
451
 
    def __init__(self, name = None, config=None):
 
326
    def __init__(self, name = None, disable_hook=None, config=None):
452
327
        """Note: the 'checker' key in 'config' sets the
453
328
        'checker_command' attribute and *not* the 'checker'
454
329
        attribute."""
474
349
                            % self.name)
475
350
        self.host = config.get("host", "")
476
351
        self.created = datetime.datetime.utcnow()
477
 
        self.enabled = config.get("enabled", True)
 
352
        self.enabled = False
478
353
        self.last_approval_request = None
479
 
        if self.enabled:
480
 
            self.last_enabled = datetime.datetime.utcnow()
481
 
        else:
482
 
            self.last_enabled = None
 
354
        self.last_enabled = None
483
355
        self.last_checked_ok = None
484
 
        self.last_checker_status = None
485
356
        self.timeout = string_to_delta(config["timeout"])
486
 
        self.extended_timeout = string_to_delta(config
487
 
                                                ["extended_timeout"])
488
357
        self.interval = string_to_delta(config["interval"])
 
358
        self.disable_hook = disable_hook
489
359
        self.checker = None
490
360
        self.checker_initiator_tag = None
491
361
        self.disable_initiator_tag = None
492
 
        if self.enabled:
493
 
            self.expires = datetime.datetime.utcnow() + self.timeout
494
 
        else:
495
 
            self.expires = None
496
362
        self.checker_callback_tag = None
497
363
        self.checker_command = config["checker"]
498
364
        self.current_checker_command = None
499
 
        self.approved = None
 
365
        self.last_connect = None
 
366
        self._approved = None
500
367
        self.approved_by_default = config.get("approved_by_default",
501
368
                                              True)
502
369
        self.approvals_pending = 0
504
371
            config["approval_delay"])
505
372
        self.approval_duration = string_to_delta(
506
373
            config["approval_duration"])
507
 
        self.changedstate = (multiprocessing_manager
508
 
                             .Condition(multiprocessing_manager
509
 
                                        .Lock()))
510
 
        self.client_structure = [attr for attr in
511
 
                                 self.__dict__.iterkeys()
512
 
                                 if not attr.startswith("_")]
513
 
        self.client_structure.append("client_structure")
514
 
        
515
 
        for name, t in inspect.getmembers(type(self),
516
 
                                          lambda obj:
517
 
                                              isinstance(obj,
518
 
                                                         property)):
519
 
            if not name.startswith("_"):
520
 
                self.client_structure.append(name)
 
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
521
375
    
522
 
    # Send notice to process children that client state has changed
523
376
    def send_changedstate(self):
524
 
        with self.changedstate:
525
 
            self.changedstate.notify_all()
526
 
    
 
377
        self.changedstate.acquire()
 
378
        self.changedstate.notify_all()
 
379
        self.changedstate.release()
 
380
        
527
381
    def enable(self):
528
382
        """Start this client's checker and timeout hooks"""
529
383
        if getattr(self, "enabled", False):
530
384
            # Already enabled
531
385
            return
532
386
        self.send_changedstate()
533
 
        self.expires = datetime.datetime.utcnow() + self.timeout
534
 
        self.enabled = True
535
387
        self.last_enabled = datetime.datetime.utcnow()
536
 
        self.init_checker()
 
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()
537
400
    
538
401
    def disable(self, quiet=True):
539
402
        """Disable this client."""
546
409
        if getattr(self, "disable_initiator_tag", False):
547
410
            gobject.source_remove(self.disable_initiator_tag)
548
411
            self.disable_initiator_tag = None
549
 
        self.expires = None
550
412
        if getattr(self, "checker_initiator_tag", False):
551
413
            gobject.source_remove(self.checker_initiator_tag)
552
414
            self.checker_initiator_tag = None
553
415
        self.stop_checker()
 
416
        if self.disable_hook:
 
417
            self.disable_hook(self)
554
418
        self.enabled = False
555
419
        # Do not run this again if called by a gobject.timeout_add
556
420
        return False
557
421
    
558
422
    def __del__(self):
 
423
        self.disable_hook = None
559
424
        self.disable()
560
425
    
561
 
    def init_checker(self):
562
 
        # Schedule a new checker to be started an 'interval' from now,
563
 
        # and every interval from then on.
564
 
        self.checker_initiator_tag = (gobject.timeout_add
565
 
                                      (self.interval_milliseconds(),
566
 
                                       self.start_checker))
567
 
        # Schedule a disable() when 'timeout' has passed
568
 
        self.disable_initiator_tag = (gobject.timeout_add
569
 
                                   (self.timeout_milliseconds(),
570
 
                                    self.disable))
571
 
        # Also start a new checker *right now*.
572
 
        self.start_checker()
573
 
    
574
426
    def checker_callback(self, pid, condition, command):
575
427
        """The checker has completed, so take appropriate actions."""
576
428
        self.checker_callback_tag = None
577
429
        self.checker = None
578
430
        if os.WIFEXITED(condition):
579
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
580
 
            if self.last_checker_status == 0:
 
431
            exitstatus = os.WEXITSTATUS(condition)
 
432
            if exitstatus == 0:
581
433
                logger.info("Checker for %(name)s succeeded",
582
434
                            vars(self))
583
435
                self.checked_ok()
585
437
                logger.info("Checker for %(name)s failed",
586
438
                            vars(self))
587
439
        else:
588
 
            self.last_checker_status = -1
589
440
            logger.warning("Checker for %(name)s crashed?",
590
441
                           vars(self))
591
442
    
592
 
    def checked_ok(self, timeout=None):
 
443
    def checked_ok(self):
593
444
        """Bump up the timeout for this client.
594
445
        
595
446
        This should only be called when the client has been seen,
596
447
        alive and well.
597
448
        """
598
 
        if timeout is None:
599
 
            timeout = self.timeout
600
449
        self.last_checked_ok = datetime.datetime.utcnow()
601
 
        if self.disable_initiator_tag is not None:
602
 
            gobject.source_remove(self.disable_initiator_tag)
603
 
        if getattr(self, "enabled", False):
604
 
            self.disable_initiator_tag = (gobject.timeout_add
605
 
                                          (timedelta_to_milliseconds
606
 
                                           (timeout), self.disable))
607
 
            self.expires = datetime.datetime.utcnow() + timeout
 
450
        gobject.source_remove(self.disable_initiator_tag)
 
451
        self.disable_initiator_tag = (gobject.timeout_add
 
452
                                      (self.timeout_milliseconds(),
 
453
                                       self.disable))
608
454
    
609
455
    def need_approval(self):
610
456
        self.last_approval_request = datetime.datetime.utcnow()
650
496
                                       'replace')))
651
497
                    for attr in
652
498
                    self.runtime_expansions)
653
 
                
 
499
 
654
500
                try:
655
501
                    command = self.checker_command % escaped_attrs
656
502
                except TypeError as error:
702
548
                raise
703
549
        self.checker = None
704
550
 
705
 
 
706
551
def dbus_service_property(dbus_interface, signature="v",
707
552
                          access="readwrite", byte_arrays=False):
708
553
    """Decorators for marking methods of a DBusObjectWithProperties to
754
599
 
755
600
class DBusObjectWithProperties(dbus.service.Object):
756
601
    """A D-Bus object with properties.
757
 
    
 
602
 
758
603
    Classes inheriting from this can use the dbus_service_property
759
604
    decorator to expose methods as D-Bus properties.  It exposes the
760
605
    standard Get(), Set(), and GetAll() methods on the D-Bus.
767
612
    def _get_all_dbus_properties(self):
768
613
        """Returns a generator of (name, attribute) pairs
769
614
        """
770
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
771
 
                for cls in self.__class__.__mro__
 
615
        return ((prop._dbus_name, prop)
772
616
                for name, prop in
773
 
                inspect.getmembers(cls, self._is_dbus_property))
 
617
                inspect.getmembers(self, self._is_dbus_property))
774
618
    
775
619
    def _get_dbus_property(self, interface_name, property_name):
776
620
        """Returns a bound method if one exists which is a D-Bus
777
621
        property with the specified name and interface.
778
622
        """
779
 
        for cls in  self.__class__.__mro__:
780
 
            for name, value in (inspect.getmembers
781
 
                                (cls, self._is_dbus_property)):
782
 
                if (value._dbus_name == property_name
783
 
                    and value._dbus_interface == interface_name):
784
 
                    return value.__get__(self)
785
 
        
 
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
786
633
        # No such property
787
634
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
788
635
                                   + interface_name + "."
822
669
    def GetAll(self, interface_name):
823
670
        """Standard D-Bus property GetAll() method, see D-Bus
824
671
        standard.
825
 
        
 
672
 
826
673
        Note: Will not include properties with access="write".
827
674
        """
828
 
        properties = {}
 
675
        all = {}
829
676
        for name, prop in self._get_all_dbus_properties():
830
677
            if (interface_name
831
678
                and interface_name != prop._dbus_interface):
836
683
                continue
837
684
            value = prop()
838
685
            if not hasattr(value, "variant_level"):
839
 
                properties[name] = value
 
686
                all[name] = value
840
687
                continue
841
 
            properties[name] = type(value)(value, variant_level=
842
 
                                           value.variant_level+1)
843
 
        return dbus.Dictionary(properties, signature="sv")
 
688
            all[name] = type(value)(value, variant_level=
 
689
                                    value.variant_level+1)
 
690
        return dbus.Dictionary(all, signature="sv")
844
691
    
845
692
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
846
693
                         out_signature="s",
890
737
        return xmlstring
891
738
 
892
739
 
893
 
def datetime_to_dbus (dt, variant_level=0):
894
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
895
 
    if dt is None:
896
 
        return dbus.String("", variant_level = variant_level)
897
 
    return dbus.String(dt.isoformat(),
898
 
                       variant_level=variant_level)
899
 
 
900
 
 
901
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
902
 
                                  .__metaclass__):
903
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
904
 
    will add additional D-Bus attributes matching a certain pattern.
905
 
    """
906
 
    def __new__(mcs, name, bases, attr):
907
 
        # Go through all the base classes which could have D-Bus
908
 
        # methods, signals, or properties in them
909
 
        for base in (b for b in bases
910
 
                     if issubclass(b, dbus.service.Object)):
911
 
            # Go though all attributes of the base class
912
 
            for attrname, attribute in inspect.getmembers(base):
913
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
914
 
                # with the wrong interface name
915
 
                if (not hasattr(attribute, "_dbus_interface")
916
 
                    or not attribute._dbus_interface
917
 
                    .startswith("se.recompile.Mandos")):
918
 
                    continue
919
 
                # Create an alternate D-Bus interface name based on
920
 
                # the current name
921
 
                alt_interface = (attribute._dbus_interface
922
 
                                 .replace("se.recompile.Mandos",
923
 
                                          "se.bsnet.fukt.Mandos"))
924
 
                # Is this a D-Bus signal?
925
 
                if getattr(attribute, "_dbus_is_signal", False):
926
 
                    # Extract the original non-method function by
927
 
                    # black magic
928
 
                    nonmethod_func = (dict(
929
 
                            zip(attribute.func_code.co_freevars,
930
 
                                attribute.__closure__))["func"]
931
 
                                      .cell_contents)
932
 
                    # Create a new, but exactly alike, function
933
 
                    # object, and decorate it to be a new D-Bus signal
934
 
                    # with the alternate D-Bus interface name
935
 
                    new_function = (dbus.service.signal
936
 
                                    (alt_interface,
937
 
                                     attribute._dbus_signature)
938
 
                                    (types.FunctionType(
939
 
                                nonmethod_func.func_code,
940
 
                                nonmethod_func.func_globals,
941
 
                                nonmethod_func.func_name,
942
 
                                nonmethod_func.func_defaults,
943
 
                                nonmethod_func.func_closure)))
944
 
                    # Define a creator of a function to call both the
945
 
                    # old and new functions, so both the old and new
946
 
                    # signals gets sent when the function is called
947
 
                    def fixscope(func1, func2):
948
 
                        """This function is a scope container to pass
949
 
                        func1 and func2 to the "call_both" function
950
 
                        outside of its arguments"""
951
 
                        def call_both(*args, **kwargs):
952
 
                            """This function will emit two D-Bus
953
 
                            signals by calling func1 and func2"""
954
 
                            func1(*args, **kwargs)
955
 
                            func2(*args, **kwargs)
956
 
                        return call_both
957
 
                    # Create the "call_both" function and add it to
958
 
                    # the class
959
 
                    attr[attrname] = fixscope(attribute,
960
 
                                              new_function)
961
 
                # Is this a D-Bus method?
962
 
                elif getattr(attribute, "_dbus_is_method", False):
963
 
                    # Create a new, but exactly alike, function
964
 
                    # object.  Decorate it to be a new D-Bus method
965
 
                    # with the alternate D-Bus interface name.  Add it
966
 
                    # to the class.
967
 
                    attr[attrname] = (dbus.service.method
968
 
                                      (alt_interface,
969
 
                                       attribute._dbus_in_signature,
970
 
                                       attribute._dbus_out_signature)
971
 
                                      (types.FunctionType
972
 
                                       (attribute.func_code,
973
 
                                        attribute.func_globals,
974
 
                                        attribute.func_name,
975
 
                                        attribute.func_defaults,
976
 
                                        attribute.func_closure)))
977
 
                # Is this a D-Bus property?
978
 
                elif getattr(attribute, "_dbus_is_property", False):
979
 
                    # Create a new, but exactly alike, function
980
 
                    # object, and decorate it to be a new D-Bus
981
 
                    # property with the alternate D-Bus interface
982
 
                    # name.  Add it to the class.
983
 
                    attr[attrname] = (dbus_service_property
984
 
                                      (alt_interface,
985
 
                                       attribute._dbus_signature,
986
 
                                       attribute._dbus_access,
987
 
                                       attribute
988
 
                                       ._dbus_get_args_options
989
 
                                       ["byte_arrays"])
990
 
                                      (types.FunctionType
991
 
                                       (attribute.func_code,
992
 
                                        attribute.func_globals,
993
 
                                        attribute.func_name,
994
 
                                        attribute.func_defaults,
995
 
                                        attribute.func_closure)))
996
 
        return type.__new__(mcs, name, bases, attr)
997
 
 
998
 
 
999
740
class ClientDBus(Client, DBusObjectWithProperties):
1000
741
    """A Client class using D-Bus
1001
742
    
1010
751
    # dbus.service.Object doesn't use super(), so we can't either.
1011
752
    
1012
753
    def __init__(self, bus = None, *args, **kwargs):
 
754
        self._approvals_pending = 0
1013
755
        self.bus = bus
1014
756
        Client.__init__(self, *args, **kwargs)
1015
 
        
1016
 
        self._approvals_pending = 0
1017
757
        # Only now, when this client is initialized, can it show up on
1018
758
        # the D-Bus
1019
759
        client_object_name = unicode(self.name).translate(
1024
764
        DBusObjectWithProperties.__init__(self, self.bus,
1025
765
                                          self.dbus_object_path)
1026
766
        
1027
 
    def notifychangeproperty(transform_func,
1028
 
                             dbus_name, type_func=lambda x: x,
1029
 
                             variant_level=1):
1030
 
        """ Modify a variable so that it's a property which announces
1031
 
        its changes to DBus.
1032
 
        
1033
 
        transform_fun: Function that takes a value and a variant_level
1034
 
                       and transforms it to a D-Bus type.
1035
 
        dbus_name: D-Bus name of the variable
1036
 
        type_func: Function that transform the value before sending it
1037
 
                   to the D-Bus.  Default: no transform
1038
 
        variant_level: D-Bus variant level.  Default: 1
1039
 
        """
1040
 
        attrname = "_{0}".format(dbus_name)
1041
 
        def setter(self, value):
1042
 
            if hasattr(self, "dbus_object_path"):
1043
 
                if (not hasattr(self, attrname) or
1044
 
                    type_func(getattr(self, attrname, None))
1045
 
                    != type_func(value)):
1046
 
                    dbus_value = transform_func(type_func(value),
1047
 
                                                variant_level
1048
 
                                                =variant_level)
1049
 
                    self.PropertyChanged(dbus.String(dbus_name),
1050
 
                                         dbus_value)
1051
 
            setattr(self, attrname, value)
1052
 
        
1053
 
        return property(lambda self: getattr(self, attrname), setter)
1054
 
    
1055
 
    
1056
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1057
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1058
 
                                             "ApprovalPending",
1059
 
                                             type_func = bool)
1060
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1061
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1062
 
                                        "LastEnabled")
1063
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1064
 
                                   type_func = lambda checker:
1065
 
                                       checker is not None)
1066
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1067
 
                                           "LastCheckedOK")
1068
 
    last_approval_request = notifychangeproperty(
1069
 
        datetime_to_dbus, "LastApprovalRequest")
1070
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1071
 
                                               "ApprovedByDefault")
1072
 
    approval_delay = notifychangeproperty(dbus.UInt16,
1073
 
                                          "ApprovalDelay",
1074
 
                                          type_func =
1075
 
                                          timedelta_to_milliseconds)
1076
 
    approval_duration = notifychangeproperty(
1077
 
        dbus.UInt16, "ApprovalDuration",
1078
 
        type_func = timedelta_to_milliseconds)
1079
 
    host = notifychangeproperty(dbus.String, "Host")
1080
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1081
 
                                   type_func =
1082
 
                                   timedelta_to_milliseconds)
1083
 
    extended_timeout = notifychangeproperty(
1084
 
        dbus.UInt16, "ExtendedTimeout",
1085
 
        type_func = timedelta_to_milliseconds)
1086
 
    interval = notifychangeproperty(dbus.UInt16,
1087
 
                                    "Interval",
1088
 
                                    type_func =
1089
 
                                    timedelta_to_milliseconds)
1090
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1091
 
    
1092
 
    del notifychangeproperty
 
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
1093
810
    
1094
811
    def __del__(self, *args, **kwargs):
1095
812
        try:
1104
821
                         *args, **kwargs):
1105
822
        self.checker_callback_tag = None
1106
823
        self.checker = None
 
824
        # Emit D-Bus signal
 
825
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
826
                             dbus.Boolean(False, variant_level=1))
1107
827
        if os.WIFEXITED(condition):
1108
828
            exitstatus = os.WEXITSTATUS(condition)
1109
829
            # Emit D-Bus signal
1119
839
        return Client.checker_callback(self, pid, condition, command,
1120
840
                                       *args, **kwargs)
1121
841
    
 
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
    
1122
859
    def start_checker(self, *args, **kwargs):
1123
860
        old_checker = self.checker
1124
861
        if self.checker is not None:
1131
868
            and old_checker_pid != self.checker.pid):
1132
869
            # Emit D-Bus signal
1133
870
            self.CheckerStarted(self.current_checker_command)
 
871
            self.PropertyChanged(
 
872
                dbus.String("CheckerRunning"),
 
873
                dbus.Boolean(True, variant_level=1))
1134
874
        return r
1135
875
    
 
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
 
1136
885
    def _reset_approved(self):
1137
 
        self.approved = None
 
886
        self._approved = None
1138
887
        return False
1139
888
    
1140
889
    def approve(self, value=True):
1141
890
        self.send_changedstate()
1142
 
        self.approved = value
1143
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(self._timedelta_to_milliseconds
1144
893
                            (self.approval_duration),
1145
894
                            self._reset_approved)
1146
895
    
1147
896
    
1148
897
    ## D-Bus methods, signals & properties
1149
 
    _interface = "se.recompile.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1150
899
    
1151
900
    ## Signals
1152
901
    
1189
938
        "D-Bus signal"
1190
939
        return self.need_approval()
1191
940
    
1192
 
    # NeRwequest - signal
1193
 
    @dbus.service.signal(_interface, signature="s")
1194
 
    def NewRequest(self, ip):
1195
 
        """D-Bus signal
1196
 
        Is sent after a client request a password.
1197
 
        """
1198
 
        pass
1199
 
    
1200
941
    ## Methods
1201
942
    
1202
943
    # Approve - method
1246
987
        if value is None:       # get
1247
988
            return dbus.Boolean(self.approved_by_default)
1248
989
        self.approved_by_default = bool(value)
 
990
        # Emit D-Bus signal
 
991
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
992
                             dbus.Boolean(value, variant_level=1))
1249
993
    
1250
994
    # ApprovalDelay - property
1251
995
    @dbus_service_property(_interface, signature="t",
1254
998
        if value is None:       # get
1255
999
            return dbus.UInt64(self.approval_delay_milliseconds())
1256
1000
        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))
1257
1004
    
1258
1005
    # ApprovalDuration - property
1259
1006
    @dbus_service_property(_interface, signature="t",
1260
1007
                           access="readwrite")
1261
1008
    def ApprovalDuration_dbus_property(self, value=None):
1262
1009
        if value is None:       # get
1263
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1010
            return dbus.UInt64(self._timedelta_to_milliseconds(
1264
1011
                    self.approval_duration))
1265
1012
        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))
1266
1016
    
1267
1017
    # Name - property
1268
1018
    @dbus_service_property(_interface, signature="s", access="read")
1281
1031
        if value is None:       # get
1282
1032
            return dbus.String(self.host)
1283
1033
        self.host = value
 
1034
        # Emit D-Bus signal
 
1035
        self.PropertyChanged(dbus.String("Host"),
 
1036
                             dbus.String(value, variant_level=1))
1284
1037
    
1285
1038
    # Created - property
1286
1039
    @dbus_service_property(_interface, signature="s", access="read")
1287
1040
    def Created_dbus_property(self):
1288
 
        return datetime_to_dbus(self.created)
 
1041
        return dbus.String(self._datetime_to_dbus(self.created))
1289
1042
    
1290
1043
    # LastEnabled - property
1291
1044
    @dbus_service_property(_interface, signature="s", access="read")
1292
1045
    def LastEnabled_dbus_property(self):
1293
 
        return datetime_to_dbus(self.last_enabled)
 
1046
        if self.last_enabled is None:
 
1047
            return dbus.String("")
 
1048
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1294
1049
    
1295
1050
    # Enabled - property
1296
1051
    @dbus_service_property(_interface, signature="b",
1310
1065
        if value is not None:
1311
1066
            self.checked_ok()
1312
1067
            return
1313
 
        return datetime_to_dbus(self.last_checked_ok)
1314
 
    
1315
 
    # Expires - property
1316
 
    @dbus_service_property(_interface, signature="s", access="read")
1317
 
    def Expires_dbus_property(self):
1318
 
        return datetime_to_dbus(self.expires)
 
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))
1319
1072
    
1320
1073
    # LastApprovalRequest - property
1321
1074
    @dbus_service_property(_interface, signature="s", access="read")
1322
1075
    def LastApprovalRequest_dbus_property(self):
1323
 
        return datetime_to_dbus(self.last_approval_request)
 
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))
1324
1081
    
1325
1082
    # Timeout - property
1326
1083
    @dbus_service_property(_interface, signature="t",
1329
1086
        if value is None:       # get
1330
1087
            return dbus.UInt64(self.timeout_milliseconds())
1331
1088
        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))
1332
1092
        if getattr(self, "disable_initiator_tag", None) is None:
1333
1093
            return
1334
1094
        # Reschedule timeout
1335
1095
        gobject.source_remove(self.disable_initiator_tag)
1336
1096
        self.disable_initiator_tag = None
1337
 
        self.expires = None
1338
 
        time_to_die = timedelta_to_milliseconds((self
1339
 
                                                 .last_checked_ok
1340
 
                                                 + self.timeout)
1341
 
                                                - datetime.datetime
1342
 
                                                .utcnow())
 
1097
        time_to_die = (self.
 
1098
                       _timedelta_to_milliseconds((self
 
1099
                                                   .last_checked_ok
 
1100
                                                   + self.timeout)
 
1101
                                                  - datetime.datetime
 
1102
                                                  .utcnow()))
1343
1103
        if time_to_die <= 0:
1344
1104
            # The timeout has passed
1345
1105
            self.disable()
1346
1106
        else:
1347
 
            self.expires = (datetime.datetime.utcnow()
1348
 
                            + datetime.timedelta(milliseconds =
1349
 
                                                 time_to_die))
1350
1107
            self.disable_initiator_tag = (gobject.timeout_add
1351
1108
                                          (time_to_die, self.disable))
1352
1109
    
1353
 
    # ExtendedTimeout - property
1354
 
    @dbus_service_property(_interface, signature="t",
1355
 
                           access="readwrite")
1356
 
    def ExtendedTimeout_dbus_property(self, value=None):
1357
 
        if value is None:       # get
1358
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1359
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1360
 
    
1361
1110
    # Interval - property
1362
1111
    @dbus_service_property(_interface, signature="t",
1363
1112
                           access="readwrite")
1365
1114
        if value is None:       # get
1366
1115
            return dbus.UInt64(self.interval_milliseconds())
1367
1116
        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))
1368
1120
        if getattr(self, "checker_initiator_tag", None) is None:
1369
1121
            return
1370
 
        if self.enabled:
1371
 
            # Reschedule checker run
1372
 
            gobject.source_remove(self.checker_initiator_tag)
1373
 
            self.checker_initiator_tag = (gobject.timeout_add
1374
 
                                          (value, self.start_checker))
1375
 
            self.start_checker()    # Start one now, too
1376
 
    
 
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
 
1377
1128
    # Checker - property
1378
1129
    @dbus_service_property(_interface, signature="s",
1379
1130
                           access="readwrite")
1381
1132
        if value is None:       # get
1382
1133
            return dbus.String(self.checker_command)
1383
1134
        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))
1384
1139
    
1385
1140
    # CheckerRunning - property
1386
1141
    @dbus_service_property(_interface, signature="b",
1413
1168
        self._pipe.send(('init', fpr, address))
1414
1169
        if not self._pipe.recv():
1415
1170
            raise KeyError()
1416
 
    
 
1171
 
1417
1172
    def __getattribute__(self, name):
1418
 
        if name == '_pipe':
 
1173
        if(name == '_pipe'):
1419
1174
            return super(ProxyClient, self).__getattribute__(name)
1420
1175
        self._pipe.send(('getattr', name))
1421
1176
        data = self._pipe.recv()
1426
1181
                self._pipe.send(('funcall', name, args, kwargs))
1427
1182
                return self._pipe.recv()[1]
1428
1183
            return func
1429
 
    
 
1184
 
1430
1185
    def __setattr__(self, name, value):
1431
 
        if name == '_pipe':
 
1186
        if(name == '_pipe'):
1432
1187
            return super(ProxyClient, self).__setattr__(name, value)
1433
1188
        self._pipe.send(('setattr', name, value))
1434
1189
 
1435
1190
 
1436
 
class ClientDBusTransitional(ClientDBus):
1437
 
    __metaclass__ = AlternateDBusNamesMetaclass
1438
 
 
1439
 
 
1440
1191
class ClientHandler(socketserver.BaseRequestHandler, object):
1441
1192
    """A class to handle client connections.
1442
1193
    
1449
1200
                        unicode(self.client_address))
1450
1201
            logger.debug("Pipe FD: %d",
1451
1202
                         self.server.child_pipe.fileno())
1452
 
            
 
1203
 
1453
1204
            session = (gnutls.connection
1454
1205
                       .ClientSession(self.request,
1455
1206
                                      gnutls.connection
1456
1207
                                      .X509Credentials()))
1457
 
            
 
1208
 
1458
1209
            # Note: gnutls.connection.X509Credentials is really a
1459
1210
            # generic GnuTLS certificate credentials object so long as
1460
1211
            # no X.509 keys are added to it.  Therefore, we can use it
1461
1212
            # here despite using OpenPGP certificates.
1462
 
            
 
1213
 
1463
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1464
1215
            #                      "+AES-256-CBC", "+SHA1",
1465
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1471
1222
            (gnutls.library.functions
1472
1223
             .gnutls_priority_set_direct(session._c_object,
1473
1224
                                         priority, None))
1474
 
            
 
1225
 
1475
1226
            # Start communication using the Mandos protocol
1476
1227
            # Get protocol number
1477
1228
            line = self.request.makefile().readline()
1482
1233
            except (ValueError, IndexError, RuntimeError) as error:
1483
1234
                logger.error("Unknown protocol version: %s", error)
1484
1235
                return
1485
 
            
 
1236
 
1486
1237
            # Start GnuTLS connection
1487
1238
            try:
1488
1239
                session.handshake()
1492
1243
                # established.  Just abandon the request.
1493
1244
                return
1494
1245
            logger.debug("Handshake succeeded")
1495
 
            
 
1246
 
1496
1247
            approval_required = False
1497
1248
            try:
1498
1249
                try:
1503
1254
                    logger.warning("Bad certificate: %s", error)
1504
1255
                    return
1505
1256
                logger.debug("Fingerprint: %s", fpr)
1506
 
                
 
1257
 
1507
1258
                try:
1508
1259
                    client = ProxyClient(child_pipe, fpr,
1509
1260
                                         self.client_address)
1510
1261
                except KeyError:
1511
1262
                    return
1512
1263
                
1513
 
                if self.server.use_dbus:
1514
 
                    # Emit D-Bus signal
1515
 
                    client.NewRequest(str(self.client_address))
1516
 
                
1517
1264
                if client.approval_delay:
1518
1265
                    delay = client.approval_delay
1519
1266
                    client.approvals_pending += 1
1521
1268
                
1522
1269
                while True:
1523
1270
                    if not client.enabled:
1524
 
                        logger.info("Client %s is disabled",
 
1271
                        logger.warning("Client %s is disabled",
1525
1272
                                       client.name)
1526
1273
                        if self.server.use_dbus:
1527
1274
                            # Emit D-Bus signal
1528
 
                            client.Rejected("Disabled")
 
1275
                            client.Rejected("Disabled")                    
1529
1276
                        return
1530
1277
                    
1531
 
                    if client.approved or not client.approval_delay:
 
1278
                    if client._approved or not client.approval_delay:
1532
1279
                        #We are approved or approval is disabled
1533
1280
                        break
1534
 
                    elif client.approved is None:
 
1281
                    elif client._approved is None:
1535
1282
                        logger.info("Client %s needs approval",
1536
1283
                                    client.name)
1537
1284
                        if self.server.use_dbus:
1548
1295
                        return
1549
1296
                    
1550
1297
                    #wait until timeout or approved
 
1298
                    #x = float(client._timedelta_to_milliseconds(delay))
1551
1299
                    time = datetime.datetime.now()
1552
1300
                    client.changedstate.acquire()
1553
 
                    (client.changedstate.wait
1554
 
                     (float(client.timedelta_to_milliseconds(delay)
1555
 
                            / 1000)))
 
1301
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1556
1302
                    client.changedstate.release()
1557
1303
                    time2 = datetime.datetime.now()
1558
1304
                    if (time2 - time) >= delay:
1580
1326
                                 sent, len(client.secret)
1581
1327
                                 - (sent_size + sent))
1582
1328
                    sent_size += sent
1583
 
                
 
1329
 
1584
1330
                logger.info("Sending secret to %s", client.name)
1585
 
                # bump the timeout using extended_timeout
1586
 
                client.checked_ok(client.extended_timeout)
 
1331
                # bump the timeout as if seen
 
1332
                client.checked_ok()
1587
1333
                if self.server.use_dbus:
1588
1334
                    # Emit D-Bus signal
1589
1335
                    client.GotSecret()
1656
1402
        # Convert the buffer to a Python bytestring
1657
1403
        fpr = ctypes.string_at(buf, buf_len.value)
1658
1404
        # Convert the bytestring to hexadecimal notation
1659
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1660
1406
        return hex_fpr
1661
1407
 
1662
1408
 
1668
1414
        except:
1669
1415
            self.handle_error(request, address)
1670
1416
        self.close_request(request)
1671
 
    
 
1417
            
1672
1418
    def process_request(self, request, address):
1673
1419
        """Start a new process to process the request."""
1674
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1675
 
                                       args = (request,
1676
 
                                               address))
1677
 
        proc.start()
1678
 
        return proc
1679
 
 
 
1420
        multiprocessing.Process(target = self.sub_process_main,
 
1421
                                args = (request, address)).start()
1680
1422
 
1681
1423
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1682
1424
    """ adds a pipe to the MixIn """
1686
1428
        This function creates a new pipe in self.pipe
1687
1429
        """
1688
1430
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1689
 
        
1690
 
        proc = MultiprocessingMixIn.process_request(self, request,
1691
 
                                                    client_address)
 
1431
 
 
1432
        super(MultiprocessingMixInWithPipe,
 
1433
              self).process_request(request, client_address)
1692
1434
        self.child_pipe.close()
1693
 
        self.add_pipe(parent_pipe, proc)
1694
 
    
1695
 
    def add_pipe(self, parent_pipe, proc):
 
1435
        self.add_pipe(parent_pipe)
 
1436
 
 
1437
    def add_pipe(self, parent_pipe):
1696
1438
        """Dummy function; override as necessary"""
1697
1439
        raise NotImplementedError
1698
1440
 
1699
 
 
1700
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1701
1442
                     socketserver.TCPServer, object):
1702
1443
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1776
1517
        self.enabled = False
1777
1518
        self.clients = clients
1778
1519
        if self.clients is None:
1779
 
            self.clients = {}
 
1520
            self.clients = set()
1780
1521
        self.use_dbus = use_dbus
1781
1522
        self.gnutls_priority = gnutls_priority
1782
1523
        IPv6_TCPServer.__init__(self, server_address,
1786
1527
    def server_activate(self):
1787
1528
        if self.enabled:
1788
1529
            return socketserver.TCPServer.server_activate(self)
1789
 
    
1790
1530
    def enable(self):
1791
1531
        self.enabled = True
1792
 
    
1793
 
    def add_pipe(self, parent_pipe, proc):
 
1532
    def add_pipe(self, parent_pipe):
1794
1533
        # Call "handle_ipc" for both data and EOF events
1795
1534
        gobject.io_add_watch(parent_pipe.fileno(),
1796
1535
                             gobject.IO_IN | gobject.IO_HUP,
1797
1536
                             functools.partial(self.handle_ipc,
1798
 
                                               parent_pipe =
1799
 
                                               parent_pipe,
1800
 
                                               proc = proc))
1801
 
    
 
1537
                                               parent_pipe = parent_pipe))
 
1538
        
1802
1539
    def handle_ipc(self, source, condition, parent_pipe=None,
1803
 
                   proc = None, client_object=None):
 
1540
                   client_object=None):
1804
1541
        condition_names = {
1805
1542
            gobject.IO_IN: "IN",   # There is data to read.
1806
1543
            gobject.IO_OUT: "OUT", # Data can be written (without
1815
1552
                                       for cond, name in
1816
1553
                                       condition_names.iteritems()
1817
1554
                                       if cond & condition)
1818
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1555
        # error or the other end of multiprocessing.Pipe has closed
1819
1556
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1820
 
            # Wait for other process to exit
1821
 
            proc.join()
1822
1557
            return False
1823
1558
        
1824
1559
        # Read a request from the child
1829
1564
            fpr = request[1]
1830
1565
            address = request[2]
1831
1566
            
1832
 
            for c in self.clients.itervalues():
 
1567
            for c in self.clients:
1833
1568
                if c.fingerprint == fpr:
1834
1569
                    client = c
1835
1570
                    break
1836
1571
            else:
1837
 
                logger.info("Client not found for fingerprint: %s, ad"
1838
 
                            "dress: %s", fpr, address)
 
1572
                logger.warning("Client not found for fingerprint: %s, ad"
 
1573
                               "dress: %s", fpr, address)
1839
1574
                if self.use_dbus:
1840
1575
                    # Emit D-Bus signal
1841
 
                    mandos_dbus_service.ClientNotFound(fpr,
1842
 
                                                       address[0])
 
1576
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1843
1577
                parent_pipe.send(False)
1844
1578
                return False
1845
1579
            
1846
1580
            gobject.io_add_watch(parent_pipe.fileno(),
1847
1581
                                 gobject.IO_IN | gobject.IO_HUP,
1848
1582
                                 functools.partial(self.handle_ipc,
1849
 
                                                   parent_pipe =
1850
 
                                                   parent_pipe,
1851
 
                                                   proc = proc,
1852
 
                                                   client_object =
1853
 
                                                   client))
 
1583
                                                   parent_pipe = parent_pipe,
 
1584
                                                   client_object = client))
1854
1585
            parent_pipe.send(True)
1855
 
            # remove the old hook in favor of the new above hook on
1856
 
            # same fileno
 
1586
            # remove the old hook in favor of the new above hook on same fileno
1857
1587
            return False
1858
1588
        if command == 'funcall':
1859
1589
            funcname = request[1]
1860
1590
            args = request[2]
1861
1591
            kwargs = request[3]
1862
1592
            
1863
 
            parent_pipe.send(('data', getattr(client_object,
1864
 
                                              funcname)(*args,
1865
 
                                                         **kwargs)))
1866
 
        
 
1593
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1594
 
1867
1595
        if command == 'getattr':
1868
1596
            attrname = request[1]
1869
1597
            if callable(client_object.__getattribute__(attrname)):
1870
1598
                parent_pipe.send(('function',))
1871
1599
            else:
1872
 
                parent_pipe.send(('data', client_object
1873
 
                                  .__getattribute__(attrname)))
 
1600
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1874
1601
        
1875
1602
        if command == 'setattr':
1876
1603
            attrname = request[1]
1877
1604
            value = request[2]
1878
1605
            setattr(client_object, attrname, value)
1879
 
        
 
1606
 
1880
1607
        return True
1881
1608
 
1882
1609
 
1919
1646
    return timevalue
1920
1647
 
1921
1648
 
 
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
 
1922
1673
def daemon(nochdir = False, noclose = False):
1923
1674
    """See daemon(3).  Standard BSD Unix function.
1924
1675
    
1979
1730
                        " system bus interface")
1980
1731
    parser.add_argument("--no-ipv6", action="store_false",
1981
1732
                        dest="use_ipv6", help="Do not use IPv6")
1982
 
    parser.add_argument("--no-restore", action="store_false",
1983
 
                        dest="restore", help="Do not restore stored"
1984
 
                        " state")
1985
 
    parser.add_argument("--statedir", metavar="DIR",
1986
 
                        help="Directory to save/restore state in")
1987
 
    
1988
1733
    options = parser.parse_args()
1989
1734
    
1990
1735
    if options.check:
2003
1748
                        "use_dbus": "True",
2004
1749
                        "use_ipv6": "True",
2005
1750
                        "debuglevel": "",
2006
 
                        "restore": "True",
2007
 
                        "statedir": "/var/lib/mandos"
2008
1751
                        }
2009
1752
    
2010
1753
    # Parse config file for server-global settings
2027
1770
    # options, if set.
2028
1771
    for option in ("interface", "address", "port", "debug",
2029
1772
                   "priority", "servicename", "configdir",
2030
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2031
 
                   "statedir"):
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
2032
1774
        value = getattr(options, option)
2033
1775
        if value is not None:
2034
1776
            server_settings[option] = value
2046
1788
    debuglevel = server_settings["debuglevel"]
2047
1789
    use_dbus = server_settings["use_dbus"]
2048
1790
    use_ipv6 = server_settings["use_ipv6"]
2049
 
    stored_state_path = os.path.join(server_settings["statedir"],
2050
 
                                     stored_state_file)
2051
 
    
2052
 
    if debug:
2053
 
        initlogger(logging.DEBUG)
2054
 
    else:
2055
 
        if not debuglevel:
2056
 
            initlogger()
2057
 
        else:
2058
 
            level = getattr(logging, debuglevel.upper())
2059
 
            initlogger(level)
2060
 
    
 
1791
 
2061
1792
    if server_settings["servicename"] != "Mandos":
2062
1793
        syslogger.setFormatter(logging.Formatter
2063
1794
                               ('Mandos (%s) [%%(process)d]:'
2065
1796
                                % server_settings["servicename"]))
2066
1797
    
2067
1798
    # Parse config file with clients
2068
 
    client_defaults = { "timeout": "5m",
2069
 
                        "extended_timeout": "15m",
2070
 
                        "interval": "2m",
 
1799
    client_defaults = { "timeout": "1h",
 
1800
                        "interval": "5m",
2071
1801
                        "checker": "fping -q -- %%(host)s",
2072
1802
                        "host": "",
2073
1803
                        "approval_delay": "0s",
2117
1847
        if error[0] != errno.EPERM:
2118
1848
            raise error
2119
1849
    
 
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
 
2120
1858
    if debug:
2121
1859
        # Enable all possible GnuTLS debugging
2122
1860
        
2153
1891
    # End of Avahi example code
2154
1892
    if use_dbus:
2155
1893
        try:
2156
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2157
1895
                                            bus, do_not_queue=True)
2158
 
            old_bus_name = (dbus.service.BusName
2159
 
                            ("se.bsnet.fukt.Mandos", bus,
2160
 
                             do_not_queue=True))
2161
1896
        except dbus.exceptions.NameExistsException as e:
2162
1897
            logger.error(unicode(e) + ", disabling D-Bus")
2163
1898
            use_dbus = False
2164
1899
            server_settings["use_dbus"] = False
2165
1900
            tcp_server.use_dbus = False
2166
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2167
 
    service = AvahiServiceToSyslog(name =
2168
 
                                   server_settings["servicename"],
2169
 
                                   servicetype = "_mandos._tcp",
2170
 
                                   protocol = protocol, bus = bus)
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
1903
                           servicetype = "_mandos._tcp",
 
1904
                           protocol = protocol, bus = bus)
2171
1905
    if server_settings["interface"]:
2172
1906
        service.interface = (if_nametoindex
2173
1907
                             (str(server_settings["interface"])))
2177
1911
    
2178
1912
    client_class = Client
2179
1913
    if use_dbus:
2180
 
        client_class = functools.partial(ClientDBusTransitional,
2181
 
                                         bus = bus)
2182
 
    
2183
 
    special_settings = {
2184
 
        # Some settings need to be accessd by special methods;
2185
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2186
 
        "approved_by_default":
2187
 
            lambda section:
2188
 
            client_config.getboolean(section, "approved_by_default"),
2189
 
        "enabled":
2190
 
            lambda section:
2191
 
            client_config.getboolean(section, "enabled"),
2192
 
        }
2193
 
    # Construct a new dict of client settings of this form:
2194
 
    # { client_name: {setting_name: value, ...}, ...}
2195
 
    # with exceptions for any special settings as defined above
2196
 
    client_settings = dict((clientname,
2197
 
                           dict((setting,
2198
 
                                 (value
2199
 
                                  if setting not in special_settings
2200
 
                                  else special_settings[setting]
2201
 
                                  (clientname)))
2202
 
                                for setting, value in
2203
 
                                client_config.items(clientname)))
2204
 
                          for clientname in client_config.sections())
2205
 
    
2206
 
    old_client_settings = {}
2207
 
    clients_data = []
2208
 
    
2209
 
    # Get client data and settings from last running state.
2210
 
    if server_settings["restore"]:
2211
 
        try:
2212
 
            with open(stored_state_path, "rb") as stored_state:
2213
 
                clients_data, old_client_settings = (pickle.load
2214
 
                                                     (stored_state))
2215
 
            os.remove(stored_state_path)
2216
 
        except IOError as e:
2217
 
            logger.warning("Could not load persistent state: {0}"
2218
 
                           .format(e))
2219
 
            if e.errno != errno.ENOENT:
2220
 
                raise
2221
 
    
2222
 
    with PGPEngine() as pgp:
2223
 
        for client in clients_data:
2224
 
            client_name = client["name"]
2225
 
            
2226
 
            # Decide which value to use after restoring saved state.
2227
 
            # We have three different values: Old config file,
2228
 
            # new config file, and saved state.
2229
 
            # New config value takes precedence if it differs from old
2230
 
            # config value, otherwise use saved state.
2231
 
            for name, value in client_settings[client_name].items():
2232
 
                try:
2233
 
                    # For each value in new config, check if it
2234
 
                    # differs from the old config value (Except for
2235
 
                    # the "secret" attribute)
2236
 
                    if (name != "secret" and
2237
 
                        value != old_client_settings[client_name]
2238
 
                        [name]):
2239
 
                        setattr(client, name, value)
2240
 
                except KeyError:
2241
 
                    pass
2242
 
            
2243
 
            # Clients who has passed its expire date can still be
2244
 
            # enabled if its last checker was sucessful.  Clients
2245
 
            # whose checker failed before we stored its state is
2246
 
            # assumed to have failed all checkers during downtime.
2247
 
            if client["enabled"] and client["last_checked_ok"]:
2248
 
                if ((datetime.datetime.utcnow()
2249
 
                     - client["last_checked_ok"])
2250
 
                    > client["interval"]):
2251
 
                    if client["last_checker_status"] != 0:
2252
 
                        client["enabled"] = False
2253
 
                    else:
2254
 
                        client["expires"] = (datetime.datetime
2255
 
                                             .utcnow()
2256
 
                                             + client["timeout"])
2257
 
            
2258
 
            client["changedstate"] = (multiprocessing_manager
2259
 
                                      .Condition
2260
 
                                      (multiprocessing_manager
2261
 
                                       .Lock()))
2262
 
            if use_dbus:
2263
 
                new_client = (ClientDBusTransitional.__new__
2264
 
                              (ClientDBusTransitional))
2265
 
                tcp_server.clients[client_name] = new_client
2266
 
                new_client.bus = bus
2267
 
                for name, value in client.iteritems():
2268
 
                    setattr(new_client, name, value)
2269
 
                client_object_name = unicode(client_name).translate(
2270
 
                    {ord("."): ord("_"),
2271
 
                     ord("-"): ord("_")})
2272
 
                new_client.dbus_object_path = (dbus.ObjectPath
2273
 
                                               ("/clients/"
2274
 
                                                + client_object_name))
2275
 
                DBusObjectWithProperties.__init__(new_client,
2276
 
                                                  new_client.bus,
2277
 
                                                  new_client
2278
 
                                                  .dbus_object_path)
2279
 
            else:
2280
 
                tcp_server.clients[client_name] = (Client.__new__
2281
 
                                                   (Client))
2282
 
                for name, value in client.iteritems():
2283
 
                    setattr(tcp_server.clients[client_name],
2284
 
                            name, value)
2285
 
            
 
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):
2286
1922
            try:
2287
 
                tcp_server.clients[client_name].secret = (
2288
 
                    pgp.decrypt(tcp_server.clients[client_name]
2289
 
                                .encrypted_secret,
2290
 
                                client_settings[client_name]
2291
 
                                ["secret"]))
2292
 
            except PGPError:
2293
 
                # If decryption fails, we use secret from new settings
2294
 
                logger.debug("Failed to decrypt {0} old secret"
2295
 
                             .format(client_name))
2296
 
                tcp_server.clients[client_name].secret = (
2297
 
                    client_settings[client_name]["secret"])
2298
 
    
2299
 
    # Create/remove clients based on new changes made to config
2300
 
    for clientname in set(old_client_settings) - set(client_settings):
2301
 
        del tcp_server.clients[clientname]
2302
 
    for clientname in set(client_settings) - set(old_client_settings):
2303
 
        tcp_server.clients[clientname] = (client_class(name
2304
 
                                                       = clientname,
2305
 
                                                       config =
2306
 
                                                       client_settings
2307
 
                                                       [clientname]))
2308
 
    
 
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()))
2309
1932
    if not tcp_server.clients:
2310
1933
        logger.warning("No clients defined")
2311
1934
        
2324
1947
        del pidfilename
2325
1948
        
2326
1949
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2327
 
    
 
1950
 
2328
1951
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2329
1952
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2330
1953
    
2333
1956
            """A D-Bus proxy object"""
2334
1957
            def __init__(self):
2335
1958
                dbus.service.Object.__init__(self, bus, "/")
2336
 
            _interface = "se.recompile.Mandos"
 
1959
            _interface = "se.bsnet.fukt.Mandos"
2337
1960
            
2338
1961
            @dbus.service.signal(_interface, signature="o")
2339
1962
            def ClientAdded(self, objpath):
2354
1977
            def GetAllClients(self):
2355
1978
                "D-Bus method"
2356
1979
                return dbus.Array(c.dbus_object_path
2357
 
                                  for c in
2358
 
                                  tcp_server.clients.itervalues())
 
1980
                                  for c in tcp_server.clients)
2359
1981
            
2360
1982
            @dbus.service.method(_interface,
2361
1983
                                 out_signature="a{oa{sv}}")
2363
1985
                "D-Bus method"
2364
1986
                return dbus.Dictionary(
2365
1987
                    ((c.dbus_object_path, c.GetAll(""))
2366
 
                     for c in tcp_server.clients.itervalues()),
 
1988
                     for c in tcp_server.clients),
2367
1989
                    signature="oa{sv}")
2368
1990
            
2369
1991
            @dbus.service.method(_interface, in_signature="o")
2370
1992
            def RemoveClient(self, object_path):
2371
1993
                "D-Bus method"
2372
 
                for c in tcp_server.clients.itervalues():
 
1994
                for c in tcp_server.clients:
2373
1995
                    if c.dbus_object_path == object_path:
2374
 
                        del tcp_server.clients[c.name]
 
1996
                        tcp_server.clients.remove(c)
2375
1997
                        c.remove_from_connection()
2376
1998
                        # Don't signal anything except ClientRemoved
2377
1999
                        c.disable(quiet=True)
2382
2004
            
2383
2005
            del _interface
2384
2006
        
2385
 
        class MandosDBusServiceTransitional(MandosDBusService):
2386
 
            __metaclass__ = AlternateDBusNamesMetaclass
2387
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2007
        mandos_dbus_service = MandosDBusService()
2388
2008
    
2389
2009
    def cleanup():
2390
2010
        "Cleanup function; run on exit"
2391
2011
        service.cleanup()
2392
2012
        
2393
 
        multiprocessing.active_children()
2394
 
        if not (tcp_server.clients or client_settings):
2395
 
            return
2396
 
        
2397
 
        # Store client before exiting. Secrets are encrypted with key
2398
 
        # based on what config file has. If config file is
2399
 
        # removed/edited, old secret will thus be unrecovable.
2400
 
        clients = []
2401
 
        with PGPEngine() as pgp:
2402
 
            for client in tcp_server.clients.itervalues():
2403
 
                key = client_settings[client.name]["secret"]
2404
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2405
 
                                                      key)
2406
 
                client_dict = {}
2407
 
                
2408
 
                # A list of attributes that will not be stored when
2409
 
                # shutting down.
2410
 
                exclude = set(("bus", "changedstate", "secret"))
2411
 
                for name, typ in (inspect.getmembers
2412
 
                                  (dbus.service.Object)):
2413
 
                    exclude.add(name)
2414
 
                
2415
 
                client_dict["encrypted_secret"] = (client
2416
 
                                                   .encrypted_secret)
2417
 
                for attr in client.client_structure:
2418
 
                    if attr not in exclude:
2419
 
                        client_dict[attr] = getattr(client, attr)
2420
 
                
2421
 
                clients.append(client_dict)
2422
 
                del client_settings[client.name]["secret"]
2423
 
        
2424
 
        try:
2425
 
            with os.fdopen(os.open(stored_state_path,
2426
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2427
 
                                   0600), "wb") as stored_state:
2428
 
                pickle.dump((clients, client_settings), stored_state)
2429
 
        except (IOError, OSError) as e:
2430
 
            logger.warning("Could not save persistent state: {0}"
2431
 
                           .format(e))
2432
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2433
 
                raise
2434
 
        
2435
 
        # Delete all clients, and settings from config
2436
2013
        while tcp_server.clients:
2437
 
            name, client = tcp_server.clients.popitem()
 
2014
            client = tcp_server.clients.pop()
2438
2015
            if use_dbus:
2439
2016
                client.remove_from_connection()
 
2017
            client.disable_hook = None
2440
2018
            # Don't signal anything except ClientRemoved
2441
2019
            client.disable(quiet=True)
2442
2020
            if use_dbus:
2443
2021
                # Emit D-Bus signal
2444
 
                mandos_dbus_service.ClientRemoved(client
2445
 
                                                  .dbus_object_path,
 
2022
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2446
2023
                                                  client.name)
2447
 
        client_settings.clear()
2448
2024
    
2449
2025
    atexit.register(cleanup)
2450
2026
    
2451
 
    for client in tcp_server.clients.itervalues():
 
2027
    for client in tcp_server.clients:
2452
2028
        if use_dbus:
2453
2029
            # Emit D-Bus signal
2454
2030
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2455
 
        # Need to initiate checking of clients
2456
 
        if client.enabled:
2457
 
            client.init_checker()
 
2031
        client.enable()
2458
2032
    
2459
2033
    tcp_server.enable()
2460
2034
    tcp_server.server_activate()
2500
2074
    # Must run before the D-Bus bus name gets deregistered
2501
2075
    cleanup()
2502
2076
 
2503
 
 
2504
2077
if __name__ == '__main__':
2505
2078
    main()