/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 at bsnet
  • Date: 2011-03-21 19:34:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110321193439-lkj3kwvhmujd8lwv
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
                                              interfaces.

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 hashlib
67
65
 
68
66
import dbus
69
67
import dbus.service
74
72
import ctypes.util
75
73
import xml.dom.minidom
76
74
import inspect
77
 
import Crypto.Cipher.AES
78
75
 
79
76
try:
80
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
82
        SO_BINDTODEVICE = None
86
83
 
87
84
 
88
 
version = "1.4.1"
89
 
 
90
 
logger = logging.getLogger()
91
 
stored_state_path = "/var/lib/mandos/clients.pickle"
92
 
 
 
85
version = "1.3.0"
 
86
 
 
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")))
99
95
logger.addHandler(syslogger)
100
96
 
101
97
console = logging.StreamHandler()
102
 
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
 
                                       ' [%(process)d]:'
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
104
99
                                       ' %(levelname)s:'
105
100
                                       ' %(message)s'))
106
101
logger.addHandler(console)
107
102
 
108
 
 
109
103
class AvahiError(Exception):
110
104
    def __init__(self, value, *args, **kwargs):
111
105
        self.value = value
157
151
        self.group = None       # our entry group
158
152
        self.server = None
159
153
        self.bus = bus
160
 
        self.entry_group_state_changed_match = None
161
154
    def rename(self):
162
155
        """Derived from the Avahi example code"""
163
156
        if self.rename_count >= self.max_renames:
165
158
                            " after %i retries, exiting.",
166
159
                            self.rename_count)
167
160
            raise AvahiServiceError("Too many renames")
168
 
        self.name = unicode(self.server
169
 
                            .GetAlternativeServiceName(self.name))
 
161
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
170
162
        logger.info("Changing Zeroconf service name to %r ...",
171
163
                    self.name)
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               ('Mandos (%s) [%%(process)d]:'
 
166
                                ' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
172
168
        self.remove()
173
169
        try:
174
170
            self.add()
175
 
        except dbus.exceptions.DBusException as error:
 
171
        except dbus.exceptions.DBusException, error:
176
172
            logger.critical("DBusException: %s", error)
177
173
            self.cleanup()
178
174
            os._exit(1)
179
175
        self.rename_count += 1
180
176
    def remove(self):
181
177
        """Derived from the Avahi example code"""
182
 
        if self.entry_group_state_changed_match is not None:
183
 
            self.entry_group_state_changed_match.remove()
184
 
            self.entry_group_state_changed_match = None
185
178
        if self.group is not None:
186
179
            self.group.Reset()
187
180
    def add(self):
188
181
        """Derived from the Avahi example code"""
189
 
        self.remove()
190
182
        if self.group is None:
191
183
            self.group = dbus.Interface(
192
184
                self.bus.get_object(avahi.DBUS_NAME,
193
185
                                    self.server.EntryGroupNew()),
194
186
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
195
 
        self.entry_group_state_changed_match = (
196
 
            self.group.connect_to_signal(
197
 
                'StateChanged', self.entry_group_state_changed))
 
187
            self.group.connect_to_signal('StateChanged',
 
188
                                         self
 
189
                                         .entry_group_state_changed)
198
190
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
199
191
                     self.name, self.type)
200
192
        self.group.AddService(
223
215
    def cleanup(self):
224
216
        """Derived from the Avahi example code"""
225
217
        if self.group is not None:
226
 
            try:
227
 
                self.group.Free()
228
 
            except (dbus.exceptions.UnknownMethodException,
229
 
                    dbus.exceptions.DBusException) as e:
230
 
                pass
 
218
            self.group.Free()
231
219
            self.group = None
232
 
        self.remove()
233
 
    def server_state_changed(self, state, error=None):
 
220
    def server_state_changed(self, state):
234
221
        """Derived from the Avahi example code"""
235
222
        logger.debug("Avahi server state change: %i", state)
236
 
        bad_states = { avahi.SERVER_INVALID:
237
 
                           "Zeroconf server invalid",
238
 
                       avahi.SERVER_REGISTERING: None,
239
 
                       avahi.SERVER_COLLISION:
240
 
                           "Zeroconf server name collision",
241
 
                       avahi.SERVER_FAILURE:
242
 
                           "Zeroconf server failure" }
243
 
        if state in bad_states:
244
 
            if bad_states[state] is not None:
245
 
                if error is None:
246
 
                    logger.error(bad_states[state])
247
 
                else:
248
 
                    logger.error(bad_states[state] + ": %r", error)
249
 
            self.cleanup()
 
223
        if state == avahi.SERVER_COLLISION:
 
224
            logger.error("Zeroconf server name collision")
 
225
            self.remove()
250
226
        elif state == avahi.SERVER_RUNNING:
251
227
            self.add()
252
 
        else:
253
 
            if error is None:
254
 
                logger.debug("Unknown state: %r", state)
255
 
            else:
256
 
                logger.debug("Unknown state: %r: %r", state, error)
257
228
    def activate(self):
258
229
        """Derived from the Avahi example code"""
259
230
        if self.server is None:
260
231
            self.server = dbus.Interface(
261
232
                self.bus.get_object(avahi.DBUS_NAME,
262
 
                                    avahi.DBUS_PATH_SERVER,
263
 
                                    follow_name_owner_changes=True),
 
233
                                    avahi.DBUS_PATH_SERVER),
264
234
                avahi.DBUS_INTERFACE_SERVER)
265
235
        self.server.connect_to_signal("StateChanged",
266
236
                                 self.server_state_changed)
267
237
        self.server_state_changed(self.server.GetState())
268
238
 
269
 
class AvahiServiceToSyslog(AvahiService):
270
 
    def rename(self):
271
 
        """Add the new name to the syslog messages"""
272
 
        ret = AvahiService.rename(self)
273
 
        syslogger.setFormatter(logging.Formatter
274
 
                               ('Mandos (%s) [%%(process)d]:'
275
 
                                ' %%(levelname)s: %%(message)s'
276
 
                                % self.name))
277
 
        return ret
278
239
 
279
 
def _timedelta_to_milliseconds(td):
280
 
    "Convert a datetime.timedelta() to milliseconds"
281
 
    return ((td.days * 24 * 60 * 60 * 1000)
282
 
            + (td.seconds * 1000)
283
 
            + (td.microseconds // 1000))
284
 
        
285
240
class Client(object):
286
241
    """A representation of a client host served by this server.
287
242
    
299
254
                     instance %(name)s can be used in the command.
300
255
    checker_initiator_tag: a gobject event source tag, or None
301
256
    created:    datetime.datetime(); (UTC) object creation
302
 
    client_structure: Object describing what attributes a client has
303
 
                      and is used for storing the client at exit
304
257
    current_checker_command: string; current running checker_command
 
258
    disable_hook:  If set, called by disable() as disable_hook(self)
305
259
    disable_initiator_tag: a gobject event source tag, or None
306
260
    enabled:    bool()
307
261
    fingerprint: string (40 or 32 hexadecimal digits); used to
310
264
    interval:   datetime.timedelta(); How often to start a new checker
311
265
    last_approval_request: datetime.datetime(); (UTC) or None
312
266
    last_checked_ok: datetime.datetime(); (UTC) or None
313
 
    last_checker_status: integer between 0 and 255 reflecting exit status
314
 
                         of last checker. -1 reflect crashed checker,
315
 
                         or None.
316
267
    last_enabled: datetime.datetime(); (UTC)
317
268
    name:       string; from the config file, used in log messages and
318
269
                        D-Bus identifiers
319
270
    secret:     bytestring; sent verbatim (over TLS) to client
320
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
321
272
                                      until this client is disabled
322
 
    extended_timeout:   extra long timeout when password has been sent
323
273
    runtime_expansions: Allowed attributes for runtime expansion.
324
 
    expires:    datetime.datetime(); time (UTC) when a client will be
325
 
                disabled, or None
326
274
    """
327
275
    
328
276
    runtime_expansions = ("approval_delay", "approval_duration",
330
278
                          "host", "interval", "last_checked_ok",
331
279
                          "last_enabled", "name", "timeout")
332
280
    
 
281
    @staticmethod
 
282
    def _timedelta_to_milliseconds(td):
 
283
        "Convert a datetime.timedelta() to milliseconds"
 
284
        return ((td.days * 24 * 60 * 60 * 1000)
 
285
                + (td.seconds * 1000)
 
286
                + (td.microseconds // 1000))
 
287
    
333
288
    def timeout_milliseconds(self):
334
289
        "Return the 'timeout' attribute in milliseconds"
335
 
        return _timedelta_to_milliseconds(self.timeout)
336
 
    
337
 
    def extended_timeout_milliseconds(self):
338
 
        "Return the 'extended_timeout' attribute in milliseconds"
339
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
290
        return self._timedelta_to_milliseconds(self.timeout)
340
291
    
341
292
    def interval_milliseconds(self):
342
293
        "Return the 'interval' attribute in milliseconds"
343
 
        return _timedelta_to_milliseconds(self.interval)
344
 
    
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
295
 
345
296
    def approval_delay_milliseconds(self):
346
 
        return _timedelta_to_milliseconds(self.approval_delay)
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
347
298
    
348
 
    def __init__(self, name = None, config=None):
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
349
300
        """Note: the 'checker' key in 'config' sets the
350
301
        'checker_command' attribute and *not* the 'checker'
351
302
        attribute."""
371
322
                            % self.name)
372
323
        self.host = config.get("host", "")
373
324
        self.created = datetime.datetime.utcnow()
374
 
        self.enabled = True
 
325
        self.enabled = False
375
326
        self.last_approval_request = None
376
 
        self.last_enabled = datetime.datetime.utcnow()
 
327
        self.last_enabled = None
377
328
        self.last_checked_ok = None
378
 
        self.last_checker_status = None
379
329
        self.timeout = string_to_delta(config["timeout"])
380
 
        self.extended_timeout = string_to_delta(config
381
 
                                                ["extended_timeout"])
382
330
        self.interval = string_to_delta(config["interval"])
 
331
        self.disable_hook = disable_hook
383
332
        self.checker = None
384
333
        self.checker_initiator_tag = None
385
334
        self.disable_initiator_tag = None
386
 
        self.expires = datetime.datetime.utcnow() + self.timeout
387
335
        self.checker_callback_tag = None
388
336
        self.checker_command = config["checker"]
389
337
        self.current_checker_command = None
 
338
        self.last_connect = None
390
339
        self._approved = None
391
340
        self.approved_by_default = config.get("approved_by_default",
392
341
                                              True)
395
344
            config["approval_delay"])
396
345
        self.approval_duration = string_to_delta(
397
346
            config["approval_duration"])
398
 
        self.changedstate = (multiprocessing_manager
399
 
                             .Condition(multiprocessing_manager
400
 
                                        .Lock()))
401
 
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
402
 
        self.client_structure.append("client_structure")
403
 
 
404
 
 
405
 
        for name, t in inspect.getmembers(type(self),
406
 
                                          lambda obj: isinstance(obj, property)):
407
 
            if not name.startswith("_"):
408
 
                self.client_structure.append(name)
 
347
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
409
348
    
410
 
    # Send notice to process children that client state has changed
411
349
    def send_changedstate(self):
412
 
        with self.changedstate:
413
 
            self.changedstate.notify_all()
414
 
    
 
350
        self.changedstate.acquire()
 
351
        self.changedstate.notify_all()
 
352
        self.changedstate.release()
 
353
        
415
354
    def enable(self):
416
355
        """Start this client's checker and timeout hooks"""
417
356
        if getattr(self, "enabled", False):
418
357
            # Already enabled
419
358
            return
420
359
        self.send_changedstate()
421
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
360
        self.last_enabled = datetime.datetime.utcnow()
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
362
        # and every interval from then on.
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
364
                                      (self.interval_milliseconds(),
 
365
                                       self.start_checker))
 
366
        # Schedule a disable() when 'timeout' has passed
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
368
                                   (self.timeout_milliseconds(),
 
369
                                    self.disable))
422
370
        self.enabled = True
423
 
        self.last_enabled = datetime.datetime.utcnow()
424
 
        self.init_checker()
 
371
        # Also start a new checker *right now*.
 
372
        self.start_checker()
425
373
    
426
374
    def disable(self, quiet=True):
427
375
        """Disable this client."""
434
382
        if getattr(self, "disable_initiator_tag", False):
435
383
            gobject.source_remove(self.disable_initiator_tag)
436
384
            self.disable_initiator_tag = None
437
 
        self.expires = None
438
385
        if getattr(self, "checker_initiator_tag", False):
439
386
            gobject.source_remove(self.checker_initiator_tag)
440
387
            self.checker_initiator_tag = None
441
388
        self.stop_checker()
 
389
        if self.disable_hook:
 
390
            self.disable_hook(self)
442
391
        self.enabled = False
443
392
        # Do not run this again if called by a gobject.timeout_add
444
393
        return False
445
394
    
446
395
    def __del__(self):
 
396
        self.disable_hook = None
447
397
        self.disable()
448
 
 
449
 
    def init_checker(self):
450
 
        # Schedule a new checker to be started an 'interval' from now,
451
 
        # and every interval from then on.
452
 
        self.checker_initiator_tag = (gobject.timeout_add
453
 
                                      (self.interval_milliseconds(),
454
 
                                       self.start_checker))
455
 
        # Schedule a disable() when 'timeout' has passed
456
 
        self.disable_initiator_tag = (gobject.timeout_add
457
 
                                   (self.timeout_milliseconds(),
458
 
                                    self.disable))
459
 
        # Also start a new checker *right now*.
460
 
        self.start_checker()
461
 
 
462
 
        
 
398
    
463
399
    def checker_callback(self, pid, condition, command):
464
400
        """The checker has completed, so take appropriate actions."""
465
401
        self.checker_callback_tag = None
466
402
        self.checker = None
467
403
        if os.WIFEXITED(condition):
468
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
469
 
            if self.last_checker_status == 0:
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
405
            if exitstatus == 0:
470
406
                logger.info("Checker for %(name)s succeeded",
471
407
                            vars(self))
472
408
                self.checked_ok()
474
410
                logger.info("Checker for %(name)s failed",
475
411
                            vars(self))
476
412
        else:
477
 
            self.last_checker_status = -1
478
413
            logger.warning("Checker for %(name)s crashed?",
479
414
                           vars(self))
480
415
    
481
 
    def checked_ok(self, timeout=None):
 
416
    def checked_ok(self):
482
417
        """Bump up the timeout for this client.
483
418
        
484
419
        This should only be called when the client has been seen,
485
420
        alive and well.
486
421
        """
487
 
        if timeout is None:
488
 
            timeout = self.timeout
489
422
        self.last_checked_ok = datetime.datetime.utcnow()
490
 
        if self.disable_initiator_tag is not None:
491
 
            gobject.source_remove(self.disable_initiator_tag)
492
 
        if getattr(self, "enabled", False):
493
 
            self.disable_initiator_tag = (gobject.timeout_add
494
 
                                          (_timedelta_to_milliseconds
495
 
                                           (timeout), self.disable))
496
 
            self.expires = datetime.datetime.utcnow() + timeout
 
423
        gobject.source_remove(self.disable_initiator_tag)
 
424
        self.disable_initiator_tag = (gobject.timeout_add
 
425
                                      (self.timeout_milliseconds(),
 
426
                                       self.disable))
497
427
    
498
428
    def need_approval(self):
499
429
        self.last_approval_request = datetime.datetime.utcnow()
515
445
        # If a checker exists, make sure it is not a zombie
516
446
        try:
517
447
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
518
 
        except (AttributeError, OSError) as error:
 
448
        except (AttributeError, OSError), error:
519
449
            if (isinstance(error, OSError)
520
450
                and error.errno != errno.ECHILD):
521
451
                raise error
539
469
                                       'replace')))
540
470
                    for attr in
541
471
                    self.runtime_expansions)
542
 
                
 
472
 
543
473
                try:
544
474
                    command = self.checker_command % escaped_attrs
545
 
                except TypeError as error:
 
475
                except TypeError, error:
546
476
                    logger.error('Could not format string "%s":'
547
477
                                 ' %s', self.checker_command, error)
548
478
                    return True # Try again later
567
497
                if pid:
568
498
                    gobject.source_remove(self.checker_callback_tag)
569
499
                    self.checker_callback(pid, status, command)
570
 
            except OSError as error:
 
500
            except OSError, error:
571
501
                logger.error("Failed to start subprocess: %s",
572
502
                             error)
573
503
        # Re-run this periodically if run by gobject.timeout_add
586
516
            #time.sleep(0.5)
587
517
            #if self.checker.poll() is None:
588
518
            #    os.kill(self.checker.pid, signal.SIGKILL)
589
 
        except OSError as error:
 
519
        except OSError, error:
590
520
            if error.errno != errno.ESRCH: # No such process
591
521
                raise
592
522
        self.checker = None
593
523
 
594
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
595
 
    def encrypt_secret(self, key):
596
 
        # Encryption-key need to be of a specific size, so we hash inputed key
597
 
        hasheng = hashlib.sha256()
598
 
        hasheng.update(key)
599
 
        encryptionkey = hasheng.digest()
600
 
 
601
 
        # Create validation hash so we know at decryption if it was sucessful
602
 
        hasheng = hashlib.sha256()
603
 
        hasheng.update(self.secret)
604
 
        validationhash = hasheng.digest()
605
 
 
606
 
        # Encrypt secret
607
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
608
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
610
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
 
        self.encrypted_secret = (ciphertext, iv)
612
 
 
613
 
    # Decrypt a encrypted client secret
614
 
    def decrypt_secret(self, key):
615
 
        # Decryption-key need to be of a specific size, so we hash inputed key
616
 
        hasheng = hashlib.sha256()
617
 
        hasheng.update(key)
618
 
        encryptionkey = hasheng.digest()
619
 
 
620
 
        # Decrypt encrypted secret
621
 
        ciphertext, iv = self.encrypted_secret
622
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
624
 
        plain = ciphereng.decrypt(ciphertext)
625
 
 
626
 
        # Validate decrypted secret to know if it was succesful
627
 
        hasheng = hashlib.sha256()
628
 
        validationhash = plain[:hasheng.digest_size]
629
 
        secret = plain[hasheng.digest_size:]
630
 
        hasheng.update(secret)
631
 
 
632
 
        # if validation fails, we use key as new secret. Otherwhise, we use
633
 
        # the decrypted secret
634
 
        if hasheng.digest() == validationhash:
635
 
            self.secret = secret
636
 
        else:
637
 
            self.secret = key
638
 
        del self.encrypted_secret
639
 
 
640
 
 
641
524
def dbus_service_property(dbus_interface, signature="v",
642
525
                          access="readwrite", byte_arrays=False):
643
526
    """Decorators for marking methods of a DBusObjectWithProperties to
689
572
 
690
573
class DBusObjectWithProperties(dbus.service.Object):
691
574
    """A D-Bus object with properties.
692
 
    
 
575
 
693
576
    Classes inheriting from this can use the dbus_service_property
694
577
    decorator to expose methods as D-Bus properties.  It exposes the
695
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
702
585
    def _get_all_dbus_properties(self):
703
586
        """Returns a generator of (name, attribute) pairs
704
587
        """
705
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
706
 
                for cls in self.__class__.__mro__
 
588
        return ((prop._dbus_name, prop)
707
589
                for name, prop in
708
 
                inspect.getmembers(cls, self._is_dbus_property))
 
590
                inspect.getmembers(self, self._is_dbus_property))
709
591
    
710
592
    def _get_dbus_property(self, interface_name, property_name):
711
593
        """Returns a bound method if one exists which is a D-Bus
712
594
        property with the specified name and interface.
713
595
        """
714
 
        for cls in  self.__class__.__mro__:
715
 
            for name, value in (inspect.getmembers
716
 
                                (cls, self._is_dbus_property)):
717
 
                if (value._dbus_name == property_name
718
 
                    and value._dbus_interface == interface_name):
719
 
                    return value.__get__(self)
720
 
        
 
596
        for name in (property_name,
 
597
                     property_name + "_dbus_property"):
 
598
            prop = getattr(self, name, None)
 
599
            if (prop is None
 
600
                or not self._is_dbus_property(prop)
 
601
                or prop._dbus_name != property_name
 
602
                or (interface_name and prop._dbus_interface
 
603
                    and interface_name != prop._dbus_interface)):
 
604
                continue
 
605
            return prop
721
606
        # No such property
722
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
723
608
                                   + interface_name + "."
757
642
    def GetAll(self, interface_name):
758
643
        """Standard D-Bus property GetAll() method, see D-Bus
759
644
        standard.
760
 
        
 
645
 
761
646
        Note: Will not include properties with access="write".
762
647
        """
763
648
        all = {}
819
704
            xmlstring = document.toxml("utf-8")
820
705
            document.unlink()
821
706
        except (AttributeError, xml.dom.DOMException,
822
 
                xml.parsers.expat.ExpatError) as error:
 
707
                xml.parsers.expat.ExpatError), error:
823
708
            logger.error("Failed to override Introspection method",
824
709
                         error)
825
710
        return xmlstring
826
711
 
827
712
 
828
 
def datetime_to_dbus (dt, variant_level=0):
829
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
830
 
    if dt is None:
831
 
        return dbus.String("", variant_level = variant_level)
832
 
    return dbus.String(dt.isoformat(),
833
 
                       variant_level=variant_level)
834
 
 
835
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
836
 
                                  .__metaclass__):
837
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
838
 
    will add additional D-Bus attributes matching a certain pattern.
839
 
    """
840
 
    def __new__(mcs, name, bases, attr):
841
 
        # Go through all the base classes which could have D-Bus
842
 
        # methods, signals, or properties in them
843
 
        for base in (b for b in bases
844
 
                     if issubclass(b, dbus.service.Object)):
845
 
            # Go though all attributes of the base class
846
 
            for attrname, attribute in inspect.getmembers(base):
847
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
848
 
                # with the wrong interface name
849
 
                if (not hasattr(attribute, "_dbus_interface")
850
 
                    or not attribute._dbus_interface
851
 
                    .startswith("se.recompile.Mandos")):
852
 
                    continue
853
 
                # Create an alternate D-Bus interface name based on
854
 
                # the current name
855
 
                alt_interface = (attribute._dbus_interface
856
 
                                 .replace("se.recompile.Mandos",
857
 
                                          "se.bsnet.fukt.Mandos"))
858
 
                # Is this a D-Bus signal?
859
 
                if getattr(attribute, "_dbus_is_signal", False):
860
 
                    # Extract the original non-method function by
861
 
                    # black magic
862
 
                    nonmethod_func = (dict(
863
 
                            zip(attribute.func_code.co_freevars,
864
 
                                attribute.__closure__))["func"]
865
 
                                      .cell_contents)
866
 
                    # Create a new, but exactly alike, function
867
 
                    # object, and decorate it to be a new D-Bus signal
868
 
                    # with the alternate D-Bus interface name
869
 
                    new_function = (dbus.service.signal
870
 
                                    (alt_interface,
871
 
                                     attribute._dbus_signature)
872
 
                                    (types.FunctionType(
873
 
                                nonmethod_func.func_code,
874
 
                                nonmethod_func.func_globals,
875
 
                                nonmethod_func.func_name,
876
 
                                nonmethod_func.func_defaults,
877
 
                                nonmethod_func.func_closure)))
878
 
                    # Define a creator of a function to call both the
879
 
                    # old and new functions, so both the old and new
880
 
                    # signals gets sent when the function is called
881
 
                    def fixscope(func1, func2):
882
 
                        """This function is a scope container to pass
883
 
                        func1 and func2 to the "call_both" function
884
 
                        outside of its arguments"""
885
 
                        def call_both(*args, **kwargs):
886
 
                            """This function will emit two D-Bus
887
 
                            signals by calling func1 and func2"""
888
 
                            func1(*args, **kwargs)
889
 
                            func2(*args, **kwargs)
890
 
                        return call_both
891
 
                    # Create the "call_both" function and add it to
892
 
                    # the class
893
 
                    attr[attrname] = fixscope(attribute,
894
 
                                              new_function)
895
 
                # Is this a D-Bus method?
896
 
                elif getattr(attribute, "_dbus_is_method", False):
897
 
                    # Create a new, but exactly alike, function
898
 
                    # object.  Decorate it to be a new D-Bus method
899
 
                    # with the alternate D-Bus interface name.  Add it
900
 
                    # to the class.
901
 
                    attr[attrname] = (dbus.service.method
902
 
                                      (alt_interface,
903
 
                                       attribute._dbus_in_signature,
904
 
                                       attribute._dbus_out_signature)
905
 
                                      (types.FunctionType
906
 
                                       (attribute.func_code,
907
 
                                        attribute.func_globals,
908
 
                                        attribute.func_name,
909
 
                                        attribute.func_defaults,
910
 
                                        attribute.func_closure)))
911
 
                # Is this a D-Bus property?
912
 
                elif getattr(attribute, "_dbus_is_property", False):
913
 
                    # Create a new, but exactly alike, function
914
 
                    # object, and decorate it to be a new D-Bus
915
 
                    # property with the alternate D-Bus interface
916
 
                    # name.  Add it to the class.
917
 
                    attr[attrname] = (dbus_service_property
918
 
                                      (alt_interface,
919
 
                                       attribute._dbus_signature,
920
 
                                       attribute._dbus_access,
921
 
                                       attribute
922
 
                                       ._dbus_get_args_options
923
 
                                       ["byte_arrays"])
924
 
                                      (types.FunctionType
925
 
                                       (attribute.func_code,
926
 
                                        attribute.func_globals,
927
 
                                        attribute.func_name,
928
 
                                        attribute.func_defaults,
929
 
                                        attribute.func_closure)))
930
 
        return type.__new__(mcs, name, bases, attr)
931
 
 
932
713
class ClientDBus(Client, DBusObjectWithProperties):
933
714
    """A Client class using D-Bus
934
715
    
943
724
    # dbus.service.Object doesn't use super(), so we can't either.
944
725
    
945
726
    def __init__(self, bus = None, *args, **kwargs):
 
727
        self._approvals_pending = 0
946
728
        self.bus = bus
947
729
        Client.__init__(self, *args, **kwargs)
948
 
 
949
 
        self._approvals_pending = 0
950
730
        # Only now, when this client is initialized, can it show up on
951
731
        # the D-Bus
952
732
        client_object_name = unicode(self.name).translate(
957
737
        DBusObjectWithProperties.__init__(self, self.bus,
958
738
                                          self.dbus_object_path)
959
739
        
960
 
    def notifychangeproperty(transform_func,
961
 
                             dbus_name, type_func=lambda x: x,
962
 
                             variant_level=1):
963
 
        """ Modify a variable so that it's a property which announces
964
 
        its changes to DBus.
 
740
    def _get_approvals_pending(self):
 
741
        return self._approvals_pending
 
742
    def _set_approvals_pending(self, value):
 
743
        old_value = self._approvals_pending
 
744
        self._approvals_pending = value
 
745
        bval = bool(value)
 
746
        if (hasattr(self, "dbus_object_path")
 
747
            and bval is not bool(old_value)):
 
748
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
749
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
750
                                 dbus_bool)
965
751
 
966
 
        transform_fun: Function that takes a value and a variant_level
967
 
                       and transforms it to a D-Bus type.
968
 
        dbus_name: D-Bus name of the variable
969
 
        type_func: Function that transform the value before sending it
970
 
                   to the D-Bus.  Default: no transform
971
 
        variant_level: D-Bus variant level.  Default: 1
972
 
        """
973
 
        attrname = "_{0}".format(dbus_name)
974
 
        def setter(self, value):
975
 
            if hasattr(self, "dbus_object_path"):
976
 
                if (not hasattr(self, attrname) or
977
 
                    type_func(getattr(self, attrname, None))
978
 
                    != type_func(value)):
979
 
                    dbus_value = transform_func(type_func(value),
980
 
                                                variant_level
981
 
                                                =variant_level)
982
 
                    self.PropertyChanged(dbus.String(dbus_name),
983
 
                                         dbus_value)
984
 
            setattr(self, attrname, value)
985
 
        
986
 
        return property(lambda self: getattr(self, attrname), setter)
987
 
    
988
 
    
989
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
990
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
991
 
                                             "ApprovalPending",
992
 
                                             type_func = bool)
993
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
994
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
995
 
                                        "LastEnabled")
996
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
997
 
                                   type_func = lambda checker:
998
 
                                       checker is not None)
999
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1000
 
                                           "LastCheckedOK")
1001
 
    last_approval_request = notifychangeproperty(
1002
 
        datetime_to_dbus, "LastApprovalRequest")
1003
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1004
 
                                               "ApprovedByDefault")
1005
 
    approval_delay = notifychangeproperty(dbus.UInt16,
1006
 
                                          "ApprovalDelay",
1007
 
                                          type_func =
1008
 
                                          _timedelta_to_milliseconds)
1009
 
    approval_duration = notifychangeproperty(
1010
 
        dbus.UInt16, "ApprovalDuration",
1011
 
        type_func = _timedelta_to_milliseconds)
1012
 
    host = notifychangeproperty(dbus.String, "Host")
1013
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1014
 
                                   type_func =
1015
 
                                   _timedelta_to_milliseconds)
1016
 
    extended_timeout = notifychangeproperty(
1017
 
        dbus.UInt16, "ExtendedTimeout",
1018
 
        type_func = _timedelta_to_milliseconds)
1019
 
    interval = notifychangeproperty(dbus.UInt16,
1020
 
                                    "Interval",
1021
 
                                    type_func =
1022
 
                                    _timedelta_to_milliseconds)
1023
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1024
 
    
1025
 
    del notifychangeproperty
 
752
    approvals_pending = property(_get_approvals_pending,
 
753
                                 _set_approvals_pending)
 
754
    del _get_approvals_pending, _set_approvals_pending
 
755
    
 
756
    @staticmethod
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
759
        return dbus.String(dt.isoformat(),
 
760
                           variant_level=variant_level)
 
761
    
 
762
    def enable(self):
 
763
        oldstate = getattr(self, "enabled", False)
 
764
        r = Client.enable(self)
 
765
        if oldstate != self.enabled:
 
766
            # Emit D-Bus signals
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
768
                                 dbus.Boolean(True, variant_level=1))
 
769
            self.PropertyChanged(
 
770
                dbus.String("LastEnabled"),
 
771
                self._datetime_to_dbus(self.last_enabled,
 
772
                                       variant_level=1))
 
773
        return r
 
774
    
 
775
    def disable(self, quiet = False):
 
776
        oldstate = getattr(self, "enabled", False)
 
777
        r = Client.disable(self, quiet=quiet)
 
778
        if not quiet and oldstate != self.enabled:
 
779
            # Emit D-Bus signal
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
781
                                 dbus.Boolean(False, variant_level=1))
 
782
        return r
1026
783
    
1027
784
    def __del__(self, *args, **kwargs):
1028
785
        try:
1037
794
                         *args, **kwargs):
1038
795
        self.checker_callback_tag = None
1039
796
        self.checker = None
 
797
        # Emit D-Bus signal
 
798
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
799
                             dbus.Boolean(False, variant_level=1))
1040
800
        if os.WIFEXITED(condition):
1041
801
            exitstatus = os.WEXITSTATUS(condition)
1042
802
            # Emit D-Bus signal
1052
812
        return Client.checker_callback(self, pid, condition, command,
1053
813
                                       *args, **kwargs)
1054
814
    
 
815
    def checked_ok(self, *args, **kwargs):
 
816
        r = Client.checked_ok(self, *args, **kwargs)
 
817
        # Emit D-Bus signal
 
818
        self.PropertyChanged(
 
819
            dbus.String("LastCheckedOK"),
 
820
            (self._datetime_to_dbus(self.last_checked_ok,
 
821
                                    variant_level=1)))
 
822
        return r
 
823
    
 
824
    def need_approval(self, *args, **kwargs):
 
825
        r = Client.need_approval(self, *args, **kwargs)
 
826
        # Emit D-Bus signal
 
827
        self.PropertyChanged(
 
828
            dbus.String("LastApprovalRequest"),
 
829
            (self._datetime_to_dbus(self.last_approval_request,
 
830
                                    variant_level=1)))
 
831
        return r
 
832
    
1055
833
    def start_checker(self, *args, **kwargs):
1056
834
        old_checker = self.checker
1057
835
        if self.checker is not None:
1064
842
            and old_checker_pid != self.checker.pid):
1065
843
            # Emit D-Bus signal
1066
844
            self.CheckerStarted(self.current_checker_command)
 
845
            self.PropertyChanged(
 
846
                dbus.String("CheckerRunning"),
 
847
                dbus.Boolean(True, variant_level=1))
1067
848
        return r
1068
849
    
 
850
    def stop_checker(self, *args, **kwargs):
 
851
        old_checker = getattr(self, "checker", None)
 
852
        r = Client.stop_checker(self, *args, **kwargs)
 
853
        if (old_checker is not None
 
854
            and getattr(self, "checker", None) is None):
 
855
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
856
                                 dbus.Boolean(False, variant_level=1))
 
857
        return r
 
858
 
1069
859
    def _reset_approved(self):
1070
860
        self._approved = None
1071
861
        return False
1073
863
    def approve(self, value=True):
1074
864
        self.send_changedstate()
1075
865
        self._approved = value
1076
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
866
        gobject.timeout_add(self._timedelta_to_milliseconds
1077
867
                            (self.approval_duration),
1078
868
                            self._reset_approved)
1079
869
    
1080
870
    
1081
871
    ## D-Bus methods, signals & properties
1082
 
    _interface = "se.recompile.Mandos.Client"
 
872
    _interface = "se.bsnet.fukt.Mandos.Client"
1083
873
    
1084
874
    ## Signals
1085
875
    
1132
922
    # CheckedOK - method
1133
923
    @dbus.service.method(_interface)
1134
924
    def CheckedOK(self):
1135
 
        self.checked_ok()
 
925
        return self.checked_ok()
1136
926
    
1137
927
    # Enable - method
1138
928
    @dbus.service.method(_interface)
1171
961
        if value is None:       # get
1172
962
            return dbus.Boolean(self.approved_by_default)
1173
963
        self.approved_by_default = bool(value)
 
964
        # Emit D-Bus signal
 
965
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
966
                             dbus.Boolean(value, variant_level=1))
1174
967
    
1175
968
    # ApprovalDelay - property
1176
969
    @dbus_service_property(_interface, signature="t",
1179
972
        if value is None:       # get
1180
973
            return dbus.UInt64(self.approval_delay_milliseconds())
1181
974
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
975
        # Emit D-Bus signal
 
976
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
977
                             dbus.UInt64(value, variant_level=1))
1182
978
    
1183
979
    # ApprovalDuration - property
1184
980
    @dbus_service_property(_interface, signature="t",
1185
981
                           access="readwrite")
1186
982
    def ApprovalDuration_dbus_property(self, value=None):
1187
983
        if value is None:       # get
1188
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
984
            return dbus.UInt64(self._timedelta_to_milliseconds(
1189
985
                    self.approval_duration))
1190
986
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
987
        # Emit D-Bus signal
 
988
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
989
                             dbus.UInt64(value, variant_level=1))
1191
990
    
1192
991
    # Name - property
1193
992
    @dbus_service_property(_interface, signature="s", access="read")
1206
1005
        if value is None:       # get
1207
1006
            return dbus.String(self.host)
1208
1007
        self.host = value
 
1008
        # Emit D-Bus signal
 
1009
        self.PropertyChanged(dbus.String("Host"),
 
1010
                             dbus.String(value, variant_level=1))
1209
1011
    
1210
1012
    # Created - property
1211
1013
    @dbus_service_property(_interface, signature="s", access="read")
1212
1014
    def Created_dbus_property(self):
1213
 
        return dbus.String(datetime_to_dbus(self.created))
 
1015
        return dbus.String(self._datetime_to_dbus(self.created))
1214
1016
    
1215
1017
    # LastEnabled - property
1216
1018
    @dbus_service_property(_interface, signature="s", access="read")
1217
1019
    def LastEnabled_dbus_property(self):
1218
 
        return datetime_to_dbus(self.last_enabled)
 
1020
        if self.last_enabled is None:
 
1021
            return dbus.String("")
 
1022
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1219
1023
    
1220
1024
    # Enabled - property
1221
1025
    @dbus_service_property(_interface, signature="b",
1235
1039
        if value is not None:
1236
1040
            self.checked_ok()
1237
1041
            return
1238
 
        return datetime_to_dbus(self.last_checked_ok)
1239
 
    
1240
 
    # Expires - property
1241
 
    @dbus_service_property(_interface, signature="s", access="read")
1242
 
    def Expires_dbus_property(self):
1243
 
        return datetime_to_dbus(self.expires)
 
1042
        if self.last_checked_ok is None:
 
1043
            return dbus.String("")
 
1044
        return dbus.String(self._datetime_to_dbus(self
 
1045
                                                  .last_checked_ok))
1244
1046
    
1245
1047
    # LastApprovalRequest - property
1246
1048
    @dbus_service_property(_interface, signature="s", access="read")
1247
1049
    def LastApprovalRequest_dbus_property(self):
1248
 
        return datetime_to_dbus(self.last_approval_request)
 
1050
        if self.last_approval_request is None:
 
1051
            return dbus.String("")
 
1052
        return dbus.String(self.
 
1053
                           _datetime_to_dbus(self
 
1054
                                             .last_approval_request))
1249
1055
    
1250
1056
    # Timeout - property
1251
1057
    @dbus_service_property(_interface, signature="t",
1254
1060
        if value is None:       # get
1255
1061
            return dbus.UInt64(self.timeout_milliseconds())
1256
1062
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1063
        # Emit D-Bus signal
 
1064
        self.PropertyChanged(dbus.String("Timeout"),
 
1065
                             dbus.UInt64(value, variant_level=1))
1257
1066
        if getattr(self, "disable_initiator_tag", None) is None:
1258
1067
            return
1259
1068
        # Reschedule timeout
1260
1069
        gobject.source_remove(self.disable_initiator_tag)
1261
1070
        self.disable_initiator_tag = None
1262
 
        self.expires = None
1263
 
        time_to_die = _timedelta_to_milliseconds((self
1264
 
                                                  .last_checked_ok
1265
 
                                                  + self.timeout)
1266
 
                                                 - datetime.datetime
1267
 
                                                 .utcnow())
 
1071
        time_to_die = (self.
 
1072
                       _timedelta_to_milliseconds((self
 
1073
                                                   .last_checked_ok
 
1074
                                                   + self.timeout)
 
1075
                                                  - datetime.datetime
 
1076
                                                  .utcnow()))
1268
1077
        if time_to_die <= 0:
1269
1078
            # The timeout has passed
1270
1079
            self.disable()
1271
1080
        else:
1272
 
            self.expires = (datetime.datetime.utcnow()
1273
 
                            + datetime.timedelta(milliseconds =
1274
 
                                                 time_to_die))
1275
1081
            self.disable_initiator_tag = (gobject.timeout_add
1276
1082
                                          (time_to_die, self.disable))
1277
1083
    
1278
 
    # ExtendedTimeout - property
1279
 
    @dbus_service_property(_interface, signature="t",
1280
 
                           access="readwrite")
1281
 
    def ExtendedTimeout_dbus_property(self, value=None):
1282
 
        if value is None:       # get
1283
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1284
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1285
 
    
1286
1084
    # Interval - property
1287
1085
    @dbus_service_property(_interface, signature="t",
1288
1086
                           access="readwrite")
1290
1088
        if value is None:       # get
1291
1089
            return dbus.UInt64(self.interval_milliseconds())
1292
1090
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1091
        # Emit D-Bus signal
 
1092
        self.PropertyChanged(dbus.String("Interval"),
 
1093
                             dbus.UInt64(value, variant_level=1))
1293
1094
        if getattr(self, "checker_initiator_tag", None) is None:
1294
1095
            return
1295
1096
        # Reschedule checker run
1297
1098
        self.checker_initiator_tag = (gobject.timeout_add
1298
1099
                                      (value, self.start_checker))
1299
1100
        self.start_checker()    # Start one now, too
1300
 
    
 
1101
 
1301
1102
    # Checker - property
1302
1103
    @dbus_service_property(_interface, signature="s",
1303
1104
                           access="readwrite")
1305
1106
        if value is None:       # get
1306
1107
            return dbus.String(self.checker_command)
1307
1108
        self.checker_command = value
 
1109
        # Emit D-Bus signal
 
1110
        self.PropertyChanged(dbus.String("Checker"),
 
1111
                             dbus.String(self.checker_command,
 
1112
                                         variant_level=1))
1308
1113
    
1309
1114
    # CheckerRunning - property
1310
1115
    @dbus_service_property(_interface, signature="b",
1337
1142
        self._pipe.send(('init', fpr, address))
1338
1143
        if not self._pipe.recv():
1339
1144
            raise KeyError()
1340
 
    
 
1145
 
1341
1146
    def __getattribute__(self, name):
1342
1147
        if(name == '_pipe'):
1343
1148
            return super(ProxyClient, self).__getattribute__(name)
1350
1155
                self._pipe.send(('funcall', name, args, kwargs))
1351
1156
                return self._pipe.recv()[1]
1352
1157
            return func
1353
 
    
 
1158
 
1354
1159
    def __setattr__(self, name, value):
1355
1160
        if(name == '_pipe'):
1356
1161
            return super(ProxyClient, self).__setattr__(name, value)
1357
1162
        self._pipe.send(('setattr', name, value))
1358
1163
 
1359
 
class ClientDBusTransitional(ClientDBus):
1360
 
    __metaclass__ = AlternateDBusNamesMetaclass
1361
1164
 
1362
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
1363
1166
    """A class to handle client connections.
1371
1174
                        unicode(self.client_address))
1372
1175
            logger.debug("Pipe FD: %d",
1373
1176
                         self.server.child_pipe.fileno())
1374
 
            
 
1177
 
1375
1178
            session = (gnutls.connection
1376
1179
                       .ClientSession(self.request,
1377
1180
                                      gnutls.connection
1378
1181
                                      .X509Credentials()))
1379
 
            
 
1182
 
1380
1183
            # Note: gnutls.connection.X509Credentials is really a
1381
1184
            # generic GnuTLS certificate credentials object so long as
1382
1185
            # no X.509 keys are added to it.  Therefore, we can use it
1383
1186
            # here despite using OpenPGP certificates.
1384
 
            
 
1187
 
1385
1188
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1386
1189
            #                      "+AES-256-CBC", "+SHA1",
1387
1190
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1393
1196
            (gnutls.library.functions
1394
1197
             .gnutls_priority_set_direct(session._c_object,
1395
1198
                                         priority, None))
1396
 
            
 
1199
 
1397
1200
            # Start communication using the Mandos protocol
1398
1201
            # Get protocol number
1399
1202
            line = self.request.makefile().readline()
1401
1204
            try:
1402
1205
                if int(line.strip().split()[0]) > 1:
1403
1206
                    raise RuntimeError
1404
 
            except (ValueError, IndexError, RuntimeError) as error:
 
1207
            except (ValueError, IndexError, RuntimeError), error:
1405
1208
                logger.error("Unknown protocol version: %s", error)
1406
1209
                return
1407
 
            
 
1210
 
1408
1211
            # Start GnuTLS connection
1409
1212
            try:
1410
1213
                session.handshake()
1411
 
            except gnutls.errors.GNUTLSError as error:
 
1214
            except gnutls.errors.GNUTLSError, error:
1412
1215
                logger.warning("Handshake failed: %s", error)
1413
1216
                # Do not run session.bye() here: the session is not
1414
1217
                # established.  Just abandon the request.
1415
1218
                return
1416
1219
            logger.debug("Handshake succeeded")
1417
 
            
 
1220
 
1418
1221
            approval_required = False
1419
1222
            try:
1420
1223
                try:
1421
1224
                    fpr = self.fingerprint(self.peer_certificate
1422
1225
                                           (session))
1423
 
                except (TypeError,
1424
 
                        gnutls.errors.GNUTLSError) as error:
 
1226
                except (TypeError, gnutls.errors.GNUTLSError), error:
1425
1227
                    logger.warning("Bad certificate: %s", error)
1426
1228
                    return
1427
1229
                logger.debug("Fingerprint: %s", fpr)
1428
 
                
 
1230
 
1429
1231
                try:
1430
1232
                    client = ProxyClient(child_pipe, fpr,
1431
1233
                                         self.client_address)
1439
1241
                
1440
1242
                while True:
1441
1243
                    if not client.enabled:
1442
 
                        logger.info("Client %s is disabled",
 
1244
                        logger.warning("Client %s is disabled",
1443
1245
                                       client.name)
1444
1246
                        if self.server.use_dbus:
1445
1247
                            # Emit D-Bus signal
1446
 
                            client.Rejected("Disabled")
 
1248
                            client.Rejected("Disabled")                    
1447
1249
                        return
1448
1250
                    
1449
1251
                    if client._approved or not client.approval_delay:
1466
1268
                        return
1467
1269
                    
1468
1270
                    #wait until timeout or approved
 
1271
                    #x = float(client._timedelta_to_milliseconds(delay))
1469
1272
                    time = datetime.datetime.now()
1470
1273
                    client.changedstate.acquire()
1471
 
                    (client.changedstate.wait
1472
 
                     (float(client._timedelta_to_milliseconds(delay)
1473
 
                            / 1000)))
 
1274
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1474
1275
                    client.changedstate.release()
1475
1276
                    time2 = datetime.datetime.now()
1476
1277
                    if (time2 - time) >= delay:
1491
1292
                while sent_size < len(client.secret):
1492
1293
                    try:
1493
1294
                        sent = session.send(client.secret[sent_size:])
1494
 
                    except gnutls.errors.GNUTLSError as error:
 
1295
                    except (gnutls.errors.GNUTLSError), error:
1495
1296
                        logger.warning("gnutls send failed")
1496
1297
                        return
1497
1298
                    logger.debug("Sent: %d, remaining: %d",
1498
1299
                                 sent, len(client.secret)
1499
1300
                                 - (sent_size + sent))
1500
1301
                    sent_size += sent
1501
 
                
 
1302
 
1502
1303
                logger.info("Sending secret to %s", client.name)
1503
 
                # bump the timeout using extended_timeout
1504
 
                client.checked_ok(client.extended_timeout)
 
1304
                # bump the timeout as if seen
 
1305
                client.checked_ok()
1505
1306
                if self.server.use_dbus:
1506
1307
                    # Emit D-Bus signal
1507
1308
                    client.GotSecret()
1511
1312
                    client.approvals_pending -= 1
1512
1313
                try:
1513
1314
                    session.bye()
1514
 
                except gnutls.errors.GNUTLSError as error:
 
1315
                except (gnutls.errors.GNUTLSError), error:
1515
1316
                    logger.warning("GnuTLS bye failed")
1516
1317
    
1517
1318
    @staticmethod
1586
1387
        except:
1587
1388
            self.handle_error(request, address)
1588
1389
        self.close_request(request)
1589
 
    
 
1390
            
1590
1391
    def process_request(self, request, address):
1591
1392
        """Start a new process to process the request."""
1592
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1593
 
                                       args = (request,
1594
 
                                               address))
1595
 
        proc.start()
1596
 
        return proc
1597
 
 
 
1393
        multiprocessing.Process(target = self.sub_process_main,
 
1394
                                args = (request, address)).start()
1598
1395
 
1599
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1600
1397
    """ adds a pipe to the MixIn """
1604
1401
        This function creates a new pipe in self.pipe
1605
1402
        """
1606
1403
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1607
 
        
1608
 
        proc = MultiprocessingMixIn.process_request(self, request,
1609
 
                                                    client_address)
 
1404
 
 
1405
        super(MultiprocessingMixInWithPipe,
 
1406
              self).process_request(request, client_address)
1610
1407
        self.child_pipe.close()
1611
 
        self.add_pipe(parent_pipe, proc)
1612
 
    
1613
 
    def add_pipe(self, parent_pipe, proc):
 
1408
        self.add_pipe(parent_pipe)
 
1409
 
 
1410
    def add_pipe(self, parent_pipe):
1614
1411
        """Dummy function; override as necessary"""
1615
1412
        raise NotImplementedError
1616
1413
 
1617
 
 
1618
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1619
1415
                     socketserver.TCPServer, object):
1620
1416
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1646
1442
                                           SO_BINDTODEVICE,
1647
1443
                                           str(self.interface
1648
1444
                                               + '\0'))
1649
 
                except socket.error as error:
 
1445
                except socket.error, error:
1650
1446
                    if error[0] == errno.EPERM:
1651
1447
                        logger.error("No permission to"
1652
1448
                                     " bind to interface %s",
1694
1490
        self.enabled = False
1695
1491
        self.clients = clients
1696
1492
        if self.clients is None:
1697
 
            self.clients = {}
 
1493
            self.clients = set()
1698
1494
        self.use_dbus = use_dbus
1699
1495
        self.gnutls_priority = gnutls_priority
1700
1496
        IPv6_TCPServer.__init__(self, server_address,
1704
1500
    def server_activate(self):
1705
1501
        if self.enabled:
1706
1502
            return socketserver.TCPServer.server_activate(self)
1707
 
    
1708
1503
    def enable(self):
1709
1504
        self.enabled = True
1710
 
    
1711
 
    def add_pipe(self, parent_pipe, proc):
 
1505
    def add_pipe(self, parent_pipe):
1712
1506
        # Call "handle_ipc" for both data and EOF events
1713
1507
        gobject.io_add_watch(parent_pipe.fileno(),
1714
1508
                             gobject.IO_IN | gobject.IO_HUP,
1715
1509
                             functools.partial(self.handle_ipc,
1716
 
                                               parent_pipe =
1717
 
                                               parent_pipe,
1718
 
                                               proc = proc))
1719
 
    
 
1510
                                               parent_pipe = parent_pipe))
 
1511
        
1720
1512
    def handle_ipc(self, source, condition, parent_pipe=None,
1721
 
                   proc = None, client_object=None):
 
1513
                   client_object=None):
1722
1514
        condition_names = {
1723
1515
            gobject.IO_IN: "IN",   # There is data to read.
1724
1516
            gobject.IO_OUT: "OUT", # Data can be written (without
1733
1525
                                       for cond, name in
1734
1526
                                       condition_names.iteritems()
1735
1527
                                       if cond & condition)
1736
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1528
        # error or the other end of multiprocessing.Pipe has closed
1737
1529
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1738
 
            # Wait for other process to exit
1739
 
            proc.join()
1740
1530
            return False
1741
1531
        
1742
1532
        # Read a request from the child
1747
1537
            fpr = request[1]
1748
1538
            address = request[2]
1749
1539
            
1750
 
            for c in self.clients.itervalues():
 
1540
            for c in self.clients:
1751
1541
                if c.fingerprint == fpr:
1752
1542
                    client = c
1753
1543
                    break
1754
1544
            else:
1755
 
                logger.info("Client not found for fingerprint: %s, ad"
1756
 
                            "dress: %s", fpr, address)
 
1545
                logger.warning("Client not found for fingerprint: %s, ad"
 
1546
                               "dress: %s", fpr, address)
1757
1547
                if self.use_dbus:
1758
1548
                    # Emit D-Bus signal
1759
 
                    mandos_dbus_service.ClientNotFound(fpr,
1760
 
                                                       address[0])
 
1549
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1761
1550
                parent_pipe.send(False)
1762
1551
                return False
1763
1552
            
1764
1553
            gobject.io_add_watch(parent_pipe.fileno(),
1765
1554
                                 gobject.IO_IN | gobject.IO_HUP,
1766
1555
                                 functools.partial(self.handle_ipc,
1767
 
                                                   parent_pipe =
1768
 
                                                   parent_pipe,
1769
 
                                                   proc = proc,
1770
 
                                                   client_object =
1771
 
                                                   client))
 
1556
                                                   parent_pipe = parent_pipe,
 
1557
                                                   client_object = client))
1772
1558
            parent_pipe.send(True)
1773
 
            # remove the old hook in favor of the new above hook on
1774
 
            # same fileno
 
1559
            # remove the old hook in favor of the new above hook on same fileno
1775
1560
            return False
1776
1561
        if command == 'funcall':
1777
1562
            funcname = request[1]
1778
1563
            args = request[2]
1779
1564
            kwargs = request[3]
1780
1565
            
1781
 
            parent_pipe.send(('data', getattr(client_object,
1782
 
                                              funcname)(*args,
1783
 
                                                         **kwargs)))
1784
 
        
 
1566
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1567
 
1785
1568
        if command == 'getattr':
1786
1569
            attrname = request[1]
1787
1570
            if callable(client_object.__getattribute__(attrname)):
1788
1571
                parent_pipe.send(('function',))
1789
1572
            else:
1790
 
                parent_pipe.send(('data', client_object
1791
 
                                  .__getattribute__(attrname)))
 
1573
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1792
1574
        
1793
1575
        if command == 'setattr':
1794
1576
            attrname = request[1]
1795
1577
            value = request[2]
1796
1578
            setattr(client_object, attrname, value)
1797
 
        
 
1579
 
1798
1580
        return True
1799
1581
 
1800
1582
 
1831
1613
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1832
1614
            else:
1833
1615
                raise ValueError("Unknown suffix %r" % suffix)
1834
 
        except (ValueError, IndexError) as e:
 
1616
        except (ValueError, IndexError), e:
1835
1617
            raise ValueError(*(e.args))
1836
1618
        timevalue += delta
1837
1619
    return timevalue
1921
1703
                        " system bus interface")
1922
1704
    parser.add_argument("--no-ipv6", action="store_false",
1923
1705
                        dest="use_ipv6", help="Do not use IPv6")
1924
 
    parser.add_argument("--no-restore", action="store_false",
1925
 
                        dest="restore", help="Do not restore stored state",
1926
 
                        default=True)
1927
 
 
1928
1706
    options = parser.parse_args()
1929
1707
    
1930
1708
    if options.check:
1965
1743
    # options, if set.
1966
1744
    for option in ("interface", "address", "port", "debug",
1967
1745
                   "priority", "servicename", "configdir",
1968
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
1746
                   "use_dbus", "use_ipv6", "debuglevel"):
1969
1747
        value = getattr(options, option)
1970
1748
        if value is not None:
1971
1749
            server_settings[option] = value
1983
1761
    debuglevel = server_settings["debuglevel"]
1984
1762
    use_dbus = server_settings["use_dbus"]
1985
1763
    use_ipv6 = server_settings["use_ipv6"]
1986
 
    
 
1764
 
1987
1765
    if server_settings["servicename"] != "Mandos":
1988
1766
        syslogger.setFormatter(logging.Formatter
1989
1767
                               ('Mandos (%s) [%%(process)d]:'
1991
1769
                                % server_settings["servicename"]))
1992
1770
    
1993
1771
    # Parse config file with clients
1994
 
    client_defaults = { "timeout": "5m",
1995
 
                        "extended_timeout": "15m",
1996
 
                        "interval": "2m",
 
1772
    client_defaults = { "timeout": "1h",
 
1773
                        "interval": "5m",
1997
1774
                        "checker": "fping -q -- %%(host)s",
1998
1775
                        "host": "",
1999
1776
                        "approval_delay": "0s",
2039
1816
    try:
2040
1817
        os.setgid(gid)
2041
1818
        os.setuid(uid)
2042
 
    except OSError as error:
 
1819
    except OSError, error:
2043
1820
        if error[0] != errno.EPERM:
2044
1821
            raise error
2045
1822
    
2046
1823
    if not debug and not debuglevel:
2047
 
        logger.setLevel(logging.WARNING)
 
1824
        syslogger.setLevel(logging.WARNING)
 
1825
        console.setLevel(logging.WARNING)
2048
1826
    if debuglevel:
2049
1827
        level = getattr(logging, debuglevel.upper())
2050
 
        logger.setLevel(level)
2051
 
    
 
1828
        syslogger.setLevel(level)
 
1829
        console.setLevel(level)
 
1830
 
2052
1831
    if debug:
2053
 
        logger.setLevel(logging.DEBUG)
2054
1832
        # Enable all possible GnuTLS debugging
2055
1833
        
2056
1834
        # "Use a log level over 10 to enable all debugging options."
2086
1864
    # End of Avahi example code
2087
1865
    if use_dbus:
2088
1866
        try:
2089
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1867
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2090
1868
                                            bus, do_not_queue=True)
2091
 
            old_bus_name = (dbus.service.BusName
2092
 
                            ("se.bsnet.fukt.Mandos", bus,
2093
 
                             do_not_queue=True))
2094
 
        except dbus.exceptions.NameExistsException as e:
 
1869
        except dbus.exceptions.NameExistsException, e:
2095
1870
            logger.error(unicode(e) + ", disabling D-Bus")
2096
1871
            use_dbus = False
2097
1872
            server_settings["use_dbus"] = False
2098
1873
            tcp_server.use_dbus = False
2099
1874
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2100
 
    service = AvahiServiceToSyslog(name =
2101
 
                                   server_settings["servicename"],
2102
 
                                   servicetype = "_mandos._tcp",
2103
 
                                   protocol = protocol, bus = bus)
 
1875
    service = AvahiService(name = server_settings["servicename"],
 
1876
                           servicetype = "_mandos._tcp",
 
1877
                           protocol = protocol, bus = bus)
2104
1878
    if server_settings["interface"]:
2105
1879
        service.interface = (if_nametoindex
2106
1880
                             (str(server_settings["interface"])))
2110
1884
    
2111
1885
    client_class = Client
2112
1886
    if use_dbus:
2113
 
        client_class = functools.partial(ClientDBusTransitional,
2114
 
                                         bus = bus)
2115
 
    
2116
 
    special_settings = {
2117
 
        # Some settings need to be accessd by special methods;
2118
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2119
 
        "approved_by_default":
2120
 
            lambda section:
2121
 
            client_config.getboolean(section, "approved_by_default"),
2122
 
        }
2123
 
    # Construct a new dict of client settings of this form:
2124
 
    # { client_name: {setting_name: value, ...}, ...}
2125
 
    # with exceptions for any special settings as defined above
2126
 
    client_settings = dict((clientname,
2127
 
                           dict((setting,
2128
 
                                 (value if setting not in special_settings
2129
 
                                  else special_settings[setting](clientname)))
2130
 
                                for setting, value in client_config.items(clientname)))
2131
 
                          for clientname in client_config.sections())
2132
 
    
2133
 
    old_client_settings = {}
2134
 
    clients_data = []
2135
 
 
2136
 
    # Get client data and settings from last running state. 
2137
 
    if server_settings["restore"]:
2138
 
        try:
2139
 
            with open(stored_state_path, "rb") as stored_state:
2140
 
                clients_data, old_client_settings = pickle.load(stored_state)
2141
 
            os.remove(stored_state_path)
2142
 
        except IOError as e:
2143
 
            logger.warning("Could not load persistant state: {0}".format(e))
2144
 
            if e.errno != errno.ENOENT:
2145
 
                raise
2146
 
 
2147
 
    for client in clients_data:
2148
 
        client_name = client["name"]
2149
 
        
2150
 
        # Decide which value to use after restoring saved state.
2151
 
        # We have three different values: Old config file,
2152
 
        # new config file, and saved state.
2153
 
        # New config value takes precedence if it differs from old
2154
 
        # config value, otherwise use saved state.
2155
 
        for name, value in client_settings[client_name].items():
 
1887
        client_class = functools.partial(ClientDBus, bus = bus)
 
1888
    def client_config_items(config, section):
 
1889
        special_settings = {
 
1890
            "approved_by_default":
 
1891
                lambda: config.getboolean(section,
 
1892
                                          "approved_by_default"),
 
1893
            }
 
1894
        for name, value in config.items(section):
2156
1895
            try:
2157
 
                # For each value in new config, check if it differs
2158
 
                # from the old config value (Except for the "secret"
2159
 
                # attribute)
2160
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2161
 
                    setattr(client, name, value)
 
1896
                yield (name, special_settings[name]())
2162
1897
            except KeyError:
2163
 
                pass
2164
 
 
2165
 
        # Clients who has passed its expire date, can still be enabled if its
2166
 
        # last checker was sucessful. Clients who checkers failed before we
2167
 
        # stored it state is asumed to had failed checker during downtime.
2168
 
        if client["enabled"] and client["last_checked_ok"]:
2169
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2170
 
                > client["interval"]):
2171
 
                if client["last_checker_status"] != 0:
2172
 
                    client["enabled"] = False
2173
 
                else:
2174
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2175
 
 
2176
 
        client["changedstate"] = (multiprocessing_manager
2177
 
                                  .Condition(multiprocessing_manager
2178
 
                                             .Lock()))
2179
 
        if use_dbus:
2180
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2181
 
            tcp_server.clients[client_name] = new_client
2182
 
            new_client.bus = bus
2183
 
            for name, value in client.iteritems():
2184
 
                setattr(new_client, name, value)
2185
 
            client_object_name = unicode(client_name).translate(
2186
 
                {ord("."): ord("_"),
2187
 
                 ord("-"): ord("_")})
2188
 
            new_client.dbus_object_path = (dbus.ObjectPath
2189
 
                                     ("/clients/" + client_object_name))
2190
 
            DBusObjectWithProperties.__init__(new_client,
2191
 
                                              new_client.bus,
2192
 
                                              new_client.dbus_object_path)
2193
 
        else:
2194
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2195
 
            for name, value in client.iteritems():
2196
 
                setattr(tcp_server.clients[client_name], name, value)
2197
 
                
2198
 
        tcp_server.clients[client_name].decrypt_secret(
2199
 
            client_settings[client_name]["secret"])            
2200
 
        
2201
 
    # Create/remove clients based on new changes made to config
2202
 
    for clientname in set(old_client_settings) - set(client_settings):
2203
 
        del tcp_server.clients[clientname]
2204
 
    for clientname in set(client_settings) - set(old_client_settings):
2205
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2206
 
                                                       config =
2207
 
                                                       client_settings
2208
 
                                                       [clientname]))
 
1898
                yield (name, value)
2209
1899
    
2210
 
 
 
1900
    tcp_server.clients.update(set(
 
1901
            client_class(name = section,
 
1902
                         config= dict(client_config_items(
 
1903
                        client_config, section)))
 
1904
            for section in client_config.sections()))
2211
1905
    if not tcp_server.clients:
2212
1906
        logger.warning("No clients defined")
2213
1907
        
2226
1920
        del pidfilename
2227
1921
        
2228
1922
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2229
 
    
 
1923
 
2230
1924
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2231
1925
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2232
1926
    
2235
1929
            """A D-Bus proxy object"""
2236
1930
            def __init__(self):
2237
1931
                dbus.service.Object.__init__(self, bus, "/")
2238
 
            _interface = "se.recompile.Mandos"
 
1932
            _interface = "se.bsnet.fukt.Mandos"
2239
1933
            
2240
1934
            @dbus.service.signal(_interface, signature="o")
2241
1935
            def ClientAdded(self, objpath):
2256
1950
            def GetAllClients(self):
2257
1951
                "D-Bus method"
2258
1952
                return dbus.Array(c.dbus_object_path
2259
 
                                  for c in
2260
 
                                  tcp_server.clients.itervalues())
 
1953
                                  for c in tcp_server.clients)
2261
1954
            
2262
1955
            @dbus.service.method(_interface,
2263
1956
                                 out_signature="a{oa{sv}}")
2265
1958
                "D-Bus method"
2266
1959
                return dbus.Dictionary(
2267
1960
                    ((c.dbus_object_path, c.GetAll(""))
2268
 
                     for c in tcp_server.clients.itervalues()),
 
1961
                     for c in tcp_server.clients),
2269
1962
                    signature="oa{sv}")
2270
1963
            
2271
1964
            @dbus.service.method(_interface, in_signature="o")
2272
1965
            def RemoveClient(self, object_path):
2273
1966
                "D-Bus method"
2274
 
                for c in tcp_server.clients.itervalues():
 
1967
                for c in tcp_server.clients:
2275
1968
                    if c.dbus_object_path == object_path:
2276
 
                        del tcp_server.clients[c.name]
 
1969
                        tcp_server.clients.remove(c)
2277
1970
                        c.remove_from_connection()
2278
1971
                        # Don't signal anything except ClientRemoved
2279
1972
                        c.disable(quiet=True)
2284
1977
            
2285
1978
            del _interface
2286
1979
        
2287
 
        class MandosDBusServiceTransitional(MandosDBusService):
2288
 
            __metaclass__ = AlternateDBusNamesMetaclass
2289
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1980
        mandos_dbus_service = MandosDBusService()
2290
1981
    
2291
1982
    def cleanup():
2292
1983
        "Cleanup function; run on exit"
2293
1984
        service.cleanup()
2294
1985
        
2295
 
        multiprocessing.active_children()
2296
 
        if not (tcp_server.clients or client_settings):
2297
 
            return
2298
 
 
2299
 
        # Store client before exiting. Secrets are encrypted with key based
2300
 
        # on what config file has. If config file is removed/edited, old
2301
 
        # secret will thus be unrecovable.
2302
 
        clients = []
2303
 
        for client in tcp_server.clients.itervalues():
2304
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2305
 
 
2306
 
            client_dict = {}
2307
 
 
2308
 
            # A list of attributes that will not be stored when shuting down.
2309
 
            exclude = set(("bus", "changedstate", "secret"))            
2310
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2311
 
                exclude.add(name)
2312
 
                
2313
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2314
 
            for attr in client.client_structure:
2315
 
                if attr not in exclude:
2316
 
                    client_dict[attr] = getattr(client, attr)
2317
 
 
2318
 
            clients.append(client_dict) 
2319
 
            del client_settings[client.name]["secret"]
2320
 
            
2321
 
        try:
2322
 
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2323
 
                pickle.dump((clients, client_settings), stored_state)
2324
 
        except IOError as e:
2325
 
            logger.warning("Could not save persistant state: {0}".format(e))
2326
 
            if e.errno != errno.ENOENT:
2327
 
                raise
2328
 
 
2329
 
        # Delete all clients, and settings from config
2330
1986
        while tcp_server.clients:
2331
 
            name, client = tcp_server.clients.popitem()
 
1987
            client = tcp_server.clients.pop()
2332
1988
            if use_dbus:
2333
1989
                client.remove_from_connection()
 
1990
            client.disable_hook = None
2334
1991
            # Don't signal anything except ClientRemoved
2335
1992
            client.disable(quiet=True)
2336
1993
            if use_dbus:
2337
1994
                # Emit D-Bus signal
2338
 
                mandos_dbus_service.ClientRemoved(client
2339
 
                                                  .dbus_object_path,
 
1995
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2340
1996
                                                  client.name)
2341
 
        client_settings.clear()
2342
1997
    
2343
1998
    atexit.register(cleanup)
2344
1999
    
2345
 
    for client in tcp_server.clients.itervalues():
 
2000
    for client in tcp_server.clients:
2346
2001
        if use_dbus:
2347
2002
            # Emit D-Bus signal
2348
2003
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2349
 
        # Need to initiate checking of clients
2350
 
        if client.enabled:
2351
 
            client.init_checker()
2352
 
 
 
2004
        client.enable()
2353
2005
    
2354
2006
    tcp_server.enable()
2355
2007
    tcp_server.server_activate()
2370
2022
        # From the Avahi example code
2371
2023
        try:
2372
2024
            service.activate()
2373
 
        except dbus.exceptions.DBusException as error:
 
2025
        except dbus.exceptions.DBusException, error:
2374
2026
            logger.critical("DBusException: %s", error)
2375
2027
            cleanup()
2376
2028
            sys.exit(1)
2383
2035
        
2384
2036
        logger.debug("Starting main loop")
2385
2037
        main_loop.run()
2386
 
    except AvahiError as error:
 
2038
    except AvahiError, error:
2387
2039
        logger.critical("AvahiError: %s", error)
2388
2040
        cleanup()
2389
2041
        sys.exit(1)
2395
2047
    # Must run before the D-Bus bus name gets deregistered
2396
2048
    cleanup()
2397
2049
 
2398
 
 
2399
2050
if __name__ == '__main__':
2400
2051
    main()