133
157
                            u" after %i retries, exiting.",
 
134
158
                            self.rename_count)
 
135
159
            raise AvahiServiceError(u"Too many renames")
 
136
 
        self.name = server.GetAlternativeServiceName(self.name)
 
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
137
161
        logger.info(u"Changing Zeroconf service name to %r ...",
 
139
163
        syslogger.setFormatter(logging.Formatter
 
140
 
                               ('Mandos (%s): %%(levelname)s:'
 
141
 
                                ' %%(message)s' % self.name))
 
 
164
                               (u'Mandos (%s) [%%(process)d]:'
 
 
165
                                u' %%(levelname)s: %%(message)s'
 
 
170
        except dbus.exceptions.DBusException, error:
 
 
171
            logger.critical(u"DBusException: %s", error)
 
144
174
        self.rename_count += 1
 
145
175
    def remove(self):
 
146
176
        """Derived from the Avahi example code"""
 
147
 
        if group is not None:
 
 
177
        if self.group is not None:
 
150
180
        """Derived from the Avahi example code"""
 
153
 
            group = dbus.Interface(bus.get_object
 
155
 
                                    server.EntryGroupNew()),
 
156
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
157
 
            group.connect_to_signal('StateChanged',
 
158
 
                                    entry_group_state_changed)
 
 
181
        if self.group is None:
 
 
182
            self.group = dbus.Interface(
 
 
183
                self.bus.get_object(avahi.DBUS_NAME,
 
 
184
                                    self.server.EntryGroupNew()),
 
 
185
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
 
186
            self.group.connect_to_signal('StateChanged',
 
 
188
                                         .entry_group_state_changed)
 
159
189
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
160
 
                     service.name, service.type)
 
162
 
                self.interface,         # interface
 
163
 
                self.protocol,          # protocol
 
164
 
                dbus.UInt32(0),         # flags
 
165
 
                self.name, self.type,
 
166
 
                self.domain, self.host,
 
167
 
                dbus.UInt16(self.port),
 
168
 
                avahi.string_array_to_txt_array(self.TXT))
 
171
 
# From the Avahi example code:
 
172
 
group = None                            # our entry group
 
173
 
# End of Avahi example code
 
176
 
def _datetime_to_dbus(dt, variant_level=0):
 
177
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
178
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
181
 
class Client(dbus.service.Object):
 
 
190
                     self.name, self.type)
 
 
191
        self.group.AddService(
 
 
194
            dbus.UInt32(0),     # flags
 
 
195
            self.name, self.type,
 
 
196
            self.domain, self.host,
 
 
197
            dbus.UInt16(self.port),
 
 
198
            avahi.string_array_to_txt_array(self.TXT))
 
 
200
    def entry_group_state_changed(self, state, error):
 
 
201
        """Derived from the Avahi example code"""
 
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
 
 
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
 
205
            logger.debug(u"Zeroconf service established.")
 
 
206
        elif state == avahi.ENTRY_GROUP_COLLISION:
 
 
207
            logger.warning(u"Zeroconf service name collision.")
 
 
209
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
 
210
            logger.critical(u"Avahi: Error in group state changed %s",
 
 
212
            raise AvahiGroupError(u"State changed: %s"
 
 
215
        """Derived from the Avahi example code"""
 
 
216
        if self.group is not None:
 
 
219
    def server_state_changed(self, state):
 
 
220
        """Derived from the Avahi example code"""
 
 
221
        logger.debug(u"Avahi server state change: %i", state)
 
 
222
        if state == avahi.SERVER_COLLISION:
 
 
223
            logger.error(u"Zeroconf server name collision")
 
 
225
        elif state == avahi.SERVER_RUNNING:
 
 
228
        """Derived from the Avahi example code"""
 
 
229
        if self.server is None:
 
 
230
            self.server = dbus.Interface(
 
 
231
                self.bus.get_object(avahi.DBUS_NAME,
 
 
232
                                    avahi.DBUS_PATH_SERVER),
 
 
233
                avahi.DBUS_INTERFACE_SERVER)
 
 
234
        self.server.connect_to_signal(u"StateChanged",
 
 
235
                                 self.server_state_changed)
 
 
236
        self.server_state_changed(self.server.GetState())
 
 
239
class Client(object):
 
182
240
    """A representation of a client host served by this server.
 
184
 
    name:       string; from the config file, used in log messages and
 
186
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
187
 
                 uniquely identify the client
 
188
 
    secret:     bytestring; sent verbatim (over TLS) to client
 
189
 
    host:       string; available for use by the checker command
 
190
 
    created:    datetime.datetime(); (UTC) object creation
 
191
 
    last_enabled: datetime.datetime(); (UTC)
 
193
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
194
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
195
 
                                      until this client is invalid
 
196
 
    interval:   datetime.timedelta(); How often to start a new checker
 
197
 
    disable_hook:  If set, called by disable() as disable_hook(self)
 
 
243
    _approved:   bool(); 'None' if not yet approved/disapproved
 
 
244
    approval_delay: datetime.timedelta(); Time to wait for approval
 
 
245
    approval_duration: datetime.timedelta(); Duration of one approval
 
198
246
    checker:    subprocess.Popen(); a running checker process used
 
199
247
                                    to see if the client lives.
 
200
248
                                    'None' if no process is running.
 
201
 
    checker_initiator_tag: a gobject event source tag, or None
 
202
 
    disable_initiator_tag:    - '' -
 
203
249
    checker_callback_tag:  - '' -
 
204
 
    checker_command: string; External command which is run to check if
 
205
 
                     client lives.  %() expansions are done at
 
 
250
    checker_command: string; External command which is run to check
 
 
251
                     if client lives.  %() expansions are done at
 
206
252
                     runtime with vars(self) as dict, so that for
 
207
253
                     instance %(name)s can be used in the command.
 
 
254
    checker_initiator_tag: a gobject event source tag, or None
 
 
255
    created:    datetime.datetime(); (UTC) object creation
 
208
256
    current_checker_command: string; current running checker_command
 
209
 
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
210
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
 
 
257
    disable_hook:  If set, called by disable() as disable_hook(self)
 
 
258
    disable_initiator_tag: - '' -
 
 
260
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
 
261
                 uniquely identify the client
 
 
262
    host:       string; available for use by the checker command
 
 
263
    interval:   datetime.timedelta(); How often to start a new checker
 
 
264
    last_checked_ok: datetime.datetime(); (UTC) or None
 
 
265
    last_enabled: datetime.datetime(); (UTC)
 
 
266
    name:       string; from the config file, used in log messages and
 
 
268
    secret:     bytestring; sent verbatim (over TLS) to client
 
 
269
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
 
270
                                      until this client is disabled
 
 
271
    runtime_expansions: Allowed attributes for runtime expansion.
 
 
274
    runtime_expansions = (u"approval_delay", u"approval_duration",
 
 
275
                          u"created", u"enabled", u"fingerprint",
 
 
276
                          u"host", u"interval", u"last_checked_ok",
 
 
277
                          u"last_enabled", u"name", u"timeout")
 
 
280
    def _timedelta_to_milliseconds(td):
 
 
281
        "Convert a datetime.timedelta() to milliseconds"
 
 
282
        return ((td.days * 24 * 60 * 60 * 1000)
 
 
283
                + (td.seconds * 1000)
 
 
284
                + (td.microseconds // 1000))
 
212
286
    def timeout_milliseconds(self):
 
213
287
        "Return the 'timeout' attribute in milliseconds"
 
214
 
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
215
 
                + (self.timeout.seconds * 1000)
 
216
 
                + (self.timeout.microseconds // 1000))
 
 
288
        return self._timedelta_to_milliseconds(self.timeout)
 
218
290
    def interval_milliseconds(self):
 
219
291
        "Return the 'interval' attribute in milliseconds"
 
220
 
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
221
 
                + (self.interval.seconds * 1000)
 
222
 
                + (self.interval.microseconds // 1000))
 
 
292
        return self._timedelta_to_milliseconds(self.interval)
 
 
294
    def approval_delay_milliseconds(self):
 
 
295
        return self._timedelta_to_milliseconds(self.approval_delay)
 
224
 
    def __init__(self, name = None, disable_hook=None, config=None,
 
 
297
    def __init__(self, name = None, disable_hook=None, config=None):
 
226
298
        """Note: the 'checker' key in 'config' sets the
 
227
299
        'checker_command' attribute and *not* the 'checker'
 
 
444
502
        if self.checker_callback_tag:
 
445
503
            gobject.source_remove(self.checker_callback_tag)
 
446
504
            self.checker_callback_tag = None
 
447
 
        if getattr(self, "checker", None) is None:
 
 
505
        if getattr(self, u"checker", None) is None:
 
449
507
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
451
509
            os.kill(self.checker.pid, signal.SIGTERM)
 
453
511
            #if self.checker.poll() is None:
 
454
512
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
455
513
        except OSError, error:
 
456
514
            if error.errno != errno.ESRCH: # No such process
 
458
516
        self.checker = None
 
460
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
461
 
                                 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
 
 
518
def dbus_service_property(dbus_interface, signature=u"v",
 
 
519
                          access=u"readwrite", byte_arrays=False):
 
 
520
    """Decorators for marking methods of a DBusObjectWithProperties to
 
 
521
    become properties on the D-Bus.
 
 
523
    The decorated method will be called with no arguments by "Get"
 
 
524
    and with one argument by "Set".
 
 
526
    The parameters, where they are supported, are the same as
 
 
527
    dbus.service.method, except there is only "signature", since the
 
 
528
    type from Get() and the type sent to Set() is the same.
 
 
530
    # Encoding deeply encoded byte arrays is not supported yet by the
 
 
531
    # "Set" method, so we fail early here:
 
 
532
    if byte_arrays and signature != u"ay":
 
 
533
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
 
534
                         u" signature %r" % signature)
 
 
536
        func._dbus_is_property = True
 
 
537
        func._dbus_interface = dbus_interface
 
 
538
        func._dbus_signature = signature
 
 
539
        func._dbus_access = access
 
 
540
        func._dbus_name = func.__name__
 
 
541
        if func._dbus_name.endswith(u"_dbus_property"):
 
 
542
            func._dbus_name = func._dbus_name[:-14]
 
 
543
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
 
548
class DBusPropertyException(dbus.exceptions.DBusException):
 
 
549
    """A base class for D-Bus property-related exceptions
 
 
551
    def __unicode__(self):
 
 
552
        return unicode(str(self))
 
 
555
class DBusPropertyAccessException(DBusPropertyException):
 
 
556
    """A property's access permissions disallows an operation.
 
 
561
class DBusPropertyNotFound(DBusPropertyException):
 
 
562
    """An attempt was made to access a non-existing property.
 
 
567
class DBusObjectWithProperties(dbus.service.Object):
 
 
568
    """A D-Bus object with properties.
 
 
570
    Classes inheriting from this can use the dbus_service_property
 
 
571
    decorator to expose methods as D-Bus properties.  It exposes the
 
 
572
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
 
576
    def _is_dbus_property(obj):
 
 
577
        return getattr(obj, u"_dbus_is_property", False)
 
 
579
    def _get_all_dbus_properties(self):
 
 
580
        """Returns a generator of (name, attribute) pairs
 
 
582
        return ((prop._dbus_name, prop)
 
 
584
                inspect.getmembers(self, self._is_dbus_property))
 
 
586
    def _get_dbus_property(self, interface_name, property_name):
 
 
587
        """Returns a bound method if one exists which is a D-Bus
 
 
588
        property with the specified name and interface.
 
 
590
        for name in (property_name,
 
 
591
                     property_name + u"_dbus_property"):
 
 
592
            prop = getattr(self, name, None)
 
 
594
                or not self._is_dbus_property(prop)
 
 
595
                or prop._dbus_name != property_name
 
 
596
                or (interface_name and prop._dbus_interface
 
 
597
                    and interface_name != prop._dbus_interface)):
 
 
601
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
 
602
                                   + interface_name + u"."
 
 
605
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
 
607
    def Get(self, interface_name, property_name):
 
 
608
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
610
        prop = self._get_dbus_property(interface_name, property_name)
 
 
611
        if prop._dbus_access == u"write":
 
 
612
            raise DBusPropertyAccessException(property_name)
 
 
614
        if not hasattr(value, u"variant_level"):
 
 
616
        return type(value)(value, variant_level=value.variant_level+1)
 
 
618
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
 
619
    def Set(self, interface_name, property_name, value):
 
 
620
        """Standard D-Bus property Set() method, see D-Bus standard.
 
 
622
        prop = self._get_dbus_property(interface_name, property_name)
 
 
623
        if prop._dbus_access == u"read":
 
 
624
            raise DBusPropertyAccessException(property_name)
 
 
625
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
 
626
            # The byte_arrays option is not supported yet on
 
 
627
            # signatures other than "ay".
 
 
628
            if prop._dbus_signature != u"ay":
 
 
630
            value = dbus.ByteArray(''.join(unichr(byte)
 
 
634
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
 
635
                         out_signature=u"a{sv}")
 
 
636
    def GetAll(self, interface_name):
 
 
637
        """Standard D-Bus property GetAll() method, see D-Bus
 
 
640
        Note: Will not include properties with access="write".
 
 
643
        for name, prop in self._get_all_dbus_properties():
 
 
645
                and interface_name != prop._dbus_interface):
 
 
646
                # Interface non-empty but did not match
 
 
648
            # Ignore write-only properties
 
 
649
            if prop._dbus_access == u"write":
 
 
652
            if not hasattr(value, u"variant_level"):
 
 
655
            all[name] = type(value)(value, variant_level=
 
 
656
                                    value.variant_level+1)
 
 
657
        return dbus.Dictionary(all, signature=u"sv")
 
 
659
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
661
                         path_keyword='object_path',
 
 
662
                         connection_keyword='connection')
 
 
663
    def Introspect(self, object_path, connection):
 
 
664
        """Standard D-Bus method, overloaded to insert property tags.
 
 
666
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
669
            document = xml.dom.minidom.parseString(xmlstring)
 
 
670
            def make_tag(document, name, prop):
 
 
671
                e = document.createElement(u"property")
 
 
672
                e.setAttribute(u"name", name)
 
 
673
                e.setAttribute(u"type", prop._dbus_signature)
 
 
674
                e.setAttribute(u"access", prop._dbus_access)
 
 
676
            for if_tag in document.getElementsByTagName(u"interface"):
 
 
677
                for tag in (make_tag(document, name, prop)
 
 
679
                            in self._get_all_dbus_properties()
 
 
680
                            if prop._dbus_interface
 
 
681
                            == if_tag.getAttribute(u"name")):
 
 
682
                    if_tag.appendChild(tag)
 
 
683
                # Add the names to the return values for the
 
 
684
                # "org.freedesktop.DBus.Properties" methods
 
 
685
                if (if_tag.getAttribute(u"name")
 
 
686
                    == u"org.freedesktop.DBus.Properties"):
 
 
687
                    for cn in if_tag.getElementsByTagName(u"method"):
 
 
688
                        if cn.getAttribute(u"name") == u"Get":
 
 
689
                            for arg in cn.getElementsByTagName(u"arg"):
 
 
690
                                if (arg.getAttribute(u"direction")
 
 
692
                                    arg.setAttribute(u"name", u"value")
 
 
693
                        elif cn.getAttribute(u"name") == u"GetAll":
 
 
694
                            for arg in cn.getElementsByTagName(u"arg"):
 
 
695
                                if (arg.getAttribute(u"direction")
 
 
697
                                    arg.setAttribute(u"name", u"props")
 
 
698
            xmlstring = document.toxml(u"utf-8")
 
 
700
        except (AttributeError, xml.dom.DOMException,
 
 
701
                xml.parsers.expat.ExpatError), error:
 
 
702
            logger.error(u"Failed to override Introspection method",
 
 
707
class ClientDBus(Client, DBusObjectWithProperties):
 
 
708
    """A Client class using D-Bus
 
 
711
    dbus_object_path: dbus.ObjectPath
 
 
712
    bus: dbus.SystemBus()
 
 
715
    runtime_expansions = (Client.runtime_expansions
 
 
716
                          + (u"dbus_object_path",))
 
 
718
    # dbus.service.Object doesn't use super(), so we can't either.
 
 
720
    def __init__(self, bus = None, *args, **kwargs):
 
 
721
        self._approvals_pending = 0
 
 
723
        Client.__init__(self, *args, **kwargs)
 
 
724
        # Only now, when this client is initialized, can it show up on
 
 
726
        client_object_name = unicode(self.name).translate(
 
 
727
            {ord(u"."): ord(u"_"),
 
 
728
             ord(u"-"): ord(u"_")})
 
 
729
        self.dbus_object_path = (dbus.ObjectPath
 
 
730
                                 (u"/clients/" + client_object_name))
 
 
731
        DBusObjectWithProperties.__init__(self, self.bus,
 
 
732
                                          self.dbus_object_path)
 
 
734
    def _get_approvals_pending(self):
 
 
735
        return self._approvals_pending
 
 
736
    def _set_approvals_pending(self, value):
 
 
737
        old_value = self._approvals_pending
 
 
738
        self._approvals_pending = value
 
 
740
        if (hasattr(self, "dbus_object_path")
 
 
741
            and bval is not bool(old_value)):
 
 
742
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
 
743
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
 
746
    approvals_pending = property(_get_approvals_pending,
 
 
747
                                 _set_approvals_pending)
 
 
748
    del _get_approvals_pending, _set_approvals_pending
 
 
751
    def _datetime_to_dbus(dt, variant_level=0):
 
 
752
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
753
        return dbus.String(dt.isoformat(),
 
 
754
                           variant_level=variant_level)
 
 
757
        oldstate = getattr(self, u"enabled", False)
 
 
758
        r = Client.enable(self)
 
 
759
        if oldstate != self.enabled:
 
 
761
            self.PropertyChanged(dbus.String(u"Enabled"),
 
 
762
                                 dbus.Boolean(True, variant_level=1))
 
 
763
            self.PropertyChanged(
 
 
764
                dbus.String(u"LastEnabled"),
 
 
765
                self._datetime_to_dbus(self.last_enabled,
 
 
769
    def disable(self, quiet = False):
 
 
770
        oldstate = getattr(self, u"enabled", False)
 
 
771
        r = Client.disable(self, quiet=quiet)
 
 
772
        if not quiet and oldstate != self.enabled:
 
 
774
            self.PropertyChanged(dbus.String(u"Enabled"),
 
 
775
                                 dbus.Boolean(False, variant_level=1))
 
 
778
    def __del__(self, *args, **kwargs):
 
 
780
            self.remove_from_connection()
 
 
783
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
 
784
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
 
 
785
        Client.__del__(self, *args, **kwargs)
 
 
787
    def checker_callback(self, pid, condition, command,
 
 
789
        self.checker_callback_tag = None
 
 
792
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
 
793
                             dbus.Boolean(False, variant_level=1))
 
 
794
        if os.WIFEXITED(condition):
 
 
795
            exitstatus = os.WEXITSTATUS(condition)
 
 
797
            self.CheckerCompleted(dbus.Int16(exitstatus),
 
 
798
                                  dbus.Int64(condition),
 
 
799
                                  dbus.String(command))
 
 
802
            self.CheckerCompleted(dbus.Int16(-1),
 
 
803
                                  dbus.Int64(condition),
 
 
804
                                  dbus.String(command))
 
 
806
        return Client.checker_callback(self, pid, condition, command,
 
 
809
    def checked_ok(self, *args, **kwargs):
 
 
810
        r = Client.checked_ok(self, *args, **kwargs)
 
 
812
        self.PropertyChanged(
 
 
813
            dbus.String(u"LastCheckedOK"),
 
 
814
            (self._datetime_to_dbus(self.last_checked_ok,
 
 
818
    def start_checker(self, *args, **kwargs):
 
 
819
        old_checker = self.checker
 
 
820
        if self.checker is not None:
 
 
821
            old_checker_pid = self.checker.pid
 
 
823
            old_checker_pid = None
 
 
824
        r = Client.start_checker(self, *args, **kwargs)
 
 
825
        # Only if new checker process was started
 
 
826
        if (self.checker is not None
 
 
827
            and old_checker_pid != self.checker.pid):
 
 
829
            self.CheckerStarted(self.current_checker_command)
 
 
830
            self.PropertyChanged(
 
 
831
                dbus.String(u"CheckerRunning"),
 
 
832
                dbus.Boolean(True, variant_level=1))
 
 
835
    def stop_checker(self, *args, **kwargs):
 
 
836
        old_checker = getattr(self, u"checker", None)
 
 
837
        r = Client.stop_checker(self, *args, **kwargs)
 
 
838
        if (old_checker is not None
 
 
839
            and getattr(self, u"checker", None) is None):
 
 
840
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
 
841
                                 dbus.Boolean(False, variant_level=1))
 
 
844
    def _reset_approved(self):
 
 
845
        self._approved = None
 
 
848
    def approve(self, value=True):
 
 
849
        self.send_changedstate()
 
 
850
        self._approved = value
 
 
851
        gobject.timeout_add(self._timedelta_to_milliseconds
 
 
852
                            (self.approval_duration),
 
 
853
                            self._reset_approved)
 
 
856
    ## D-Bus methods, signals & properties
 
474
857
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
477
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
478
 
    CheckedOK.__name__ = "CheckedOK"
 
480
861
    # CheckerCompleted - signal
 
481
 
    @dbus.service.signal(_interface, signature="nxs")
 
 
862
    @dbus.service.signal(_interface, signature=u"nxs")
 
482
863
    def CheckerCompleted(self, exitcode, waitstatus, command):
 
486
867
    # CheckerStarted - signal
 
487
 
    @dbus.service.signal(_interface, signature="s")
 
 
868
    @dbus.service.signal(_interface, signature=u"s")
 
488
869
    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
873
    # PropertyChanged - signal
 
540
 
    @dbus.service.signal(_interface, signature="sv")
 
 
874
    @dbus.service.signal(_interface, signature=u"sv")
 
541
875
    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(),
 
 
880
    @dbus.service.signal(_interface)
 
 
883
        Is sent after a successful transfer of secret from the Mandos
 
 
884
        server to mandos-client
 
 
889
    @dbus.service.signal(_interface, signature=u"s")
 
 
890
    def Rejected(self, reason):
 
 
894
    # NeedApproval - signal
 
 
895
    @dbus.service.signal(_interface, signature=u"tb")
 
 
896
    def NeedApproval(self, timeout, default):
 
 
903
    @dbus.service.method(_interface, in_signature=u"b")
 
 
904
    def Approve(self, value):
 
 
908
    @dbus.service.method(_interface)
 
 
910
        return self.checked_ok()
 
589
912
    # Enable - method
 
590
 
    Enable = dbus.service.method(_interface)(enable)
 
591
 
    Enable.__name__ = "Enable"
 
 
913
    @dbus.service.method(_interface)
 
593
918
    # StartChecker - method
 
594
919
    @dbus.service.method(_interface)
 
 
605
930
    # StopChecker - method
 
606
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
607
 
    StopChecker.__name__ = "StopChecker"
 
 
931
    @dbus.service.method(_interface)
 
 
932
    def StopChecker(self):
 
 
937
    # ApprovalPending - property
 
 
938
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
 
939
    def ApprovalPending_dbus_property(self):
 
 
940
        return dbus.Boolean(bool(self.approvals_pending))
 
 
942
    # ApprovedByDefault - property
 
 
943
    @dbus_service_property(_interface, signature=u"b",
 
 
945
    def ApprovedByDefault_dbus_property(self, value=None):
 
 
946
        if value is None:       # get
 
 
947
            return dbus.Boolean(self.approved_by_default)
 
 
948
        self.approved_by_default = bool(value)
 
 
950
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
 
951
                             dbus.Boolean(value, variant_level=1))
 
 
953
    # ApprovalDelay - property
 
 
954
    @dbus_service_property(_interface, signature=u"t",
 
 
956
    def ApprovalDelay_dbus_property(self, value=None):
 
 
957
        if value is None:       # get
 
 
958
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
959
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
 
961
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
 
962
                             dbus.UInt64(value, variant_level=1))
 
 
964
    # ApprovalDuration - property
 
 
965
    @dbus_service_property(_interface, signature=u"t",
 
 
967
    def ApprovalDuration_dbus_property(self, value=None):
 
 
968
        if value is None:       # get
 
 
969
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
 
970
                    self.approval_duration))
 
 
971
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
 
973
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
 
974
                             dbus.UInt64(value, variant_level=1))
 
 
977
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
978
    def Name_dbus_property(self):
 
 
979
        return dbus.String(self.name)
 
 
981
    # Fingerprint - property
 
 
982
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
983
    def Fingerprint_dbus_property(self):
 
 
984
        return dbus.String(self.fingerprint)
 
 
987
    @dbus_service_property(_interface, signature=u"s",
 
 
989
    def Host_dbus_property(self, value=None):
 
 
990
        if value is None:       # get
 
 
991
            return dbus.String(self.host)
 
 
994
        self.PropertyChanged(dbus.String(u"Host"),
 
 
995
                             dbus.String(value, variant_level=1))
 
 
998
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
999
    def Created_dbus_property(self):
 
 
1000
        return dbus.String(self._datetime_to_dbus(self.created))
 
 
1002
    # LastEnabled - property
 
 
1003
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
 
1004
    def LastEnabled_dbus_property(self):
 
 
1005
        if self.last_enabled is None:
 
 
1006
            return dbus.String(u"")
 
 
1007
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
 
1009
    # Enabled - property
 
 
1010
    @dbus_service_property(_interface, signature=u"b",
 
 
1011
                           access=u"readwrite")
 
 
1012
    def Enabled_dbus_property(self, value=None):
 
 
1013
        if value is None:       # get
 
 
1014
            return dbus.Boolean(self.enabled)
 
 
1020
    # LastCheckedOK - property
 
 
1021
    @dbus_service_property(_interface, signature=u"s",
 
 
1022
                           access=u"readwrite")
 
 
1023
    def LastCheckedOK_dbus_property(self, value=None):
 
 
1024
        if value is not None:
 
 
1027
        if self.last_checked_ok is None:
 
 
1028
            return dbus.String(u"")
 
 
1029
        return dbus.String(self._datetime_to_dbus(self
 
 
1032
    # Timeout - property
 
 
1033
    @dbus_service_property(_interface, signature=u"t",
 
 
1034
                           access=u"readwrite")
 
 
1035
    def Timeout_dbus_property(self, value=None):
 
 
1036
        if value is None:       # get
 
 
1037
            return dbus.UInt64(self.timeout_milliseconds())
 
 
1038
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
 
1040
        self.PropertyChanged(dbus.String(u"Timeout"),
 
 
1041
                             dbus.UInt64(value, variant_level=1))
 
 
1042
        if getattr(self, u"disable_initiator_tag", None) is None:
 
 
1044
        # Reschedule timeout
 
 
1045
        gobject.source_remove(self.disable_initiator_tag)
 
 
1046
        self.disable_initiator_tag = None
 
 
1047
        time_to_die = (self.
 
 
1048
                       _timedelta_to_milliseconds((self
 
 
1053
        if time_to_die <= 0:
 
 
1054
            # The timeout has passed
 
 
1057
            self.disable_initiator_tag = (gobject.timeout_add
 
 
1058
                                          (time_to_die, self.disable))
 
 
1060
    # Interval - property
 
 
1061
    @dbus_service_property(_interface, signature=u"t",
 
 
1062
                           access=u"readwrite")
 
 
1063
    def Interval_dbus_property(self, value=None):
 
 
1064
        if value is None:       # get
 
 
1065
            return dbus.UInt64(self.interval_milliseconds())
 
 
1066
        self.interval = datetime.timedelta(0, 0, 0, value)
 
 
1068
        self.PropertyChanged(dbus.String(u"Interval"),
 
 
1069
                             dbus.UInt64(value, variant_level=1))
 
 
1070
        if getattr(self, u"checker_initiator_tag", None) is None:
 
 
1072
        # Reschedule checker run
 
 
1073
        gobject.source_remove(self.checker_initiator_tag)
 
 
1074
        self.checker_initiator_tag = (gobject.timeout_add
 
 
1075
                                      (value, self.start_checker))
 
 
1076
        self.start_checker()    # Start one now, too
 
 
1078
    # Checker - property
 
 
1079
    @dbus_service_property(_interface, signature=u"s",
 
 
1080
                           access=u"readwrite")
 
 
1081
    def Checker_dbus_property(self, value=None):
 
 
1082
        if value is None:       # get
 
 
1083
            return dbus.String(self.checker_command)
 
 
1084
        self.checker_command = value
 
 
1086
        self.PropertyChanged(dbus.String(u"Checker"),
 
 
1087
                             dbus.String(self.checker_command,
 
 
1090
    # CheckerRunning - property
 
 
1091
    @dbus_service_property(_interface, signature=u"b",
 
 
1092
                           access=u"readwrite")
 
 
1093
    def CheckerRunning_dbus_property(self, value=None):
 
 
1094
        if value is None:       # get
 
 
1095
            return dbus.Boolean(self.checker is not None)
 
 
1097
            self.start_checker()
 
 
1101
    # ObjectPath - property
 
 
1102
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
 
1103
    def ObjectPath_dbus_property(self):
 
 
1104
        return self.dbus_object_path # is already a dbus.ObjectPath
 
 
1107
    @dbus_service_property(_interface, signature=u"ay",
 
 
1108
                           access=u"write", byte_arrays=True)
 
 
1109
    def Secret_dbus_property(self, value):
 
 
1110
        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.
 
 
1115
class ProxyClient(object):
 
 
1116
    def __init__(self, child_pipe, fpr, address):
 
 
1117
        self._pipe = child_pipe
 
 
1118
        self._pipe.send(('init', fpr, address))
 
 
1119
        if not self._pipe.recv():
 
 
1122
    def __getattribute__(self, name):
 
 
1123
        if(name == '_pipe'):
 
 
1124
            return super(ProxyClient, self).__getattribute__(name)
 
 
1125
        self._pipe.send(('getattr', name))
 
 
1126
        data = self._pipe.recv()
 
 
1127
        if data[0] == 'data':
 
 
1129
        if data[0] == 'function':
 
 
1130
            def func(*args, **kwargs):
 
 
1131
                self._pipe.send(('funcall', name, args, kwargs))
 
 
1132
                return self._pipe.recv()[1]
 
 
1135
    def __setattr__(self, name, value):
 
 
1136
        if(name == '_pipe'):
 
 
1137
            return super(ProxyClient, self).__setattr__(name, value)
 
 
1138
        self._pipe.send(('setattr', name, value))
 
 
1141
class ClientHandler(socketserver.BaseRequestHandler, object):
 
 
1142
    """A class to handle client connections.
 
 
1144
    Instantiated once for each connection to handle it.
 
676
1145
    Note: This will run in its own forked process."""
 
678
1147
    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):
 
 
1148
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
 
1149
            logger.info(u"TCP connection from: %s",
 
 
1150
                        unicode(self.client_address))
 
 
1151
            logger.debug(u"Pipe FD: %d",
 
 
1152
                         self.server.child_pipe.fileno())
 
 
1154
            session = (gnutls.connection
 
 
1155
                       .ClientSession(self.request,
 
 
1157
                                      .X509Credentials()))
 
 
1159
            # Note: gnutls.connection.X509Credentials is really a
 
 
1160
            # generic GnuTLS certificate credentials object so long as
 
 
1161
            # no X.509 keys are added to it.  Therefore, we can use it
 
 
1162
            # here despite using OpenPGP certificates.
 
 
1164
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
 
1165
            #                      u"+AES-256-CBC", u"+SHA1",
 
 
1166
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
 
1168
            # Use a fallback default, since this MUST be set.
 
 
1169
            priority = self.server.gnutls_priority
 
 
1170
            if priority is None:
 
 
1171
                priority = u"NORMAL"
 
 
1172
            (gnutls.library.functions
 
 
1173
             .gnutls_priority_set_direct(session._c_object,
 
 
1176
            # Start communication using the Mandos protocol
 
 
1177
            # Get protocol number
 
 
1178
            line = self.request.makefile().readline()
 
 
1179
            logger.debug(u"Protocol version: %r", line)
 
 
1181
                if int(line.strip().split()[0]) > 1:
 
 
1183
            except (ValueError, IndexError, RuntimeError), error:
 
 
1184
                logger.error(u"Unknown protocol version: %s", error)
 
 
1187
            # Start GnuTLS connection
 
 
1190
            except gnutls.errors.GNUTLSError, error:
 
 
1191
                logger.warning(u"Handshake failed: %s", error)
 
 
1192
                # Do not run session.bye() here: the session is not
 
 
1193
                # established.  Just abandon the request.
 
 
1195
            logger.debug(u"Handshake succeeded")
 
 
1197
            approval_required = False
 
 
1200
                    fpr = self.fingerprint(self.peer_certificate
 
 
1202
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
 
1203
                    logger.warning(u"Bad certificate: %s", error)
 
 
1205
                logger.debug(u"Fingerprint: %s", fpr)
 
 
1208
                    client = ProxyClient(child_pipe, fpr,
 
 
1209
                                         self.client_address)
 
 
1213
                if client.approval_delay:
 
 
1214
                    delay = client.approval_delay
 
 
1215
                    client.approvals_pending += 1
 
 
1216
                    approval_required = True
 
 
1219
                    if not client.enabled:
 
 
1220
                        logger.warning(u"Client %s is disabled",
 
 
1222
                        if self.server.use_dbus:
 
 
1224
                            client.Rejected("Disabled")                    
 
 
1227
                    if client._approved or not client.approval_delay:
 
 
1228
                        #We are approved or approval is disabled
 
 
1230
                    elif client._approved is None:
 
 
1231
                        logger.info(u"Client %s needs approval",
 
 
1233
                        if self.server.use_dbus:
 
 
1235
                            client.NeedApproval(
 
 
1236
                                client.approval_delay_milliseconds(),
 
 
1237
                                client.approved_by_default)
 
 
1239
                        logger.warning(u"Client %s was not approved",
 
 
1241
                        if self.server.use_dbus:
 
 
1243
                            client.Rejected("Denied")
 
 
1246
                    #wait until timeout or approved
 
 
1247
                    #x = float(client._timedelta_to_milliseconds(delay))
 
 
1248
                    time = datetime.datetime.now()
 
 
1249
                    client.changedstate.acquire()
 
 
1250
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
 
1251
                    client.changedstate.release()
 
 
1252
                    time2 = datetime.datetime.now()
 
 
1253
                    if (time2 - time) >= delay:
 
 
1254
                        if not client.approved_by_default:
 
 
1255
                            logger.warning("Client %s timed out while"
 
 
1256
                                           " waiting for approval",
 
 
1258
                            if self.server.use_dbus:
 
 
1260
                                client.Rejected("Approval timed out")
 
 
1265
                        delay -= time2 - time
 
 
1268
                while sent_size < len(client.secret):
 
 
1270
                        sent = session.send(client.secret[sent_size:])
 
 
1271
                    except (gnutls.errors.GNUTLSError), error:
 
 
1272
                        logger.warning("gnutls send failed")
 
 
1274
                    logger.debug(u"Sent: %d, remaining: %d",
 
 
1275
                                 sent, len(client.secret)
 
 
1276
                                 - (sent_size + sent))
 
 
1279
                logger.info(u"Sending secret to %s", client.name)
 
 
1280
                # bump the timeout as if seen
 
 
1282
                if self.server.use_dbus:
 
 
1287
                if approval_required:
 
 
1288
                    client.approvals_pending -= 1
 
 
1291
                except (gnutls.errors.GNUTLSError), error:
 
 
1292
                    logger.warning("GnuTLS bye failed")
 
 
1295
    def peer_certificate(session):
 
 
1296
        "Return the peer's OpenPGP certificate as a bytestring"
 
 
1297
        # If not an OpenPGP certificate...
 
 
1298
        if (gnutls.library.functions
 
 
1299
            .gnutls_certificate_type_get(session._c_object)
 
 
1300
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
 
1301
            # ...do the normal thing
 
 
1302
            return session.peer_certificate
 
 
1303
        list_size = ctypes.c_uint(1)
 
 
1304
        cert_list = (gnutls.library.functions
 
 
1305
                     .gnutls_certificate_get_peers
 
 
1306
                     (session._c_object, ctypes.byref(list_size)))
 
 
1307
        if not bool(cert_list) and list_size.value != 0:
 
 
1308
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
 
1310
        if list_size.value == 0:
 
 
1313
        return ctypes.string_at(cert.data, cert.size)
 
 
1316
    def fingerprint(openpgp):
 
 
1317
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
 
1318
        # New GnuTLS "datum" with the OpenPGP public key
 
 
1319
        datum = (gnutls.library.types
 
 
1320
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
 
1323
                                 ctypes.c_uint(len(openpgp))))
 
 
1324
        # New empty GnuTLS certificate
 
 
1325
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
 
1326
        (gnutls.library.functions
 
 
1327
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
1328
        # Import the OpenPGP public key into the certificate
 
 
1329
        (gnutls.library.functions
 
 
1330
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
 
1331
                                    gnutls.library.constants
 
 
1332
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
1333
        # Verify the self signature in the key
 
 
1334
        crtverify = ctypes.c_uint()
 
 
1335
        (gnutls.library.functions
 
 
1336
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
 
1337
                                         ctypes.byref(crtverify)))
 
 
1338
        if crtverify.value != 0:
 
 
1339
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1340
            raise (gnutls.errors.CertificateSecurityError
 
 
1342
        # New buffer for the fingerprint
 
 
1343
        buf = ctypes.create_string_buffer(20)
 
 
1344
        buf_len = ctypes.c_size_t()
 
 
1345
        # Get the fingerprint from the certificate into the buffer
 
 
1346
        (gnutls.library.functions
 
 
1347
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
1348
                                             ctypes.byref(buf_len)))
 
 
1349
        # Deinit the certificate
 
 
1350
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
1351
        # Convert the buffer to a Python bytestring
 
 
1352
        fpr = ctypes.string_at(buf, buf_len.value)
 
 
1353
        # Convert the bytestring to hexadecimal notation
 
 
1354
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
 
1358
class MultiprocessingMixIn(object):
 
 
1359
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
 
1360
    def sub_process_main(self, request, address):
 
 
1362
            self.finish_request(request, address)
 
 
1364
            self.handle_error(request, address)
 
 
1365
        self.close_request(request)
 
 
1367
    def process_request(self, request, address):
 
 
1368
        """Start a new process to process the request."""
 
 
1369
        multiprocessing.Process(target = self.sub_process_main,
 
 
1370
                                args = (request, address)).start()
 
 
1372
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
 
1373
    """ adds a pipe to the MixIn """
 
 
1374
    def process_request(self, request, client_address):
 
 
1375
        """Overrides and wraps the original process_request().
 
 
1377
        This function creates a new pipe in self.pipe
 
 
1379
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
 
1381
        super(MultiprocessingMixInWithPipe,
 
 
1382
              self).process_request(request, client_address)
 
 
1383
        self.child_pipe.close()
 
 
1384
        self.add_pipe(parent_pipe)
 
 
1386
    def add_pipe(self, parent_pipe):
 
 
1387
        """Dummy function; override as necessary"""
 
 
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
 
1391
                     socketserver.TCPServer, object):
 
756
1392
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
758
 
        settings:       Server settings
 
759
 
        clients:        Set() of Client objects
 
760
1395
        enabled:        Boolean; whether this server is activated yet
 
 
1396
        interface:      None or a network interface name (string)
 
 
1397
        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)
 
 
1399
    def __init__(self, server_address, RequestHandlerClass,
 
 
1400
                 interface=None, use_ipv6=True):
 
 
1401
        self.interface = interface
 
 
1403
            self.address_family = socket.AF_INET6
 
 
1404
        socketserver.TCPServer.__init__(self, server_address,
 
 
1405
                                        RequestHandlerClass)
 
776
1406
    def server_bind(self):
 
777
1407
        """This overrides the normal server_bind() function
 
778
1408
        to bind to an interface if one was specified, and also NOT to
 
779
1409
        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"])
 
 
1410
        if self.interface is not None:
 
 
1411
            if SO_BINDTODEVICE is None:
 
 
1412
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
 
1413
                             u" cannot bind to interface %s",
 
 
1417
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
 
1421
                except socket.error, error:
 
 
1422
                    if error[0] == errno.EPERM:
 
 
1423
                        logger.error(u"No permission to"
 
 
1424
                                     u" bind to interface %s",
 
 
1426
                    elif error[0] == errno.ENOPROTOOPT:
 
 
1427
                        logger.error(u"SO_BINDTODEVICE not available;"
 
 
1428
                                     u" cannot bind to interface %s",
 
794
1432
        # Only bind(2) the socket if we really need to.
 
795
1433
        if self.server_address[0] or self.server_address[1]:
 
796
1434
            if not self.server_address[0]:
 
797
1435
                if self.address_family == socket.AF_INET6:
 
798
 
                    any_address = "::" # in6addr_any
 
 
1436
                    any_address = u"::" # in6addr_any
 
800
1438
                    any_address = socket.INADDR_ANY
 
801
1439
                self.server_address = (any_address,
 
 
963
1686
    # Default values for config file for server-global settings
 
964
 
    server_defaults = { "interface": "",
 
969
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
970
 
                        "servicename": "Mandos",
 
 
1687
    server_defaults = { u"interface": u"",
 
 
1692
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
 
1693
                        u"servicename": u"Mandos",
 
 
1694
                        u"use_dbus": u"True",
 
 
1695
                        u"use_ipv6": u"True",
 
975
1699
    # Parse config file for server-global settings
 
976
 
    server_config = ConfigParser.SafeConfigParser(server_defaults)
 
 
1700
    server_config = configparser.SafeConfigParser(server_defaults)
 
977
1701
    del server_defaults
 
978
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
1702
    server_config.read(os.path.join(options.configdir,
 
979
1704
    # Convert the SafeConfigParser object to a dict
 
980
1705
    server_settings = server_config.defaults()
 
981
1706
    # 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",
 
 
1707
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
 
1708
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
988
1710
    if server_settings["port"]:
 
989
 
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
1711
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
991
1713
    del server_config
 
993
1715
    # Override the settings from the config file with command line
 
994
1716
    # options, if set.
 
995
 
    for option in ("interface", "address", "port", "debug",
 
996
 
                   "priority", "servicename", "configdir",
 
997
 
                   "use_dbus", "use_ipv6"):
 
 
1717
    for option in (u"interface", u"address", u"port", u"debug",
 
 
1718
                   u"priority", u"servicename", u"configdir",
 
 
1719
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
998
1720
        value = getattr(options, option)
 
999
1721
        if value is not None:
 
1000
1722
            server_settings[option] = value
 
 
1724
    # Force all strings to be unicode
 
 
1725
    for option in server_settings.keys():
 
 
1726
        if type(server_settings[option]) is str:
 
 
1727
            server_settings[option] = unicode(server_settings[option])
 
1002
1728
    # Now we have our good server settings in "server_settings"
 
 
1730
    ##################################################################
 
1004
1732
    # For convenience
 
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":
 
 
1733
    debug = server_settings[u"debug"]
 
 
1734
    debuglevel = server_settings[u"debuglevel"]
 
 
1735
    use_dbus = server_settings[u"use_dbus"]
 
 
1736
    use_ipv6 = server_settings[u"use_ipv6"]
 
 
1738
    if server_settings[u"servicename"] != u"Mandos":
 
1014
1739
        syslogger.setFormatter(logging.Formatter
 
1015
 
                               ('Mandos (%s): %%(levelname)s:'
 
1017
 
                                % server_settings["servicename"]))
 
 
1740
                               (u'Mandos (%s) [%%(process)d]:'
 
 
1741
                                u' %%(levelname)s: %%(message)s'
 
 
1742
                                % server_settings[u"servicename"]))
 
1019
1744
    # Parse config file with clients
 
1020
 
    client_defaults = { "timeout": "1h",
 
1022
 
                        "checker": "fping -q -- %%(host)s",
 
 
1745
    client_defaults = { u"timeout": u"1h",
 
 
1747
                        u"checker": u"fping -q -- %%(host)s",
 
 
1749
                        u"approval_delay": u"0s",
 
 
1750
                        u"approval_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"
 
1037
 
        pidfile = open(pidfilename, "w")
 
1039
 
        logger.error("Could not open file %r", pidfilename)
 
1042
 
        uid = pwd.getpwnam("_mandos").pw_uid
 
1043
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
 
1752
    client_config = configparser.SafeConfigParser(client_defaults)
 
 
1753
    client_config.read(os.path.join(server_settings[u"configdir"],
 
 
1756
    global mandos_dbus_service
 
 
1757
    mandos_dbus_service = None
 
 
1759
    tcp_server = MandosServer((server_settings[u"address"],
 
 
1760
                               server_settings[u"port"]),
 
 
1762
                              interface=(server_settings[u"interface"]
 
 
1766
                              server_settings[u"priority"],
 
 
1769
        pidfilename = u"/var/run/mandos.pid"
 
 
1771
            pidfile = open(pidfilename, u"w")
 
 
1773
            logger.error(u"Could not open file %r", pidfilename)
 
 
1776
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
 
1777
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1044
1778
    except KeyError:
 
1046
 
            uid = pwd.getpwnam("mandos").pw_uid
 
1047
 
            gid = pwd.getpwnam("mandos").pw_gid
 
 
1780
            uid = pwd.getpwnam(u"mandos").pw_uid
 
 
1781
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1048
1782
        except KeyError:
 
1050
 
                uid = pwd.getpwnam("nobody").pw_uid
 
1051
 
                gid = pwd.getpwnam("nogroup").pw_gid
 
 
1784
                uid = pwd.getpwnam(u"nobody").pw_uid
 
 
1785
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1052
1786
            except KeyError:
 
 
1059
1793
        if error[0] != errno.EPERM:
 
1062
 
    # Enable all possible GnuTLS debugging
 
 
1796
    if not debug and not debuglevel:
 
 
1797
        syslogger.setLevel(logging.WARNING)
 
 
1798
        console.setLevel(logging.WARNING)
 
 
1800
        level = getattr(logging, debuglevel.upper())
 
 
1801
        syslogger.setLevel(level)
 
 
1802
        console.setLevel(level)
 
 
1805
        # Enable all possible GnuTLS debugging
 
1064
1807
        # "Use a log level over 10 to enable all debugging options."
 
1065
1808
        # - GnuTLS manual
 
1066
1809
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
1068
1811
        @gnutls.library.types.gnutls_log_func
 
1069
1812
        def debug_gnutls(level, string):
 
1070
 
            logger.debug("GnuTLS: %s", string[:-1])
 
 
1813
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1072
1815
        (gnutls.library.functions
 
1073
1816
         .gnutls_global_set_log_function(debug_gnutls))
 
 
1818
        # Redirect stdin so all checkers get /dev/null
 
 
1819
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1820
        os.dup2(null, sys.stdin.fileno())
 
 
1824
        # No console logging
 
 
1825
        logger.removeHandler(console)
 
1076
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1077
 
    service = AvahiService(name = server_settings["servicename"],
 
1078
 
                           servicetype = "_mandos._tcp",
 
1079
 
                           protocol = protocol)
 
1080
 
    if server_settings["interface"]:
 
1081
 
        service.interface = (if_nametoindex
 
1082
 
                             (server_settings["interface"]))
 
1084
1828
    global main_loop
 
1087
1829
    # From the Avahi example code
 
1088
1830
    DBusGMainLoop(set_as_default=True )
 
1089
1831
    main_loop = gobject.MainLoop()
 
1090
1832
    bus = dbus.SystemBus()
 
1091
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1092
 
                                           avahi.DBUS_PATH_SERVER),
 
1093
 
                            avahi.DBUS_INTERFACE_SERVER)
 
1094
1833
    # End of Avahi example code
 
1096
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1098
 
    clients.update(Set(Client(name = section,
 
1100
 
                              = dict(client_config.items(section)),
 
1101
 
                              use_dbus = use_dbus)
 
1102
 
                       for section in client_config.sections()))
 
1104
 
        logger.warning(u"No clients defined")
 
1107
 
        # Redirect stdin so all checkers get /dev/null
 
1108
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1109
 
        os.dup2(null, sys.stdin.fileno())
 
1113
 
        # No console logging
 
1114
 
        logger.removeHandler(console)
 
 
1836
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
 
1837
                                            bus, do_not_queue=True)
 
 
1838
        except dbus.exceptions.NameExistsException, e:
 
 
1839
            logger.error(unicode(e) + u", disabling D-Bus")
 
 
1841
            server_settings[u"use_dbus"] = False
 
 
1842
            tcp_server.use_dbus = False
 
 
1843
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
1844
    service = AvahiService(name = server_settings[u"servicename"],
 
 
1845
                           servicetype = u"_mandos._tcp",
 
 
1846
                           protocol = protocol, bus = bus)
 
 
1847
    if server_settings["interface"]:
 
 
1848
        service.interface = (if_nametoindex
 
 
1849
                             (str(server_settings[u"interface"])))
 
1115
1852
        # Close all input and output, do double fork, etc.
 
1120
 
        pidfile.write(str(pid) + "\n")
 
1124
 
        logger.error(u"Could not write to file %r with PID %d",
 
1127
 
        # "pidfile" was never created
 
1132
 
        "Cleanup function; run on exit"
 
1134
 
        # From the Avahi example code
 
1135
 
        if not group is None:
 
1138
 
        # End of Avahi example code
 
1141
 
            client = clients.pop()
 
1142
 
            client.disable_hook = None
 
1145
 
    atexit.register(cleanup)
 
 
1855
    global multiprocessing_manager
 
 
1856
    multiprocessing_manager = multiprocessing.Manager()
 
 
1858
    client_class = Client
 
 
1860
        client_class = functools.partial(ClientDBus, bus = bus)
 
 
1861
    def client_config_items(config, section):
 
 
1862
        special_settings = {
 
 
1863
            "approved_by_default":
 
 
1864
                lambda: config.getboolean(section,
 
 
1865
                                          "approved_by_default"),
 
 
1867
        for name, value in config.items(section):
 
 
1869
                yield (name, special_settings[name]())
 
 
1873
    tcp_server.clients.update(set(
 
 
1874
            client_class(name = section,
 
 
1875
                         config= dict(client_config_items(
 
 
1876
                        client_config, section)))
 
 
1877
            for section in client_config.sections()))
 
 
1878
    if not tcp_server.clients:
 
 
1879
        logger.warning(u"No clients defined")
 
 
1885
                pidfile.write(str(pid) + "\n")
 
 
1888
            logger.error(u"Could not write to file %r with PID %d",
 
 
1891
            # "pidfile" was never created
 
1148
1895
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1149
1897
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
1150
1898
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
1153
 
        class MandosServer(dbus.service.Object):
 
 
1901
        class MandosDBusService(dbus.service.Object):
 
1154
1902
            """A D-Bus proxy object"""
 
1155
1903
            def __init__(self):
 
1156
 
                dbus.service.Object.__init__(self, bus, "/")
 
 
1904
                dbus.service.Object.__init__(self, bus, u"/")
 
1157
1905
            _interface = u"se.bsnet.fukt.Mandos"
 
1159
 
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1160
 
            def ClientAdded(self, objpath, properties):
 
1164
 
            @dbus.service.signal(_interface, signature="os")
 
 
1907
            @dbus.service.signal(_interface, signature=u"o")
 
 
1908
            def ClientAdded(self, objpath):
 
 
1912
            @dbus.service.signal(_interface, signature=u"ss")
 
 
1913
            def ClientNotFound(self, fingerprint, address):
 
 
1917
            @dbus.service.signal(_interface, signature=u"os")
 
1165
1918
            def ClientRemoved(self, objpath, name):
 
1169
 
            @dbus.service.method(_interface, out_signature="ao")
 
 
1922
            @dbus.service.method(_interface, out_signature=u"ao")
 
1170
1923
            def GetAllClients(self):
 
1172
 
                return dbus.Array(c.dbus_object_path for c in clients)
 
 
1925
                return dbus.Array(c.dbus_object_path
 
 
1926
                                  for c in tcp_server.clients)
 
1174
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
 
 
1928
            @dbus.service.method(_interface,
 
 
1929
                                 out_signature=u"a{oa{sv}}")
 
1175
1930
            def GetAllClientsWithProperties(self):
 
1177
1932
                return dbus.Dictionary(
 
1178
 
                    ((c.dbus_object_path, c.GetAllProperties())
 
 
1933
                    ((c.dbus_object_path, c.GetAll(u""))
 
 
1934
                     for c in tcp_server.clients),
 
 
1935
                    signature=u"oa{sv}")
 
1182
 
            @dbus.service.method(_interface, in_signature="o")
 
 
1937
            @dbus.service.method(_interface, in_signature=u"o")
 
1183
1938
            def RemoveClient(self, object_path):
 
 
1940
                for c in tcp_server.clients:
 
1186
1941
                    if c.dbus_object_path == object_path:
 
 
1942
                        tcp_server.clients.remove(c)
 
 
1943
                        c.remove_from_connection()
 
1188
1944
                        # Don't signal anything except ClientRemoved
 
 
1945
                        c.disable(quiet=True)
 
1191
1946
                        # Emit D-Bus signal
 
1192
1947
                        self.ClientRemoved(object_path, c.name)
 
 
1949
                raise KeyError(object_path)
 
1198
 
        mandos_server = MandosServer()
 
1200
 
    for client in clients:
 
 
1953
        mandos_dbus_service = MandosDBusService()
 
 
1956
        "Cleanup function; run on exit"
 
 
1959
        while tcp_server.clients:
 
 
1960
            client = tcp_server.clients.pop()
 
 
1962
                client.remove_from_connection()
 
 
1963
            client.disable_hook = None
 
 
1964
            # Don't signal anything except ClientRemoved
 
 
1965
            client.disable(quiet=True)
 
 
1968
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
 
1971
    atexit.register(cleanup)
 
 
1973
    for client in tcp_server.clients:
 
1202
1975
            # Emit D-Bus signal
 
1203
 
            mandos_server.ClientAdded(client.dbus_object_path,
 
1204
 
                                      client.GetAllProperties())
 
 
1976
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
1205
1977
        client.enable()
 
1207
1979
    tcp_server.enable()