150
152
self.group = None # our entry group
151
153
self.server = None
155
self.entry_group_state_changed_match = None
153
156
def rename(self):
154
157
"""Derived from the Avahi example code"""
155
158
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
158
161
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
162
raise AvahiServiceError("Too many renames")
160
163
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
164
logger.info("Changing Zeroconf service name to %r ...",
163
166
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
167
('Mandos (%s) [%%(process)d]:'
168
' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
173
except dbus.exceptions.DBusException as error:
174
logger.critical("DBusException: %s", error)
174
177
self.rename_count += 1
175
178
def remove(self):
176
179
"""Derived from the Avahi example code"""
180
if self.entry_group_state_changed_match is not None:
181
self.entry_group_state_changed_match.remove()
182
self.entry_group_state_changed_match = None
177
183
if self.group is not None:
178
184
self.group.Reset()
180
186
"""Derived from the Avahi example code"""
181
188
if self.group is None:
182
189
self.group = dbus.Interface(
183
190
self.bus.get_object(avahi.DBUS_NAME,
184
191
self.server.EntryGroupNew()),
185
192
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
193
self.entry_group_state_changed_match = (
194
self.group.connect_to_signal(
195
'StateChanged', self .entry_group_state_changed))
196
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
197
self.name, self.type)
191
198
self.group.AddService(
199
206
self.group.Commit()
200
207
def entry_group_state_changed(self, state, error):
201
208
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
209
logger.debug("Avahi entry group state change: %i", state)
204
211
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
212
logger.debug("Zeroconf service established.")
206
213
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
214
logger.info("Zeroconf service name collision.")
209
216
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
217
logger.critical("Avahi: Error in group state changed %s",
212
raise AvahiGroupError(u"State changed: %s"
219
raise AvahiGroupError("State changed: %s"
213
220
% unicode(error))
214
221
def cleanup(self):
215
222
"""Derived from the Avahi example code"""
216
223
if self.group is not None:
226
except (dbus.exceptions.UnknownMethodException,
227
dbus.exceptions.DBusException) as e:
218
229
self.group = None
219
def server_state_changed(self, state):
231
def server_state_changed(self, state, error=None):
220
232
"""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")
233
logger.debug("Avahi server state change: %i", state)
234
bad_states = { avahi.SERVER_INVALID:
235
"Zeroconf server invalid",
236
avahi.SERVER_REGISTERING: None,
237
avahi.SERVER_COLLISION:
238
"Zeroconf server name collision",
239
avahi.SERVER_FAILURE:
240
"Zeroconf server failure" }
241
if state in bad_states:
242
if bad_states[state] is not None:
244
logger.error(bad_states[state])
246
logger.error(bad_states[state] + ": %r", error)
225
248
elif state == avahi.SERVER_RUNNING:
252
logger.debug("Unknown state: %r", state)
254
logger.debug("Unknown state: %r: %r", state, error)
227
255
def activate(self):
228
256
"""Derived from the Avahi example code"""
229
257
if self.server is None:
230
258
self.server = dbus.Interface(
231
259
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
260
avahi.DBUS_PATH_SERVER,
261
follow_name_owner_changes=True),
233
262
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
263
self.server.connect_to_signal("StateChanged",
235
264
self.server_state_changed)
236
265
self.server_state_changed(self.server.GetState())
268
def _timedelta_to_milliseconds(td):
269
"Convert a datetime.timedelta() to milliseconds"
270
return ((td.days * 24 * 60 * 60 * 1000)
271
+ (td.seconds * 1000)
272
+ (td.microseconds // 1000))
239
274
class Client(object):
240
275
"""A representation of a client host served by this server.
243
name: string; from the config file, used in log messages and
278
_approved: bool(); 'None' if not yet approved/disapproved
279
approval_delay: datetime.timedelta(); Time to wait for approval
280
approval_duration: datetime.timedelta(); Duration of one approval
281
checker: subprocess.Popen(); a running checker process used
282
to see if the client lives.
283
'None' if no process is running.
284
checker_callback_tag: a gobject event source tag, or None
285
checker_command: string; External command which is run to check
286
if client lives. %() expansions are done at
287
runtime with vars(self) as dict, so that for
288
instance %(name)s can be used in the command.
289
checker_initiator_tag: a gobject event source tag, or None
290
created: datetime.datetime(); (UTC) object creation
291
current_checker_command: string; current running checker_command
292
disable_hook: If set, called by disable() as disable_hook(self)
293
disable_initiator_tag: a gobject event source tag, or None
245
295
fingerprint: string (40 or 32 hexadecimal digits); used to
246
296
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
297
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
298
interval: datetime.timedelta(); How often to start a new checker
299
last_approval_request: datetime.datetime(); (UTC) or None
300
last_checked_ok: datetime.datetime(); (UTC) or None
250
301
last_enabled: datetime.datetime(); (UTC)
252
last_checked_ok: datetime.datetime(); (UTC) or None
302
name: string; from the config file, used in log messages and
304
secret: bytestring; sent verbatim (over TLS) to client
253
305
timeout: datetime.timedelta(); How long from last_checked_ok
254
306
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
257
checker: subprocess.Popen(); a running checker process used
258
to see if the client lives.
259
'None' if no process is running.
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
265
runtime with vars(self) as dict, so that for
266
instance %(name)s can be used in the command.
267
current_checker_command: string; current running checker_command
268
approved_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approved_duration: datetime.timedelta(); Duration of one approval
307
extended_timeout: extra long timeout when password has been sent
308
runtime_expansions: Allowed attributes for runtime expansion.
309
expires: datetime.datetime(); time (UTC) when a client will be
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (td.microseconds // 1000))
313
runtime_expansions = ("approval_delay", "approval_duration",
314
"created", "enabled", "fingerprint",
315
"host", "interval", "last_checked_ok",
316
"last_enabled", "name", "timeout")
280
318
def timeout_milliseconds(self):
281
319
"Return the 'timeout' attribute in milliseconds"
282
return self._timedelta_to_milliseconds(self.timeout)
320
return _timedelta_to_milliseconds(self.timeout)
322
def extended_timeout_milliseconds(self):
323
"Return the 'extended_timeout' attribute in milliseconds"
324
return _timedelta_to_milliseconds(self.extended_timeout)
284
326
def interval_milliseconds(self):
285
327
"Return the 'interval' attribute in milliseconds"
286
return self._timedelta_to_milliseconds(self.interval)
288
def approved_delay_milliseconds(self):
289
return self._timedelta_to_milliseconds(self.approved_delay)
328
return _timedelta_to_milliseconds(self.interval)
330
def approval_delay_milliseconds(self):
331
return _timedelta_to_milliseconds(self.approval_delay)
291
333
def __init__(self, name = None, disable_hook=None, config=None):
292
334
"""Note: the 'checker' key in 'config' sets the
296
338
if config is None:
298
logger.debug(u"Creating client %r", self.name)
340
logger.debug("Creating client %r", self.name)
299
341
# Uppercase and remove spaces from fingerprint for later
300
342
# comparison purposes with return value from the fingerprint()
302
self.fingerprint = (config[u"fingerprint"].upper()
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
elif u"secfile" in config:
344
self.fingerprint = (config["fingerprint"].upper()
346
logger.debug(" Fingerprint: %s", self.fingerprint)
347
if "secret" in config:
348
self.secret = config["secret"].decode("base64")
349
elif "secfile" in config:
308
350
with open(os.path.expanduser(os.path.expandvars
309
(config[u"secfile"])),
351
(config["secfile"])),
310
352
"rb") as secfile:
311
353
self.secret = secfile.read()
313
raise TypeError(u"No secret or secfile for client %s"
355
raise TypeError("No secret or secfile for client %s"
315
self.host = config.get(u"host", u"")
357
self.host = config.get("host", "")
316
358
self.created = datetime.datetime.utcnow()
317
359
self.enabled = False
360
self.last_approval_request = None
318
361
self.last_enabled = None
319
362
self.last_checked_ok = None
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
363
self.timeout = string_to_delta(config["timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
365
self.interval = string_to_delta(config["interval"])
322
366
self.disable_hook = disable_hook
323
367
self.checker = None
324
368
self.checker_initiator_tag = None
325
369
self.disable_initiator_tag = None
326
371
self.checker_callback_tag = None
327
self.checker_command = config[u"checker"]
372
self.checker_command = config["checker"]
328
373
self.current_checker_command = None
329
374
self.last_connect = None
330
375
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
376
self.approved_by_default = config.get("approved_by_default",
333
378
self.approvals_pending = 0
334
self.approved_delay = string_to_delta(
335
config[u"approved_delay"])
336
self.approved_duration = string_to_delta(
337
config[u"approved_duration"])
379
self.approval_delay = string_to_delta(
380
config["approval_delay"])
381
self.approval_duration = string_to_delta(
382
config["approval_duration"])
338
383
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
340
385
def send_changedstate(self):
568
624
def _is_dbus_property(obj):
569
return getattr(obj, u"_dbus_is_property", False)
625
return getattr(obj, "_dbus_is_property", False)
571
627
def _get_all_dbus_properties(self):
572
628
"""Returns a generator of (name, attribute) pairs
574
return ((prop._dbus_name, prop)
576
inspect.getmembers(self, self._is_dbus_property))
630
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
631
for cls in self.__class__.__mro__
632
for name, prop in inspect.getmembers(cls, self._is_dbus_property))
578
634
def _get_dbus_property(self, interface_name, property_name):
579
635
"""Returns a bound method if one exists which is a D-Bus
580
636
property with the specified name and interface.
582
for name in (property_name,
583
property_name + u"_dbus_property"):
584
prop = getattr(self, name, None)
586
or not self._is_dbus_property(prop)
587
or prop._dbus_name != property_name
588
or (interface_name and prop._dbus_interface
589
and interface_name != prop._dbus_interface)):
638
for cls in self.__class__.__mro__:
639
for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
if value._dbus_name == property_name and value._dbus_interface == interface_name:
641
return value.__get__(self)
592
643
# No such property
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
644
raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
+ interface_name + "."
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
648
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
599
650
def Get(self, interface_name, property_name):
600
651
"""Standard D-Bus property Get() method, see D-Bus standard.
602
653
prop = self._get_dbus_property(interface_name, property_name)
603
if prop._dbus_access == u"write":
654
if prop._dbus_access == "write":
604
655
raise DBusPropertyAccessException(property_name)
606
if not hasattr(value, u"variant_level"):
657
if not hasattr(value, "variant_level"):
608
659
return type(value)(value, variant_level=value.variant_level+1)
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
661
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
611
662
def Set(self, interface_name, property_name, value):
612
663
"""Standard D-Bus property Set() method, see D-Bus standard.
614
665
prop = self._get_dbus_property(interface_name, property_name)
615
if prop._dbus_access == u"read":
666
if prop._dbus_access == "read":
616
667
raise DBusPropertyAccessException(property_name)
617
if prop._dbus_get_args_options[u"byte_arrays"]:
668
if prop._dbus_get_args_options["byte_arrays"]:
618
669
# The byte_arrays option is not supported yet on
619
670
# signatures other than "ay".
620
if prop._dbus_signature != u"ay":
671
if prop._dbus_signature != "ay":
622
673
value = dbus.ByteArray(''.join(unichr(byte)
623
674
for byte in value))
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
677
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
678
out_signature="a{sv}")
628
679
def GetAll(self, interface_name):
629
680
"""Standard D-Bus property GetAll() method, see D-Bus
632
683
Note: Will not include properties with access="write".
661
712
document = xml.dom.minidom.parseString(xmlstring)
662
713
def make_tag(document, name, prop):
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
714
e = document.createElement("property")
715
e.setAttribute("name", name)
716
e.setAttribute("type", prop._dbus_signature)
717
e.setAttribute("access", prop._dbus_access)
668
for if_tag in document.getElementsByTagName(u"interface"):
719
for if_tag in document.getElementsByTagName("interface"):
669
720
for tag in (make_tag(document, name, prop)
671
722
in self._get_all_dbus_properties()
672
723
if prop._dbus_interface
673
== if_tag.getAttribute(u"name")):
724
== if_tag.getAttribute("name")):
674
725
if_tag.appendChild(tag)
675
726
# Add the names to the return values for the
676
727
# "org.freedesktop.DBus.Properties" methods
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
728
if (if_tag.getAttribute("name")
729
== "org.freedesktop.DBus.Properties"):
730
for cn in if_tag.getElementsByTagName("method"):
731
if cn.getAttribute("name") == "Get":
732
for arg in cn.getElementsByTagName("arg"):
733
if (arg.getAttribute("direction")
735
arg.setAttribute("name", "value")
736
elif cn.getAttribute("name") == "GetAll":
737
for arg in cn.getElementsByTagName("arg"):
738
if (arg.getAttribute("direction")
740
arg.setAttribute("name", "props")
741
xmlstring = document.toxml("utf-8")
691
742
document.unlink()
692
743
except (AttributeError, xml.dom.DOMException,
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
744
xml.parsers.expat.ExpatError) as error:
745
logger.error("Failed to override Introspection method",
750
def datetime_to_dbus (dt, variant_level=0):
751
"""Convert a UTC datetime.datetime() to a D-Bus type."""
753
return dbus.String("", variant_level = variant_level)
754
return dbus.String(dt.isoformat(),
755
variant_level=variant_level)
757
class AlternateDBusNamesMetaclass(DBusObjectWithProperties.__metaclass__):
758
"""Applied to an empty subclass of a D-Bus object, this metaclass
759
will add additional D-Bus attributes matching a certain pattern.
761
def __new__(mcs, name, bases, attr):
762
# Go through all the base classes which could have D-Bus
763
# methods, signals, or properties in them
764
for base in (b for b in bases
765
if issubclass(b, dbus.service.Object)):
766
# Go though all attributes of the base class
767
for attrname, attribute in inspect.getmembers(base):
768
# Ignore non-D-Bus attributes, and D-Bus attributes
769
# with the wrong interface name
770
if (not hasattr(attribute, "_dbus_interface")
771
or not attribute._dbus_interface
772
.startswith("se.recompile.Mandos")):
774
# Create an alternate D-Bus interface name based on
776
alt_interface = (attribute._dbus_interface
777
.replace("se.recompile.Mandos",
778
"se.bsnet.fukt.Mandos"))
779
# Is this a D-Bus signal?
780
if getattr(attribute, "_dbus_is_signal", False):
781
# Extract the original non-method function by
783
nonmethod_func = (dict(
784
zip(attribute.func_code.co_freevars,
785
attribute.__closure__))["func"]
787
# Create a new, but exactly alike, function
788
# object, and decorate it to be a new D-Bus signal
789
# with the alternate D-Bus interface name
790
new_function = (dbus.service.signal
792
attribute._dbus_signature)
794
nonmethod_func.func_code,
795
nonmethod_func.func_globals,
796
nonmethod_func.func_name,
797
nonmethod_func.func_defaults,
798
nonmethod_func.func_closure)))
799
# Define a creator of a function to call both the
800
# old and new functions, so both the old and new
801
# signals gets sent when the function is called
802
def fixscope(func1, func2):
803
"""This function is a scope container to pass
804
func1 and func2 to the "call_both" function
805
outside of its arguments"""
806
def call_both(*args, **kwargs):
807
"""This function will emit two D-Bus
808
signals by calling func1 and func2"""
809
func1(*args, **kwargs)
810
func2(*args, **kwargs)
812
# Create the "call_both" function and add it to
814
attr[attrname] = fixscope(attribute,
816
# Is this a D-Bus method?
817
elif getattr(attribute, "_dbus_is_method", False):
818
# Create a new, but exactly alike, function
819
# object. Decorate it to be a new D-Bus method
820
# with the alternate D-Bus interface name. Add it
822
attr[attrname] = (dbus.service.method
824
attribute._dbus_in_signature,
825
attribute._dbus_out_signature)
827
(attribute.func_code,
828
attribute.func_globals,
830
attribute.func_defaults,
831
attribute.func_closure)))
832
# Is this a D-Bus property?
833
elif getattr(attribute, "_dbus_is_property", False):
834
# Create a new, but exactly alike, function
835
# object, and decorate it to be a new D-Bus
836
# property with the alternate D-Bus interface
837
# name. Add it to the class.
838
attr[attrname] = (dbus_service_property
840
attribute._dbus_signature,
841
attribute._dbus_access,
843
._dbus_get_args_options
846
(attribute.func_code,
847
attribute.func_globals,
849
attribute.func_defaults,
850
attribute.func_closure)))
851
return type.__new__(mcs, name, bases, attr)
699
853
class ClientDBus(Client, DBusObjectWithProperties):
700
854
"""A Client class using D-Bus
711
869
Client.__init__(self, *args, **kwargs)
712
870
# Only now, when this client is initialized, can it show up on
872
client_object_name = unicode(self.name).translate(
714
875
self.dbus_object_path = (dbus.ObjectPath
716
+ self.name.replace(u".", u"_")))
876
("/clients/" + client_object_name))
717
877
DBusObjectWithProperties.__init__(self, self.bus,
718
878
self.dbus_object_path)
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"approved_pending"),
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
737
def _datetime_to_dbus(dt, variant_level=0):
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
739
return dbus.String(dt.isoformat(),
740
variant_level=variant_level)
743
oldstate = getattr(self, u"enabled", False)
744
r = Client.enable(self)
745
if oldstate != self.enabled:
747
self.PropertyChanged(dbus.String(u"enabled"),
748
dbus.Boolean(True, variant_level=1))
749
self.PropertyChanged(
750
dbus.String(u"last_enabled"),
751
self._datetime_to_dbus(self.last_enabled,
755
def disable(self, quiet = False):
756
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
760
self.PropertyChanged(dbus.String(u"enabled"),
761
dbus.Boolean(False, variant_level=1))
880
def notifychangeproperty(transform_func,
881
dbus_name, type_func=lambda x: x,
883
""" Modify a variable so that it's a property which announces
886
transform_fun: Function that takes a value and transforms it
888
dbus_name: D-Bus name of the variable
889
type_func: Function that transform the value before sending it
890
to the D-Bus. Default: no transform
891
variant_level: D-Bus variant level. Default: 1
894
def setter(self, value):
895
old_value = real_value[0]
896
real_value[0] = value
897
if hasattr(self, "dbus_object_path"):
898
if type_func(old_value) != type_func(real_value[0]):
899
dbus_value = transform_func(type_func(real_value[0]),
901
self.PropertyChanged(dbus.String(dbus_name),
904
return property(lambda self: real_value[0], setter)
907
expires = notifychangeproperty(datetime_to_dbus, "Expires")
908
approvals_pending = notifychangeproperty(dbus.Boolean,
911
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
912
last_enabled = notifychangeproperty(datetime_to_dbus,
914
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
915
type_func = lambda checker: checker is not None)
916
last_checked_ok = notifychangeproperty(datetime_to_dbus,
918
last_approval_request = notifychangeproperty(datetime_to_dbus,
919
"LastApprovalRequest")
920
approved_by_default = notifychangeproperty(dbus.Boolean,
922
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
923
type_func = _timedelta_to_milliseconds)
924
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
925
type_func = _timedelta_to_milliseconds)
926
host = notifychangeproperty(dbus.String, "Host")
927
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
928
type_func = _timedelta_to_milliseconds)
929
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
930
type_func = _timedelta_to_milliseconds)
931
interval = notifychangeproperty(dbus.UInt16, "Interval",
932
type_func = _timedelta_to_milliseconds)
933
checker_command = notifychangeproperty(dbus.String, "Checker")
935
del notifychangeproperty
764
937
def __del__(self, *args, **kwargs):
766
939
self.remove_from_connection()
767
940
except LookupError:
769
if hasattr(DBusObjectWithProperties, u"__del__"):
942
if hasattr(DBusObjectWithProperties, "__del__"):
770
943
DBusObjectWithProperties.__del__(self, *args, **kwargs)
771
944
Client.__del__(self, *args, **kwargs)
922
# approved_pending - property
923
@dbus_service_property(_interface, signature=u"b", access=u"read")
924
def approved_pending_dbus_property(self):
1072
# ApprovalPending - property
1073
@dbus_service_property(_interface, signature="b", access="read")
1074
def ApprovalPending_dbus_property(self):
925
1075
return dbus.Boolean(bool(self.approvals_pending))
927
# approved_by_default - property
928
@dbus_service_property(_interface, signature=u"b",
930
def approved_by_default_dbus_property(self):
931
return dbus.Boolean(self.approved_by_default)
933
# approved_delay - property
934
@dbus_service_property(_interface, signature=u"t",
936
def approved_delay_dbus_property(self):
937
return dbus.UInt64(self.approved_delay_milliseconds())
939
# approved_duration - property
940
@dbus_service_property(_interface, signature=u"t",
942
def approved_duration_dbus_property(self):
943
return dbus.UInt64(self._timedelta_to_milliseconds(
944
self.approved_duration))
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def name_dbus_property(self):
1077
# ApprovedByDefault - property
1078
@dbus_service_property(_interface, signature="b",
1080
def ApprovedByDefault_dbus_property(self, value=None):
1081
if value is None: # get
1082
return dbus.Boolean(self.approved_by_default)
1083
self.approved_by_default = bool(value)
1085
# ApprovalDelay - property
1086
@dbus_service_property(_interface, signature="t",
1088
def ApprovalDelay_dbus_property(self, value=None):
1089
if value is None: # get
1090
return dbus.UInt64(self.approval_delay_milliseconds())
1091
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1093
# ApprovalDuration - property
1094
@dbus_service_property(_interface, signature="t",
1096
def ApprovalDuration_dbus_property(self, value=None):
1097
if value is None: # get
1098
return dbus.UInt64(_timedelta_to_milliseconds(
1099
self.approval_duration))
1100
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1103
@dbus_service_property(_interface, signature="s", access="read")
1104
def Name_dbus_property(self):
949
1105
return dbus.String(self.name)
951
# fingerprint - property
952
@dbus_service_property(_interface, signature=u"s", access=u"read")
953
def fingerprint_dbus_property(self):
1107
# Fingerprint - property
1108
@dbus_service_property(_interface, signature="s", access="read")
1109
def Fingerprint_dbus_property(self):
954
1110
return dbus.String(self.fingerprint)
957
@dbus_service_property(_interface, signature=u"s",
959
def host_dbus_property(self, value=None):
1113
@dbus_service_property(_interface, signature="s",
1115
def Host_dbus_property(self, value=None):
960
1116
if value is None: # get
961
1117
return dbus.String(self.host)
962
1118
self.host = value
964
self.PropertyChanged(dbus.String(u"host"),
965
dbus.String(value, variant_level=1))
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def created_dbus_property(self):
970
return dbus.String(self._datetime_to_dbus(self.created))
972
# last_enabled - property
973
@dbus_service_property(_interface, signature=u"s", access=u"read")
974
def last_enabled_dbus_property(self):
975
if self.last_enabled is None:
976
return dbus.String(u"")
977
return dbus.String(self._datetime_to_dbus(self.last_enabled))
980
@dbus_service_property(_interface, signature=u"b",
982
def enabled_dbus_property(self, value=None):
1120
# Created - property
1121
@dbus_service_property(_interface, signature="s", access="read")
1122
def Created_dbus_property(self):
1123
return dbus.String(datetime_to_dbus(self.created))
1125
# LastEnabled - property
1126
@dbus_service_property(_interface, signature="s", access="read")
1127
def LastEnabled_dbus_property(self):
1128
return datetime_to_dbus(self.last_enabled)
1130
# Enabled - property
1131
@dbus_service_property(_interface, signature="b",
1133
def Enabled_dbus_property(self, value=None):
983
1134
if value is None: # get
984
1135
return dbus.Boolean(self.enabled)
990
# last_checked_ok - property
991
@dbus_service_property(_interface, signature=u"s",
993
def last_checked_ok_dbus_property(self, value=None):
1141
# LastCheckedOK - property
1142
@dbus_service_property(_interface, signature="s",
1144
def LastCheckedOK_dbus_property(self, value=None):
994
1145
if value is not None:
995
1146
self.checked_ok()
997
if self.last_checked_ok is None:
998
return dbus.String(u"")
999
return dbus.String(self._datetime_to_dbus(self
1002
# timeout - property
1003
@dbus_service_property(_interface, signature=u"t",
1004
access=u"readwrite")
1005
def timeout_dbus_property(self, value=None):
1148
return datetime_to_dbus(self.last_checked_ok)
1150
# Expires - property
1151
@dbus_service_property(_interface, signature="s", access="read")
1152
def Expires_dbus_property(self):
1153
return datetime_to_dbus(self.expires)
1155
# LastApprovalRequest - property
1156
@dbus_service_property(_interface, signature="s", access="read")
1157
def LastApprovalRequest_dbus_property(self):
1158
return datetime_to_dbus(self.last_approval_request)
1160
# Timeout - property
1161
@dbus_service_property(_interface, signature="t",
1163
def Timeout_dbus_property(self, value=None):
1006
1164
if value is None: # get
1007
1165
return dbus.UInt64(self.timeout_milliseconds())
1008
1166
self.timeout = datetime.timedelta(0, 0, 0, value)
1010
self.PropertyChanged(dbus.String(u"timeout"),
1011
dbus.UInt64(value, variant_level=1))
1012
if getattr(self, u"disable_initiator_tag", None) is None:
1167
if getattr(self, "disable_initiator_tag", None) is None:
1014
1169
# Reschedule timeout
1015
1170
gobject.source_remove(self.disable_initiator_tag)
1016
1171
self.disable_initiator_tag = None
1017
1173
time_to_die = (self.
1018
1174
_timedelta_to_milliseconds((self
1019
1175
.last_checked_ok
1024
1180
# The timeout has passed
1183
self.expires = (datetime.datetime.utcnow()
1184
+ datetime.timedelta(milliseconds = time_to_die))
1027
1185
self.disable_initiator_tag = (gobject.timeout_add
1028
1186
(time_to_die, self.disable))
1030
# interval - property
1031
@dbus_service_property(_interface, signature=u"t",
1032
access=u"readwrite")
1033
def interval_dbus_property(self, value=None):
1188
# ExtendedTimeout - property
1189
@dbus_service_property(_interface, signature="t",
1191
def ExtendedTimeout_dbus_property(self, value=None):
1192
if value is None: # get
1193
return dbus.UInt64(self.extended_timeout_milliseconds())
1194
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1196
# Interval - property
1197
@dbus_service_property(_interface, signature="t",
1199
def Interval_dbus_property(self, value=None):
1034
1200
if value is None: # get
1035
1201
return dbus.UInt64(self.interval_milliseconds())
1036
1202
self.interval = datetime.timedelta(0, 0, 0, value)
1038
self.PropertyChanged(dbus.String(u"interval"),
1039
dbus.UInt64(value, variant_level=1))
1040
if getattr(self, u"checker_initiator_tag", None) is None:
1203
if getattr(self, "checker_initiator_tag", None) is None:
1042
1205
# Reschedule checker run
1043
1206
gobject.source_remove(self.checker_initiator_tag)
1044
1207
self.checker_initiator_tag = (gobject.timeout_add
1045
1208
(value, self.start_checker))
1046
1209
self.start_checker() # Start one now, too
1048
# checker - property
1049
@dbus_service_property(_interface, signature=u"s",
1050
access=u"readwrite")
1051
def checker_dbus_property(self, value=None):
1211
# Checker - property
1212
@dbus_service_property(_interface, signature="s",
1214
def Checker_dbus_property(self, value=None):
1052
1215
if value is None: # get
1053
1216
return dbus.String(self.checker_command)
1054
1217
self.checker_command = value
1056
self.PropertyChanged(dbus.String(u"checker"),
1057
dbus.String(self.checker_command,
1060
# checker_running - property
1061
@dbus_service_property(_interface, signature=u"b",
1062
access=u"readwrite")
1063
def checker_running_dbus_property(self, value=None):
1219
# CheckerRunning - property
1220
@dbus_service_property(_interface, signature="b",
1222
def CheckerRunning_dbus_property(self, value=None):
1064
1223
if value is None: # get
1065
1224
return dbus.Boolean(self.checker is not None)
1117
1278
def handle(self):
1118
1279
with contextlib.closing(self.server.child_pipe) as child_pipe:
1119
logger.info(u"TCP connection from: %s",
1280
logger.info("TCP connection from: %s",
1120
1281
unicode(self.client_address))
1121
logger.debug(u"Pipe FD: %d",
1282
logger.debug("Pipe FD: %d",
1122
1283
self.server.child_pipe.fileno())
1124
1285
session = (gnutls.connection
1125
1286
.ClientSession(self.request,
1126
1287
gnutls.connection
1127
1288
.X509Credentials()))
1129
1290
# Note: gnutls.connection.X509Credentials is really a
1130
1291
# generic GnuTLS certificate credentials object so long as
1131
1292
# no X.509 keys are added to it. Therefore, we can use it
1132
1293
# here despite using OpenPGP certificates.
1134
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1135
# u"+AES-256-CBC", u"+SHA1",
1136
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1295
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1296
# "+AES-256-CBC", "+SHA1",
1297
# "+COMP-NULL", "+CTYPE-OPENPGP",
1138
1299
# Use a fallback default, since this MUST be set.
1139
1300
priority = self.server.gnutls_priority
1140
1301
if priority is None:
1141
priority = u"NORMAL"
1142
1303
(gnutls.library.functions
1143
1304
.gnutls_priority_set_direct(session._c_object,
1144
1305
priority, None))
1146
1307
# Start communication using the Mandos protocol
1147
1308
# Get protocol number
1148
1309
line = self.request.makefile().readline()
1149
logger.debug(u"Protocol version: %r", line)
1310
logger.debug("Protocol version: %r", line)
1151
1312
if int(line.strip().split()[0]) > 1:
1152
1313
raise RuntimeError
1153
except (ValueError, IndexError, RuntimeError), error:
1154
logger.error(u"Unknown protocol version: %s", error)
1314
except (ValueError, IndexError, RuntimeError) as error:
1315
logger.error("Unknown protocol version: %s", error)
1157
1318
# Start GnuTLS connection
1159
1320
session.handshake()
1160
except gnutls.errors.GNUTLSError, error:
1161
logger.warning(u"Handshake failed: %s", error)
1321
except gnutls.errors.GNUTLSError as error:
1322
logger.warning("Handshake failed: %s", error)
1162
1323
# Do not run session.bye() here: the session is not
1163
1324
# established. Just abandon the request.
1165
logger.debug(u"Handshake succeeded")
1326
logger.debug("Handshake succeeded")
1167
1328
approval_required = False
1170
1331
fpr = self.fingerprint(self.peer_certificate
1172
except (TypeError, gnutls.errors.GNUTLSError), error:
1173
logger.warning(u"Bad certificate: %s", error)
1334
gnutls.errors.GNUTLSError) as error:
1335
logger.warning("Bad certificate: %s", error)
1175
logger.debug(u"Fingerprint: %s", fpr)
1337
logger.debug("Fingerprint: %s", fpr)
1178
1340
client = ProxyClient(child_pipe, fpr,
1179
1341
self.client_address)
1180
1342
except KeyError:
1183
if client.approved_delay:
1184
delay = client.approved_delay
1345
if client.approval_delay:
1346
delay = client.approval_delay
1185
1347
client.approvals_pending += 1
1186
1348
approval_required = True
1189
1351
if not client.enabled:
1190
logger.warning(u"Client %s is disabled",
1352
logger.info("Client %s is disabled",
1192
1354
if self.server.use_dbus:
1193
1355
# Emit D-Bus signal
1194
1356
client.Rejected("Disabled")
1197
if client._approved or not client.approved_delay:
1359
if client._approved or not client.approval_delay:
1198
1360
#We are approved or approval is disabled
1200
1362
elif client._approved is None:
1201
logger.info(u"Client %s need approval",
1363
logger.info("Client %s needs approval",
1203
1365
if self.server.use_dbus:
1204
1366
# Emit D-Bus signal
1205
1367
client.NeedApproval(
1206
client.approved_delay_milliseconds(),
1368
client.approval_delay_milliseconds(),
1207
1369
client.approved_by_default)
1209
logger.warning(u"Client %s was not approved",
1371
logger.warning("Client %s was not approved",
1211
1373
if self.server.use_dbus:
1212
1374
# Emit D-Bus signal
1213
client.Rejected("Disapproved")
1375
client.Rejected("Denied")
1216
1378
#wait until timeout or approved
1623
1783
##################################################################
1624
1784
# Parsing of options, both command line and config file
1626
parser = optparse.OptionParser(version = "%%prog %s" % version)
1627
parser.add_option("-i", u"--interface", type=u"string",
1628
metavar="IF", help=u"Bind to interface IF")
1629
parser.add_option("-a", u"--address", type=u"string",
1630
help=u"Address to listen for requests on")
1631
parser.add_option("-p", u"--port", type=u"int",
1632
help=u"Port number to receive requests on")
1633
parser.add_option("--check", action=u"store_true",
1634
help=u"Run self-test")
1635
parser.add_option("--debug", action=u"store_true",
1636
help=u"Debug mode; run in foreground and log to"
1638
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1639
help=u"Debug level for stdout output")
1640
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1641
u" priority string (see GnuTLS documentation)")
1642
parser.add_option("--servicename", type=u"string",
1643
metavar=u"NAME", help=u"Zeroconf service name")
1644
parser.add_option("--configdir", type=u"string",
1645
default=u"/etc/mandos", metavar=u"DIR",
1646
help=u"Directory to search for configuration"
1648
parser.add_option("--no-dbus", action=u"store_false",
1649
dest=u"use_dbus", help=u"Do not provide D-Bus"
1650
u" system bus interface")
1651
parser.add_option("--no-ipv6", action=u"store_false",
1652
dest=u"use_ipv6", help=u"Do not use IPv6")
1653
options = parser.parse_args()[0]
1786
parser = argparse.ArgumentParser()
1787
parser.add_argument("-v", "--version", action="version",
1788
version = "%%(prog)s %s" % version,
1789
help="show version number and exit")
1790
parser.add_argument("-i", "--interface", metavar="IF",
1791
help="Bind to interface IF")
1792
parser.add_argument("-a", "--address",
1793
help="Address to listen for requests on")
1794
parser.add_argument("-p", "--port", type=int,
1795
help="Port number to receive requests on")
1796
parser.add_argument("--check", action="store_true",
1797
help="Run self-test")
1798
parser.add_argument("--debug", action="store_true",
1799
help="Debug mode; run in foreground and log"
1801
parser.add_argument("--debuglevel", metavar="LEVEL",
1802
help="Debug level for stdout output")
1803
parser.add_argument("--priority", help="GnuTLS"
1804
" priority string (see GnuTLS documentation)")
1805
parser.add_argument("--servicename",
1806
metavar="NAME", help="Zeroconf service name")
1807
parser.add_argument("--configdir",
1808
default="/etc/mandos", metavar="DIR",
1809
help="Directory to search for configuration"
1811
parser.add_argument("--no-dbus", action="store_false",
1812
dest="use_dbus", help="Do not provide D-Bus"
1813
" system bus interface")
1814
parser.add_argument("--no-ipv6", action="store_false",
1815
dest="use_ipv6", help="Do not use IPv6")
1816
options = parser.parse_args()
1655
1818
if options.check:
1660
1823
# Default values for config file for server-global settings
1661
server_defaults = { u"interface": u"",
1666
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1667
u"servicename": u"Mandos",
1668
u"use_dbus": u"True",
1669
u"use_ipv6": u"True",
1824
server_defaults = { "interface": "",
1829
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1830
"servicename": "Mandos",
1673
1836
# Parse config file for server-global settings
1674
1837
server_config = configparser.SafeConfigParser(server_defaults)
1675
1838
del server_defaults
1676
1839
server_config.read(os.path.join(options.configdir,
1678
1841
# Convert the SafeConfigParser object to a dict
1679
1842
server_settings = server_config.defaults()
1680
1843
# Use the appropriate methods on the non-string config options
1681
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1682
server_settings[option] = server_config.getboolean(u"DEFAULT",
1844
for option in ("debug", "use_dbus", "use_ipv6"):
1845
server_settings[option] = server_config.getboolean("DEFAULT",
1684
1847
if server_settings["port"]:
1685
server_settings["port"] = server_config.getint(u"DEFAULT",
1848
server_settings["port"] = server_config.getint("DEFAULT",
1687
1850
del server_config
1689
1852
# Override the settings from the config file with command line
1690
1853
# options, if set.
1691
for option in (u"interface", u"address", u"port", u"debug",
1692
u"priority", u"servicename", u"configdir",
1693
u"use_dbus", u"use_ipv6", u"debuglevel"):
1854
for option in ("interface", "address", "port", "debug",
1855
"priority", "servicename", "configdir",
1856
"use_dbus", "use_ipv6", "debuglevel"):
1694
1857
value = getattr(options, option)
1695
1858
if value is not None:
1696
1859
server_settings[option] = value
1704
1867
##################################################################
1706
1869
# For convenience
1707
debug = server_settings[u"debug"]
1708
debuglevel = server_settings[u"debuglevel"]
1709
use_dbus = server_settings[u"use_dbus"]
1710
use_ipv6 = server_settings[u"use_ipv6"]
1712
if server_settings[u"servicename"] != u"Mandos":
1870
debug = server_settings["debug"]
1871
debuglevel = server_settings["debuglevel"]
1872
use_dbus = server_settings["use_dbus"]
1873
use_ipv6 = server_settings["use_ipv6"]
1875
if server_settings["servicename"] != "Mandos":
1713
1876
syslogger.setFormatter(logging.Formatter
1714
(u'Mandos (%s) [%%(process)d]:'
1715
u' %%(levelname)s: %%(message)s'
1716
% server_settings[u"servicename"]))
1877
('Mandos (%s) [%%(process)d]:'
1878
' %%(levelname)s: %%(message)s'
1879
% server_settings["servicename"]))
1718
1881
# Parse config file with clients
1719
client_defaults = { u"timeout": u"1h",
1721
u"checker": u"fping -q -- %%(host)s",
1723
u"approved_delay": u"0s",
1724
u"approved_duration": u"1s",
1882
client_defaults = { "timeout": "5m",
1883
"extended_timeout": "15m",
1885
"checker": "fping -q -- %%(host)s",
1887
"approval_delay": "0s",
1888
"approval_duration": "1s",
1726
1890
client_config = configparser.SafeConfigParser(client_defaults)
1727
client_config.read(os.path.join(server_settings[u"configdir"],
1891
client_config.read(os.path.join(server_settings["configdir"],
1730
1894
global mandos_dbus_service
1731
1895
mandos_dbus_service = None
1733
tcp_server = MandosServer((server_settings[u"address"],
1734
server_settings[u"port"]),
1897
tcp_server = MandosServer((server_settings["address"],
1898
server_settings["port"]),
1736
interface=(server_settings[u"interface"]
1900
interface=(server_settings["interface"]
1738
1902
use_ipv6=use_ipv6,
1739
1903
gnutls_priority=
1740
server_settings[u"priority"],
1904
server_settings["priority"],
1741
1905
use_dbus=use_dbus)
1742
pidfilename = u"/var/run/mandos.pid"
1744
pidfile = open(pidfilename, u"w")
1746
logger.error(u"Could not open file %r", pidfilename)
1907
pidfilename = "/var/run/mandos.pid"
1909
pidfile = open(pidfilename, "w")
1911
logger.error("Could not open file %r", pidfilename)
1749
uid = pwd.getpwnam(u"_mandos").pw_uid
1750
gid = pwd.getpwnam(u"_mandos").pw_gid
1914
uid = pwd.getpwnam("_mandos").pw_uid
1915
gid = pwd.getpwnam("_mandos").pw_gid
1751
1916
except KeyError:
1753
uid = pwd.getpwnam(u"mandos").pw_uid
1754
gid = pwd.getpwnam(u"mandos").pw_gid
1918
uid = pwd.getpwnam("mandos").pw_uid
1919
gid = pwd.getpwnam("mandos").pw_gid
1755
1920
except KeyError:
1757
uid = pwd.getpwnam(u"nobody").pw_uid
1758
gid = pwd.getpwnam(u"nobody").pw_gid
1922
uid = pwd.getpwnam("nobody").pw_uid
1923
gid = pwd.getpwnam("nobody").pw_gid
1759
1924
except KeyError:
1765
except OSError, error:
1930
except OSError as error:
1766
1931
if error[0] != errno.EPERM:
1769
# Enable all possible GnuTLS debugging
1772
1934
if not debug and not debuglevel:
1773
1935
syslogger.setLevel(logging.WARNING)
1774
1936
console.setLevel(logging.WARNING)
1807
1975
# End of Avahi example code
1810
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1978
bus_name = dbus.service.BusName("se.recompile.Mandos",
1811
1979
bus, do_not_queue=True)
1812
except dbus.exceptions.NameExistsException, e:
1813
logger.error(unicode(e) + u", disabling D-Bus")
1980
old_bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1981
bus, do_not_queue=True)
1982
except dbus.exceptions.NameExistsException as e:
1983
logger.error(unicode(e) + ", disabling D-Bus")
1814
1984
use_dbus = False
1815
server_settings[u"use_dbus"] = False
1985
server_settings["use_dbus"] = False
1816
1986
tcp_server.use_dbus = False
1817
1987
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1818
service = AvahiService(name = server_settings[u"servicename"],
1819
servicetype = u"_mandos._tcp",
1988
service = AvahiService(name = server_settings["servicename"],
1989
servicetype = "_mandos._tcp",
1820
1990
protocol = protocol, bus = bus)
1821
1991
if server_settings["interface"]:
1822
1992
service.interface = (if_nametoindex
1823
(str(server_settings[u"interface"])))
1826
# Close all input and output, do double fork, etc.
1993
(str(server_settings["interface"])))
1829
1995
global multiprocessing_manager
1830
1996
multiprocessing_manager = multiprocessing.Manager()
1832
1998
client_class = Client
1834
client_class = functools.partial(ClientDBus, bus = bus)
2000
client_class = functools.partial(ClientDBusTransitional, bus = bus)
1835
2001
def client_config_items(config, section):
1836
2002
special_settings = {
1837
2003
"approved_by_default":
1874
2041
class MandosDBusService(dbus.service.Object):
1875
2042
"""A D-Bus proxy object"""
1876
2043
def __init__(self):
1877
dbus.service.Object.__init__(self, bus, u"/")
1878
_interface = u"se.bsnet.fukt.Mandos"
2044
dbus.service.Object.__init__(self, bus, "/")
2045
_interface = "se.recompile.Mandos"
1880
@dbus.service.signal(_interface, signature=u"o")
2047
@dbus.service.signal(_interface, signature="o")
1881
2048
def ClientAdded(self, objpath):
1885
@dbus.service.signal(_interface, signature=u"ss")
2052
@dbus.service.signal(_interface, signature="ss")
1886
2053
def ClientNotFound(self, fingerprint, address):
1890
@dbus.service.signal(_interface, signature=u"os")
2057
@dbus.service.signal(_interface, signature="os")
1891
2058
def ClientRemoved(self, objpath, name):
1895
@dbus.service.method(_interface, out_signature=u"ao")
2062
@dbus.service.method(_interface, out_signature="ao")
1896
2063
def GetAllClients(self):
1898
2065
return dbus.Array(c.dbus_object_path
1899
2066
for c in tcp_server.clients)
1901
2068
@dbus.service.method(_interface,
1902
out_signature=u"a{oa{sv}}")
2069
out_signature="a{oa{sv}}")
1903
2070
def GetAllClientsWithProperties(self):
1905
2072
return dbus.Dictionary(
1906
((c.dbus_object_path, c.GetAll(u""))
2073
((c.dbus_object_path, c.GetAll(""))
1907
2074
for c in tcp_server.clients),
1908
signature=u"oa{sv}")
1910
@dbus.service.method(_interface, in_signature=u"o")
2077
@dbus.service.method(_interface, in_signature="o")
1911
2078
def RemoveClient(self, object_path):
1913
2080
for c in tcp_server.clients: