/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-09-12 03:00:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh
Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
55
55
import logging
56
56
import logging.handlers
57
57
import pwd
58
 
from contextlib import closing
 
58
import contextlib
59
59
import struct
60
60
import fcntl
61
61
import functools
 
62
import cPickle as pickle
 
63
import multiprocessing
62
64
 
63
65
import dbus
64
66
import dbus.service
67
69
from dbus.mainloop.glib import DBusGMainLoop
68
70
import ctypes
69
71
import ctypes.util
 
72
import xml.dom.minidom
 
73
import inspect
70
74
 
71
75
try:
72
76
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
81
        SO_BINDTODEVICE = None
78
82
 
79
83
 
80
 
version = "1.0.8"
 
84
version = "1.0.14"
81
85
 
 
86
#logger = logging.getLogger(u'mandos')
82
87
logger = logging.Logger(u'mandos')
83
88
syslogger = (logging.handlers.SysLogHandler
84
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
152
157
                            u" after %i retries, exiting.",
153
158
                            self.rename_count)
154
159
            raise AvahiServiceError(u"Too many renames")
155
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
156
161
        logger.info(u"Changing Zeroconf service name to %r ...",
157
 
                    unicode(self.name))
 
162
                    self.name)
158
163
        syslogger.setFormatter(logging.Formatter
159
164
                               (u'Mandos (%s) [%%(process)d]:'
160
165
                                u' %%(levelname)s: %%(message)s'
161
166
                                % self.name))
162
167
        self.remove()
163
 
        self.add()
 
168
        try:
 
169
            self.add()
 
170
        except dbus.exceptions.DBusException, error:
 
171
            logger.critical(u"DBusException: %s", error)
 
172
            self.cleanup()
 
173
            os._exit(1)
164
174
        self.rename_count += 1
165
175
    def remove(self):
166
176
        """Derived from the Avahi example code"""
174
184
                                    self.server.EntryGroupNew()),
175
185
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
186
            self.group.connect_to_signal('StateChanged',
177
 
                                         self.entry_group_state_changed)
 
187
                                         self
 
188
                                         .entry_group_state_changed)
178
189
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
179
190
                     self.name, self.type)
180
191
        self.group.AddService(
188
199
        self.group.Commit()
189
200
    def entry_group_state_changed(self, state, error):
190
201
        """Derived from the Avahi example code"""
191
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
192
203
        
193
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
205
            logger.debug(u"Zeroconf service established.")
207
218
            self.group = None
208
219
    def server_state_changed(self, state):
209
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
210
222
        if state == avahi.SERVER_COLLISION:
211
223
            logger.error(u"Zeroconf server name collision")
212
224
            self.remove()
239
251
    enabled:    bool()
240
252
    last_checked_ok: datetime.datetime(); (UTC) or None
241
253
    timeout:    datetime.timedelta(); How long from last_checked_ok
242
 
                                      until this client is invalid
 
254
                                      until this client is disabled
243
255
    interval:   datetime.timedelta(); How often to start a new checker
244
256
    disable_hook:  If set, called by disable() as disable_hook(self)
245
257
    checker:    subprocess.Popen(); a running checker process used
246
258
                                    to see if the client lives.
247
259
                                    'None' if no process is running.
248
260
    checker_initiator_tag: a gobject event source tag, or None
249
 
    disable_initiator_tag:    - '' -
 
261
    disable_initiator_tag: - '' -
250
262
    checker_callback_tag:  - '' -
251
263
    checker_command: string; External command which is run to check if
252
264
                     client lives.  %() expansions are done at
253
265
                     runtime with vars(self) as dict, so that for
254
266
                     instance %(name)s can be used in the command.
255
267
    current_checker_command: string; current running checker_command
 
268
    approval_delay: datetime.timedelta(); Time to wait for approval
 
269
    _approved:   bool(); 'None' if not yet approved/disapproved
 
270
    approval_duration: datetime.timedelta(); Duration of one approval
256
271
    """
257
272
    
258
273
    @staticmethod
259
 
    def _datetime_to_milliseconds(dt):
260
 
        "Convert a datetime.datetime() to milliseconds"
261
 
        return ((dt.days * 24 * 60 * 60 * 1000)
262
 
                + (dt.seconds * 1000)
263
 
                + (dt.microseconds // 1000))
 
274
    def _timedelta_to_milliseconds(td):
 
275
        "Convert a datetime.timedelta() to milliseconds"
 
276
        return ((td.days * 24 * 60 * 60 * 1000)
 
277
                + (td.seconds * 1000)
 
278
                + (td.microseconds // 1000))
264
279
    
265
280
    def timeout_milliseconds(self):
266
281
        "Return the 'timeout' attribute in milliseconds"
267
 
        return self._datetime_to_milliseconds(self.timeout)
 
282
        return self._timedelta_to_milliseconds(self.timeout)
268
283
    
269
284
    def interval_milliseconds(self):
270
285
        "Return the 'interval' attribute in milliseconds"
271
 
        return self._datetime_to_milliseconds(self.interval)
 
286
        return self._timedelta_to_milliseconds(self.interval)
 
287
 
 
288
    def approval_delay_milliseconds(self):
 
289
        return self._timedelta_to_milliseconds(self.approval_delay)
272
290
    
273
291
    def __init__(self, name = None, disable_hook=None, config=None):
274
292
        """Note: the 'checker' key in 'config' sets the
287
305
        if u"secret" in config:
288
306
            self.secret = config[u"secret"].decode(u"base64")
289
307
        elif u"secfile" in config:
290
 
            with closing(open(os.path.expanduser
291
 
                              (os.path.expandvars
292
 
                               (config[u"secfile"])))) as secfile:
 
308
            with open(os.path.expanduser(os.path.expandvars
 
309
                                         (config[u"secfile"])),
 
310
                      "rb") as secfile:
293
311
                self.secret = secfile.read()
294
312
        else:
295
313
            raise TypeError(u"No secret or secfile for client %s"
309
327
        self.checker_command = config[u"checker"]
310
328
        self.current_checker_command = None
311
329
        self.last_connect = None
 
330
        self._approved = None
 
331
        self.approved_by_default = config.get(u"approved_by_default",
 
332
                                              True)
 
333
        self.approvals_pending = 0
 
334
        self.approval_delay = string_to_delta(
 
335
            config[u"approval_delay"])
 
336
        self.approval_duration = string_to_delta(
 
337
            config[u"approval_duration"])
 
338
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
312
339
    
 
340
    def send_changedstate(self):
 
341
        self.changedstate.acquire()
 
342
        self.changedstate.notify_all()
 
343
        self.changedstate.release()
 
344
        
313
345
    def enable(self):
314
346
        """Start this client's checker and timeout hooks"""
 
347
        if getattr(self, u"enabled", False):
 
348
            # Already enabled
 
349
            return
 
350
        self.send_changedstate()
315
351
        self.last_enabled = datetime.datetime.utcnow()
316
352
        # Schedule a new checker to be started an 'interval' from now,
317
353
        # and every interval from then on.
318
354
        self.checker_initiator_tag = (gobject.timeout_add
319
355
                                      (self.interval_milliseconds(),
320
356
                                       self.start_checker))
321
 
        # Also start a new checker *right now*.
322
 
        self.start_checker()
323
357
        # Schedule a disable() when 'timeout' has passed
324
358
        self.disable_initiator_tag = (gobject.timeout_add
325
359
                                   (self.timeout_milliseconds(),
326
360
                                    self.disable))
327
361
        self.enabled = True
 
362
        # Also start a new checker *right now*.
 
363
        self.start_checker()
328
364
    
329
 
    def disable(self):
 
365
    def disable(self, quiet=True):
330
366
        """Disable this client."""
331
367
        if not getattr(self, "enabled", False):
332
368
            return False
333
 
        logger.info(u"Disabling client %s", self.name)
 
369
        if not quiet:
 
370
            self.send_changedstate()
 
371
        if not quiet:
 
372
            logger.info(u"Disabling client %s", self.name)
334
373
        if getattr(self, u"disable_initiator_tag", False):
335
374
            gobject.source_remove(self.disable_initiator_tag)
336
375
            self.disable_initiator_tag = None
388
427
        # client would inevitably timeout, since no checker would get
389
428
        # a chance to run to completion.  If we instead leave running
390
429
        # checkers alone, the checker would have to take more time
391
 
        # than 'timeout' for the client to be declared invalid, which
392
 
        # is as it should be.
 
430
        # than 'timeout' for the client to be disabled, which is as it
 
431
        # should be.
393
432
        
394
433
        # If a checker exists, make sure it is not a zombie
395
 
        if self.checker is not None:
 
434
        try:
396
435
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
436
        except (AttributeError, OSError), error:
 
437
            if (isinstance(error, OSError)
 
438
                and error.errno != errno.ECHILD):
 
439
                raise error
 
440
        else:
397
441
            if pid:
398
442
                logger.warning(u"Checker was a zombie")
399
443
                gobject.source_remove(self.checker_callback_tag)
455
499
        logger.debug(u"Stopping checker for %(name)s", vars(self))
456
500
        try:
457
501
            os.kill(self.checker.pid, signal.SIGTERM)
458
 
            #os.sleep(0.5)
 
502
            #time.sleep(0.5)
459
503
            #if self.checker.poll() is None:
460
504
            #    os.kill(self.checker.pid, signal.SIGKILL)
461
505
        except OSError, error:
462
506
            if error.errno != errno.ESRCH: # No such process
463
507
                raise
464
508
        self.checker = None
465
 
    
466
 
    def still_valid(self):
467
 
        """Has the timeout not yet passed for this client?"""
468
 
        if not getattr(self, u"enabled", False):
469
 
            return False
470
 
        now = datetime.datetime.utcnow()
471
 
        if self.last_checked_ok is None:
472
 
            return now < (self.created + self.timeout)
473
 
        else:
474
 
            return now < (self.last_checked_ok + self.timeout)
475
 
 
476
 
 
477
 
class ClientDBus(Client, dbus.service.Object):
 
509
 
 
510
def dbus_service_property(dbus_interface, signature=u"v",
 
511
                          access=u"readwrite", byte_arrays=False):
 
512
    """Decorators for marking methods of a DBusObjectWithProperties to
 
513
    become properties on the D-Bus.
 
514
    
 
515
    The decorated method will be called with no arguments by "Get"
 
516
    and with one argument by "Set".
 
517
    
 
518
    The parameters, where they are supported, are the same as
 
519
    dbus.service.method, except there is only "signature", since the
 
520
    type from Get() and the type sent to Set() is the same.
 
521
    """
 
522
    # Encoding deeply encoded byte arrays is not supported yet by the
 
523
    # "Set" method, so we fail early here:
 
524
    if byte_arrays and signature != u"ay":
 
525
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
526
                         u" signature %r" % signature)
 
527
    def decorator(func):
 
528
        func._dbus_is_property = True
 
529
        func._dbus_interface = dbus_interface
 
530
        func._dbus_signature = signature
 
531
        func._dbus_access = access
 
532
        func._dbus_name = func.__name__
 
533
        if func._dbus_name.endswith(u"_dbus_property"):
 
534
            func._dbus_name = func._dbus_name[:-14]
 
535
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
536
        return func
 
537
    return decorator
 
538
 
 
539
 
 
540
class DBusPropertyException(dbus.exceptions.DBusException):
 
541
    """A base class for D-Bus property-related exceptions
 
542
    """
 
543
    def __unicode__(self):
 
544
        return unicode(str(self))
 
545
 
 
546
 
 
547
class DBusPropertyAccessException(DBusPropertyException):
 
548
    """A property's access permissions disallows an operation.
 
549
    """
 
550
    pass
 
551
 
 
552
 
 
553
class DBusPropertyNotFound(DBusPropertyException):
 
554
    """An attempt was made to access a non-existing property.
 
555
    """
 
556
    pass
 
557
 
 
558
 
 
559
class DBusObjectWithProperties(dbus.service.Object):
 
560
    """A D-Bus object with properties.
 
561
 
 
562
    Classes inheriting from this can use the dbus_service_property
 
563
    decorator to expose methods as D-Bus properties.  It exposes the
 
564
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
565
    """
 
566
    
 
567
    @staticmethod
 
568
    def _is_dbus_property(obj):
 
569
        return getattr(obj, u"_dbus_is_property", False)
 
570
    
 
571
    def _get_all_dbus_properties(self):
 
572
        """Returns a generator of (name, attribute) pairs
 
573
        """
 
574
        return ((prop._dbus_name, prop)
 
575
                for name, prop in
 
576
                inspect.getmembers(self, self._is_dbus_property))
 
577
    
 
578
    def _get_dbus_property(self, interface_name, property_name):
 
579
        """Returns a bound method if one exists which is a D-Bus
 
580
        property with the specified name and interface.
 
581
        """
 
582
        for name in (property_name,
 
583
                     property_name + u"_dbus_property"):
 
584
            prop = getattr(self, name, None)
 
585
            if (prop is None
 
586
                or not self._is_dbus_property(prop)
 
587
                or prop._dbus_name != property_name
 
588
                or (interface_name and prop._dbus_interface
 
589
                    and interface_name != prop._dbus_interface)):
 
590
                continue
 
591
            return prop
 
592
        # No such property
 
593
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
594
                                   + interface_name + u"."
 
595
                                   + property_name)
 
596
    
 
597
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
598
                         out_signature=u"v")
 
599
    def Get(self, interface_name, property_name):
 
600
        """Standard D-Bus property Get() method, see D-Bus standard.
 
601
        """
 
602
        prop = self._get_dbus_property(interface_name, property_name)
 
603
        if prop._dbus_access == u"write":
 
604
            raise DBusPropertyAccessException(property_name)
 
605
        value = prop()
 
606
        if not hasattr(value, u"variant_level"):
 
607
            return value
 
608
        return type(value)(value, variant_level=value.variant_level+1)
 
609
    
 
610
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
611
    def Set(self, interface_name, property_name, value):
 
612
        """Standard D-Bus property Set() method, see D-Bus standard.
 
613
        """
 
614
        prop = self._get_dbus_property(interface_name, property_name)
 
615
        if prop._dbus_access == u"read":
 
616
            raise DBusPropertyAccessException(property_name)
 
617
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
618
            # The byte_arrays option is not supported yet on
 
619
            # signatures other than "ay".
 
620
            if prop._dbus_signature != u"ay":
 
621
                raise ValueError
 
622
            value = dbus.ByteArray(''.join(unichr(byte)
 
623
                                           for byte in value))
 
624
        prop(value)
 
625
    
 
626
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
627
                         out_signature=u"a{sv}")
 
628
    def GetAll(self, interface_name):
 
629
        """Standard D-Bus property GetAll() method, see D-Bus
 
630
        standard.
 
631
 
 
632
        Note: Will not include properties with access="write".
 
633
        """
 
634
        all = {}
 
635
        for name, prop in self._get_all_dbus_properties():
 
636
            if (interface_name
 
637
                and interface_name != prop._dbus_interface):
 
638
                # Interface non-empty but did not match
 
639
                continue
 
640
            # Ignore write-only properties
 
641
            if prop._dbus_access == u"write":
 
642
                continue
 
643
            value = prop()
 
644
            if not hasattr(value, u"variant_level"):
 
645
                all[name] = value
 
646
                continue
 
647
            all[name] = type(value)(value, variant_level=
 
648
                                    value.variant_level+1)
 
649
        return dbus.Dictionary(all, signature=u"sv")
 
650
    
 
651
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
652
                         out_signature=u"s",
 
653
                         path_keyword='object_path',
 
654
                         connection_keyword='connection')
 
655
    def Introspect(self, object_path, connection):
 
656
        """Standard D-Bus method, overloaded to insert property tags.
 
657
        """
 
658
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
659
                                                   connection)
 
660
        try:
 
661
            document = xml.dom.minidom.parseString(xmlstring)
 
662
            def make_tag(document, name, prop):
 
663
                e = document.createElement(u"property")
 
664
                e.setAttribute(u"name", name)
 
665
                e.setAttribute(u"type", prop._dbus_signature)
 
666
                e.setAttribute(u"access", prop._dbus_access)
 
667
                return e
 
668
            for if_tag in document.getElementsByTagName(u"interface"):
 
669
                for tag in (make_tag(document, name, prop)
 
670
                            for name, prop
 
671
                            in self._get_all_dbus_properties()
 
672
                            if prop._dbus_interface
 
673
                            == if_tag.getAttribute(u"name")):
 
674
                    if_tag.appendChild(tag)
 
675
                # Add the names to the return values for the
 
676
                # "org.freedesktop.DBus.Properties" methods
 
677
                if (if_tag.getAttribute(u"name")
 
678
                    == u"org.freedesktop.DBus.Properties"):
 
679
                    for cn in if_tag.getElementsByTagName(u"method"):
 
680
                        if cn.getAttribute(u"name") == u"Get":
 
681
                            for arg in cn.getElementsByTagName(u"arg"):
 
682
                                if (arg.getAttribute(u"direction")
 
683
                                    == u"out"):
 
684
                                    arg.setAttribute(u"name", u"value")
 
685
                        elif cn.getAttribute(u"name") == u"GetAll":
 
686
                            for arg in cn.getElementsByTagName(u"arg"):
 
687
                                if (arg.getAttribute(u"direction")
 
688
                                    == u"out"):
 
689
                                    arg.setAttribute(u"name", u"props")
 
690
            xmlstring = document.toxml(u"utf-8")
 
691
            document.unlink()
 
692
        except (AttributeError, xml.dom.DOMException,
 
693
                xml.parsers.expat.ExpatError), error:
 
694
            logger.error(u"Failed to override Introspection method",
 
695
                         error)
 
696
        return xmlstring
 
697
 
 
698
 
 
699
class ClientDBus(Client, DBusObjectWithProperties):
478
700
    """A Client class using D-Bus
479
701
    
480
702
    Attributes:
484
706
    # dbus.service.Object doesn't use super(), so we can't either.
485
707
    
486
708
    def __init__(self, bus = None, *args, **kwargs):
 
709
        self._approvals_pending = 0
487
710
        self.bus = bus
488
711
        Client.__init__(self, *args, **kwargs)
489
712
        # Only now, when this client is initialized, can it show up on
491
714
        self.dbus_object_path = (dbus.ObjectPath
492
715
                                 (u"/clients/"
493
716
                                  + self.name.replace(u".", u"_")))
494
 
        dbus.service.Object.__init__(self, self.bus,
495
 
                                     self.dbus_object_path)
 
717
        DBusObjectWithProperties.__init__(self, self.bus,
 
718
                                          self.dbus_object_path)
 
719
        
 
720
    def _get_approvals_pending(self):
 
721
        return self._approvals_pending
 
722
    def _set_approvals_pending(self, value):
 
723
        old_value = self._approvals_pending
 
724
        self._approvals_pending = value
 
725
        bval = bool(value)
 
726
        if (hasattr(self, "dbus_object_path")
 
727
            and bval is not bool(old_value)):
 
728
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
729
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
730
                                 dbus_bool)
 
731
 
 
732
    approvals_pending = property(_get_approvals_pending,
 
733
                                 _set_approvals_pending)
 
734
    del _get_approvals_pending, _set_approvals_pending
496
735
    
497
736
    @staticmethod
498
737
    def _datetime_to_dbus(dt, variant_level=0):
505
744
        r = Client.enable(self)
506
745
        if oldstate != self.enabled:
507
746
            # Emit D-Bus signals
508
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
509
748
                                 dbus.Boolean(True, variant_level=1))
510
749
            self.PropertyChanged(
511
 
                dbus.String(u"last_enabled"),
 
750
                dbus.String(u"LastEnabled"),
512
751
                self._datetime_to_dbus(self.last_enabled,
513
752
                                       variant_level=1))
514
753
        return r
515
754
    
516
 
    def disable(self, signal = True):
 
755
    def disable(self, quiet = False):
517
756
        oldstate = getattr(self, u"enabled", False)
518
 
        r = Client.disable(self)
519
 
        if signal and oldstate != self.enabled:
 
757
        r = Client.disable(self, quiet=quiet)
 
758
        if not quiet and oldstate != self.enabled:
520
759
            # Emit D-Bus signal
521
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
522
761
                                 dbus.Boolean(False, variant_level=1))
523
762
        return r
524
763
    
527
766
            self.remove_from_connection()
528
767
        except LookupError:
529
768
            pass
530
 
        if hasattr(dbus.service.Object, u"__del__"):
531
 
            dbus.service.Object.__del__(self, *args, **kwargs)
 
769
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
770
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
532
771
        Client.__del__(self, *args, **kwargs)
533
772
    
534
773
    def checker_callback(self, pid, condition, command,
536
775
        self.checker_callback_tag = None
537
776
        self.checker = None
538
777
        # Emit D-Bus signal
539
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
540
779
                             dbus.Boolean(False, variant_level=1))
541
780
        if os.WIFEXITED(condition):
542
781
            exitstatus = os.WEXITSTATUS(condition)
557
796
        r = Client.checked_ok(self, *args, **kwargs)
558
797
        # Emit D-Bus signal
559
798
        self.PropertyChanged(
560
 
            dbus.String(u"last_checked_ok"),
 
799
            dbus.String(u"LastCheckedOK"),
561
800
            (self._datetime_to_dbus(self.last_checked_ok,
562
801
                                    variant_level=1)))
563
802
        return r
575
814
            # Emit D-Bus signal
576
815
            self.CheckerStarted(self.current_checker_command)
577
816
            self.PropertyChanged(
578
 
                dbus.String(u"checker_running"),
 
817
                dbus.String(u"CheckerRunning"),
579
818
                dbus.Boolean(True, variant_level=1))
580
819
        return r
581
820
    
584
823
        r = Client.stop_checker(self, *args, **kwargs)
585
824
        if (old_checker is not None
586
825
            and getattr(self, u"checker", None) is None):
587
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
588
827
                                 dbus.Boolean(False, variant_level=1))
589
828
        return r
590
 
    
591
 
    ## D-Bus methods & signals
 
829
 
 
830
    def _reset_approved(self):
 
831
        self._approved = None
 
832
        return False
 
833
    
 
834
    def approve(self, value=True):
 
835
        self.send_changedstate()
 
836
        self._approved = value
 
837
        gobject.timeout_add(self._timedelta_to_milliseconds
 
838
                            (self.approval_duration),
 
839
                            self._reset_approved)
 
840
    
 
841
    
 
842
    ## D-Bus methods, signals & properties
592
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
593
844
    
594
 
    # CheckedOK - method
595
 
    @dbus.service.method(_interface)
596
 
    def CheckedOK(self):
597
 
        return self.checked_ok()
 
845
    ## Signals
598
846
    
599
847
    # CheckerCompleted - signal
600
848
    @dbus.service.signal(_interface, signature=u"nxs")
608
856
        "D-Bus signal"
609
857
        pass
610
858
    
611
 
    # GetAllProperties - method
612
 
    @dbus.service.method(_interface, out_signature=u"a{sv}")
613
 
    def GetAllProperties(self):
614
 
        "D-Bus method"
615
 
        return dbus.Dictionary({
616
 
                dbus.String(u"name"):
617
 
                    dbus.String(self.name, variant_level=1),
618
 
                dbus.String(u"fingerprint"):
619
 
                    dbus.String(self.fingerprint, variant_level=1),
620
 
                dbus.String(u"host"):
621
 
                    dbus.String(self.host, variant_level=1),
622
 
                dbus.String(u"created"):
623
 
                    self._datetime_to_dbus(self.created,
624
 
                                           variant_level=1),
625
 
                dbus.String(u"last_enabled"):
626
 
                    (self._datetime_to_dbus(self.last_enabled,
627
 
                                            variant_level=1)
628
 
                     if self.last_enabled is not None
629
 
                     else dbus.Boolean(False, variant_level=1)),
630
 
                dbus.String(u"enabled"):
631
 
                    dbus.Boolean(self.enabled, variant_level=1),
632
 
                dbus.String(u"last_checked_ok"):
633
 
                    (self._datetime_to_dbus(self.last_checked_ok,
634
 
                                            variant_level=1)
635
 
                     if self.last_checked_ok is not None
636
 
                     else dbus.Boolean (False, variant_level=1)),
637
 
                dbus.String(u"timeout"):
638
 
                    dbus.UInt64(self.timeout_milliseconds(),
639
 
                                variant_level=1),
640
 
                dbus.String(u"interval"):
641
 
                    dbus.UInt64(self.interval_milliseconds(),
642
 
                                variant_level=1),
643
 
                dbus.String(u"checker"):
644
 
                    dbus.String(self.checker_command,
645
 
                                variant_level=1),
646
 
                dbus.String(u"checker_running"):
647
 
                    dbus.Boolean(self.checker is not None,
648
 
                                 variant_level=1),
649
 
                dbus.String(u"object_path"):
650
 
                    dbus.ObjectPath(self.dbus_object_path,
651
 
                                    variant_level=1)
652
 
                }, signature=u"sv")
653
 
    
654
 
    # IsStillValid - method
655
 
    @dbus.service.method(_interface, out_signature=u"b")
656
 
    def IsStillValid(self):
657
 
        return self.still_valid()
658
 
    
659
859
    # PropertyChanged - signal
660
860
    @dbus.service.signal(_interface, signature=u"sv")
661
861
    def PropertyChanged(self, property, value):
662
862
        "D-Bus signal"
663
863
        pass
664
864
    
665
 
    # ReceivedSecret - signal
 
865
    # GotSecret - signal
666
866
    @dbus.service.signal(_interface)
667
 
    def ReceivedSecret(self):
668
 
        "D-Bus signal"
 
867
    def GotSecret(self):
 
868
        """D-Bus signal
 
869
        Is sent after a successful transfer of secret from the Mandos
 
870
        server to mandos-client
 
871
        """
669
872
        pass
670
873
    
671
874
    # Rejected - signal
672
 
    @dbus.service.signal(_interface)
673
 
    def Rejected(self):
674
 
        "D-Bus signal"
675
 
        pass
676
 
    
677
 
    # SetChecker - method
678
 
    @dbus.service.method(_interface, in_signature=u"s")
679
 
    def SetChecker(self, checker):
680
 
        "D-Bus setter method"
681
 
        self.checker_command = checker
682
 
        # Emit D-Bus signal
683
 
        self.PropertyChanged(dbus.String(u"checker"),
684
 
                             dbus.String(self.checker_command,
685
 
                                         variant_level=1))
686
 
    
687
 
    # SetHost - method
688
 
    @dbus.service.method(_interface, in_signature=u"s")
689
 
    def SetHost(self, host):
690
 
        "D-Bus setter method"
691
 
        self.host = host
692
 
        # Emit D-Bus signal
693
 
        self.PropertyChanged(dbus.String(u"host"),
694
 
                             dbus.String(self.host, variant_level=1))
695
 
    
696
 
    # SetInterval - method
697
 
    @dbus.service.method(_interface, in_signature=u"t")
698
 
    def SetInterval(self, milliseconds):
699
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
700
 
        # Emit D-Bus signal
701
 
        self.PropertyChanged(dbus.String(u"interval"),
702
 
                             (dbus.UInt64(self.interval_milliseconds(),
703
 
                                          variant_level=1)))
704
 
    
705
 
    # SetSecret - method
706
 
    @dbus.service.method(_interface, in_signature=u"ay",
707
 
                         byte_arrays=True)
708
 
    def SetSecret(self, secret):
709
 
        "D-Bus setter method"
710
 
        self.secret = str(secret)
711
 
    
712
 
    # SetTimeout - method
713
 
    @dbus.service.method(_interface, in_signature=u"t")
714
 
    def SetTimeout(self, milliseconds):
715
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
716
 
        # Emit D-Bus signal
717
 
        self.PropertyChanged(dbus.String(u"timeout"),
718
 
                             (dbus.UInt64(self.timeout_milliseconds(),
719
 
                                          variant_level=1)))
 
875
    @dbus.service.signal(_interface, signature=u"s")
 
876
    def Rejected(self, reason):
 
877
        "D-Bus signal"
 
878
        pass
 
879
    
 
880
    # NeedApproval - signal
 
881
    @dbus.service.signal(_interface, signature=u"tb")
 
882
    def NeedApproval(self, timeout, default):
 
883
        "D-Bus signal"
 
884
        pass
 
885
    
 
886
    ## Methods
 
887
 
 
888
    # Approve - method
 
889
    @dbus.service.method(_interface, in_signature=u"b")
 
890
    def Approve(self, value):
 
891
        self.approve(value)
 
892
 
 
893
    # CheckedOK - method
 
894
    @dbus.service.method(_interface)
 
895
    def CheckedOK(self):
 
896
        return self.checked_ok()
720
897
    
721
898
    # Enable - method
722
899
    @dbus.service.method(_interface)
741
918
    def StopChecker(self):
742
919
        self.stop_checker()
743
920
    
 
921
    ## Properties
 
922
    
 
923
    # ApprovalPending - property
 
924
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
925
    def ApprovalPending_dbus_property(self):
 
926
        return dbus.Boolean(bool(self.approvals_pending))
 
927
    
 
928
    # ApprovedByDefault - property
 
929
    @dbus_service_property(_interface, signature=u"b",
 
930
                           access=u"readwrite")
 
931
    def ApprovedByDefault_dbus_property(self, value=None):
 
932
        if value is None:       # get
 
933
            return dbus.Boolean(self.approved_by_default)
 
934
        self.approved_by_default = bool(value)
 
935
        # Emit D-Bus signal
 
936
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
937
                             dbus.Boolean(value, variant_level=1))
 
938
    
 
939
    # ApprovalDelay - property
 
940
    @dbus_service_property(_interface, signature=u"t",
 
941
                           access=u"readwrite")
 
942
    def ApprovalDelay_dbus_property(self, value=None):
 
943
        if value is None:       # get
 
944
            return dbus.UInt64(self.approval_delay_milliseconds())
 
945
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
946
        # Emit D-Bus signal
 
947
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
948
                             dbus.UInt64(value, variant_level=1))
 
949
    
 
950
    # ApprovalDuration - property
 
951
    @dbus_service_property(_interface, signature=u"t",
 
952
                           access=u"readwrite")
 
953
    def ApprovalDuration_dbus_property(self, value=None):
 
954
        if value is None:       # get
 
955
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
956
                    self.approval_duration))
 
957
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
958
        # Emit D-Bus signal
 
959
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
960
                             dbus.UInt64(value, variant_level=1))
 
961
    
 
962
    # Name - property
 
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
964
    def Name_dbus_property(self):
 
965
        return dbus.String(self.name)
 
966
    
 
967
    # Fingerprint - property
 
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
969
    def Fingerprint_dbus_property(self):
 
970
        return dbus.String(self.fingerprint)
 
971
    
 
972
    # Host - property
 
973
    @dbus_service_property(_interface, signature=u"s",
 
974
                           access=u"readwrite")
 
975
    def Host_dbus_property(self, value=None):
 
976
        if value is None:       # get
 
977
            return dbus.String(self.host)
 
978
        self.host = value
 
979
        # Emit D-Bus signal
 
980
        self.PropertyChanged(dbus.String(u"Host"),
 
981
                             dbus.String(value, variant_level=1))
 
982
    
 
983
    # Created - property
 
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
985
    def Created_dbus_property(self):
 
986
        return dbus.String(self._datetime_to_dbus(self.created))
 
987
    
 
988
    # LastEnabled - property
 
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
990
    def LastEnabled_dbus_property(self):
 
991
        if self.last_enabled is None:
 
992
            return dbus.String(u"")
 
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
994
    
 
995
    # Enabled - property
 
996
    @dbus_service_property(_interface, signature=u"b",
 
997
                           access=u"readwrite")
 
998
    def Enabled_dbus_property(self, value=None):
 
999
        if value is None:       # get
 
1000
            return dbus.Boolean(self.enabled)
 
1001
        if value:
 
1002
            self.enable()
 
1003
        else:
 
1004
            self.disable()
 
1005
    
 
1006
    # LastCheckedOK - property
 
1007
    @dbus_service_property(_interface, signature=u"s",
 
1008
                           access=u"readwrite")
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
 
1010
        if value is not None:
 
1011
            self.checked_ok()
 
1012
            return
 
1013
        if self.last_checked_ok is None:
 
1014
            return dbus.String(u"")
 
1015
        return dbus.String(self._datetime_to_dbus(self
 
1016
                                                  .last_checked_ok))
 
1017
    
 
1018
    # Timeout - property
 
1019
    @dbus_service_property(_interface, signature=u"t",
 
1020
                           access=u"readwrite")
 
1021
    def Timeout_dbus_property(self, value=None):
 
1022
        if value is None:       # get
 
1023
            return dbus.UInt64(self.timeout_milliseconds())
 
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1025
        # Emit D-Bus signal
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
 
1027
                             dbus.UInt64(value, variant_level=1))
 
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1029
            return
 
1030
        # Reschedule timeout
 
1031
        gobject.source_remove(self.disable_initiator_tag)
 
1032
        self.disable_initiator_tag = None
 
1033
        time_to_die = (self.
 
1034
                       _timedelta_to_milliseconds((self
 
1035
                                                   .last_checked_ok
 
1036
                                                   + self.timeout)
 
1037
                                                  - datetime.datetime
 
1038
                                                  .utcnow()))
 
1039
        if time_to_die <= 0:
 
1040
            # The timeout has passed
 
1041
            self.disable()
 
1042
        else:
 
1043
            self.disable_initiator_tag = (gobject.timeout_add
 
1044
                                          (time_to_die, self.disable))
 
1045
    
 
1046
    # Interval - property
 
1047
    @dbus_service_property(_interface, signature=u"t",
 
1048
                           access=u"readwrite")
 
1049
    def Interval_dbus_property(self, value=None):
 
1050
        if value is None:       # get
 
1051
            return dbus.UInt64(self.interval_milliseconds())
 
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1053
        # Emit D-Bus signal
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
 
1055
                             dbus.UInt64(value, variant_level=1))
 
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1057
            return
 
1058
        # Reschedule checker run
 
1059
        gobject.source_remove(self.checker_initiator_tag)
 
1060
        self.checker_initiator_tag = (gobject.timeout_add
 
1061
                                      (value, self.start_checker))
 
1062
        self.start_checker()    # Start one now, too
 
1063
 
 
1064
    # Checker - property
 
1065
    @dbus_service_property(_interface, signature=u"s",
 
1066
                           access=u"readwrite")
 
1067
    def Checker_dbus_property(self, value=None):
 
1068
        if value is None:       # get
 
1069
            return dbus.String(self.checker_command)
 
1070
        self.checker_command = value
 
1071
        # Emit D-Bus signal
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
 
1073
                             dbus.String(self.checker_command,
 
1074
                                         variant_level=1))
 
1075
    
 
1076
    # CheckerRunning - property
 
1077
    @dbus_service_property(_interface, signature=u"b",
 
1078
                           access=u"readwrite")
 
1079
    def CheckerRunning_dbus_property(self, value=None):
 
1080
        if value is None:       # get
 
1081
            return dbus.Boolean(self.checker is not None)
 
1082
        if value:
 
1083
            self.start_checker()
 
1084
        else:
 
1085
            self.stop_checker()
 
1086
    
 
1087
    # ObjectPath - property
 
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1089
    def ObjectPath_dbus_property(self):
 
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
 
1091
    
 
1092
    # Secret = property
 
1093
    @dbus_service_property(_interface, signature=u"ay",
 
1094
                           access=u"write", byte_arrays=True)
 
1095
    def Secret_dbus_property(self, value):
 
1096
        self.secret = str(value)
 
1097
    
744
1098
    del _interface
745
1099
 
746
1100
 
 
1101
class ProxyClient(object):
 
1102
    def __init__(self, child_pipe, fpr, address):
 
1103
        self._pipe = child_pipe
 
1104
        self._pipe.send(('init', fpr, address))
 
1105
        if not self._pipe.recv():
 
1106
            raise KeyError()
 
1107
 
 
1108
    def __getattribute__(self, name):
 
1109
        if(name == '_pipe'):
 
1110
            return super(ProxyClient, self).__getattribute__(name)
 
1111
        self._pipe.send(('getattr', name))
 
1112
        data = self._pipe.recv()
 
1113
        if data[0] == 'data':
 
1114
            return data[1]
 
1115
        if data[0] == 'function':
 
1116
            def func(*args, **kwargs):
 
1117
                self._pipe.send(('funcall', name, args, kwargs))
 
1118
                return self._pipe.recv()[1]
 
1119
            return func
 
1120
 
 
1121
    def __setattr__(self, name, value):
 
1122
        if(name == '_pipe'):
 
1123
            return super(ProxyClient, self).__setattr__(name, value)
 
1124
        self._pipe.send(('setattr', name, value))
 
1125
 
 
1126
 
747
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
748
1128
    """A class to handle client connections.
749
1129
    
751
1131
    Note: This will run in its own forked process."""
752
1132
    
753
1133
    def handle(self):
754
 
        logger.info(u"TCP connection from: %s",
755
 
                    unicode(self.client_address))
756
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
757
 
        # Open IPC pipe to parent process
758
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
1134
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1135
            logger.info(u"TCP connection from: %s",
 
1136
                        unicode(self.client_address))
 
1137
            logger.debug(u"Pipe FD: %d",
 
1138
                         self.server.child_pipe.fileno())
 
1139
 
759
1140
            session = (gnutls.connection
760
1141
                       .ClientSession(self.request,
761
1142
                                      gnutls.connection
762
1143
                                      .X509Credentials()))
763
 
            
764
 
            line = self.request.makefile().readline()
765
 
            logger.debug(u"Protocol version: %r", line)
766
 
            try:
767
 
                if int(line.strip().split()[0]) > 1:
768
 
                    raise RuntimeError
769
 
            except (ValueError, IndexError, RuntimeError), error:
770
 
                logger.error(u"Unknown protocol version: %s", error)
771
 
                return
772
 
            
 
1144
 
773
1145
            # Note: gnutls.connection.X509Credentials is really a
774
1146
            # generic GnuTLS certificate credentials object so long as
775
1147
            # no X.509 keys are added to it.  Therefore, we can use it
776
1148
            # here despite using OpenPGP certificates.
777
 
            
 
1149
 
778
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
779
1151
            #                      u"+AES-256-CBC", u"+SHA1",
780
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
786
1158
            (gnutls.library.functions
787
1159
             .gnutls_priority_set_direct(session._c_object,
788
1160
                                         priority, None))
789
 
            
 
1161
 
 
1162
            # Start communication using the Mandos protocol
 
1163
            # Get protocol number
 
1164
            line = self.request.makefile().readline()
 
1165
            logger.debug(u"Protocol version: %r", line)
 
1166
            try:
 
1167
                if int(line.strip().split()[0]) > 1:
 
1168
                    raise RuntimeError
 
1169
            except (ValueError, IndexError, RuntimeError), error:
 
1170
                logger.error(u"Unknown protocol version: %s", error)
 
1171
                return
 
1172
 
 
1173
            # Start GnuTLS connection
790
1174
            try:
791
1175
                session.handshake()
792
1176
            except gnutls.errors.GNUTLSError, error:
795
1179
                # established.  Just abandon the request.
796
1180
                return
797
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
798
1184
            try:
799
 
                fpr = self.fingerprint(self.peer_certificate(session))
800
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
801
 
                logger.warning(u"Bad certificate: %s", error)
802
 
                session.bye()
803
 
                return
804
 
            logger.debug(u"Fingerprint: %s", fpr)
 
1185
                try:
 
1186
                    fpr = self.fingerprint(self.peer_certificate
 
1187
                                           (session))
 
1188
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1189
                    logger.warning(u"Bad certificate: %s", error)
 
1190
                    return
 
1191
                logger.debug(u"Fingerprint: %s", fpr)
 
1192
 
 
1193
                try:
 
1194
                    client = ProxyClient(child_pipe, fpr,
 
1195
                                         self.client_address)
 
1196
                except KeyError:
 
1197
                    return
 
1198
                
 
1199
                if client.approval_delay:
 
1200
                    delay = client.approval_delay
 
1201
                    client.approvals_pending += 1
 
1202
                    approval_required = True
 
1203
                
 
1204
                while True:
 
1205
                    if not client.enabled:
 
1206
                        logger.warning(u"Client %s is disabled",
 
1207
                                       client.name)
 
1208
                        if self.server.use_dbus:
 
1209
                            # Emit D-Bus signal
 
1210
                            client.Rejected("Disabled")                    
 
1211
                        return
 
1212
                    
 
1213
                    if client._approved or not client.approval_delay:
 
1214
                        #We are approved or approval is disabled
 
1215
                        break
 
1216
                    elif client._approved is None:
 
1217
                        logger.info(u"Client %s needs approval",
 
1218
                                    client.name)
 
1219
                        if self.server.use_dbus:
 
1220
                            # Emit D-Bus signal
 
1221
                            client.NeedApproval(
 
1222
                                client.approval_delay_milliseconds(),
 
1223
                                client.approved_by_default)
 
1224
                    else:
 
1225
                        logger.warning(u"Client %s was not approved",
 
1226
                                       client.name)
 
1227
                        if self.server.use_dbus:
 
1228
                            # Emit D-Bus signal
 
1229
                            client.Rejected("Denied")
 
1230
                        return
 
1231
                    
 
1232
                    #wait until timeout or approved
 
1233
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1234
                    time = datetime.datetime.now()
 
1235
                    client.changedstate.acquire()
 
1236
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1237
                    client.changedstate.release()
 
1238
                    time2 = datetime.datetime.now()
 
1239
                    if (time2 - time) >= delay:
 
1240
                        if not client.approved_by_default:
 
1241
                            logger.warning("Client %s timed out while"
 
1242
                                           " waiting for approval",
 
1243
                                           client.name)
 
1244
                            if self.server.use_dbus:
 
1245
                                # Emit D-Bus signal
 
1246
                                client.Rejected("Timed out")
 
1247
                            return
 
1248
                        else:
 
1249
                            break
 
1250
                    else:
 
1251
                        delay -= time2 - time
 
1252
                
 
1253
                sent_size = 0
 
1254
                while sent_size < len(client.secret):
 
1255
                    try:
 
1256
                        sent = session.send(client.secret[sent_size:])
 
1257
                    except (gnutls.errors.GNUTLSError), error:
 
1258
                        logger.warning("gnutls send failed")
 
1259
                        return
 
1260
                    logger.debug(u"Sent: %d, remaining: %d",
 
1261
                                 sent, len(client.secret)
 
1262
                                 - (sent_size + sent))
 
1263
                    sent_size += sent
 
1264
 
 
1265
                logger.info(u"Sending secret to %s", client.name)
 
1266
                # bump the timeout as if seen
 
1267
                client.checked_ok()
 
1268
                if self.server.use_dbus:
 
1269
                    # Emit D-Bus signal
 
1270
                    client.GotSecret()
805
1271
            
806
 
            for c in self.server.clients:
807
 
                if c.fingerprint == fpr:
808
 
                    client = c
809
 
                    break
810
 
            else:
811
 
                ipc.write(u"NOTFOUND %s\n" % fpr)
812
 
                session.bye()
813
 
                return
814
 
            # Have to check if client.still_valid(), since it is
815
 
            # possible that the client timed out while establishing
816
 
            # the GnuTLS session.
817
 
            if not client.still_valid():
818
 
                ipc.write(u"INVALID %s\n" % client.name)
819
 
                session.bye()
820
 
                return
821
 
            ipc.write(u"SENDING %s\n" % client.name)
822
 
            sent_size = 0
823
 
            while sent_size < len(client.secret):
824
 
                sent = session.send(client.secret[sent_size:])
825
 
                logger.debug(u"Sent: %d, remaining: %d",
826
 
                             sent, len(client.secret)
827
 
                             - (sent_size + sent))
828
 
                sent_size += sent
829
 
            session.bye()
 
1272
            finally:
 
1273
                if approval_required:
 
1274
                    client.approvals_pending -= 1
 
1275
                try:
 
1276
                    session.bye()
 
1277
                except (gnutls.errors.GNUTLSError), error:
 
1278
                    logger.warning("GnuTLS bye failed")
830
1279
    
831
1280
    @staticmethod
832
1281
    def peer_certificate(session):
892
1341
        return hex_fpr
893
1342
 
894
1343
 
895
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
896
 
    """Like socketserver.ForkingMixIn, but also pass a pipe.
897
 
    
898
 
    Assumes a gobject.MainLoop event loop.
899
 
    """
 
1344
class MultiprocessingMixIn(object):
 
1345
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1346
    def sub_process_main(self, request, address):
 
1347
        try:
 
1348
            self.finish_request(request, address)
 
1349
        except:
 
1350
            self.handle_error(request, address)
 
1351
        self.close_request(request)
 
1352
            
 
1353
    def process_request(self, request, address):
 
1354
        """Start a new process to process the request."""
 
1355
        multiprocessing.Process(target = self.sub_process_main,
 
1356
                                args = (request, address)).start()
 
1357
 
 
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1359
    """ adds a pipe to the MixIn """
900
1360
    def process_request(self, request, client_address):
901
1361
        """Overrides and wraps the original process_request().
902
1362
        
903
 
        This function creates a new pipe in self.pipe 
 
1363
        This function creates a new pipe in self.pipe
904
1364
        """
905
 
        self.pipe = os.pipe()
906
 
        super(ForkingMixInWithPipe,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
907
1368
              self).process_request(request, client_address)
908
 
        os.close(self.pipe[1])  # close write end
909
 
        # Call "handle_ipc" for both data and EOF events
910
 
        gobject.io_add_watch(self.pipe[0],
911
 
                             gobject.IO_IN | gobject.IO_HUP,
912
 
                             self.handle_ipc)
913
 
    def handle_ipc(self, source, condition):
 
1369
        self.child_pipe.close()
 
1370
        self.add_pipe(parent_pipe)
 
1371
 
 
1372
    def add_pipe(self, parent_pipe):
914
1373
        """Dummy function; override as necessary"""
915
 
        os.close(source)
916
 
        return False
917
 
 
918
 
 
919
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
920
1377
                     socketserver.TCPServer, object):
921
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
922
1379
    
924
1381
        enabled:        Boolean; whether this server is activated yet
925
1382
        interface:      None or a network interface name (string)
926
1383
        use_ipv6:       Boolean; to use IPv6 or not
927
 
        ----
928
 
        clients:        set of Client objects
929
 
        gnutls_priority GnuTLS priority string
930
 
        use_dbus:       Boolean; to emit D-Bus signals or not
931
1384
    """
932
1385
    def __init__(self, server_address, RequestHandlerClass,
933
1386
                 interface=None, use_ipv6=True):
990
1443
        clients:        set of Client objects
991
1444
        gnutls_priority GnuTLS priority string
992
1445
        use_dbus:       Boolean; to emit D-Bus signals or not
 
1446
    
 
1447
    Assumes a gobject.MainLoop event loop.
993
1448
    """
994
1449
    def __init__(self, server_address, RequestHandlerClass,
995
1450
                 interface=None, use_ipv6=True, clients=None,
996
1451
                 gnutls_priority=None, use_dbus=True):
997
1452
        self.enabled = False
998
1453
        self.clients = clients
 
1454
        if self.clients is None:
 
1455
            self.clients = set()
999
1456
        self.use_dbus = use_dbus
1000
1457
        self.gnutls_priority = gnutls_priority
1001
1458
        IPv6_TCPServer.__init__(self, server_address,
1007
1464
            return socketserver.TCPServer.server_activate(self)
1008
1465
    def enable(self):
1009
1466
        self.enabled = True
1010
 
    def handle_ipc(self, source, condition, file_objects={}):
 
1467
    def add_pipe(self, parent_pipe):
 
1468
        # Call "handle_ipc" for both data and EOF events
 
1469
        gobject.io_add_watch(parent_pipe.fileno(),
 
1470
                             gobject.IO_IN | gobject.IO_HUP,
 
1471
                             functools.partial(self.handle_ipc,
 
1472
                                               parent_pipe = parent_pipe))
 
1473
        
 
1474
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1475
                   client_object=None):
1011
1476
        condition_names = {
1012
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1013
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1024
1489
                                       if cond & condition)
1025
1490
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1026
1491
                     conditions_string)
1027
 
        
1028
 
        # Turn the pipe file descriptor into a Python file object
1029
 
        if source not in file_objects:
1030
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1031
 
        
1032
 
        # Read a line from the file object
1033
 
        cmdline = file_objects[source].readline()
1034
 
        if not cmdline:             # Empty line means end of file
1035
 
            # close the IPC pipe
1036
 
            file_objects[source].close()
1037
 
            del file_objects[source]
1038
 
            
1039
 
            # Stop calling this function
1040
 
            return False
1041
 
        
1042
 
        logger.debug(u"IPC command: %r", cmdline)
1043
 
        
1044
 
        # Parse and act on command
1045
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1046
 
        
1047
 
        if cmd == u"NOTFOUND":
1048
 
            logger.warning(u"Client not found for fingerprint: %s",
1049
 
                           args)
1050
 
            if self.use_dbus:
1051
 
                # Emit D-Bus signal
1052
 
                mandos_dbus_service.ClientNotFound(args)
1053
 
        elif cmd == u"INVALID":
1054
 
            for client in self.clients:
1055
 
                if client.name == args:
1056
 
                    logger.warning(u"Client %s is invalid", args)
1057
 
                    if self.use_dbus:
1058
 
                        # Emit D-Bus signal
1059
 
                        client.Rejected()
1060
 
                    break
1061
 
            else:
1062
 
                logger.error(u"Unknown client %s is invalid", args)
1063
 
        elif cmd == u"SENDING":
1064
 
            for client in self.clients:
1065
 
                if client.name == args:
1066
 
                    logger.info(u"Sending secret to %s", client.name)
1067
 
                    client.checked_ok()
1068
 
                    if self.use_dbus:
1069
 
                        # Emit D-Bus signal
1070
 
                        client.ReceivedSecret()
1071
 
                    break
1072
 
            else:
1073
 
                logger.error(u"Sending secret to unknown client %s",
1074
 
                             args)
1075
 
        else:
1076
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1077
 
        
1078
 
        # Keep calling this function
 
1492
 
 
1493
        # error or the other end of multiprocessing.Pipe has closed
 
1494
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1495
            return False
 
1496
        
 
1497
        # Read a request from the child
 
1498
        request = parent_pipe.recv()
 
1499
        logger.debug(u"IPC request: %s", repr(request))
 
1500
        command = request[0]
 
1501
        
 
1502
        if command == 'init':
 
1503
            fpr = request[1]
 
1504
            address = request[2]
 
1505
            
 
1506
            for c in self.clients:
 
1507
                if c.fingerprint == fpr:
 
1508
                    client = c
 
1509
                    break
 
1510
            else:
 
1511
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1512
                               u"dress: %s", fpr, address)
 
1513
                if self.use_dbus:
 
1514
                    # Emit D-Bus signal
 
1515
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1516
                parent_pipe.send(False)
 
1517
                return False
 
1518
            
 
1519
            gobject.io_add_watch(parent_pipe.fileno(),
 
1520
                                 gobject.IO_IN | gobject.IO_HUP,
 
1521
                                 functools.partial(self.handle_ipc,
 
1522
                                                   parent_pipe = parent_pipe,
 
1523
                                                   client_object = client))
 
1524
            parent_pipe.send(True)
 
1525
            # remove the old hook in favor of the new above hook on same fileno
 
1526
            return False
 
1527
        if command == 'funcall':
 
1528
            funcname = request[1]
 
1529
            args = request[2]
 
1530
            kwargs = request[3]
 
1531
            
 
1532
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1533
 
 
1534
        if command == 'getattr':
 
1535
            attrname = request[1]
 
1536
            if callable(client_object.__getattribute__(attrname)):
 
1537
                parent_pipe.send(('function',))
 
1538
            else:
 
1539
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1540
        
 
1541
        if command == 'setattr':
 
1542
            attrname = request[1]
 
1543
            value = request[2]
 
1544
            setattr(client_object, attrname, value)
 
1545
 
1079
1546
        return True
1080
1547
 
1081
1548
 
1111
1578
            elif suffix == u"w":
1112
1579
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1113
1580
            else:
1114
 
                raise ValueError
1115
 
        except (ValueError, IndexError):
1116
 
            raise ValueError
 
1581
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1582
        except (ValueError, IndexError), e:
 
1583
            raise ValueError(e.message)
1117
1584
        timevalue += delta
1118
1585
    return timevalue
1119
1586
 
1132
1599
        def if_nametoindex(interface):
1133
1600
            "Get an interface index the hard way, i.e. using fcntl()"
1134
1601
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1135
 
            with closing(socket.socket()) as s:
 
1602
            with contextlib.closing(socket.socket()) as s:
1136
1603
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1137
1604
                                    struct.pack(str(u"16s16x"),
1138
1605
                                                interface))
1158
1625
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1159
1626
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1160
1627
            raise OSError(errno.ENODEV,
1161
 
                          u"/dev/null not a character device")
 
1628
                          u"%s not a character device"
 
1629
                          % os.path.devnull)
1162
1630
        os.dup2(null, sys.stdin.fileno())
1163
1631
        os.dup2(null, sys.stdout.fileno())
1164
1632
        os.dup2(null, sys.stderr.fileno())
1168
1636
 
1169
1637
def main():
1170
1638
    
1171
 
    ######################################################################
 
1639
    ##################################################################
1172
1640
    # Parsing of options, both command line and config file
1173
1641
    
1174
1642
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1183
1651
    parser.add_option("--debug", action=u"store_true",
1184
1652
                      help=u"Debug mode; run in foreground and log to"
1185
1653
                      u" terminal")
 
1654
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1655
                      help=u"Debug level for stdout output")
1186
1656
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1187
1657
                      u" priority string (see GnuTLS documentation)")
1188
1658
    parser.add_option("--servicename", type=u"string",
1213
1683
                        u"servicename": u"Mandos",
1214
1684
                        u"use_dbus": u"True",
1215
1685
                        u"use_ipv6": u"True",
 
1686
                        u"debuglevel": u"",
1216
1687
                        }
1217
1688
    
1218
1689
    # Parse config file for server-global settings
1235
1706
    # options, if set.
1236
1707
    for option in (u"interface", u"address", u"port", u"debug",
1237
1708
                   u"priority", u"servicename", u"configdir",
1238
 
                   u"use_dbus", u"use_ipv6"):
 
1709
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1239
1710
        value = getattr(options, option)
1240
1711
        if value is not None:
1241
1712
            server_settings[option] = value
1250
1721
    
1251
1722
    # For convenience
1252
1723
    debug = server_settings[u"debug"]
 
1724
    debuglevel = server_settings[u"debuglevel"]
1253
1725
    use_dbus = server_settings[u"use_dbus"]
1254
1726
    use_ipv6 = server_settings[u"use_ipv6"]
1255
 
    
1256
 
    if not debug:
1257
 
        syslogger.setLevel(logging.WARNING)
1258
 
        console.setLevel(logging.WARNING)
1259
 
    
 
1727
 
1260
1728
    if server_settings[u"servicename"] != u"Mandos":
1261
1729
        syslogger.setFormatter(logging.Formatter
1262
1730
                               (u'Mandos (%s) [%%(process)d]:'
1268
1736
                        u"interval": u"5m",
1269
1737
                        u"checker": u"fping -q -- %%(host)s",
1270
1738
                        u"host": u"",
 
1739
                        u"approval_delay": u"0s",
 
1740
                        u"approval_duration": u"1s",
1271
1741
                        }
1272
1742
    client_config = configparser.SafeConfigParser(client_defaults)
1273
1743
    client_config.read(os.path.join(server_settings[u"configdir"],
1276
1746
    global mandos_dbus_service
1277
1747
    mandos_dbus_service = None
1278
1748
    
1279
 
    clients = set()
1280
1749
    tcp_server = MandosServer((server_settings[u"address"],
1281
1750
                               server_settings[u"port"]),
1282
1751
                              ClientHandler,
1283
 
                              interface=server_settings[u"interface"],
 
1752
                              interface=(server_settings[u"interface"]
 
1753
                                         or None),
1284
1754
                              use_ipv6=use_ipv6,
1285
 
                              clients=clients,
1286
1755
                              gnutls_priority=
1287
1756
                              server_settings[u"priority"],
1288
1757
                              use_dbus=use_dbus)
1313
1782
        if error[0] != errno.EPERM:
1314
1783
            raise error
1315
1784
    
1316
 
    # Enable all possible GnuTLS debugging
 
1785
    if not debug and not debuglevel:
 
1786
        syslogger.setLevel(logging.WARNING)
 
1787
        console.setLevel(logging.WARNING)
 
1788
    if debuglevel:
 
1789
        level = getattr(logging, debuglevel.upper())
 
1790
        syslogger.setLevel(level)
 
1791
        console.setLevel(level)
 
1792
 
1317
1793
    if debug:
 
1794
        # Enable all possible GnuTLS debugging
 
1795
        
1318
1796
        # "Use a log level over 10 to enable all debugging options."
1319
1797
        # - GnuTLS manual
1320
1798
        gnutls.library.functions.gnutls_global_set_log_level(11)
1325
1803
        
1326
1804
        (gnutls.library.functions
1327
1805
         .gnutls_global_set_log_function(debug_gnutls))
 
1806
        
 
1807
        # Redirect stdin so all checkers get /dev/null
 
1808
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1809
        os.dup2(null, sys.stdin.fileno())
 
1810
        if null > 2:
 
1811
            os.close(null)
 
1812
    else:
 
1813
        # No console logging
 
1814
        logger.removeHandler(console)
 
1815
    
1328
1816
    
1329
1817
    global main_loop
1330
1818
    # From the Avahi example code
1333
1821
    bus = dbus.SystemBus()
1334
1822
    # End of Avahi example code
1335
1823
    if use_dbus:
1336
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1824
        try:
 
1825
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1826
                                            bus, do_not_queue=True)
 
1827
        except dbus.exceptions.NameExistsException, e:
 
1828
            logger.error(unicode(e) + u", disabling D-Bus")
 
1829
            use_dbus = False
 
1830
            server_settings[u"use_dbus"] = False
 
1831
            tcp_server.use_dbus = False
1337
1832
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1338
1833
    service = AvahiService(name = server_settings[u"servicename"],
1339
1834
                           servicetype = u"_mandos._tcp",
1341
1836
    if server_settings["interface"]:
1342
1837
        service.interface = (if_nametoindex
1343
1838
                             (str(server_settings[u"interface"])))
 
1839
 
 
1840
    if not debug:
 
1841
        # Close all input and output, do double fork, etc.
 
1842
        daemon()
 
1843
        
 
1844
    global multiprocessing_manager
 
1845
    multiprocessing_manager = multiprocessing.Manager()
1344
1846
    
1345
1847
    client_class = Client
1346
1848
    if use_dbus:
1347
1849
        client_class = functools.partial(ClientDBus, bus = bus)
1348
 
    clients.update(set(
 
1850
    def client_config_items(config, section):
 
1851
        special_settings = {
 
1852
            "approved_by_default":
 
1853
                lambda: config.getboolean(section,
 
1854
                                          "approved_by_default"),
 
1855
            }
 
1856
        for name, value in config.items(section):
 
1857
            try:
 
1858
                yield (name, special_settings[name]())
 
1859
            except KeyError:
 
1860
                yield (name, value)
 
1861
    
 
1862
    tcp_server.clients.update(set(
1349
1863
            client_class(name = section,
1350
 
                         config= dict(client_config.items(section)))
 
1864
                         config= dict(client_config_items(
 
1865
                        client_config, section)))
1351
1866
            for section in client_config.sections()))
1352
 
    if not clients:
 
1867
    if not tcp_server.clients:
1353
1868
        logger.warning(u"No clients defined")
1354
 
    
1355
 
    if debug:
1356
 
        # Redirect stdin so all checkers get /dev/null
1357
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1358
 
        os.dup2(null, sys.stdin.fileno())
1359
 
        if null > 2:
1360
 
            os.close(null)
1361
 
    else:
1362
 
        # No console logging
1363
 
        logger.removeHandler(console)
1364
 
        # Close all input and output, do double fork, etc.
1365
 
        daemon()
1366
 
    
 
1869
        
1367
1870
    try:
1368
 
        with closing(pidfile):
 
1871
        with pidfile:
1369
1872
            pid = os.getpid()
1370
1873
            pidfile.write(str(pid) + "\n")
1371
1874
        del pidfile
1377
1880
        pass
1378
1881
    del pidfilename
1379
1882
    
1380
 
    def cleanup():
1381
 
        "Cleanup function; run on exit"
1382
 
        service.cleanup()
1383
 
        
1384
 
        while clients:
1385
 
            client = clients.pop()
1386
 
            client.disable_hook = None
1387
 
            client.disable()
1388
 
    
1389
 
    atexit.register(cleanup)
1390
 
    
1391
1883
    if not debug:
1392
1884
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1393
1885
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1400
1892
                dbus.service.Object.__init__(self, bus, u"/")
1401
1893
            _interface = u"se.bsnet.fukt.Mandos"
1402
1894
            
1403
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1404
 
            def ClientAdded(self, objpath, properties):
 
1895
            @dbus.service.signal(_interface, signature=u"o")
 
1896
            def ClientAdded(self, objpath):
1405
1897
                "D-Bus signal"
1406
1898
                pass
1407
1899
            
1408
 
            @dbus.service.signal(_interface, signature=u"s")
1409
 
            def ClientNotFound(self, fingerprint):
 
1900
            @dbus.service.signal(_interface, signature=u"ss")
 
1901
            def ClientNotFound(self, fingerprint, address):
1410
1902
                "D-Bus signal"
1411
1903
                pass
1412
1904
            
1418
1910
            @dbus.service.method(_interface, out_signature=u"ao")
1419
1911
            def GetAllClients(self):
1420
1912
                "D-Bus method"
1421
 
                return dbus.Array(c.dbus_object_path for c in clients)
 
1913
                return dbus.Array(c.dbus_object_path
 
1914
                                  for c in tcp_server.clients)
1422
1915
            
1423
1916
            @dbus.service.method(_interface,
1424
1917
                                 out_signature=u"a{oa{sv}}")
1425
1918
            def GetAllClientsWithProperties(self):
1426
1919
                "D-Bus method"
1427
1920
                return dbus.Dictionary(
1428
 
                    ((c.dbus_object_path, c.GetAllProperties())
1429
 
                     for c in clients),
 
1921
                    ((c.dbus_object_path, c.GetAll(u""))
 
1922
                     for c in tcp_server.clients),
1430
1923
                    signature=u"oa{sv}")
1431
1924
            
1432
1925
            @dbus.service.method(_interface, in_signature=u"o")
1433
1926
            def RemoveClient(self, object_path):
1434
1927
                "D-Bus method"
1435
 
                for c in clients:
 
1928
                for c in tcp_server.clients:
1436
1929
                    if c.dbus_object_path == object_path:
1437
 
                        clients.remove(c)
 
1930
                        tcp_server.clients.remove(c)
1438
1931
                        c.remove_from_connection()
1439
1932
                        # Don't signal anything except ClientRemoved
1440
 
                        c.disable(signal=False)
 
1933
                        c.disable(quiet=True)
1441
1934
                        # Emit D-Bus signal
1442
1935
                        self.ClientRemoved(object_path, c.name)
1443
1936
                        return
1444
 
                raise KeyError
 
1937
                raise KeyError(object_path)
1445
1938
            
1446
1939
            del _interface
1447
1940
        
1448
1941
        mandos_dbus_service = MandosDBusService()
1449
1942
    
1450
 
    for client in clients:
 
1943
    def cleanup():
 
1944
        "Cleanup function; run on exit"
 
1945
        service.cleanup()
 
1946
        
 
1947
        while tcp_server.clients:
 
1948
            client = tcp_server.clients.pop()
 
1949
            if use_dbus:
 
1950
                client.remove_from_connection()
 
1951
            client.disable_hook = None
 
1952
            # Don't signal anything except ClientRemoved
 
1953
            client.disable(quiet=True)
 
1954
            if use_dbus:
 
1955
                # Emit D-Bus signal
 
1956
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
1957
                                                  client.name)
 
1958
    
 
1959
    atexit.register(cleanup)
 
1960
    
 
1961
    for client in tcp_server.clients:
1451
1962
        if use_dbus:
1452
1963
            # Emit D-Bus signal
1453
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1454
 
                                            client.GetAllProperties())
 
1964
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1455
1965
        client.enable()
1456
1966
    
1457
1967
    tcp_server.enable()
1475
1985
            service.activate()
1476
1986
        except dbus.exceptions.DBusException, error:
1477
1987
            logger.critical(u"DBusException: %s", error)
 
1988
            cleanup()
1478
1989
            sys.exit(1)
1479
1990
        # End of Avahi example code
1480
1991
        
1487
1998
        main_loop.run()
1488
1999
    except AvahiError, error:
1489
2000
        logger.critical(u"AvahiError: %s", error)
 
2001
        cleanup()
1490
2002
        sys.exit(1)
1491
2003
    except KeyboardInterrupt:
1492
2004
        if debug:
1493
2005
            print >> sys.stderr
1494
2006
        logger.debug(u"Server received KeyboardInterrupt")
1495
2007
    logger.debug(u"Server exiting")
 
2008
    # Must run before the D-Bus bus name gets deregistered
 
2009
    cleanup()
1496
2010
 
1497
2011
if __name__ == '__main__':
1498
2012
    main()