290
230
        if config is None:
 
292
232
        logger.debug(u"Creating client %r", self.name)
 
 
233
        self.use_dbus = False   # During __init__
 
293
234
        # Uppercase and remove spaces from fingerprint for later
 
294
235
        # comparison purposes with return value from the fingerprint()
 
296
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
 
237
        self.fingerprint = (config["fingerprint"].upper()
 
297
238
                            .replace(u" ", u""))
 
298
239
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
299
 
        if u"secret" in config:
 
300
 
            self.secret = config[u"secret"].decode(u"base64")
 
301
 
        elif u"secfile" in config:
 
302
 
            with open(os.path.expanduser(os.path.expandvars
 
303
 
                                         (config[u"secfile"])),
 
 
240
        if "secret" in config:
 
 
241
            self.secret = config["secret"].decode(u"base64")
 
 
242
        elif "secfile" in config:
 
 
243
            with closing(open(os.path.expanduser
 
 
245
                               (config["secfile"])))) as secfile:
 
305
246
                self.secret = secfile.read()
 
307
248
            raise TypeError(u"No secret or secfile for client %s"
 
309
 
        self.host = config.get(u"host", u"")
 
 
250
        self.host = config.get("host", "")
 
310
251
        self.created = datetime.datetime.utcnow()
 
311
252
        self.enabled = False
 
312
253
        self.last_enabled = None
 
313
254
        self.last_checked_ok = None
 
314
 
        self.timeout = string_to_delta(config[u"timeout"])
 
315
 
        self.interval = string_to_delta(config[u"interval"])
 
 
255
        self.timeout = string_to_delta(config["timeout"])
 
 
256
        self.interval = string_to_delta(config["interval"])
 
316
257
        self.disable_hook = disable_hook
 
317
258
        self.checker = None
 
318
259
        self.checker_initiator_tag = None
 
319
260
        self.disable_initiator_tag = None
 
320
261
        self.checker_callback_tag = None
 
321
 
        self.checker_command = config[u"checker"]
 
 
262
        self.checker_command = config["checker"]
 
322
263
        self.current_checker_command = None
 
323
264
        self.last_connect = None
 
324
 
        self._approved = None
 
325
 
        self.approved_by_default = config.get(u"approved_by_default",
 
327
 
        self.approvals_pending = 0
 
328
 
        self.approved_delay = string_to_delta(
 
329
 
            config[u"approved_delay"])
 
330
 
        self.approved_duration = string_to_delta(
 
331
 
            config[u"approved_duration"])
 
332
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
 
265
        # Only now, when this client is initialized, can it show up on
 
 
267
        self.use_dbus = use_dbus
 
 
269
            self.dbus_object_path = (dbus.ObjectPath
 
 
271
                                      + self.name.replace(".", "_")))
 
 
272
            dbus.service.Object.__init__(self, bus,
 
 
273
                                         self.dbus_object_path)
 
334
 
    def send_changedstate(self):
 
335
 
        self.changedstate.acquire()
 
336
 
        self.changedstate.notify_all()
 
337
 
        self.changedstate.release()
 
339
275
    def enable(self):
 
340
276
        """Start this client's checker and timeout hooks"""
 
341
 
        if getattr(self, u"enabled", False):
 
344
 
        self.send_changedstate()
 
345
277
        self.last_enabled = datetime.datetime.utcnow()
 
346
278
        # Schedule a new checker to be started an 'interval' from now,
 
347
279
        # and every interval from then on.
 
348
280
        self.checker_initiator_tag = (gobject.timeout_add
 
349
281
                                      (self.interval_milliseconds(),
 
350
282
                                       self.start_checker))
 
 
283
        # Also start a new checker *right now*.
 
351
285
        # Schedule a disable() when 'timeout' has passed
 
352
286
        self.disable_initiator_tag = (gobject.timeout_add
 
353
287
                                   (self.timeout_milliseconds(),
 
355
289
        self.enabled = True
 
356
 
        # Also start a new checker *right now*.
 
 
292
            self.PropertyChanged(dbus.String(u"enabled"),
 
 
293
                                 dbus.Boolean(True, variant_level=1))
 
 
294
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
 
295
                                 (_datetime_to_dbus(self.last_enabled,
 
359
 
    def disable(self, quiet=True):
 
360
299
        """Disable this client."""
 
361
300
        if not getattr(self, "enabled", False):
 
364
 
            self.send_changedstate()
 
366
 
            logger.info(u"Disabling client %s", self.name)
 
367
 
        if getattr(self, u"disable_initiator_tag", False):
 
 
302
        logger.info(u"Disabling client %s", self.name)
 
 
303
        if getattr(self, "disable_initiator_tag", False):
 
368
304
            gobject.source_remove(self.disable_initiator_tag)
 
369
305
            self.disable_initiator_tag = None
 
370
 
        if getattr(self, u"checker_initiator_tag", False):
 
 
306
        if getattr(self, "checker_initiator_tag", False):
 
371
307
            gobject.source_remove(self.checker_initiator_tag)
 
372
308
            self.checker_initiator_tag = None
 
373
309
        self.stop_checker()
 
374
310
        if self.disable_hook:
 
375
311
            self.disable_hook(self)
 
376
312
        self.enabled = False
 
 
315
            self.PropertyChanged(dbus.String(u"enabled"),
 
 
316
                                 dbus.Boolean(False, variant_level=1))
 
377
317
        # Do not run this again if called by a gobject.timeout_add
 
 
488
444
        if self.checker_callback_tag:
 
489
445
            gobject.source_remove(self.checker_callback_tag)
 
490
446
            self.checker_callback_tag = None
 
491
 
        if getattr(self, u"checker", None) is None:
 
 
447
        if getattr(self, "checker", None) is None:
 
493
449
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
495
451
            os.kill(self.checker.pid, signal.SIGTERM)
 
497
453
            #if self.checker.poll() is None:
 
498
454
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
499
455
        except OSError, error:
 
500
456
            if error.errno != errno.ESRCH: # No such process
 
502
458
        self.checker = None
 
504
 
def dbus_service_property(dbus_interface, signature=u"v",
 
505
 
                          access=u"readwrite", byte_arrays=False):
 
506
 
    """Decorators for marking methods of a DBusObjectWithProperties to
 
507
 
    become properties on the D-Bus.
 
509
 
    The decorated method will be called with no arguments by "Get"
 
510
 
    and with one argument by "Set".
 
512
 
    The parameters, where they are supported, are the same as
 
513
 
    dbus.service.method, except there is only "signature", since the
 
514
 
    type from Get() and the type sent to Set() is the same.
 
516
 
    # Encoding deeply encoded byte arrays is not supported yet by the
 
517
 
    # "Set" method, so we fail early here:
 
518
 
    if byte_arrays and signature != u"ay":
 
519
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
520
 
                         u" signature %r" % signature)
 
522
 
        func._dbus_is_property = True
 
523
 
        func._dbus_interface = dbus_interface
 
524
 
        func._dbus_signature = signature
 
525
 
        func._dbus_access = access
 
526
 
        func._dbus_name = func.__name__
 
527
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
528
 
            func._dbus_name = func._dbus_name[:-14]
 
529
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
534
 
class DBusPropertyException(dbus.exceptions.DBusException):
 
535
 
    """A base class for D-Bus property-related exceptions
 
537
 
    def __unicode__(self):
 
538
 
        return unicode(str(self))
 
541
 
class DBusPropertyAccessException(DBusPropertyException):
 
542
 
    """A property's access permissions disallows an operation.
 
547
 
class DBusPropertyNotFound(DBusPropertyException):
 
548
 
    """An attempt was made to access a non-existing property.
 
553
 
class DBusObjectWithProperties(dbus.service.Object):
 
554
 
    """A D-Bus object with properties.
 
556
 
    Classes inheriting from this can use the dbus_service_property
 
557
 
    decorator to expose methods as D-Bus properties.  It exposes the
 
558
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
562
 
    def _is_dbus_property(obj):
 
563
 
        return getattr(obj, u"_dbus_is_property", False)
 
565
 
    def _get_all_dbus_properties(self):
 
566
 
        """Returns a generator of (name, attribute) pairs
 
568
 
        return ((prop._dbus_name, prop)
 
570
 
                inspect.getmembers(self, self._is_dbus_property))
 
572
 
    def _get_dbus_property(self, interface_name, property_name):
 
573
 
        """Returns a bound method if one exists which is a D-Bus
 
574
 
        property with the specified name and interface.
 
576
 
        for name in (property_name,
 
577
 
                     property_name + u"_dbus_property"):
 
578
 
            prop = getattr(self, name, None)
 
580
 
                or not self._is_dbus_property(prop)
 
581
 
                or prop._dbus_name != property_name
 
582
 
                or (interface_name and prop._dbus_interface
 
583
 
                    and interface_name != prop._dbus_interface)):
 
587
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
588
 
                                   + interface_name + u"."
 
591
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
593
 
    def Get(self, interface_name, property_name):
 
594
 
        """Standard D-Bus property Get() method, see D-Bus standard.
 
596
 
        prop = self._get_dbus_property(interface_name, property_name)
 
597
 
        if prop._dbus_access == u"write":
 
598
 
            raise DBusPropertyAccessException(property_name)
 
600
 
        if not hasattr(value, u"variant_level"):
 
602
 
        return type(value)(value, variant_level=value.variant_level+1)
 
604
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
605
 
    def Set(self, interface_name, property_name, value):
 
606
 
        """Standard D-Bus property Set() method, see D-Bus standard.
 
608
 
        prop = self._get_dbus_property(interface_name, property_name)
 
609
 
        if prop._dbus_access == u"read":
 
610
 
            raise DBusPropertyAccessException(property_name)
 
611
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
612
 
            # The byte_arrays option is not supported yet on
 
613
 
            # signatures other than "ay".
 
614
 
            if prop._dbus_signature != u"ay":
 
616
 
            value = dbus.ByteArray(''.join(unichr(byte)
 
620
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
621
 
                         out_signature=u"a{sv}")
 
622
 
    def GetAll(self, interface_name):
 
623
 
        """Standard D-Bus property GetAll() method, see D-Bus
 
626
 
        Note: Will not include properties with access="write".
 
629
 
        for name, prop in self._get_all_dbus_properties():
 
631
 
                and interface_name != prop._dbus_interface):
 
632
 
                # Interface non-empty but did not match
 
634
 
            # Ignore write-only properties
 
635
 
            if prop._dbus_access == u"write":
 
638
 
            if not hasattr(value, u"variant_level"):
 
641
 
            all[name] = type(value)(value, variant_level=
 
642
 
                                    value.variant_level+1)
 
643
 
        return dbus.Dictionary(all, signature=u"sv")
 
645
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
647
 
                         path_keyword='object_path',
 
648
 
                         connection_keyword='connection')
 
649
 
    def Introspect(self, object_path, connection):
 
650
 
        """Standard D-Bus method, overloaded to insert property tags.
 
652
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
655
 
            document = xml.dom.minidom.parseString(xmlstring)
 
656
 
            def make_tag(document, name, prop):
 
657
 
                e = document.createElement(u"property")
 
658
 
                e.setAttribute(u"name", name)
 
659
 
                e.setAttribute(u"type", prop._dbus_signature)
 
660
 
                e.setAttribute(u"access", prop._dbus_access)
 
662
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
663
 
                for tag in (make_tag(document, name, prop)
 
665
 
                            in self._get_all_dbus_properties()
 
666
 
                            if prop._dbus_interface
 
667
 
                            == if_tag.getAttribute(u"name")):
 
668
 
                    if_tag.appendChild(tag)
 
669
 
                # Add the names to the return values for the
 
670
 
                # "org.freedesktop.DBus.Properties" methods
 
671
 
                if (if_tag.getAttribute(u"name")
 
672
 
                    == u"org.freedesktop.DBus.Properties"):
 
673
 
                    for cn in if_tag.getElementsByTagName(u"method"):
 
674
 
                        if cn.getAttribute(u"name") == u"Get":
 
675
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
676
 
                                if (arg.getAttribute(u"direction")
 
678
 
                                    arg.setAttribute(u"name", u"value")
 
679
 
                        elif cn.getAttribute(u"name") == u"GetAll":
 
680
 
                            for arg in cn.getElementsByTagName(u"arg"):
 
681
 
                                if (arg.getAttribute(u"direction")
 
683
 
                                    arg.setAttribute(u"name", u"props")
 
684
 
            xmlstring = document.toxml(u"utf-8")
 
686
 
        except (AttributeError, xml.dom.DOMException,
 
687
 
                xml.parsers.expat.ExpatError), error:
 
688
 
            logger.error(u"Failed to override Introspection method",
 
693
 
class ClientDBus(Client, DBusObjectWithProperties):
 
694
 
    """A Client class using D-Bus
 
697
 
    dbus_object_path: dbus.ObjectPath
 
698
 
    bus: dbus.SystemBus()
 
700
 
    # dbus.service.Object doesn't use super(), so we can't either.
 
702
 
    def __init__(self, bus = None, *args, **kwargs):
 
703
 
        self._approvals_pending = 0
 
705
 
        Client.__init__(self, *args, **kwargs)
 
706
 
        # Only now, when this client is initialized, can it show up on
 
708
 
        self.dbus_object_path = (dbus.ObjectPath
 
710
 
                                  + self.name.replace(u".", u"_")))
 
711
 
        DBusObjectWithProperties.__init__(self, self.bus,
 
712
 
                                          self.dbus_object_path)
 
714
 
    def _get_approvals_pending(self):
 
715
 
        return self._approvals_pending
 
716
 
    def _set_approvals_pending(self, value):
 
717
 
        old_value = self._approvals_pending
 
718
 
        self._approvals_pending = value
 
720
 
        if (hasattr(self, "dbus_object_path")
 
721
 
            and bval is not bool(old_value)):
 
722
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
723
 
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
726
 
    approvals_pending = property(_get_approvals_pending,
 
727
 
                                 _set_approvals_pending)
 
728
 
    del _get_approvals_pending, _set_approvals_pending
 
731
 
    def _datetime_to_dbus(dt, variant_level=0):
 
732
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
733
 
        return dbus.String(dt.isoformat(),
 
734
 
                           variant_level=variant_level)
 
737
 
        oldstate = getattr(self, u"enabled", False)
 
738
 
        r = Client.enable(self)
 
739
 
        if oldstate != self.enabled:
 
741
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
742
 
                                 dbus.Boolean(True, variant_level=1))
 
743
 
            self.PropertyChanged(
 
744
 
                dbus.String(u"last_enabled"),
 
745
 
                self._datetime_to_dbus(self.last_enabled,
 
749
 
    def disable(self, quiet = False):
 
750
 
        oldstate = getattr(self, u"enabled", False)
 
751
 
        r = Client.disable(self, quiet=quiet)
 
752
 
        if not quiet and oldstate != self.enabled:
 
754
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
755
 
                                 dbus.Boolean(False, variant_level=1))
 
758
 
    def __del__(self, *args, **kwargs):
 
760
 
            self.remove_from_connection()
 
763
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
764
 
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
765
 
        Client.__del__(self, *args, **kwargs)
 
767
 
    def checker_callback(self, pid, condition, command,
 
769
 
        self.checker_callback_tag = None
 
772
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
773
 
                             dbus.Boolean(False, variant_level=1))
 
774
 
        if os.WIFEXITED(condition):
 
775
 
            exitstatus = os.WEXITSTATUS(condition)
 
777
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
778
 
                                  dbus.Int64(condition),
 
779
 
                                  dbus.String(command))
 
782
 
            self.CheckerCompleted(dbus.Int16(-1),
 
783
 
                                  dbus.Int64(condition),
 
784
 
                                  dbus.String(command))
 
786
 
        return Client.checker_callback(self, pid, condition, command,
 
789
 
    def checked_ok(self, *args, **kwargs):
 
790
 
        r = Client.checked_ok(self, *args, **kwargs)
 
792
 
        self.PropertyChanged(
 
793
 
            dbus.String(u"last_checked_ok"),
 
794
 
            (self._datetime_to_dbus(self.last_checked_ok,
 
798
 
    def start_checker(self, *args, **kwargs):
 
799
 
        old_checker = self.checker
 
800
 
        if self.checker is not None:
 
801
 
            old_checker_pid = self.checker.pid
 
803
 
            old_checker_pid = None
 
804
 
        r = Client.start_checker(self, *args, **kwargs)
 
805
 
        # Only if new checker process was started
 
806
 
        if (self.checker is not None
 
807
 
            and old_checker_pid != self.checker.pid):
 
809
 
            self.CheckerStarted(self.current_checker_command)
 
810
 
            self.PropertyChanged(
 
811
 
                dbus.String(u"checker_running"),
 
812
 
                dbus.Boolean(True, variant_level=1))
 
815
 
    def stop_checker(self, *args, **kwargs):
 
816
 
        old_checker = getattr(self, u"checker", None)
 
817
 
        r = Client.stop_checker(self, *args, **kwargs)
 
818
 
        if (old_checker is not None
 
819
 
            and getattr(self, u"checker", None) is None):
 
820
460
            self.PropertyChanged(dbus.String(u"checker_running"),
 
821
461
                                 dbus.Boolean(False, variant_level=1))
 
824
 
    def _reset_approved(self):
 
825
 
        self._approved = None
 
828
 
    def approve(self, value=True):
 
829
 
        self.send_changedstate()
 
830
 
        self._approved = value
 
831
 
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
 
832
 
                            self._reset_approved)
 
835
 
    ## D-Bus methods, signals & properties
 
 
463
    def still_valid(self):
 
 
464
        """Has the timeout not yet passed for this client?"""
 
 
465
        if not getattr(self, "enabled", False):
 
 
467
        now = datetime.datetime.utcnow()
 
 
468
        if self.last_checked_ok is None:
 
 
469
            return now < (self.created + self.timeout)
 
 
471
            return now < (self.last_checked_ok + self.timeout)
 
 
473
    ## D-Bus methods & signals
 
836
474
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
 
477
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
 
478
    CheckedOK.__name__ = "CheckedOK"
 
840
480
    # CheckerCompleted - signal
 
841
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
 
481
    @dbus.service.signal(_interface, signature="nxs")
 
842
482
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
846
486
    # CheckerStarted - signal
 
847
 
    @dbus.service.signal(_interface, signature=u"s")
 
 
487
    @dbus.service.signal(_interface, signature="s")
 
848
488
    def CheckerStarted(self, command):
 
 
492
    # GetAllProperties - method
 
 
493
    @dbus.service.method(_interface, out_signature="a{sv}")
 
 
494
    def GetAllProperties(self):
 
 
496
        return dbus.Dictionary({
 
 
498
                    dbus.String(self.name, variant_level=1),
 
 
499
                dbus.String("fingerprint"):
 
 
500
                    dbus.String(self.fingerprint, variant_level=1),
 
 
502
                    dbus.String(self.host, variant_level=1),
 
 
503
                dbus.String("created"):
 
 
504
                    _datetime_to_dbus(self.created, variant_level=1),
 
 
505
                dbus.String("last_enabled"):
 
 
506
                    (_datetime_to_dbus(self.last_enabled,
 
 
508
                     if self.last_enabled is not None
 
 
509
                     else dbus.Boolean(False, variant_level=1)),
 
 
510
                dbus.String("enabled"):
 
 
511
                    dbus.Boolean(self.enabled, variant_level=1),
 
 
512
                dbus.String("last_checked_ok"):
 
 
513
                    (_datetime_to_dbus(self.last_checked_ok,
 
 
515
                     if self.last_checked_ok is not None
 
 
516
                     else dbus.Boolean (False, variant_level=1)),
 
 
517
                dbus.String("timeout"):
 
 
518
                    dbus.UInt64(self.timeout_milliseconds(),
 
 
520
                dbus.String("interval"):
 
 
521
                    dbus.UInt64(self.interval_milliseconds(),
 
 
523
                dbus.String("checker"):
 
 
524
                    dbus.String(self.checker_command,
 
 
526
                dbus.String("checker_running"):
 
 
527
                    dbus.Boolean(self.checker is not None,
 
 
529
                dbus.String("object_path"):
 
 
530
                    dbus.ObjectPath(self.dbus_object_path,
 
 
534
    # IsStillValid - method
 
 
535
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
 
537
    IsStillValid.__name__ = "IsStillValid"
 
852
539
    # PropertyChanged - signal
 
853
 
    @dbus.service.signal(_interface, signature=u"sv")
 
 
540
    @dbus.service.signal(_interface, signature="sv")
 
854
541
    def PropertyChanged(self, property, value):
 
859
 
    @dbus.service.signal(_interface)
 
862
 
        Is sent after a successful transfer of secret from the Mandos
 
863
 
        server to mandos-client
 
868
 
    @dbus.service.signal(_interface, signature=u"s")
 
869
 
    def Rejected(self, reason):
 
873
 
    # NeedApproval - signal
 
874
 
    @dbus.service.signal(_interface, signature=u"db")
 
875
 
    def NeedApproval(self, timeout, default):
 
882
 
    @dbus.service.method(_interface, in_signature=u"b")
 
883
 
    def Approve(self, value):
 
887
 
    @dbus.service.method(_interface)
 
889
 
        return self.checked_ok()
 
 
545
    # SetChecker - method
 
 
546
    @dbus.service.method(_interface, in_signature="s")
 
 
547
    def SetChecker(self, checker):
 
 
548
        "D-Bus setter method"
 
 
549
        self.checker_command = checker
 
 
551
        self.PropertyChanged(dbus.String(u"checker"),
 
 
552
                             dbus.String(self.checker_command,
 
 
556
    @dbus.service.method(_interface, in_signature="s")
 
 
557
    def SetHost(self, host):
 
 
558
        "D-Bus setter method"
 
 
561
        self.PropertyChanged(dbus.String(u"host"),
 
 
562
                             dbus.String(self.host, variant_level=1))
 
 
564
    # SetInterval - method
 
 
565
    @dbus.service.method(_interface, in_signature="t")
 
 
566
    def SetInterval(self, milliseconds):
 
 
567
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
 
569
        self.PropertyChanged(dbus.String(u"interval"),
 
 
570
                             (dbus.UInt64(self.interval_milliseconds(),
 
 
574
    @dbus.service.method(_interface, in_signature="ay",
 
 
576
    def SetSecret(self, secret):
 
 
577
        "D-Bus setter method"
 
 
578
        self.secret = str(secret)
 
 
580
    # SetTimeout - method
 
 
581
    @dbus.service.method(_interface, in_signature="t")
 
 
582
    def SetTimeout(self, milliseconds):
 
 
583
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
 
585
        self.PropertyChanged(dbus.String(u"timeout"),
 
 
586
                             (dbus.UInt64(self.timeout_milliseconds(),
 
891
589
    # Enable - method
 
892
 
    @dbus.service.method(_interface)
 
 
590
    Enable = dbus.service.method(_interface)(enable)
 
 
591
    Enable.__name__ = "Enable"
 
897
593
    # StartChecker - method
 
898
594
    @dbus.service.method(_interface)
 
 
909
605
    # StopChecker - method
 
910
 
    @dbus.service.method(_interface)
 
911
 
    def StopChecker(self):
 
916
 
    # approved_pending - property
 
917
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
918
 
    def approved_pending_dbus_property(self):
 
919
 
        return dbus.Boolean(bool(self.approvals_pending))
 
921
 
    # approved_by_default - property
 
922
 
    @dbus_service_property(_interface, signature=u"b",
 
924
 
    def approved_by_default_dbus_property(self):
 
925
 
        return dbus.Boolean(self.approved_by_default)
 
927
 
    # approved_delay - property
 
928
 
    @dbus_service_property(_interface, signature=u"t",
 
930
 
    def approved_delay_dbus_property(self):
 
931
 
        return dbus.UInt64(self.approved_delay_milliseconds())
 
933
 
    # approved_duration - property
 
934
 
    @dbus_service_property(_interface, signature=u"t",
 
936
 
    def approved_duration_dbus_property(self):
 
937
 
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
938
 
                self.approved_duration))
 
941
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
942
 
    def name_dbus_property(self):
 
943
 
        return dbus.String(self.name)
 
945
 
    # fingerprint - property
 
946
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
947
 
    def fingerprint_dbus_property(self):
 
948
 
        return dbus.String(self.fingerprint)
 
951
 
    @dbus_service_property(_interface, signature=u"s",
 
953
 
    def host_dbus_property(self, value=None):
 
954
 
        if value is None:       # get
 
955
 
            return dbus.String(self.host)
 
958
 
        self.PropertyChanged(dbus.String(u"host"),
 
959
 
                             dbus.String(value, variant_level=1))
 
962
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
963
 
    def created_dbus_property(self):
 
964
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
966
 
    # last_enabled - property
 
967
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
968
 
    def last_enabled_dbus_property(self):
 
969
 
        if self.last_enabled is None:
 
970
 
            return dbus.String(u"")
 
971
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
974
 
    @dbus_service_property(_interface, signature=u"b",
 
976
 
    def enabled_dbus_property(self, value=None):
 
977
 
        if value is None:       # get
 
978
 
            return dbus.Boolean(self.enabled)
 
984
 
    # last_checked_ok - property
 
985
 
    @dbus_service_property(_interface, signature=u"s",
 
987
 
    def last_checked_ok_dbus_property(self, value=None):
 
988
 
        if value is not None:
 
991
 
        if self.last_checked_ok is None:
 
992
 
            return dbus.String(u"")
 
993
 
        return dbus.String(self._datetime_to_dbus(self
 
997
 
    @dbus_service_property(_interface, signature=u"t",
 
999
 
    def timeout_dbus_property(self, value=None):
 
1000
 
        if value is None:       # get
 
1001
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1002
 
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1004
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1005
 
                             dbus.UInt64(value, variant_level=1))
 
1006
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1008
 
        # Reschedule timeout
 
1009
 
        gobject.source_remove(self.disable_initiator_tag)
 
1010
 
        self.disable_initiator_tag = None
 
1011
 
        time_to_die = (self.
 
1012
 
                       _timedelta_to_milliseconds((self
 
1017
 
        if time_to_die <= 0:
 
1018
 
            # The timeout has passed
 
1021
 
            self.disable_initiator_tag = (gobject.timeout_add
 
1022
 
                                          (time_to_die, self.disable))
 
1024
 
    # interval - property
 
1025
 
    @dbus_service_property(_interface, signature=u"t",
 
1026
 
                           access=u"readwrite")
 
1027
 
    def interval_dbus_property(self, value=None):
 
1028
 
        if value is None:       # get
 
1029
 
            return dbus.UInt64(self.interval_milliseconds())
 
1030
 
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1032
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1033
 
                             dbus.UInt64(value, variant_level=1))
 
1034
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1036
 
        # Reschedule checker run
 
1037
 
        gobject.source_remove(self.checker_initiator_tag)
 
1038
 
        self.checker_initiator_tag = (gobject.timeout_add
 
1039
 
                                      (value, self.start_checker))
 
1040
 
        self.start_checker()    # Start one now, too
 
1042
 
    # checker - property
 
1043
 
    @dbus_service_property(_interface, signature=u"s",
 
1044
 
                           access=u"readwrite")
 
1045
 
    def checker_dbus_property(self, value=None):
 
1046
 
        if value is None:       # get
 
1047
 
            return dbus.String(self.checker_command)
 
1048
 
        self.checker_command = value
 
1050
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1051
 
                             dbus.String(self.checker_command,
 
1054
 
    # checker_running - property
 
1055
 
    @dbus_service_property(_interface, signature=u"b",
 
1056
 
                           access=u"readwrite")
 
1057
 
    def checker_running_dbus_property(self, value=None):
 
1058
 
        if value is None:       # get
 
1059
 
            return dbus.Boolean(self.checker is not None)
 
1061
 
            self.start_checker()
 
1065
 
    # object_path - property
 
1066
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1067
 
    def object_path_dbus_property(self):
 
1068
 
        return self.dbus_object_path # is already a dbus.ObjectPath
 
1071
 
    @dbus_service_property(_interface, signature=u"ay",
 
1072
 
                           access=u"write", byte_arrays=True)
 
1073
 
    def secret_dbus_property(self, value):
 
1074
 
        self.secret = str(value)
 
 
606
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
 
607
    StopChecker.__name__ = "StopChecker"
 
1079
 
class ProxyClient(object):
 
1080
 
    def __init__(self, child_pipe, fpr, address):
 
1081
 
        self._pipe = child_pipe
 
1082
 
        self._pipe.send(('init', fpr, address))
 
1083
 
        if not self._pipe.recv():
 
1086
 
    def __getattribute__(self, name):
 
1087
 
        if(name == '_pipe'):
 
1088
 
            return super(ProxyClient, self).__getattribute__(name)
 
1089
 
        self._pipe.send(('getattr', name))
 
1090
 
        data = self._pipe.recv()
 
1091
 
        if data[0] == 'data':
 
1093
 
        if data[0] == 'function':
 
1094
 
            def func(*args, **kwargs):
 
1095
 
                self._pipe.send(('funcall', name, args, kwargs))
 
1096
 
                return self._pipe.recv()[1]
 
1099
 
    def __setattr__(self, name, value):
 
1100
 
        if(name == '_pipe'):
 
1101
 
            return super(ProxyClient, self).__setattr__(name, value)
 
1102
 
        self._pipe.send(('setattr', name, value))
 
1105
 
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1106
 
    """A class to handle client connections.
 
1108
 
    Instantiated once for each connection to handle it.
 
 
612
def peer_certificate(session):
 
 
613
    "Return the peer's OpenPGP certificate as a bytestring"
 
 
614
    # If not an OpenPGP certificate...
 
 
615
    if (gnutls.library.functions
 
 
616
        .gnutls_certificate_type_get(session._c_object)
 
 
617
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
618
        # ...do the normal thing
 
 
619
        return session.peer_certificate
 
 
620
    list_size = ctypes.c_uint(1)
 
 
621
    cert_list = (gnutls.library.functions
 
 
622
                 .gnutls_certificate_get_peers
 
 
623
                 (session._c_object, ctypes.byref(list_size)))
 
 
624
    if not bool(cert_list) and list_size.value != 0:
 
 
625
        raise gnutls.errors.GNUTLSError("error getting peer"
 
 
627
    if list_size.value == 0:
 
 
630
    return ctypes.string_at(cert.data, cert.size)
 
 
633
def fingerprint(openpgp):
 
 
634
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
 
635
    # New GnuTLS "datum" with the OpenPGP public key
 
 
636
    datum = (gnutls.library.types
 
 
637
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
640
                             ctypes.c_uint(len(openpgp))))
 
 
641
    # New empty GnuTLS certificate
 
 
642
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
643
    (gnutls.library.functions
 
 
644
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
645
    # Import the OpenPGP public key into the certificate
 
 
646
    (gnutls.library.functions
 
 
647
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
648
                                gnutls.library.constants
 
 
649
                                .GNUTLS_OPENPGP_FMT_RAW))
 
 
650
    # Verify the self signature in the key
 
 
651
    crtverify = ctypes.c_uint()
 
 
652
    (gnutls.library.functions
 
 
653
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
 
654
    if crtverify.value != 0:
 
 
655
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
656
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
 
657
    # New buffer for the fingerprint
 
 
658
    buf = ctypes.create_string_buffer(20)
 
 
659
    buf_len = ctypes.c_size_t()
 
 
660
    # Get the fingerprint from the certificate into the buffer
 
 
661
    (gnutls.library.functions
 
 
662
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
663
                                         ctypes.byref(buf_len)))
 
 
664
    # Deinit the certificate
 
 
665
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
666
    # Convert the buffer to a Python bytestring
 
 
667
    fpr = ctypes.string_at(buf, buf_len.value)
 
 
668
    # Convert the bytestring to hexadecimal notation
 
 
669
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
 
673
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
 
674
    """A TCP request handler class.
 
 
675
    Instantiated by IPv6_TCPServer for each request to handle it.
 
1109
676
    Note: This will run in its own forked process."""
 
1111
678
    def handle(self):
 
1112
 
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1113
 
            logger.info(u"TCP connection from: %s",
 
1114
 
                        unicode(self.client_address))
 
1115
 
            logger.debug(u"Pipe FD: %d",
 
1116
 
                         self.server.child_pipe.fileno())
 
1118
 
            session = (gnutls.connection
 
1119
 
                       .ClientSession(self.request,
 
1121
 
                                      .X509Credentials()))
 
1123
 
            # Note: gnutls.connection.X509Credentials is really a
 
1124
 
            # generic GnuTLS certificate credentials object so long as
 
1125
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1126
 
            # here despite using OpenPGP certificates.
 
1128
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1129
 
            #                      u"+AES-256-CBC", u"+SHA1",
 
1130
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1132
 
            # Use a fallback default, since this MUST be set.
 
1133
 
            priority = self.server.gnutls_priority
 
1134
 
            if priority is None:
 
1135
 
                priority = u"NORMAL"
 
1136
 
            (gnutls.library.functions
 
1137
 
             .gnutls_priority_set_direct(session._c_object,
 
1140
 
            # Start communication using the Mandos protocol
 
1141
 
            # Get protocol number
 
1142
 
            line = self.request.makefile().readline()
 
1143
 
            logger.debug(u"Protocol version: %r", line)
 
1145
 
                if int(line.strip().split()[0]) > 1:
 
1147
 
            except (ValueError, IndexError, RuntimeError), error:
 
1148
 
                logger.error(u"Unknown protocol version: %s", error)
 
1151
 
            # Start GnuTLS connection
 
1154
 
            except gnutls.errors.GNUTLSError, error:
 
1155
 
                logger.warning(u"Handshake failed: %s", error)
 
1156
 
                # Do not run session.bye() here: the session is not
 
1157
 
                # established.  Just abandon the request.
 
1159
 
            logger.debug(u"Handshake succeeded")
 
1161
 
            approval_required = False
 
1164
 
                    fpr = self.fingerprint(self.peer_certificate
 
1166
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1167
 
                    logger.warning(u"Bad certificate: %s", error)
 
1169
 
                logger.debug(u"Fingerprint: %s", fpr)
 
1172
 
                    client = ProxyClient(child_pipe, fpr,
 
1173
 
                                         self.client_address)
 
1177
 
                if client.approved_delay:
 
1178
 
                    delay = client.approved_delay
 
1179
 
                    client.approvals_pending += 1
 
1180
 
                    approval_required = True
 
1183
 
                    if not client.enabled:
 
1184
 
                        logger.warning(u"Client %s is disabled",
 
1186
 
                        if self.server.use_dbus:
 
1188
 
                            client.Rejected("Disabled")                    
 
1191
 
                    if client._approved or not client.approved_delay:
 
1192
 
                        #We are approved or approval is disabled
 
1194
 
                    elif client._approved is None:
 
1195
 
                        logger.info(u"Client %s need approval",
 
1197
 
                        if self.server.use_dbus:
 
1199
 
                            client.NeedApproval(
 
1200
 
                                client.approved_delay_milliseconds(),
 
1201
 
                                client.approved_by_default)
 
1203
 
                        logger.warning(u"Client %s was not approved",
 
1205
 
                        if self.server.use_dbus:
 
1207
 
                            client.Rejected("Disapproved")
 
1210
 
                    #wait until timeout or approved
 
1211
 
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1212
 
                    time = datetime.datetime.now()
 
1213
 
                    client.changedstate.acquire()
 
1214
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1215
 
                    client.changedstate.release()
 
1216
 
                    time2 = datetime.datetime.now()
 
1217
 
                    if (time2 - time) >= delay:
 
1218
 
                        if not client.approved_by_default:
 
1219
 
                            logger.warning("Client %s timed out while"
 
1220
 
                                           " waiting for approval",
 
1222
 
                            if self.server.use_dbus:
 
1224
 
                                client.Rejected("Time out")
 
1229
 
                        delay -= time2 - time
 
1232
 
                while sent_size < len(client.secret):
 
1234
 
                        sent = session.send(client.secret[sent_size:])
 
1235
 
                    except (gnutls.errors.GNUTLSError), error:
 
1236
 
                        logger.warning("gnutls send failed")
 
1238
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1239
 
                                 sent, len(client.secret)
 
1240
 
                                 - (sent_size + sent))
 
1243
 
                logger.info(u"Sending secret to %s", client.name)
 
1244
 
                # bump the timeout as if seen
 
1246
 
                if self.server.use_dbus:
 
1251
 
                if approval_required:
 
1252
 
                    client.approvals_pending -= 1
 
1255
 
                except (gnutls.errors.GNUTLSError), error:
 
1256
 
                    logger.warning("gnutls bye failed")
 
1259
 
    def peer_certificate(session):
 
1260
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1261
 
        # If not an OpenPGP certificate...
 
1262
 
        if (gnutls.library.functions
 
1263
 
            .gnutls_certificate_type_get(session._c_object)
 
1264
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1265
 
            # ...do the normal thing
 
1266
 
            return session.peer_certificate
 
1267
 
        list_size = ctypes.c_uint(1)
 
1268
 
        cert_list = (gnutls.library.functions
 
1269
 
                     .gnutls_certificate_get_peers
 
1270
 
                     (session._c_object, ctypes.byref(list_size)))
 
1271
 
        if not bool(cert_list) and list_size.value != 0:
 
1272
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1274
 
        if list_size.value == 0:
 
1277
 
        return ctypes.string_at(cert.data, cert.size)
 
1280
 
    def fingerprint(openpgp):
 
1281
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1282
 
        # New GnuTLS "datum" with the OpenPGP public key
 
1283
 
        datum = (gnutls.library.types
 
1284
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1287
 
                                 ctypes.c_uint(len(openpgp))))
 
1288
 
        # New empty GnuTLS certificate
 
1289
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1290
 
        (gnutls.library.functions
 
1291
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1292
 
        # Import the OpenPGP public key into the certificate
 
1293
 
        (gnutls.library.functions
 
1294
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1295
 
                                    gnutls.library.constants
 
1296
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1297
 
        # Verify the self signature in the key
 
1298
 
        crtverify = ctypes.c_uint()
 
1299
 
        (gnutls.library.functions
 
1300
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1301
 
                                         ctypes.byref(crtverify)))
 
1302
 
        if crtverify.value != 0:
 
1303
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1304
 
            raise (gnutls.errors.CertificateSecurityError
 
1306
 
        # New buffer for the fingerprint
 
1307
 
        buf = ctypes.create_string_buffer(20)
 
1308
 
        buf_len = ctypes.c_size_t()
 
1309
 
        # Get the fingerprint from the certificate into the buffer
 
1310
 
        (gnutls.library.functions
 
1311
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1312
 
                                             ctypes.byref(buf_len)))
 
1313
 
        # Deinit the certificate
 
1314
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1315
 
        # Convert the buffer to a Python bytestring
 
1316
 
        fpr = ctypes.string_at(buf, buf_len.value)
 
1317
 
        # Convert the bytestring to hexadecimal notation
 
1318
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1322
 
class MultiprocessingMixIn(object):
 
1323
 
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1324
 
    def sub_process_main(self, request, address):
 
1326
 
            self.finish_request(request, address)
 
1328
 
            self.handle_error(request, address)
 
1329
 
        self.close_request(request)
 
1331
 
    def process_request(self, request, address):
 
1332
 
        """Start a new process to process the request."""
 
1333
 
        multiprocessing.Process(target = self.sub_process_main,
 
1334
 
                                args = (request, address)).start()
 
1336
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1337
 
    """ adds a pipe to the MixIn """
 
1338
 
    def process_request(self, request, client_address):
 
1339
 
        """Overrides and wraps the original process_request().
 
1341
 
        This function creates a new pipe in self.pipe
 
1343
 
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1345
 
        super(MultiprocessingMixInWithPipe,
 
1346
 
              self).process_request(request, client_address)
 
1347
 
        self.child_pipe.close()
 
1348
 
        self.add_pipe(parent_pipe)
 
1350
 
    def add_pipe(self, parent_pipe):
 
1351
 
        """Dummy function; override as necessary"""
 
1354
 
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1355
 
                     socketserver.TCPServer, object):
 
 
679
        logger.info(u"TCP connection from: %s",
 
 
680
                    unicode(self.client_address))
 
 
681
        session = (gnutls.connection
 
 
682
                   .ClientSession(self.request,
 
 
686
        line = self.request.makefile().readline()
 
 
687
        logger.debug(u"Protocol version: %r", line)
 
 
689
            if int(line.strip().split()[0]) > 1:
 
 
691
        except (ValueError, IndexError, RuntimeError), error:
 
 
692
            logger.error(u"Unknown protocol version: %s", error)
 
 
695
        # Note: gnutls.connection.X509Credentials is really a generic
 
 
696
        # GnuTLS certificate credentials object so long as no X.509
 
 
697
        # keys are added to it.  Therefore, we can use it here despite
 
 
698
        # using OpenPGP certificates.
 
 
700
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
 
 
701
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
703
        # Use a fallback default, since this MUST be set.
 
 
704
        priority = self.server.settings.get("priority", "NORMAL")
 
 
705
        (gnutls.library.functions
 
 
706
         .gnutls_priority_set_direct(session._c_object,
 
 
711
        except gnutls.errors.GNUTLSError, error:
 
 
712
            logger.warning(u"Handshake failed: %s", error)
 
 
713
            # Do not run session.bye() here: the session is not
 
 
714
            # established.  Just abandon the request.
 
 
716
        logger.debug(u"Handshake succeeded")
 
 
718
            fpr = fingerprint(peer_certificate(session))
 
 
719
        except (TypeError, gnutls.errors.GNUTLSError), error:
 
 
720
            logger.warning(u"Bad certificate: %s", error)
 
 
723
        logger.debug(u"Fingerprint: %s", fpr)
 
 
725
        for c in self.server.clients:
 
 
726
            if c.fingerprint == fpr:
 
 
730
            logger.warning(u"Client not found for fingerprint: %s",
 
 
734
        # Have to check if client.still_valid(), since it is possible
 
 
735
        # that the client timed out while establishing the GnuTLS
 
 
737
        if not client.still_valid():
 
 
738
            logger.warning(u"Client %(name)s is invalid",
 
 
742
        ## This won't work here, since we're in a fork.
 
 
743
        # client.checked_ok()
 
 
745
        while sent_size < len(client.secret):
 
 
746
            sent = session.send(client.secret[sent_size:])
 
 
747
            logger.debug(u"Sent: %d, remaining: %d",
 
 
748
                         sent, len(client.secret)
 
 
749
                         - (sent_size + sent))
 
 
754
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
 
755
                     SocketServer.TCPServer, object):
 
1356
756
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
 
758
        settings:       Server settings
 
 
759
        clients:        Set() of Client objects
 
1359
760
        enabled:        Boolean; whether this server is activated yet
 
1360
 
        interface:      None or a network interface name (string)
 
1361
 
        use_ipv6:       Boolean; to use IPv6 or not
 
1363
 
    def __init__(self, server_address, RequestHandlerClass,
 
1364
 
                 interface=None, use_ipv6=True):
 
1365
 
        self.interface = interface
 
1367
 
            self.address_family = socket.AF_INET6
 
1368
 
        socketserver.TCPServer.__init__(self, server_address,
 
1369
 
                                        RequestHandlerClass)
 
 
762
    address_family = socket.AF_INET6
 
 
763
    def __init__(self, *args, **kwargs):
 
 
764
        if "settings" in kwargs:
 
 
765
            self.settings = kwargs["settings"]
 
 
766
            del kwargs["settings"]
 
 
767
        if "clients" in kwargs:
 
 
768
            self.clients = kwargs["clients"]
 
 
769
            del kwargs["clients"]
 
 
770
        if "use_ipv6" in kwargs:
 
 
771
            if not kwargs["use_ipv6"]:
 
 
772
                self.address_family = socket.AF_INET
 
 
773
            del kwargs["use_ipv6"]
 
 
775
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
1370
776
    def server_bind(self):
 
1371
777
        """This overrides the normal server_bind() function
 
1372
778
        to bind to an interface if one was specified, and also NOT to
 
1373
779
        bind to an address or port if they were not specified."""
 
1374
 
        if self.interface is not None:
 
1375
 
            if SO_BINDTODEVICE is None:
 
1376
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1377
 
                             u" cannot bind to interface %s",
 
1381
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1385
 
                except socket.error, error:
 
1386
 
                    if error[0] == errno.EPERM:
 
1387
 
                        logger.error(u"No permission to"
 
1388
 
                                     u" bind to interface %s",
 
1390
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1391
 
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1392
 
                                     u" cannot bind to interface %s",
 
 
780
        if self.settings["interface"]:
 
 
781
            # 25 is from /usr/include/asm-i486/socket.h
 
 
782
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
 
 
784
                self.socket.setsockopt(socket.SOL_SOCKET,
 
 
786
                                       self.settings["interface"])
 
 
787
            except socket.error, error:
 
 
788
                if error[0] == errno.EPERM:
 
 
789
                    logger.error(u"No permission to"
 
 
790
                                 u" bind to interface %s",
 
 
791
                                 self.settings["interface"])
 
1396
794
        # Only bind(2) the socket if we really need to.
 
1397
795
        if self.server_address[0] or self.server_address[1]:
 
1398
796
            if not self.server_address[0]:
 
1399
797
                if self.address_family == socket.AF_INET6:
 
1400
 
                    any_address = u"::" # in6addr_any
 
 
798
                    any_address = "::" # in6addr_any
 
1402
800
                    any_address = socket.INADDR_ANY
 
1403
801
                self.server_address = (any_address,
 
 
1654
963
    # Default values for config file for server-global settings
 
1655
 
    server_defaults = { u"interface": u"",
 
1660
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1661
 
                        u"servicename": u"Mandos",
 
1662
 
                        u"use_dbus": u"True",
 
1663
 
                        u"use_ipv6": u"True",
 
 
964
    server_defaults = { "interface": "",
 
 
969
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
970
                        "servicename": "Mandos",
 
1667
975
    # Parse config file for server-global settings
 
1668
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
976
    server_config = ConfigParser.SafeConfigParser(server_defaults)
 
1669
977
    del server_defaults
 
1670
 
    server_config.read(os.path.join(options.configdir,
 
 
978
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
1672
979
    # Convert the SafeConfigParser object to a dict
 
1673
980
    server_settings = server_config.defaults()
 
1674
981
    # Use the appropriate methods on the non-string config options
 
1675
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1676
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
 
982
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
 
984
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
 
986
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
1678
988
    if server_settings["port"]:
 
1679
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
 
989
        server_settings["port"] = server_config.getint("DEFAULT",
 
1681
991
    del server_config
 
1683
993
    # Override the settings from the config file with command line
 
1684
994
    # options, if set.
 
1685
 
    for option in (u"interface", u"address", u"port", u"debug",
 
1686
 
                   u"priority", u"servicename", u"configdir",
 
1687
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
 
995
    for option in ("interface", "address", "port", "debug",
 
 
996
                   "priority", "servicename", "configdir",
 
 
997
                   "use_dbus", "use_ipv6"):
 
1688
998
        value = getattr(options, option)
 
1689
999
        if value is not None:
 
1690
1000
            server_settings[option] = value
 
1692
 
    # Force all strings to be unicode
 
1693
 
    for option in server_settings.keys():
 
1694
 
        if type(server_settings[option]) is str:
 
1695
 
            server_settings[option] = unicode(server_settings[option])
 
1696
1002
    # Now we have our good server settings in "server_settings"
 
1698
 
    ##################################################################
 
1700
1004
    # For convenience
 
1701
 
    debug = server_settings[u"debug"]
 
1702
 
    debuglevel = server_settings[u"debuglevel"]
 
1703
 
    use_dbus = server_settings[u"use_dbus"]
 
1704
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1706
 
    if server_settings[u"servicename"] != u"Mandos":
 
 
1005
    debug = server_settings["debug"]
 
 
1006
    use_dbus = server_settings["use_dbus"]
 
 
1007
    use_ipv6 = server_settings["use_ipv6"]
 
 
1010
        syslogger.setLevel(logging.WARNING)
 
 
1011
        console.setLevel(logging.WARNING)
 
 
1013
    if server_settings["servicename"] != "Mandos":
 
1707
1014
        syslogger.setFormatter(logging.Formatter
 
1708
 
                               (u'Mandos (%s) [%%(process)d]:'
 
1709
 
                                u' %%(levelname)s: %%(message)s'
 
1710
 
                                % server_settings[u"servicename"]))
 
 
1015
                               ('Mandos (%s): %%(levelname)s:'
 
 
1017
                                % server_settings["servicename"]))
 
1712
1019
    # Parse config file with clients
 
1713
 
    client_defaults = { u"timeout": u"1h",
 
1715
 
                        u"checker": u"fping -q -- %%(host)s",
 
1717
 
                        u"approved_delay": u"0s",
 
1718
 
                        u"approved_duration": u"1s",
 
 
1020
    client_defaults = { "timeout": "1h",
 
 
1022
                        "checker": "fping -q -- %%(host)s",
 
1720
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
1721
 
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1724
 
    global mandos_dbus_service
 
1725
 
    mandos_dbus_service = None
 
1727
 
    tcp_server = MandosServer((server_settings[u"address"],
 
1728
 
                               server_settings[u"port"]),
 
1730
 
                              interface=server_settings[u"interface"],
 
1733
 
                              server_settings[u"priority"],
 
1735
 
    pidfilename = u"/var/run/mandos.pid"
 
 
1025
    client_config = ConfigParser.SafeConfigParser(client_defaults)
 
 
1026
    client_config.read(os.path.join(server_settings["configdir"],
 
 
1030
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
 
1031
                                 server_settings["port"]),
 
 
1033
                                settings=server_settings,
 
 
1034
                                clients=clients, use_ipv6=use_ipv6)
 
 
1035
    pidfilename = "/var/run/mandos.pid"
 
1737
 
        pidfile = open(pidfilename, u"w")
 
 
1037
        pidfile = open(pidfilename, "w")
 
1738
1038
    except IOError:
 
1739
 
        logger.error(u"Could not open file %r", pidfilename)
 
 
1039
        logger.error("Could not open file %r", pidfilename)
 
1742
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1743
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
 
1042
        uid = pwd.getpwnam("_mandos").pw_uid
 
 
1043
        gid = pwd.getpwnam("_mandos").pw_gid
 
1744
1044
    except KeyError:
 
1746
 
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1747
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
 
1046
            uid = pwd.getpwnam("mandos").pw_uid
 
 
1047
            gid = pwd.getpwnam("mandos").pw_gid
 
1748
1048
        except KeyError:
 
1750
 
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1751
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
 
1050
                uid = pwd.getpwnam("nobody").pw_uid
 
 
1051
                gid = pwd.getpwnam("nogroup").pw_gid
 
1752
1052
            except KeyError: