150
151
self.group = None # our entry group
151
152
self.server = None
154
self.entry_group_state_changed_match = None
153
155
def rename(self):
154
156
"""Derived from the Avahi example code"""
155
157
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
158
160
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
161
raise AvahiServiceError("Too many renames")
160
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
logger.info("Changing Zeroconf service name to %r ...",
163
165
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
169
176
self.rename_count += 1
170
177
def remove(self):
171
178
"""Derived from the Avahi example code"""
172
179
if self.group is not None:
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
186
if self.entry_group_state_changed_match is not None:
187
self.entry_group_state_changed_match.remove()
188
self.entry_group_state_changed_match = None
175
190
"""Derived from the Avahi example code"""
176
if self.group is None:
177
self.group = dbus.Interface(
178
self.bus.get_object(avahi.DBUS_NAME,
179
self.server.EntryGroupNew()),
180
avahi.DBUS_INTERFACE_ENTRY_GROUP)
181
self.group.connect_to_signal('StateChanged',
183
.entry_group_state_changed)
184
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
self.entry_group_state_changed_match = (
198
self.group.connect_to_signal(
199
'StateChanged', self .entry_group_state_changed))
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
185
201
self.name, self.type)
186
202
self.group.AddService(
194
210
self.group.Commit()
195
211
def entry_group_state_changed(self, state, error):
196
212
"""Derived from the Avahi example code"""
197
logger.debug(u"Avahi entry group state change: %i", state)
213
logger.debug("Avahi entry group state change: %i", state)
199
215
if state == avahi.ENTRY_GROUP_ESTABLISHED:
200
logger.debug(u"Zeroconf service established.")
216
logger.debug("Zeroconf service established.")
201
217
elif state == avahi.ENTRY_GROUP_COLLISION:
202
logger.warning(u"Zeroconf service name collision.")
218
logger.info("Zeroconf service name collision.")
204
220
elif state == avahi.ENTRY_GROUP_FAILURE:
205
logger.critical(u"Avahi: Error in group state changed %s",
221
logger.critical("Avahi: Error in group state changed %s",
207
raise AvahiGroupError(u"State changed: %s"
223
raise AvahiGroupError("State changed: %s"
208
224
% unicode(error))
209
225
def cleanup(self):
210
226
"""Derived from the Avahi example code"""
211
if self.group is not None:
214
def server_state_changed(self, state):
228
def server_state_changed(self, state, error=None):
215
229
"""Derived from the Avahi example code"""
216
logger.debug(u"Avahi server state change: %i", state)
217
if state == avahi.SERVER_COLLISION:
218
logger.error(u"Zeroconf server name collision")
230
logger.debug("Avahi server state change: %i", state)
231
bad_states = { avahi.SERVER_INVALID:
232
"Zeroconf server invalid",
233
avahi.SERVER_REGISTERING: None,
234
avahi.SERVER_COLLISION:
235
"Zeroconf server name collision",
236
avahi.SERVER_FAILURE:
237
"Zeroconf server failure" }
238
if state in bad_states:
239
if bad_states[state]:
240
logger.error(bad_states[state])
220
242
elif state == avahi.SERVER_RUNNING:
245
logger.debug("Unknown state: %r", state)
222
246
def activate(self):
223
247
"""Derived from the Avahi example code"""
224
248
if self.server is None:
225
249
self.server = dbus.Interface(
226
250
self.bus.get_object(avahi.DBUS_NAME,
227
avahi.DBUS_PATH_SERVER),
251
avahi.DBUS_PATH_SERVER,
252
follow_name_owner_changes=True),
228
253
avahi.DBUS_INTERFACE_SERVER)
229
self.server.connect_to_signal(u"StateChanged",
254
self.server.connect_to_signal("StateChanged",
230
255
self.server_state_changed)
231
256
self.server_state_changed(self.server.GetState())
235
260
"""A representation of a client host served by this server.
238
name: string; from the config file, used in log messages and
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approval_delay: datetime.timedelta(); Time to wait for approval
265
approval_duration: datetime.timedelta(); Duration of one approval
266
checker: subprocess.Popen(); a running checker process used
267
to see if the client lives.
268
'None' if no process is running.
269
checker_callback_tag: a gobject event source tag, or None
270
checker_command: string; External command which is run to check
271
if client lives. %() expansions are done at
272
runtime with vars(self) as dict, so that for
273
instance %(name)s can be used in the command.
274
checker_initiator_tag: a gobject event source tag, or None
275
created: datetime.datetime(); (UTC) object creation
276
current_checker_command: string; current running checker_command
277
disable_hook: If set, called by disable() as disable_hook(self)
278
disable_initiator_tag: a gobject event source tag, or None
240
280
fingerprint: string (40 or 32 hexadecimal digits); used to
241
281
uniquely identify the client
242
secret: bytestring; sent verbatim (over TLS) to client
243
282
host: string; available for use by the checker command
244
created: datetime.datetime(); (UTC) object creation
283
interval: datetime.timedelta(); How often to start a new checker
284
last_approval_request: datetime.datetime(); (UTC) or None
285
last_checked_ok: datetime.datetime(); (UTC) or None
245
286
last_enabled: datetime.datetime(); (UTC)
247
last_checked_ok: datetime.datetime(); (UTC) or None
287
name: string; from the config file, used in log messages and
289
secret: bytestring; sent verbatim (over TLS) to client
248
290
timeout: datetime.timedelta(); How long from last_checked_ok
249
291
until this client is disabled
250
interval: datetime.timedelta(); How often to start a new checker
251
disable_hook: If set, called by disable() as disable_hook(self)
252
checker: subprocess.Popen(); a running checker process used
253
to see if the client lives.
254
'None' if no process is running.
255
checker_initiator_tag: a gobject event source tag, or None
256
disable_initiator_tag: - '' -
257
checker_callback_tag: - '' -
258
checker_command: string; External command which is run to check if
259
client lives. %() expansions are done at
260
runtime with vars(self) as dict, so that for
261
instance %(name)s can be used in the command.
262
current_checker_command: string; current running checker_command
263
approved_delay: datetime.timedelta(); Time to wait for approval
264
_approved: bool(); 'None' if not yet approved/disapproved
265
approved_duration: datetime.timedelta(); Duration of one approval
292
runtime_expansions: Allowed attributes for runtime expansion.
295
runtime_expansions = ("approval_delay", "approval_duration",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
298
"last_enabled", "name", "timeout")
269
301
def _timedelta_to_milliseconds(td):
270
302
"Convert a datetime.timedelta() to milliseconds"
291
323
if config is None:
293
logger.debug(u"Creating client %r", self.name)
325
logger.debug("Creating client %r", self.name)
294
326
# Uppercase and remove spaces from fingerprint for later
295
327
# comparison purposes with return value from the fingerprint()
297
self.fingerprint = (config[u"fingerprint"].upper()
299
logger.debug(u" Fingerprint: %s", self.fingerprint)
300
if u"secret" in config:
301
self.secret = config[u"secret"].decode(u"base64")
302
elif u"secfile" in config:
329
self.fingerprint = (config["fingerprint"].upper()
331
logger.debug(" Fingerprint: %s", self.fingerprint)
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
303
335
with open(os.path.expanduser(os.path.expandvars
304
(config[u"secfile"])),
336
(config["secfile"])),
305
337
"rb") as secfile:
306
338
self.secret = secfile.read()
308
raise TypeError(u"No secret or secfile for client %s"
340
raise TypeError("No secret or secfile for client %s"
310
self.host = config.get(u"host", u"")
342
self.host = config.get("host", "")
311
343
self.created = datetime.datetime.utcnow()
312
344
self.enabled = False
345
self.last_approval_request = None
313
346
self.last_enabled = None
314
347
self.last_checked_ok = None
315
self.timeout = string_to_delta(config[u"timeout"])
316
self.interval = string_to_delta(config[u"interval"])
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
317
350
self.disable_hook = disable_hook
318
351
self.checker = None
319
352
self.checker_initiator_tag = None
320
353
self.disable_initiator_tag = None
321
354
self.checker_callback_tag = None
322
self.checker_command = config[u"checker"]
355
self.checker_command = config["checker"]
323
356
self.current_checker_command = None
324
357
self.last_connect = None
325
358
self._approved = None
326
self.approved_by_default = config.get(u"approved_by_default",
359
self.approved_by_default = config.get("approved_by_default",
328
361
self.approvals_pending = 0
329
self.approved_delay = string_to_delta(
330
config[u"approved_delay"])
331
self.approved_duration = string_to_delta(
332
config[u"approved_duration"])
362
self.approval_delay = string_to_delta(
363
config["approval_delay"])
364
self.approval_duration = string_to_delta(
365
config["approval_duration"])
333
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
335
368
def send_changedstate(self):
445
481
command = self.checker_command % self.host
446
482
except TypeError:
447
483
# Escape attributes for the shell
448
escaped_attrs = dict((key,
449
re.escape(unicode(str(val),
453
vars(self).iteritems())
484
escaped_attrs = dict(
486
re.escape(unicode(str(getattr(self, attr, "")),
490
self.runtime_expansions)
455
493
command = self.checker_command % escaped_attrs
456
except TypeError, error:
457
logger.error(u'Could not format string "%s":'
458
u' %s', self.checker_command, error)
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
459
497
return True # Try again later
460
498
self.current_checker_command = command
462
logger.info(u"Starting checker %r for %s",
500
logger.info("Starting checker %r for %s",
463
501
command, self.name)
464
502
# We don't need to redirect stdout and stderr, since
465
503
# in normal mode, that is already done by daemon(),
489
527
if self.checker_callback_tag:
490
528
gobject.source_remove(self.checker_callback_tag)
491
529
self.checker_callback_tag = None
492
if getattr(self, u"checker", None) is None:
530
if getattr(self, "checker", None) is None:
494
logger.debug(u"Stopping checker for %(name)s", vars(self))
532
logger.debug("Stopping checker for %(name)s", vars(self))
496
534
os.kill(self.checker.pid, signal.SIGTERM)
498
536
#if self.checker.poll() is None:
499
537
# os.kill(self.checker.pid, signal.SIGKILL)
500
except OSError, error:
538
except OSError as error:
501
539
if error.errno != errno.ESRCH: # No such process
503
541
self.checker = None
505
def dbus_service_property(dbus_interface, signature=u"v",
506
access=u"readwrite", byte_arrays=False):
543
def dbus_service_property(dbus_interface, signature="v",
544
access="readwrite", byte_arrays=False):
507
545
"""Decorators for marking methods of a DBusObjectWithProperties to
508
546
become properties on the D-Bus.
517
555
# Encoding deeply encoded byte arrays is not supported yet by the
518
556
# "Set" method, so we fail early here:
519
if byte_arrays and signature != u"ay":
520
raise ValueError(u"Byte arrays not supported for non-'ay'"
521
u" signature %r" % signature)
557
if byte_arrays and signature != "ay":
558
raise ValueError("Byte arrays not supported for non-'ay'"
559
" signature %r" % signature)
522
560
def decorator(func):
523
561
func._dbus_is_property = True
524
562
func._dbus_interface = dbus_interface
525
563
func._dbus_signature = signature
526
564
func._dbus_access = access
527
565
func._dbus_name = func.__name__
528
if func._dbus_name.endswith(u"_dbus_property"):
566
if func._dbus_name.endswith("_dbus_property"):
529
567
func._dbus_name = func._dbus_name[:-14]
530
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
568
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
587
625
# No such property
588
raise DBusPropertyNotFound(self.dbus_object_path + u":"
589
+ interface_name + u"."
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
592
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
594
632
def Get(self, interface_name, property_name):
595
633
"""Standard D-Bus property Get() method, see D-Bus standard.
597
635
prop = self._get_dbus_property(interface_name, property_name)
598
if prop._dbus_access == u"write":
636
if prop._dbus_access == "write":
599
637
raise DBusPropertyAccessException(property_name)
601
if not hasattr(value, u"variant_level"):
639
if not hasattr(value, "variant_level"):
603
641
return type(value)(value, variant_level=value.variant_level+1)
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
643
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
606
644
def Set(self, interface_name, property_name, value):
607
645
"""Standard D-Bus property Set() method, see D-Bus standard.
609
647
prop = self._get_dbus_property(interface_name, property_name)
610
if prop._dbus_access == u"read":
648
if prop._dbus_access == "read":
611
649
raise DBusPropertyAccessException(property_name)
612
if prop._dbus_get_args_options[u"byte_arrays"]:
650
if prop._dbus_get_args_options["byte_arrays"]:
613
651
# The byte_arrays option is not supported yet on
614
652
# signatures other than "ay".
615
if prop._dbus_signature != u"ay":
653
if prop._dbus_signature != "ay":
617
655
value = dbus.ByteArray(''.join(unichr(byte)
618
656
for byte in value))
621
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
622
out_signature=u"a{sv}")
659
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
out_signature="a{sv}")
623
661
def GetAll(self, interface_name):
624
662
"""Standard D-Bus property GetAll() method, see D-Bus
656
694
document = xml.dom.minidom.parseString(xmlstring)
657
695
def make_tag(document, name, prop):
658
e = document.createElement(u"property")
659
e.setAttribute(u"name", name)
660
e.setAttribute(u"type", prop._dbus_signature)
661
e.setAttribute(u"access", prop._dbus_access)
696
e = document.createElement("property")
697
e.setAttribute("name", name)
698
e.setAttribute("type", prop._dbus_signature)
699
e.setAttribute("access", prop._dbus_access)
663
for if_tag in document.getElementsByTagName(u"interface"):
701
for if_tag in document.getElementsByTagName("interface"):
664
702
for tag in (make_tag(document, name, prop)
666
704
in self._get_all_dbus_properties()
667
705
if prop._dbus_interface
668
== if_tag.getAttribute(u"name")):
706
== if_tag.getAttribute("name")):
669
707
if_tag.appendChild(tag)
670
708
# Add the names to the return values for the
671
709
# "org.freedesktop.DBus.Properties" methods
672
if (if_tag.getAttribute(u"name")
673
== u"org.freedesktop.DBus.Properties"):
674
for cn in if_tag.getElementsByTagName(u"method"):
675
if cn.getAttribute(u"name") == u"Get":
676
for arg in cn.getElementsByTagName(u"arg"):
677
if (arg.getAttribute(u"direction")
679
arg.setAttribute(u"name", u"value")
680
elif cn.getAttribute(u"name") == u"GetAll":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"props")
685
xmlstring = document.toxml(u"utf-8")
710
if (if_tag.getAttribute("name")
711
== "org.freedesktop.DBus.Properties"):
712
for cn in if_tag.getElementsByTagName("method"):
713
if cn.getAttribute("name") == "Get":
714
for arg in cn.getElementsByTagName("arg"):
715
if (arg.getAttribute("direction")
717
arg.setAttribute("name", "value")
718
elif cn.getAttribute("name") == "GetAll":
719
for arg in cn.getElementsByTagName("arg"):
720
if (arg.getAttribute("direction")
722
arg.setAttribute("name", "props")
723
xmlstring = document.toxml("utf-8")
686
724
document.unlink()
687
725
except (AttributeError, xml.dom.DOMException,
688
xml.parsers.expat.ExpatError), error:
689
logger.error(u"Failed to override Introspection method",
726
xml.parsers.expat.ExpatError) as error:
727
logger.error("Failed to override Introspection method",
735
779
variant_level=variant_level)
737
781
def enable(self):
738
oldstate = getattr(self, u"enabled", False)
782
oldstate = getattr(self, "enabled", False)
739
783
r = Client.enable(self)
740
784
if oldstate != self.enabled:
741
785
# Emit D-Bus signals
742
self.PropertyChanged(dbus.String(u"enabled"),
786
self.PropertyChanged(dbus.String("Enabled"),
743
787
dbus.Boolean(True, variant_level=1))
744
788
self.PropertyChanged(
745
dbus.String(u"last_enabled"),
789
dbus.String("LastEnabled"),
746
790
self._datetime_to_dbus(self.last_enabled,
747
791
variant_level=1))
750
794
def disable(self, quiet = False):
751
oldstate = getattr(self, u"enabled", False)
795
oldstate = getattr(self, "enabled", False)
752
796
r = Client.disable(self, quiet=quiet)
753
797
if not quiet and oldstate != self.enabled:
754
798
# Emit D-Bus signal
755
self.PropertyChanged(dbus.String(u"enabled"),
799
self.PropertyChanged(dbus.String("Enabled"),
756
800
dbus.Boolean(False, variant_level=1))
790
834
def checked_ok(self, *args, **kwargs):
791
r = Client.checked_ok(self, *args, **kwargs)
835
Client.checked_ok(self, *args, **kwargs)
792
836
# Emit D-Bus signal
793
837
self.PropertyChanged(
794
dbus.String(u"last_checked_ok"),
838
dbus.String("LastCheckedOK"),
795
839
(self._datetime_to_dbus(self.last_checked_ok,
796
840
variant_level=1)))
842
def need_approval(self, *args, **kwargs):
843
r = Client.need_approval(self, *args, **kwargs)
845
self.PropertyChanged(
846
dbus.String("LastApprovalRequest"),
847
(self._datetime_to_dbus(self.last_approval_request,
799
851
def start_checker(self, *args, **kwargs):
809
861
# Emit D-Bus signal
810
862
self.CheckerStarted(self.current_checker_command)
811
863
self.PropertyChanged(
812
dbus.String(u"checker_running"),
864
dbus.String("CheckerRunning"),
813
865
dbus.Boolean(True, variant_level=1))
816
868
def stop_checker(self, *args, **kwargs):
817
old_checker = getattr(self, u"checker", None)
869
old_checker = getattr(self, "checker", None)
818
870
r = Client.stop_checker(self, *args, **kwargs)
819
871
if (old_checker is not None
820
and getattr(self, u"checker", None) is None):
821
self.PropertyChanged(dbus.String(u"checker_running"),
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
822
874
dbus.Boolean(False, variant_level=1))
829
881
def approve(self, value=True):
830
882
self.send_changedstate()
831
883
self._approved = value
832
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
884
gobject.timeout_add(self._timedelta_to_milliseconds
885
(self.approval_duration),
833
886
self._reset_approved)
836
889
## D-Bus methods, signals & properties
837
_interface = u"se.bsnet.fukt.Mandos.Client"
890
_interface = "se.bsnet.fukt.Mandos.Client"
841
894
# CheckerCompleted - signal
842
@dbus.service.signal(_interface, signature=u"nxs")
895
@dbus.service.signal(_interface, signature="nxs")
843
896
def CheckerCompleted(self, exitcode, waitstatus, command):
847
900
# CheckerStarted - signal
848
@dbus.service.signal(_interface, signature=u"s")
901
@dbus.service.signal(_interface, signature="s")
849
902
def CheckerStarted(self, command):
853
906
# PropertyChanged - signal
854
@dbus.service.signal(_interface, signature=u"sv")
907
@dbus.service.signal(_interface, signature="sv")
855
908
def PropertyChanged(self, property, value):
917
# approved_pending - property
918
@dbus_service_property(_interface, signature=u"b", access=u"read")
919
def approved_pending_dbus_property(self):
970
# ApprovalPending - property
971
@dbus_service_property(_interface, signature="b", access="read")
972
def ApprovalPending_dbus_property(self):
920
973
return dbus.Boolean(bool(self.approvals_pending))
922
# approved_by_default - property
923
@dbus_service_property(_interface, signature=u"b",
925
def approved_by_default_dbus_property(self):
926
return dbus.Boolean(self.approved_by_default)
928
# approved_delay - property
929
@dbus_service_property(_interface, signature=u"t",
931
def approved_delay_dbus_property(self):
932
return dbus.UInt64(self.approved_delay_milliseconds())
934
# approved_duration - property
935
@dbus_service_property(_interface, signature=u"t",
937
def approved_duration_dbus_property(self):
938
return dbus.UInt64(self._timedelta_to_milliseconds(
939
self.approved_duration))
942
@dbus_service_property(_interface, signature=u"s", access=u"read")
943
def name_dbus_property(self):
975
# ApprovedByDefault - property
976
@dbus_service_property(_interface, signature="b",
978
def ApprovedByDefault_dbus_property(self, value=None):
979
if value is None: # get
980
return dbus.Boolean(self.approved_by_default)
981
self.approved_by_default = bool(value)
983
self.PropertyChanged(dbus.String("ApprovedByDefault"),
984
dbus.Boolean(value, variant_level=1))
986
# ApprovalDelay - property
987
@dbus_service_property(_interface, signature="t",
989
def ApprovalDelay_dbus_property(self, value=None):
990
if value is None: # get
991
return dbus.UInt64(self.approval_delay_milliseconds())
992
self.approval_delay = datetime.timedelta(0, 0, 0, value)
994
self.PropertyChanged(dbus.String("ApprovalDelay"),
995
dbus.UInt64(value, variant_level=1))
997
# ApprovalDuration - property
998
@dbus_service_property(_interface, signature="t",
1000
def ApprovalDuration_dbus_property(self, value=None):
1001
if value is None: # get
1002
return dbus.UInt64(self._timedelta_to_milliseconds(
1003
self.approval_duration))
1004
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1006
self.PropertyChanged(dbus.String("ApprovalDuration"),
1007
dbus.UInt64(value, variant_level=1))
1010
@dbus_service_property(_interface, signature="s", access="read")
1011
def Name_dbus_property(self):
944
1012
return dbus.String(self.name)
946
# fingerprint - property
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def fingerprint_dbus_property(self):
1014
# Fingerprint - property
1015
@dbus_service_property(_interface, signature="s", access="read")
1016
def Fingerprint_dbus_property(self):
949
1017
return dbus.String(self.fingerprint)
952
@dbus_service_property(_interface, signature=u"s",
954
def host_dbus_property(self, value=None):
1020
@dbus_service_property(_interface, signature="s",
1022
def Host_dbus_property(self, value=None):
955
1023
if value is None: # get
956
1024
return dbus.String(self.host)
957
1025
self.host = value
958
1026
# Emit D-Bus signal
959
self.PropertyChanged(dbus.String(u"host"),
1027
self.PropertyChanged(dbus.String("Host"),
960
1028
dbus.String(value, variant_level=1))
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
964
def created_dbus_property(self):
1030
# Created - property
1031
@dbus_service_property(_interface, signature="s", access="read")
1032
def Created_dbus_property(self):
965
1033
return dbus.String(self._datetime_to_dbus(self.created))
967
# last_enabled - property
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def last_enabled_dbus_property(self):
1035
# LastEnabled - property
1036
@dbus_service_property(_interface, signature="s", access="read")
1037
def LastEnabled_dbus_property(self):
970
1038
if self.last_enabled is None:
971
return dbus.String(u"")
1039
return dbus.String("")
972
1040
return dbus.String(self._datetime_to_dbus(self.last_enabled))
975
@dbus_service_property(_interface, signature=u"b",
977
def enabled_dbus_property(self, value=None):
1042
# Enabled - property
1043
@dbus_service_property(_interface, signature="b",
1045
def Enabled_dbus_property(self, value=None):
978
1046
if value is None: # get
979
1047
return dbus.Boolean(self.enabled)
985
# last_checked_ok - property
986
@dbus_service_property(_interface, signature=u"s",
988
def last_checked_ok_dbus_property(self, value=None):
1053
# LastCheckedOK - property
1054
@dbus_service_property(_interface, signature="s",
1056
def LastCheckedOK_dbus_property(self, value=None):
989
1057
if value is not None:
990
1058
self.checked_ok()
992
1060
if self.last_checked_ok is None:
993
return dbus.String(u"")
1061
return dbus.String("")
994
1062
return dbus.String(self._datetime_to_dbus(self
995
1063
.last_checked_ok))
998
@dbus_service_property(_interface, signature=u"t",
1000
def timeout_dbus_property(self, value=None):
1065
# LastApprovalRequest - property
1066
@dbus_service_property(_interface, signature="s", access="read")
1067
def LastApprovalRequest_dbus_property(self):
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1074
# Timeout - property
1075
@dbus_service_property(_interface, signature="t",
1077
def Timeout_dbus_property(self, value=None):
1001
1078
if value is None: # get
1002
1079
return dbus.UInt64(self.timeout_milliseconds())
1003
1080
self.timeout = datetime.timedelta(0, 0, 0, value)
1004
1081
# Emit D-Bus signal
1005
self.PropertyChanged(dbus.String(u"timeout"),
1082
self.PropertyChanged(dbus.String("Timeout"),
1006
1083
dbus.UInt64(value, variant_level=1))
1007
if getattr(self, u"disable_initiator_tag", None) is None:
1084
if getattr(self, "disable_initiator_tag", None) is None:
1009
1086
# Reschedule timeout
1010
1087
gobject.source_remove(self.disable_initiator_tag)
1022
1099
self.disable_initiator_tag = (gobject.timeout_add
1023
1100
(time_to_die, self.disable))
1025
# interval - property
1026
@dbus_service_property(_interface, signature=u"t",
1027
access=u"readwrite")
1028
def interval_dbus_property(self, value=None):
1102
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1105
def Interval_dbus_property(self, value=None):
1029
1106
if value is None: # get
1030
1107
return dbus.UInt64(self.interval_milliseconds())
1031
1108
self.interval = datetime.timedelta(0, 0, 0, value)
1032
1109
# Emit D-Bus signal
1033
self.PropertyChanged(dbus.String(u"interval"),
1110
self.PropertyChanged(dbus.String("Interval"),
1034
1111
dbus.UInt64(value, variant_level=1))
1035
if getattr(self, u"checker_initiator_tag", None) is None:
1112
if getattr(self, "checker_initiator_tag", None) is None:
1037
1114
# Reschedule checker run
1038
1115
gobject.source_remove(self.checker_initiator_tag)
1040
1117
(value, self.start_checker))
1041
1118
self.start_checker() # Start one now, too
1043
# checker - property
1044
@dbus_service_property(_interface, signature=u"s",
1045
access=u"readwrite")
1046
def checker_dbus_property(self, value=None):
1120
# Checker - property
1121
@dbus_service_property(_interface, signature="s",
1123
def Checker_dbus_property(self, value=None):
1047
1124
if value is None: # get
1048
1125
return dbus.String(self.checker_command)
1049
1126
self.checker_command = value
1050
1127
# Emit D-Bus signal
1051
self.PropertyChanged(dbus.String(u"checker"),
1128
self.PropertyChanged(dbus.String("Checker"),
1052
1129
dbus.String(self.checker_command,
1053
1130
variant_level=1))
1055
# checker_running - property
1056
@dbus_service_property(_interface, signature=u"b",
1057
access=u"readwrite")
1058
def checker_running_dbus_property(self, value=None):
1132
# CheckerRunning - property
1133
@dbus_service_property(_interface, signature="b",
1135
def CheckerRunning_dbus_property(self, value=None):
1059
1136
if value is None: # get
1060
1137
return dbus.Boolean(self.checker is not None)
1126
1203
# no X.509 keys are added to it. Therefore, we can use it
1127
1204
# here despite using OpenPGP certificates.
1129
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1130
# u"+AES-256-CBC", u"+SHA1",
1131
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1206
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
# "+AES-256-CBC", "+SHA1",
1208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1133
1210
# Use a fallback default, since this MUST be set.
1134
1211
priority = self.server.gnutls_priority
1135
1212
if priority is None:
1136
priority = u"NORMAL"
1137
1214
(gnutls.library.functions
1138
1215
.gnutls_priority_set_direct(session._c_object,
1139
1216
priority, None))
1141
1218
# Start communication using the Mandos protocol
1142
1219
# Get protocol number
1143
1220
line = self.request.makefile().readline()
1144
logger.debug(u"Protocol version: %r", line)
1221
logger.debug("Protocol version: %r", line)
1146
1223
if int(line.strip().split()[0]) > 1:
1147
1224
raise RuntimeError
1148
except (ValueError, IndexError, RuntimeError), error:
1149
logger.error(u"Unknown protocol version: %s", error)
1225
except (ValueError, IndexError, RuntimeError) as error:
1226
logger.error("Unknown protocol version: %s", error)
1152
1229
# Start GnuTLS connection
1154
1231
session.handshake()
1155
except gnutls.errors.GNUTLSError, error:
1156
logger.warning(u"Handshake failed: %s", error)
1232
except gnutls.errors.GNUTLSError as error:
1233
logger.warning("Handshake failed: %s", error)
1157
1234
# Do not run session.bye() here: the session is not
1158
1235
# established. Just abandon the request.
1160
logger.debug(u"Handshake succeeded")
1237
logger.debug("Handshake succeeded")
1162
1239
approval_required = False
1165
1242
fpr = self.fingerprint(self.peer_certificate
1167
except (TypeError, gnutls.errors.GNUTLSError), error:
1168
logger.warning(u"Bad certificate: %s", error)
1245
gnutls.errors.GNUTLSError) as error:
1246
logger.warning("Bad certificate: %s", error)
1170
logger.debug(u"Fingerprint: %s", fpr)
1248
logger.debug("Fingerprint: %s", fpr)
1173
1251
client = ProxyClient(child_pipe, fpr,
1175
1253
except KeyError:
1178
if client.approved_delay:
1179
delay = client.approved_delay
1256
if client.approval_delay:
1257
delay = client.approval_delay
1180
1258
client.approvals_pending += 1
1181
1259
approval_required = True
1184
1262
if not client.enabled:
1185
logger.warning(u"Client %s is disabled",
1263
logger.warning("Client %s is disabled",
1187
1265
if self.server.use_dbus:
1188
1266
# Emit D-Bus signal
1189
1267
client.Rejected("Disabled")
1192
if client._approved or not client.approved_delay:
1270
if client._approved or not client.approval_delay:
1193
1271
#We are approved or approval is disabled
1195
1273
elif client._approved is None:
1196
logger.info(u"Client %s need approval",
1274
logger.info("Client %s needs approval",
1198
1276
if self.server.use_dbus:
1199
1277
# Emit D-Bus signal
1200
1278
client.NeedApproval(
1201
client.approved_delay_milliseconds(),
1279
client.approval_delay_milliseconds(),
1202
1280
client.approved_by_default)
1204
logger.warning(u"Client %s was not approved",
1282
logger.warning("Client %s was not approved",
1206
1284
if self.server.use_dbus:
1207
1285
# Emit D-Bus signal
1208
client.Rejected("Disapproved")
1286
client.Rejected("Denied")
1211
1289
#wait until timeout or approved
1374
1452
bind to an address or port if they were not specified."""
1375
1453
if self.interface is not None:
1376
1454
if SO_BINDTODEVICE is None:
1377
logger.error(u"SO_BINDTODEVICE does not exist;"
1378
u" cannot bind to interface %s",
1455
logger.error("SO_BINDTODEVICE does not exist;"
1456
" cannot bind to interface %s",
1379
1457
self.interface)
1382
1460
self.socket.setsockopt(socket.SOL_SOCKET,
1383
1461
SO_BINDTODEVICE,
1384
1462
str(self.interface
1386
except socket.error, error:
1464
except socket.error as error:
1387
1465
if error[0] == errno.EPERM:
1388
logger.error(u"No permission to"
1389
u" bind to interface %s",
1466
logger.error("No permission to"
1467
" bind to interface %s",
1390
1468
self.interface)
1391
1469
elif error[0] == errno.ENOPROTOOPT:
1392
logger.error(u"SO_BINDTODEVICE not available;"
1393
u" cannot bind to interface %s",
1470
logger.error("SO_BINDTODEVICE not available;"
1471
" cannot bind to interface %s",
1394
1472
self.interface)
1453
1531
def handle_ipc(self, source, condition, parent_pipe=None,
1454
1532
client_object=None):
1455
1533
condition_names = {
1456
gobject.IO_IN: u"IN", # There is data to read.
1457
gobject.IO_OUT: u"OUT", # Data can be written (without
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1459
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1460
gobject.IO_ERR: u"ERR", # Error condition.
1461
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1462
1540
# broken, usually for pipes and
1528
1602
def string_to_delta(interval):
1529
1603
"""Parse a string and return a datetime.timedelta
1531
>>> string_to_delta(u'7d')
1605
>>> string_to_delta('7d')
1532
1606
datetime.timedelta(7)
1533
>>> string_to_delta(u'60s')
1607
>>> string_to_delta('60s')
1534
1608
datetime.timedelta(0, 60)
1535
>>> string_to_delta(u'60m')
1609
>>> string_to_delta('60m')
1536
1610
datetime.timedelta(0, 3600)
1537
>>> string_to_delta(u'24h')
1611
>>> string_to_delta('24h')
1538
1612
datetime.timedelta(1)
1539
>>> string_to_delta(u'1w')
1613
>>> string_to_delta('1w')
1540
1614
datetime.timedelta(7)
1541
>>> string_to_delta(u'5m 30s')
1615
>>> string_to_delta('5m 30s')
1542
1616
datetime.timedelta(0, 330)
1544
1618
timevalue = datetime.timedelta(0)
1547
1621
suffix = unicode(s[-1])
1548
1622
value = int(s[:-1])
1550
1624
delta = datetime.timedelta(value)
1551
elif suffix == u"s":
1552
1626
delta = datetime.timedelta(0, value)
1553
elif suffix == u"m":
1554
1628
delta = datetime.timedelta(0, 0, 0, 0, value)
1555
elif suffix == u"h":
1556
1630
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1557
elif suffix == u"w":
1558
1632
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1560
raise ValueError(u"Unknown suffix %r" % suffix)
1561
except (ValueError, IndexError), e:
1562
raise ValueError(e.message)
1634
raise ValueError("Unknown suffix %r" % suffix)
1635
except (ValueError, IndexError) as e:
1636
raise ValueError(*(e.args))
1563
1637
timevalue += delta
1564
1638
return timevalue
1571
1645
global if_nametoindex
1573
1647
if_nametoindex = (ctypes.cdll.LoadLibrary
1574
(ctypes.util.find_library(u"c"))
1648
(ctypes.util.find_library("c"))
1575
1649
.if_nametoindex)
1576
1650
except (OSError, AttributeError):
1577
logger.warning(u"Doing if_nametoindex the hard way")
1651
logger.warning("Doing if_nametoindex the hard way")
1578
1652
def if_nametoindex(interface):
1579
1653
"Get an interface index the hard way, i.e. using fcntl()"
1580
1654
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1581
1655
with contextlib.closing(socket.socket()) as s:
1582
1656
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1583
struct.pack(str(u"16s16x"),
1657
struct.pack(str("16s16x"),
1585
interface_index = struct.unpack(str(u"I"),
1659
interface_index = struct.unpack(str("I"),
1586
1660
ifreq[16:20])[0]
1587
1661
return interface_index
1588
1662
return if_nametoindex(interface)
1618
1692
##################################################################
1619
1693
# Parsing of options, both command line and config file
1621
parser = optparse.OptionParser(version = "%%prog %s" % version)
1622
parser.add_option("-i", u"--interface", type=u"string",
1623
metavar="IF", help=u"Bind to interface IF")
1624
parser.add_option("-a", u"--address", type=u"string",
1625
help=u"Address to listen for requests on")
1626
parser.add_option("-p", u"--port", type=u"int",
1627
help=u"Port number to receive requests on")
1628
parser.add_option("--check", action=u"store_true",
1629
help=u"Run self-test")
1630
parser.add_option("--debug", action=u"store_true",
1631
help=u"Debug mode; run in foreground and log to"
1633
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1634
help=u"Debug level for stdout output")
1635
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1636
u" priority string (see GnuTLS documentation)")
1637
parser.add_option("--servicename", type=u"string",
1638
metavar=u"NAME", help=u"Zeroconf service name")
1639
parser.add_option("--configdir", type=u"string",
1640
default=u"/etc/mandos", metavar=u"DIR",
1641
help=u"Directory to search for configuration"
1643
parser.add_option("--no-dbus", action=u"store_false",
1644
dest=u"use_dbus", help=u"Do not provide D-Bus"
1645
u" system bus interface")
1646
parser.add_option("--no-ipv6", action=u"store_false",
1647
dest=u"use_ipv6", help=u"Do not use IPv6")
1648
options = parser.parse_args()[0]
1695
parser = argparse.ArgumentParser()
1696
parser.add_argument("-v", "--version", action="version",
1697
version = "%%(prog)s %s" % version,
1698
help="show version number and exit")
1699
parser.add_argument("-i", "--interface", metavar="IF",
1700
help="Bind to interface IF")
1701
parser.add_argument("-a", "--address",
1702
help="Address to listen for requests on")
1703
parser.add_argument("-p", "--port", type=int,
1704
help="Port number to receive requests on")
1705
parser.add_argument("--check", action="store_true",
1706
help="Run self-test")
1707
parser.add_argument("--debug", action="store_true",
1708
help="Debug mode; run in foreground and log"
1710
parser.add_argument("--debuglevel", metavar="LEVEL",
1711
help="Debug level for stdout output")
1712
parser.add_argument("--priority", help="GnuTLS"
1713
" priority string (see GnuTLS documentation)")
1714
parser.add_argument("--servicename",
1715
metavar="NAME", help="Zeroconf service name")
1716
parser.add_argument("--configdir",
1717
default="/etc/mandos", metavar="DIR",
1718
help="Directory to search for configuration"
1720
parser.add_argument("--no-dbus", action="store_false",
1721
dest="use_dbus", help="Do not provide D-Bus"
1722
" system bus interface")
1723
parser.add_argument("--no-ipv6", action="store_false",
1724
dest="use_ipv6", help="Do not use IPv6")
1725
options = parser.parse_args()
1650
1727
if options.check:
1655
1732
# Default values for config file for server-global settings
1656
server_defaults = { u"interface": u"",
1661
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1662
u"servicename": u"Mandos",
1663
u"use_dbus": u"True",
1664
u"use_ipv6": u"True",
1733
server_defaults = { "interface": "",
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
"servicename": "Mandos",
1668
1745
# Parse config file for server-global settings
1669
1746
server_config = configparser.SafeConfigParser(server_defaults)
1670
1747
del server_defaults
1671
1748
server_config.read(os.path.join(options.configdir,
1673
1750
# Convert the SafeConfigParser object to a dict
1674
1751
server_settings = server_config.defaults()
1675
1752
# Use the appropriate methods on the non-string config options
1676
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1677
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
for option in ("debug", "use_dbus", "use_ipv6"):
1754
server_settings[option] = server_config.getboolean("DEFAULT",
1679
1756
if server_settings["port"]:
1680
server_settings["port"] = server_config.getint(u"DEFAULT",
1757
server_settings["port"] = server_config.getint("DEFAULT",
1682
1759
del server_config
1684
1761
# Override the settings from the config file with command line
1685
1762
# options, if set.
1686
for option in (u"interface", u"address", u"port", u"debug",
1687
u"priority", u"servicename", u"configdir",
1688
u"use_dbus", u"use_ipv6", u"debuglevel"):
1763
for option in ("interface", "address", "port", "debug",
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
1689
1766
value = getattr(options, option)
1690
1767
if value is not None:
1691
1768
server_settings[option] = value
1699
1776
##################################################################
1701
1778
# For convenience
1702
debug = server_settings[u"debug"]
1703
debuglevel = server_settings[u"debuglevel"]
1704
use_dbus = server_settings[u"use_dbus"]
1705
use_ipv6 = server_settings[u"use_ipv6"]
1779
debug = server_settings["debug"]
1780
debuglevel = server_settings["debuglevel"]
1781
use_dbus = server_settings["use_dbus"]
1782
use_ipv6 = server_settings["use_ipv6"]
1707
if server_settings[u"servicename"] != u"Mandos":
1784
if server_settings["servicename"] != "Mandos":
1708
1785
syslogger.setFormatter(logging.Formatter
1709
(u'Mandos (%s) [%%(process)d]:'
1710
u' %%(levelname)s: %%(message)s'
1711
% server_settings[u"servicename"]))
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
1713
1790
# Parse config file with clients
1714
client_defaults = { u"timeout": u"1h",
1716
u"checker": u"fping -q -- %%(host)s",
1718
u"approved_delay": u"0s",
1719
u"approved_duration": u"1s",
1791
client_defaults = { "timeout": "1h",
1793
"checker": "fping -q -- %%(host)s",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1721
1798
client_config = configparser.SafeConfigParser(client_defaults)
1722
client_config.read(os.path.join(server_settings[u"configdir"],
1799
client_config.read(os.path.join(server_settings["configdir"],
1725
1802
global mandos_dbus_service
1726
1803
mandos_dbus_service = None
1728
tcp_server = MandosServer((server_settings[u"address"],
1729
server_settings[u"port"]),
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1731
interface=server_settings[u"interface"],
1808
interface=(server_settings["interface"]
1732
1810
use_ipv6=use_ipv6,
1733
1811
gnutls_priority=
1734
server_settings[u"priority"],
1812
server_settings["priority"],
1735
1813
use_dbus=use_dbus)
1736
pidfilename = u"/var/run/mandos.pid"
1738
pidfile = open(pidfilename, u"w")
1740
logger.error(u"Could not open file %r", pidfilename)
1815
pidfilename = "/var/run/mandos.pid"
1817
pidfile = open(pidfilename, "w")
1819
logger.error("Could not open file %r", pidfilename)
1743
uid = pwd.getpwnam(u"_mandos").pw_uid
1744
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
1745
1824
except KeyError:
1747
uid = pwd.getpwnam(u"mandos").pw_uid
1748
gid = pwd.getpwnam(u"mandos").pw_gid
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
1749
1828
except KeyError:
1751
uid = pwd.getpwnam(u"nobody").pw_uid
1752
gid = pwd.getpwnam(u"nobody").pw_gid
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
1753
1832
except KeyError:
1759
except OSError, error:
1838
except OSError as error:
1760
1839
if error[0] != errno.EPERM:
1763
# Enable all possible GnuTLS debugging
1766
1842
if not debug and not debuglevel:
1767
1843
syslogger.setLevel(logging.WARNING)
1768
1844
console.setLevel(logging.WARNING)
1801
1883
# End of Avahi example code
1804
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1805
1887
bus, do_not_queue=True)
1806
except dbus.exceptions.NameExistsException, e:
1807
logger.error(unicode(e) + u", disabling D-Bus")
1888
except dbus.exceptions.NameExistsException as e:
1889
logger.error(unicode(e) + ", disabling D-Bus")
1808
1890
use_dbus = False
1809
server_settings[u"use_dbus"] = False
1891
server_settings["use_dbus"] = False
1810
1892
tcp_server.use_dbus = False
1811
1893
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1812
service = AvahiService(name = server_settings[u"servicename"],
1813
servicetype = u"_mandos._tcp",
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1814
1896
protocol = protocol, bus = bus)
1815
1897
if server_settings["interface"]:
1816
1898
service.interface = (if_nametoindex
1817
(str(server_settings[u"interface"])))
1820
# Close all input and output, do double fork, etc.
1899
(str(server_settings["interface"])))
1823
1901
global multiprocessing_manager
1824
1902
multiprocessing_manager = multiprocessing.Manager()
1844
1922
client_config, section)))
1845
1923
for section in client_config.sections()))
1846
1924
if not tcp_server.clients:
1847
logger.warning(u"No clients defined")
1925
logger.warning("No clients defined")
1852
pidfile.write(str(pid) + "\n")
1855
logger.error(u"Could not write to file %r with PID %d",
1858
# "pidfile" was never created
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1934
logger.error("Could not write to file %r with PID %d",
1937
# "pidfile" was never created
1863
1941
signal.signal(signal.SIGINT, signal.SIG_IGN)
1864
1943
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1865
1944
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1868
1947
class MandosDBusService(dbus.service.Object):
1869
1948
"""A D-Bus proxy object"""
1870
1949
def __init__(self):
1871
dbus.service.Object.__init__(self, bus, u"/")
1872
_interface = u"se.bsnet.fukt.Mandos"
1950
dbus.service.Object.__init__(self, bus, "/")
1951
_interface = "se.bsnet.fukt.Mandos"
1874
@dbus.service.signal(_interface, signature=u"o")
1953
@dbus.service.signal(_interface, signature="o")
1875
1954
def ClientAdded(self, objpath):
1879
@dbus.service.signal(_interface, signature=u"ss")
1958
@dbus.service.signal(_interface, signature="ss")
1880
1959
def ClientNotFound(self, fingerprint, address):
1884
@dbus.service.signal(_interface, signature=u"os")
1963
@dbus.service.signal(_interface, signature="os")
1885
1964
def ClientRemoved(self, objpath, name):
1889
@dbus.service.method(_interface, out_signature=u"ao")
1968
@dbus.service.method(_interface, out_signature="ao")
1890
1969
def GetAllClients(self):
1892
1971
return dbus.Array(c.dbus_object_path
1893
1972
for c in tcp_server.clients)
1895
1974
@dbus.service.method(_interface,
1896
out_signature=u"a{oa{sv}}")
1975
out_signature="a{oa{sv}}")
1897
1976
def GetAllClientsWithProperties(self):
1899
1978
return dbus.Dictionary(
1900
((c.dbus_object_path, c.GetAll(u""))
1979
((c.dbus_object_path, c.GetAll(""))
1901
1980
for c in tcp_server.clients),
1902
signature=u"oa{sv}")
1904
@dbus.service.method(_interface, in_signature=u"o")
1983
@dbus.service.method(_interface, in_signature="o")
1905
1984
def RemoveClient(self, object_path):
1907
1986
for c in tcp_server.clients: