230
291
        if config is None:
 
232
293
        logger.debug(u"Creating client %r", self.name)
 
233
 
        self.use_dbus = False   # During __init__
 
234
294
        # Uppercase and remove spaces from fingerprint for later
 
235
295
        # comparison purposes with return value from the fingerprint()
 
237
 
        self.fingerprint = (config["fingerprint"].upper()
 
 
297
        self.fingerprint = (config[u"fingerprint"].upper()
 
238
298
                            .replace(u" ", u""))
 
239
299
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
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:
 
 
300
        if u"secret" in config:
 
 
301
            self.secret = config[u"secret"].decode(u"base64")
 
 
302
        elif u"secfile" in config:
 
 
303
            with open(os.path.expanduser(os.path.expandvars
 
 
304
                                         (config[u"secfile"])),
 
246
306
                self.secret = secfile.read()
 
 
308
            #XXX Need to allow secret on demand!
 
248
309
            raise TypeError(u"No secret or secfile for client %s"
 
250
 
        self.host = config.get("host", "")
 
 
311
        self.host = config.get(u"host", u"")
 
251
312
        self.created = datetime.datetime.utcnow()
 
252
313
        self.enabled = False
 
253
314
        self.last_enabled = None
 
254
315
        self.last_checked_ok = None
 
255
 
        self.timeout = string_to_delta(config["timeout"])
 
256
 
        self.interval = string_to_delta(config["interval"])
 
 
316
        self.timeout = string_to_delta(config[u"timeout"])
 
 
317
        self.interval = string_to_delta(config[u"interval"])
 
257
318
        self.disable_hook = disable_hook
 
258
319
        self.checker = None
 
259
320
        self.checker_initiator_tag = None
 
260
321
        self.disable_initiator_tag = None
 
261
322
        self.checker_callback_tag = None
 
262
 
        self.checker_command = config["checker"]
 
 
323
        self.checker_command = config[u"checker"]
 
263
324
        self.current_checker_command = None
 
264
325
        self.last_connect = None
 
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)
 
 
326
        self.approvals_pending = 0
 
 
327
        self._approved = None
 
 
328
        self.approved_by_default = config.get(u"approved_by_default",
 
 
330
        self.approved_delay = string_to_delta(
 
 
331
            config[u"approved_delay"])
 
 
332
        self.approved_duration = string_to_delta(
 
 
333
            config[u"approved_duration"])
 
 
334
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
 
336
    def send_changedstate(self):
 
 
337
        self.changedstate.acquire()
 
 
338
        self.changedstate.notify_all()
 
 
339
        self.changedstate.release()
 
275
341
    def enable(self):
 
276
342
        """Start this client's checker and timeout hooks"""
 
 
343
        if getattr(self, u"enabled", False):
 
 
346
        self.send_changedstate()
 
277
347
        self.last_enabled = datetime.datetime.utcnow()
 
278
348
        # Schedule a new checker to be started an 'interval' from now,
 
279
349
        # and every interval from then on.
 
280
350
        self.checker_initiator_tag = (gobject.timeout_add
 
281
351
                                      (self.interval_milliseconds(),
 
282
352
                                       self.start_checker))
 
283
 
        # Also start a new checker *right now*.
 
285
353
        # Schedule a disable() when 'timeout' has passed
 
286
354
        self.disable_initiator_tag = (gobject.timeout_add
 
287
355
                                   (self.timeout_milliseconds(),
 
289
357
        self.enabled = True
 
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,
 
 
358
        # Also start a new checker *right now*.
 
 
361
    def disable(self, quiet=True):
 
299
362
        """Disable this client."""
 
300
363
        if not getattr(self, "enabled", False):
 
302
 
        logger.info(u"Disabling client %s", self.name)
 
303
 
        if getattr(self, "disable_initiator_tag", False):
 
 
366
            self.send_changedstate()
 
 
368
            logger.info(u"Disabling client %s", self.name)
 
 
369
        if getattr(self, u"disable_initiator_tag", False):
 
304
370
            gobject.source_remove(self.disable_initiator_tag)
 
305
371
            self.disable_initiator_tag = None
 
306
 
        if getattr(self, "checker_initiator_tag", False):
 
 
372
        if getattr(self, u"checker_initiator_tag", False):
 
307
373
            gobject.source_remove(self.checker_initiator_tag)
 
308
374
            self.checker_initiator_tag = None
 
309
375
        self.stop_checker()
 
310
376
        if self.disable_hook:
 
311
377
            self.disable_hook(self)
 
312
378
        self.enabled = False
 
315
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
316
 
                                 dbus.Boolean(False, variant_level=1))
 
317
379
        # Do not run this again if called by a gobject.timeout_add
 
 
444
490
        if self.checker_callback_tag:
 
445
491
            gobject.source_remove(self.checker_callback_tag)
 
446
492
            self.checker_callback_tag = None
 
447
 
        if getattr(self, "checker", None) is None:
 
 
493
        if getattr(self, u"checker", None) is None:
 
449
495
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
451
497
            os.kill(self.checker.pid, signal.SIGTERM)
 
453
499
            #if self.checker.poll() is None:
 
454
500
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
455
501
        except OSError, error:
 
456
502
            if error.errno != errno.ESRCH: # No such process
 
458
504
        self.checker = None
 
 
506
def dbus_service_property(dbus_interface, signature=u"v",
 
 
507
                          access=u"readwrite", byte_arrays=False):
 
 
508
    """Decorators for marking methods of a DBusObjectWithProperties to
 
 
509
    become properties on the D-Bus.
 
 
511
    The decorated method will be called with no arguments by "Get"
 
 
512
    and with one argument by "Set".
 
 
514
    The parameters, where they are supported, are the same as
 
 
515
    dbus.service.method, except there is only "signature", since the
 
 
516
    type from Get() and the type sent to Set() is the same.
 
 
518
    # Encoding deeply encoded byte arrays is not supported yet by the
 
 
519
    # "Set" method, so we fail early here:
 
 
520
    if byte_arrays and signature != u"ay":
 
 
521
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
 
522
                         u" signature %r" % signature)
 
 
524
        func._dbus_is_property = True
 
 
525
        func._dbus_interface = dbus_interface
 
 
526
        func._dbus_signature = signature
 
 
527
        func._dbus_access = access
 
 
528
        func._dbus_name = func.__name__
 
 
529
        if func._dbus_name.endswith(u"_dbus_property"):
 
 
530
            func._dbus_name = func._dbus_name[:-14]
 
 
531
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
 
536
class DBusPropertyException(dbus.exceptions.DBusException):
 
 
537
    """A base class for D-Bus property-related exceptions
 
 
539
    def __unicode__(self):
 
 
540
        return unicode(str(self))
 
 
543
class DBusPropertyAccessException(DBusPropertyException):
 
 
544
    """A property's access permissions disallows an operation.
 
 
549
class DBusPropertyNotFound(DBusPropertyException):
 
 
550
    """An attempt was made to access a non-existing property.
 
 
555
class DBusObjectWithProperties(dbus.service.Object):
 
 
556
    """A D-Bus object with properties.
 
 
558
    Classes inheriting from this can use the dbus_service_property
 
 
559
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
560
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
564
    def _is_dbus_property(obj):
 
 
565
        return getattr(obj, u"_dbus_is_property", False)
 
 
567
    def _get_all_dbus_properties(self):
 
 
568
        """Returns a generator of (name, attribute) pairs
 
 
570
        return ((prop._dbus_name, prop)
 
 
572
                inspect.getmembers(self, self._is_dbus_property))
 
 
574
    def _get_dbus_property(self, interface_name, property_name):
 
 
575
        """Returns a bound method if one exists which is a D-Bus
 
 
576
        property with the specified name and interface.
 
 
578
        for name in (property_name,
 
 
579
                     property_name + u"_dbus_property"):
 
 
580
            prop = getattr(self, name, None)
 
 
582
                or not self._is_dbus_property(prop)
 
 
583
                or prop._dbus_name != property_name
 
 
584
                or (interface_name and prop._dbus_interface
 
 
585
                    and interface_name != prop._dbus_interface)):
 
 
589
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
 
590
                                   + interface_name + u"."
 
 
593
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
 
595
    def Get(self, interface_name, property_name):
 
 
596
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
598
        prop = self._get_dbus_property(interface_name, property_name)
 
 
599
        if prop._dbus_access == u"write":
 
 
600
            raise DBusPropertyAccessException(property_name)
 
 
602
        if not hasattr(value, u"variant_level"):
 
 
604
        return type(value)(value, variant_level=value.variant_level+1)
 
 
606
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
 
607
    def Set(self, interface_name, property_name, value):
 
 
608
        """Standard D-Bus property Set() method, see D-Bus standard.
 
 
610
        prop = self._get_dbus_property(interface_name, property_name)
 
 
611
        if prop._dbus_access == u"read":
 
 
612
            raise DBusPropertyAccessException(property_name)
 
 
613
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
614
            # The byte_arrays option is not supported yet on
 
 
615
            # signatures other than "ay".
 
 
616
            if prop._dbus_signature != u"ay":
 
 
618
            value = dbus.ByteArray(''.join(unichr(byte)
 
 
622
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
 
623
                         out_signature=u"a{sv}")
 
 
624
    def GetAll(self, interface_name):
 
 
625
        """Standard D-Bus property GetAll() method, see D-Bus
 
 
628
        Note: Will not include properties with access="write".
 
 
631
        for name, prop in self._get_all_dbus_properties():
 
 
633
                and interface_name != prop._dbus_interface):
 
 
634
                # Interface non-empty but did not match
 
 
636
            # Ignore write-only properties
 
 
637
            if prop._dbus_access == u"write":
 
 
640
            if not hasattr(value, u"variant_level"):
 
 
643
            all[name] = type(value)(value, variant_level=
 
 
644
                                    value.variant_level+1)
 
 
645
        return dbus.Dictionary(all, signature=u"sv")
 
 
647
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
649
                         path_keyword='object_path',
 
 
650
                         connection_keyword='connection')
 
 
651
    def Introspect(self, object_path, connection):
 
 
652
        """Standard D-Bus method, overloaded to insert property tags.
 
 
654
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
657
            document = xml.dom.minidom.parseString(xmlstring)
 
 
658
            def make_tag(document, name, prop):
 
 
659
                e = document.createElement(u"property")
 
 
660
                e.setAttribute(u"name", name)
 
 
661
                e.setAttribute(u"type", prop._dbus_signature)
 
 
662
                e.setAttribute(u"access", prop._dbus_access)
 
 
664
            for if_tag in document.getElementsByTagName(u"interface"):
 
 
665
                for tag in (make_tag(document, name, prop)
 
 
667
                            in self._get_all_dbus_properties()
 
 
668
                            if prop._dbus_interface
 
 
669
                            == if_tag.getAttribute(u"name")):
 
 
670
                    if_tag.appendChild(tag)
 
 
671
                # Add the names to the return values for the
 
 
672
                # "org.freedesktop.DBus.Properties" methods
 
 
673
                if (if_tag.getAttribute(u"name")
 
 
674
                    == u"org.freedesktop.DBus.Properties"):
 
 
675
                    for cn in if_tag.getElementsByTagName(u"method"):
 
 
676
                        if cn.getAttribute(u"name") == u"Get":
 
 
677
                            for arg in cn.getElementsByTagName(u"arg"):
 
 
678
                                if (arg.getAttribute(u"direction")
 
 
680
                                    arg.setAttribute(u"name", u"value")
 
 
681
                        elif cn.getAttribute(u"name") == u"GetAll":
 
 
682
                            for arg in cn.getElementsByTagName(u"arg"):
 
 
683
                                if (arg.getAttribute(u"direction")
 
 
685
                                    arg.setAttribute(u"name", u"props")
 
 
686
            xmlstring = document.toxml(u"utf-8")
 
 
688
        except (AttributeError, xml.dom.DOMException,
 
 
689
                xml.parsers.expat.ExpatError), error:
 
 
690
            logger.error(u"Failed to override Introspection method",
 
 
695
class ClientDBus(Client, DBusObjectWithProperties):
 
 
696
    """A Client class using D-Bus
 
 
699
    dbus_object_path: dbus.ObjectPath
 
 
700
    bus: dbus.SystemBus()
 
 
702
    # dbus.service.Object doesn't use super(), so we can't either.
 
 
704
    def __init__(self, bus = None, *args, **kwargs):
 
 
706
        Client.__init__(self, *args, **kwargs)
 
 
707
        # Only now, when this client is initialized, can it show up on
 
 
709
        self.dbus_object_path = (dbus.ObjectPath
 
 
711
                                  + self.name.replace(u".", u"_")))
 
 
712
        DBusObjectWithProperties.__init__(self, self.bus,
 
 
713
                                          self.dbus_object_path)
 
 
716
    def _datetime_to_dbus(dt, variant_level=0):
 
 
717
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
718
        return dbus.String(dt.isoformat(),
 
 
719
                           variant_level=variant_level)
 
 
722
        oldstate = getattr(self, u"enabled", False)
 
 
723
        r = Client.enable(self)
 
 
724
        if oldstate != self.enabled:
 
 
726
            self.PropertyChanged(dbus.String(u"enabled"),
 
 
727
                                 dbus.Boolean(True, variant_level=1))
 
 
728
            self.PropertyChanged(
 
 
729
                dbus.String(u"last_enabled"),
 
 
730
                self._datetime_to_dbus(self.last_enabled,
 
 
734
    def disable(self, quiet = False):
 
 
735
        oldstate = getattr(self, u"enabled", False)
 
 
736
        r = Client.disable(self, quiet=quiet)
 
 
737
        if not quiet and oldstate != self.enabled:
 
 
739
            self.PropertyChanged(dbus.String(u"enabled"),
 
 
740
                                 dbus.Boolean(False, variant_level=1))
 
 
743
    def __del__(self, *args, **kwargs):
 
 
745
            self.remove_from_connection()
 
 
748
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
 
749
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
 
750
        Client.__del__(self, *args, **kwargs)
 
 
752
    def checker_callback(self, pid, condition, command,
 
 
754
        self.checker_callback_tag = None
 
 
757
        self.PropertyChanged(dbus.String(u"checker_running"),
 
 
758
                             dbus.Boolean(False, variant_level=1))
 
 
759
        if os.WIFEXITED(condition):
 
 
760
            exitstatus = os.WEXITSTATUS(condition)
 
 
762
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
 
763
                                  dbus.Int64(condition),
 
 
764
                                  dbus.String(command))
 
 
767
            self.CheckerCompleted(dbus.Int16(-1),
 
 
768
                                  dbus.Int64(condition),
 
 
769
                                  dbus.String(command))
 
 
771
        return Client.checker_callback(self, pid, condition, command,
 
 
774
    def checked_ok(self, *args, **kwargs):
 
 
775
        r = Client.checked_ok(self, *args, **kwargs)
 
 
777
        self.PropertyChanged(
 
 
778
            dbus.String(u"last_checked_ok"),
 
 
779
            (self._datetime_to_dbus(self.last_checked_ok,
 
 
783
    def start_checker(self, *args, **kwargs):
 
 
784
        old_checker = self.checker
 
 
785
        if self.checker is not None:
 
 
786
            old_checker_pid = self.checker.pid
 
 
788
            old_checker_pid = None
 
 
789
        r = Client.start_checker(self, *args, **kwargs)
 
 
790
        # Only if new checker process was started
 
 
791
        if (self.checker is not None
 
 
792
            and old_checker_pid != self.checker.pid):
 
 
794
            self.CheckerStarted(self.current_checker_command)
 
 
795
            self.PropertyChanged(
 
 
796
                dbus.String(u"checker_running"),
 
 
797
                dbus.Boolean(True, variant_level=1))
 
 
800
    def stop_checker(self, *args, **kwargs):
 
 
801
        old_checker = getattr(self, u"checker", None)
 
 
802
        r = Client.stop_checker(self, *args, **kwargs)
 
 
803
        if (old_checker is not None
 
 
804
            and getattr(self, u"checker", None) is None):
 
460
805
            self.PropertyChanged(dbus.String(u"checker_running"),
 
461
806
                                 dbus.Boolean(False, variant_level=1))
 
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
 
 
809
    def _reset_approved(self):
 
 
810
        self._approved = None
 
 
813
    def approve(self, value=True):
 
 
814
        self._approved = value
 
 
815
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
 
 
817
    def approved_pending(self):
 
 
818
        return self.approvals_pending > 0
 
 
821
    ## D-Bus methods, signals & properties
 
474
822
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
477
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
478
 
    CheckedOK.__name__ = "CheckedOK"
 
480
826
    # CheckerCompleted - signal
 
481
 
    @dbus.service.signal(_interface, signature="nxs")
 
 
827
    @dbus.service.signal(_interface, signature=u"nxs")
 
482
828
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
486
832
    # CheckerStarted - signal
 
487
 
    @dbus.service.signal(_interface, signature="s")
 
 
833
    @dbus.service.signal(_interface, signature=u"s")
 
488
834
    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"
 
539
838
    # PropertyChanged - signal
 
540
 
    @dbus.service.signal(_interface, signature="sv")
 
 
839
    @dbus.service.signal(_interface, signature=u"sv")
 
541
840
    def PropertyChanged(self, property, value):
 
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(),
 
 
845
    @dbus.service.signal(_interface)
 
 
848
        if self.approved_pending():
 
 
849
            self.PropertyChanged(dbus.String(u"checker_running"),
 
 
850
                                 dbus.Boolean(False, variant_level=1))
 
 
853
    @dbus.service.signal(_interface, signature=u"s")
 
 
854
    def Rejected(self, reason):
 
 
856
        if self.approved_pending():
 
 
857
            self.PropertyChanged(dbus.String(u"checker_running"),
 
 
858
                                 dbus.Boolean(False, variant_level=1))
 
 
860
    # NeedApproval - signal
 
 
861
    @dbus.service.signal(_interface, signature=u"db")
 
 
862
    def NeedApproval(self, timeout, default):
 
 
864
        if not self.approved_pending():
 
 
865
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
 
866
                                 dbus.Boolean(True, variant_level=1))
 
 
871
    @dbus.service.method(_interface, in_signature=u"b")
 
 
872
    def Approve(self, value):
 
 
876
    @dbus.service.method(_interface)
 
 
878
        return self.checked_ok()
 
589
880
    # Enable - method
 
590
 
    Enable = dbus.service.method(_interface)(enable)
 
591
 
    Enable.__name__ = "Enable"
 
 
881
    @dbus.service.method(_interface)
 
593
886
    # StartChecker - method
 
594
887
    @dbus.service.method(_interface)
 
 
605
898
    # StopChecker - method
 
606
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
607
 
    StopChecker.__name__ = "StopChecker"
 
 
899
    @dbus.service.method(_interface)
 
 
900
    def StopChecker(self):
 
 
905
    # approved_pending - property
 
 
906
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
 
907
    def approved_pending_dbus_property(self):
 
 
908
        return dbus.Boolean(self.approved_pending())
 
 
910
    # approved_by_default - property
 
 
911
    @dbus_service_property(_interface, signature=u"b",
 
 
913
    def approved_by_default_dbus_property(self):
 
 
914
        return dbus.Boolean(self.approved_by_default)
 
 
916
    # approved_delay - property
 
 
917
    @dbus_service_property(_interface, signature=u"t",
 
 
919
    def approved_delay_dbus_property(self):
 
 
920
        return dbus.UInt64(self.approved_delay_milliseconds())
 
 
922
    # approved_duration - property
 
 
923
    @dbus_service_property(_interface, signature=u"t",
 
 
925
    def approved_duration_dbus_property(self):
 
 
926
        return dbus.UInt64(self._timedelta_to_milliseconds(
 
 
927
                self.approved_duration))
 
 
930
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
931
    def name_dbus_property(self):
 
 
932
        return dbus.String(self.name)
 
 
934
    # fingerprint - property
 
 
935
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
936
    def fingerprint_dbus_property(self):
 
 
937
        return dbus.String(self.fingerprint)
 
 
940
    @dbus_service_property(_interface, signature=u"s",
 
 
942
    def host_dbus_property(self, value=None):
 
 
943
        if value is None:       # get
 
 
944
            return dbus.String(self.host)
 
 
947
        self.PropertyChanged(dbus.String(u"host"),
 
 
948
                             dbus.String(value, variant_level=1))
 
 
951
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
952
    def created_dbus_property(self):
 
 
953
        return dbus.String(self._datetime_to_dbus(self.created))
 
 
955
    # last_enabled - property
 
 
956
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
957
    def last_enabled_dbus_property(self):
 
 
958
        if self.last_enabled is None:
 
 
959
            return dbus.String(u"")
 
 
960
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
 
963
    @dbus_service_property(_interface, signature=u"b",
 
 
965
    def enabled_dbus_property(self, value=None):
 
 
966
        if value is None:       # get
 
 
967
            return dbus.Boolean(self.enabled)
 
 
973
    # last_checked_ok - property
 
 
974
    @dbus_service_property(_interface, signature=u"s",
 
 
976
    def last_checked_ok_dbus_property(self, value=None):
 
 
977
        if value is not None:
 
 
980
        if self.last_checked_ok is None:
 
 
981
            return dbus.String(u"")
 
 
982
        return dbus.String(self._datetime_to_dbus(self
 
 
986
    @dbus_service_property(_interface, signature=u"t",
 
 
988
    def timeout_dbus_property(self, value=None):
 
 
989
        if value is None:       # get
 
 
990
            return dbus.UInt64(self.timeout_milliseconds())
 
 
991
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
 
993
        self.PropertyChanged(dbus.String(u"timeout"),
 
 
994
                             dbus.UInt64(value, variant_level=1))
 
 
995
        if getattr(self, u"disable_initiator_tag", None) is None:
 
 
998
        gobject.source_remove(self.disable_initiator_tag)
 
 
999
        self.disable_initiator_tag = None
 
 
1000
        time_to_die = (self.
 
 
1001
                       _timedelta_to_milliseconds((self
 
 
1006
        if time_to_die <= 0:
 
 
1007
            # The timeout has passed
 
 
1010
            self.disable_initiator_tag = (gobject.timeout_add
 
 
1011
                                          (time_to_die, self.disable))
 
 
1013
    # interval - property
 
 
1014
    @dbus_service_property(_interface, signature=u"t",
 
 
1015
                           access=u"readwrite")
 
 
1016
    def interval_dbus_property(self, value=None):
 
 
1017
        if value is None:       # get
 
 
1018
            return dbus.UInt64(self.interval_milliseconds())
 
 
1019
        self.interval = datetime.timedelta(0, 0, 0, value)
 
 
1021
        self.PropertyChanged(dbus.String(u"interval"),
 
 
1022
                             dbus.UInt64(value, variant_level=1))
 
 
1023
        if getattr(self, u"checker_initiator_tag", None) is None:
 
 
1025
        # Reschedule checker run
 
 
1026
        gobject.source_remove(self.checker_initiator_tag)
 
 
1027
        self.checker_initiator_tag = (gobject.timeout_add
 
 
1028
                                      (value, self.start_checker))
 
 
1029
        self.start_checker()    # Start one now, too
 
 
1031
    # checker - property
 
 
1032
    @dbus_service_property(_interface, signature=u"s",
 
 
1033
                           access=u"readwrite")
 
 
1034
    def checker_dbus_property(self, value=None):
 
 
1035
        if value is None:       # get
 
 
1036
            return dbus.String(self.checker_command)
 
 
1037
        self.checker_command = value
 
 
1039
        self.PropertyChanged(dbus.String(u"checker"),
 
 
1040
                             dbus.String(self.checker_command,
 
 
1043
    # checker_running - property
 
 
1044
    @dbus_service_property(_interface, signature=u"b",
 
 
1045
                           access=u"readwrite")
 
 
1046
    def checker_running_dbus_property(self, value=None):
 
 
1047
        if value is None:       # get
 
 
1048
            return dbus.Boolean(self.checker is not None)
 
 
1050
            self.start_checker()
 
 
1054
    # object_path - property
 
 
1055
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
 
1056
    def object_path_dbus_property(self):
 
 
1057
        return self.dbus_object_path # is already a dbus.ObjectPath
 
 
1060
    @dbus_service_property(_interface, signature=u"ay",
 
 
1061
                           access=u"write", byte_arrays=True)
 
 
1062
    def secret_dbus_property(self, value):
 
 
1063
        self.secret = str(value)
 
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.
 
 
1068
class ProxyClient(object):
 
 
1069
    def __init__(self, child_pipe, fpr, address):
 
 
1070
        self._pipe = child_pipe
 
 
1071
        self._pipe.send(('init', fpr, address))
 
 
1072
        if not self._pipe.recv():
 
 
1075
    def __getattribute__(self, name):
 
 
1076
        if(name == '_pipe'):
 
 
1077
            return super(ProxyClient, self).__getattribute__(name)
 
 
1078
        self._pipe.send(('getattr', name))
 
 
1079
        data = self._pipe.recv()
 
 
1080
        if data[0] == 'data':
 
 
1082
        if data[0] == 'function':
 
 
1083
            def func(*args, **kwargs):
 
 
1084
                self._pipe.send(('funcall', name, args, kwargs))
 
 
1085
                return self._pipe.recv()[1]
 
 
1088
    def __setattr__(self, name, value):
 
 
1089
        if(name == '_pipe'):
 
 
1090
            return super(ProxyClient, self).__setattr__(name, value)
 
 
1091
        self._pipe.send(('setattr', name, value))
 
 
1094
class ClientHandler(socketserver.BaseRequestHandler, object):
 
 
1095
    """A class to handle client connections.
 
 
1097
    Instantiated once for each connection to handle it.
 
676
1098
    Note: This will run in its own forked process."""
 
678
1100
    def handle(self):
 
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):
 
 
1101
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
 
1102
            logger.info(u"TCP connection from: %s",
 
 
1103
                        unicode(self.client_address))
 
 
1104
            logger.debug(u"Pipe FD: %d",
 
 
1105
                         self.server.child_pipe.fileno())
 
 
1107
            session = (gnutls.connection
 
 
1108
                       .ClientSession(self.request,
 
 
1110
                                      .X509Credentials()))
 
 
1112
            # Note: gnutls.connection.X509Credentials is really a
 
 
1113
            # generic GnuTLS certificate credentials object so long as
 
 
1114
            # no X.509 keys are added to it.  Therefore, we can use it
 
 
1115
            # here despite using OpenPGP certificates.
 
 
1117
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
 
1118
            #                      u"+AES-256-CBC", u"+SHA1",
 
 
1119
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
 
1121
            # Use a fallback default, since this MUST be set.
 
 
1122
            priority = self.server.gnutls_priority
 
 
1123
            if priority is None:
 
 
1124
                priority = u"NORMAL"
 
 
1125
            (gnutls.library.functions
 
 
1126
             .gnutls_priority_set_direct(session._c_object,
 
 
1129
            # Start communication using the Mandos protocol
 
 
1130
            # Get protocol number
 
 
1131
            line = self.request.makefile().readline()
 
 
1132
            logger.debug(u"Protocol version: %r", line)
 
 
1134
                if int(line.strip().split()[0]) > 1:
 
 
1136
            except (ValueError, IndexError, RuntimeError), error:
 
 
1137
                logger.error(u"Unknown protocol version: %s", error)
 
 
1140
            # Start GnuTLS connection
 
 
1143
            except gnutls.errors.GNUTLSError, error:
 
 
1144
                logger.warning(u"Handshake failed: %s", error)
 
 
1145
                # Do not run session.bye() here: the session is not
 
 
1146
                # established.  Just abandon the request.
 
 
1148
            logger.debug(u"Handshake succeeded")
 
 
1150
            approval_required = False
 
 
1153
                    fpr = self.fingerprint(self.peer_certificate
 
 
1155
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
 
1156
                    logger.warning(u"Bad certificate: %s", error)
 
 
1158
                logger.debug(u"Fingerprint: %s", fpr)
 
 
1161
                    client = ProxyClient(child_pipe, fpr,
 
 
1162
                                         self.client_address)
 
 
1166
                if client.approved_delay:
 
 
1167
                    delay = client.approved_delay
 
 
1168
                    client.approvals_pending += 1
 
 
1169
                    approval_required = True
 
 
1172
                    if not client.enabled:
 
 
1173
                        logger.warning(u"Client %s is disabled",
 
 
1175
                        if self.server.use_dbus:
 
 
1177
                            client.Rejected("Disabled")                    
 
 
1180
                    if client._approved or not client.approved_delay:
 
 
1181
                        #We are approved or approval is disabled
 
 
1183
                    elif client._approved is None:
 
 
1184
                        logger.info(u"Client %s need approval",
 
 
1186
                        if self.server.use_dbus:
 
 
1188
                            client.NeedApproval(
 
 
1189
                                client.approved_delay_milliseconds(),
 
 
1190
                                client.approved_by_default)
 
 
1192
                        logger.warning(u"Client %s was not approved",
 
 
1194
                        if self.server.use_dbus:
 
 
1196
                            client.Rejected("Disapproved")
 
 
1199
                    #wait until timeout or approved
 
 
1200
                    #x = float(client._timedelta_to_milliseconds(delay))
 
 
1201
                    time = datetime.datetime.now()
 
 
1202
                    client.changedstate.acquire()
 
 
1203
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
 
1204
                    client.changedstate.release()
 
 
1205
                    time2 = datetime.datetime.now()
 
 
1206
                    if (time2 - time) >= delay:
 
 
1207
                        if not client.approved_by_default:
 
 
1208
                            logger.warning("Client %s timed out while"
 
 
1209
                                           " waiting for approval",
 
 
1211
                            if self.server.use_dbus:
 
 
1213
                                client.Rejected("Time out")
 
 
1218
                        delay -= time2 - time
 
 
1221
                while sent_size < len(client.secret):
 
 
1222
                    # XXX handle session exception
 
 
1223
                    sent = session.send(client.secret[sent_size:])
 
 
1224
                    logger.debug(u"Sent: %d, remaining: %d",
 
 
1225
                                 sent, len(client.secret)
 
 
1226
                                 - (sent_size + sent))
 
 
1229
                logger.info(u"Sending secret to %s", client.name)
 
 
1230
                # bump the timeout as if seen
 
 
1232
                if self.server.use_dbus:
 
 
1237
                if approval_required:
 
 
1238
                    client.approvals_pending -= 1
 
 
1242
    def peer_certificate(session):
 
 
1243
        "Return the peer's OpenPGP certificate as a bytestring"
 
 
1244
        # If not an OpenPGP certificate...
 
 
1245
        if (gnutls.library.functions
 
 
1246
            .gnutls_certificate_type_get(session._c_object)
 
 
1247
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1248
            # ...do the normal thing
 
 
1249
            return session.peer_certificate
 
 
1250
        list_size = ctypes.c_uint(1)
 
 
1251
        cert_list = (gnutls.library.functions
 
 
1252
                     .gnutls_certificate_get_peers
 
 
1253
                     (session._c_object, ctypes.byref(list_size)))
 
 
1254
        if not bool(cert_list) and list_size.value != 0:
 
 
1255
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
 
1257
        if list_size.value == 0:
 
 
1260
        return ctypes.string_at(cert.data, cert.size)
 
 
1263
    def fingerprint(openpgp):
 
 
1264
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
 
1265
        # New GnuTLS "datum" with the OpenPGP public key
 
 
1266
        datum = (gnutls.library.types
 
 
1267
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1270
                                 ctypes.c_uint(len(openpgp))))
 
 
1271
        # New empty GnuTLS certificate
 
 
1272
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1273
        (gnutls.library.functions
 
 
1274
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
1275
        # Import the OpenPGP public key into the certificate
 
 
1276
        (gnutls.library.functions
 
 
1277
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1278
                                    gnutls.library.constants
 
 
1279
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
1280
        # Verify the self signature in the key
 
 
1281
        crtverify = ctypes.c_uint()
 
 
1282
        (gnutls.library.functions
 
 
1283
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1284
                                         ctypes.byref(crtverify)))
 
 
1285
        if crtverify.value != 0:
 
 
1286
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1287
            raise (gnutls.errors.CertificateSecurityError
 
 
1289
        # New buffer for the fingerprint
 
 
1290
        buf = ctypes.create_string_buffer(20)
 
 
1291
        buf_len = ctypes.c_size_t()
 
 
1292
        # Get the fingerprint from the certificate into the buffer
 
 
1293
        (gnutls.library.functions
 
 
1294
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1295
                                             ctypes.byref(buf_len)))
 
 
1296
        # Deinit the certificate
 
 
1297
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1298
        # Convert the buffer to a Python bytestring
 
 
1299
        fpr = ctypes.string_at(buf, buf_len.value)
 
 
1300
        # Convert the bytestring to hexadecimal notation
 
 
1301
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
 
1305
class MultiprocessingMixIn(object):
 
 
1306
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
 
1307
    def sub_process_main(self, request, address):
 
 
1309
            self.finish_request(request, address)
 
 
1311
            self.handle_error(request, address)
 
 
1312
        self.close_request(request)
 
 
1314
    def process_request(self, request, address):
 
 
1315
        """Start a new process to process the request."""
 
 
1316
        multiprocessing.Process(target = self.sub_process_main,
 
 
1317
                                args = (request, address)).start()
 
 
1319
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
 
1320
    """ adds a pipe to the MixIn """
 
 
1321
    def process_request(self, request, client_address):
 
 
1322
        """Overrides and wraps the original process_request().
 
 
1324
        This function creates a new pipe in self.pipe
 
 
1326
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
 
1328
        super(MultiprocessingMixInWithPipe,
 
 
1329
              self).process_request(request, client_address)
 
 
1330
        self.add_pipe(parent_pipe)
 
 
1331
    def add_pipe(self, parent_pipe):
 
 
1332
        """Dummy function; override as necessary"""
 
 
1335
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
 
1336
                     socketserver.TCPServer, object):
 
756
1337
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
758
 
        settings:       Server settings
 
759
 
        clients:        Set() of Client objects
 
760
1340
        enabled:        Boolean; whether this server is activated yet
 
 
1341
        interface:      None or a network interface name (string)
 
 
1342
        use_ipv6:       Boolean; to use IPv6 or not
 
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)
 
 
1344
    def __init__(self, server_address, RequestHandlerClass,
 
 
1345
                 interface=None, use_ipv6=True):
 
 
1346
        self.interface = interface
 
 
1348
            self.address_family = socket.AF_INET6
 
 
1349
        socketserver.TCPServer.__init__(self, server_address,
 
 
1350
                                        RequestHandlerClass)
 
776
1351
    def server_bind(self):
 
777
1352
        """This overrides the normal server_bind() function
 
778
1353
        to bind to an interface if one was specified, and also NOT to
 
779
1354
        bind to an address or port if they were not specified."""
 
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"])
 
 
1355
        if self.interface is not None:
 
 
1356
            if SO_BINDTODEVICE is None:
 
 
1357
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
 
1358
                             u" cannot bind to interface %s",
 
 
1362
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1366
                except socket.error, error:
 
 
1367
                    if error[0] == errno.EPERM:
 
 
1368
                        logger.error(u"No permission to"
 
 
1369
                                     u" bind to interface %s",
 
 
1371
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1372
                        logger.error(u"SO_BINDTODEVICE not available;"
 
 
1373
                                     u" cannot bind to interface %s",
 
794
1377
        # Only bind(2) the socket if we really need to.
 
795
1378
        if self.server_address[0] or self.server_address[1]:
 
796
1379
            if not self.server_address[0]:
 
797
1380
                if self.address_family == socket.AF_INET6:
 
798
 
                    any_address = "::" # in6addr_any
 
 
1381
                    any_address = u"::" # in6addr_any
 
800
1383
                    any_address = socket.INADDR_ANY
 
801
1384
                self.server_address = (any_address,
 
 
963
1628
    # Default values for config file for server-global settings
 
964
 
    server_defaults = { "interface": "",
 
969
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
970
 
                        "servicename": "Mandos",
 
 
1629
    server_defaults = { u"interface": u"",
 
 
1634
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1635
                        u"servicename": u"Mandos",
 
 
1636
                        u"use_dbus": u"True",
 
 
1637
                        u"use_ipv6": u"True",
 
975
1640
    # Parse config file for server-global settings
 
976
 
    server_config = ConfigParser.SafeConfigParser(server_defaults)
 
 
1641
    server_config = configparser.SafeConfigParser(server_defaults)
 
977
1642
    del server_defaults
 
978
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
1643
    server_config.read(os.path.join(options.configdir,
 
979
1645
    # Convert the SafeConfigParser object to a dict
 
980
1646
    server_settings = server_config.defaults()
 
981
1647
    # Use the appropriate methods on the non-string config options
 
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",
 
 
1648
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
 
1649
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
988
1651
    if server_settings["port"]:
 
989
 
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
1652
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
991
1654
    del server_config
 
993
1656
    # Override the settings from the config file with command line
 
994
1657
    # options, if set.
 
995
 
    for option in ("interface", "address", "port", "debug",
 
996
 
                   "priority", "servicename", "configdir",
 
997
 
                   "use_dbus", "use_ipv6"):
 
 
1658
    for option in (u"interface", u"address", u"port", u"debug",
 
 
1659
                   u"priority", u"servicename", u"configdir",
 
 
1660
                   u"use_dbus", u"use_ipv6"):
 
998
1661
        value = getattr(options, option)
 
999
1662
        if value is not None:
 
1000
1663
            server_settings[option] = value
 
 
1665
    # Force all strings to be unicode
 
 
1666
    for option in server_settings.keys():
 
 
1667
        if type(server_settings[option]) is str:
 
 
1668
            server_settings[option] = unicode(server_settings[option])
 
1002
1669
    # Now we have our good server settings in "server_settings"
 
 
1671
    ##################################################################
 
1004
1673
    # For convenience
 
1005
 
    debug = server_settings["debug"]
 
1006
 
    use_dbus = server_settings["use_dbus"]
 
1007
 
    use_ipv6 = server_settings["use_ipv6"]
 
 
1674
    debug = server_settings[u"debug"]
 
 
1675
    use_dbus = server_settings[u"use_dbus"]
 
 
1676
    use_ipv6 = server_settings[u"use_ipv6"]
 
1010
1679
        syslogger.setLevel(logging.WARNING)
 
1011
1680
        console.setLevel(logging.WARNING)
 
1013
 
    if server_settings["servicename"] != "Mandos":
 
 
1682
    if server_settings[u"servicename"] != u"Mandos":
 
1014
1683
        syslogger.setFormatter(logging.Formatter
 
1015
 
                               ('Mandos (%s): %%(levelname)s:'
 
1017
 
                                % server_settings["servicename"]))
 
 
1684
                               (u'Mandos (%s) [%%(process)d]:'
 
 
1685
                                u' %%(levelname)s: %%(message)s'
 
 
1686
                                % server_settings[u"servicename"]))
 
1019
1688
    # Parse config file with clients
 
1020
 
    client_defaults = { "timeout": "1h",
 
1022
 
                        "checker": "fping -q -- %%(host)s",
 
 
1689
    client_defaults = { u"timeout": u"1h",
 
 
1691
                        u"checker": u"fping -q -- %%(host)s",
 
 
1693
                        u"approved_delay": u"0s",
 
 
1694
                        u"approved_duration": u"1s",
 
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"
 
 
1696
    client_config = configparser.SafeConfigParser(client_defaults)
 
 
1697
    client_config.read(os.path.join(server_settings[u"configdir"],
 
 
1700
    global mandos_dbus_service
 
 
1701
    mandos_dbus_service = None
 
 
1703
    tcp_server = MandosServer((server_settings[u"address"],
 
 
1704
                               server_settings[u"port"]),
 
 
1706
                              interface=server_settings[u"interface"],
 
 
1709
                              server_settings[u"priority"],
 
 
1711
    pidfilename = u"/var/run/mandos.pid"
 
1037
 
        pidfile = open(pidfilename, "w")
 
 
1713
        pidfile = open(pidfilename, u"w")
 
1038
1714
    except IOError:
 
1039
 
        logger.error("Could not open file %r", pidfilename)
 
 
1715
        logger.error(u"Could not open file %r", pidfilename)
 
1042
 
        uid = pwd.getpwnam("_mandos").pw_uid
 
1043
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
 
1718
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
 
1719
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1044
1720
    except KeyError:
 
1046
 
            uid = pwd.getpwnam("mandos").pw_uid
 
1047
 
            gid = pwd.getpwnam("mandos").pw_gid
 
 
1722
            uid = pwd.getpwnam(u"mandos").pw_uid
 
 
1723
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1048
1724
        except KeyError:
 
1050
 
                uid = pwd.getpwnam("nobody").pw_uid
 
1051
 
                gid = pwd.getpwnam("nogroup").pw_gid
 
 
1726
                uid = pwd.getpwnam(u"nobody").pw_uid
 
 
1727
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1052
1728
            except KeyError: