151
151
self.group = None # our entry group
152
152
self.server = None
154
self.entry_group_state_changed_match = None
155
154
def rename(self):
156
155
"""Derived from the Avahi example code"""
157
156
if self.rename_count >= self.max_renames:
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
157
logger.critical(u"No suitable Zeroconf service name found"
158
u" after %i retries, exiting.",
160
159
self.rename_count)
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
160
raise AvahiServiceError(u"Too many renames")
161
self.name = self.server.GetAlternativeServiceName(self.name)
162
logger.info(u"Changing Zeroconf service name to %r ...",
165
164
syslogger.setFormatter(logging.Formatter
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
165
(u'Mandos (%s) [%%(process)d]:'
166
u' %%(levelname)s: %%(message)s'
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
176
170
self.rename_count += 1
177
171
def remove(self):
178
172
"""Derived from the Avahi example code"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
182
173
if self.group is not None:
183
174
self.group.Reset()
185
176
"""Derived from the Avahi example code"""
187
177
if self.group is None:
188
178
self.group = dbus.Interface(
189
179
self.bus.get_object(avahi.DBUS_NAME,
190
180
self.server.EntryGroupNew()),
191
181
avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
self.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
182
self.group.connect_to_signal('StateChanged',
184
.entry_group_state_changed)
185
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
196
186
self.name, self.type)
197
187
self.group.AddService(
205
195
self.group.Commit()
206
196
def entry_group_state_changed(self, state, error):
207
197
"""Derived from the Avahi example code"""
208
logger.debug("Avahi entry group state change: %i", state)
198
logger.debug(u"Avahi state change: %i", state)
210
200
if state == avahi.ENTRY_GROUP_ESTABLISHED:
211
logger.debug("Zeroconf service established.")
201
logger.debug(u"Zeroconf service established.")
212
202
elif state == avahi.ENTRY_GROUP_COLLISION:
213
logger.info("Zeroconf service name collision.")
203
logger.warning(u"Zeroconf service name collision.")
215
205
elif state == avahi.ENTRY_GROUP_FAILURE:
216
logger.critical("Avahi: Error in group state changed %s",
206
logger.critical(u"Avahi: Error in group state changed %s",
218
raise AvahiGroupError("State changed: %s"
208
raise AvahiGroupError(u"State changed: %s"
219
209
% unicode(error))
220
210
def cleanup(self):
221
211
"""Derived from the Avahi example code"""
222
212
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
228
214
self.group = None
230
def server_state_changed(self, state, error=None):
215
def server_state_changed(self, state):
231
216
"""Derived from the Avahi example code"""
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
243
logger.error(bad_states[state])
245
logger.error(bad_states[state] + ": %r", error)
217
if state == avahi.SERVER_COLLISION:
218
logger.error(u"Zeroconf server name collision")
247
220
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
254
222
def activate(self):
255
223
"""Derived from the Avahi example code"""
256
224
if self.server is None:
257
225
self.server = dbus.Interface(
258
226
self.bus.get_object(avahi.DBUS_NAME,
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
227
avahi.DBUS_PATH_SERVER),
261
228
avahi.DBUS_INTERFACE_SERVER)
262
self.server.connect_to_signal("StateChanged",
229
self.server.connect_to_signal(u"StateChanged",
263
230
self.server_state_changed)
264
231
self.server_state_changed(self.server.GetState())
267
def _timedelta_to_milliseconds(td):
268
"Convert a datetime.timedelta() to milliseconds"
269
return ((td.days * 24 * 60 * 60 * 1000)
270
+ (td.seconds * 1000)
271
+ (td.microseconds // 1000))
273
234
class Client(object):
274
235
"""A representation of a client host served by this server.
277
_approved: bool(); 'None' if not yet approved/disapproved
278
approval_delay: datetime.timedelta(); Time to wait for approval
279
approval_duration: datetime.timedelta(); Duration of one approval
238
name: string; from the config file, used in log messages and
240
fingerprint: string (40 or 32 hexadecimal digits); used to
241
uniquely identify the client
242
secret: bytestring; sent verbatim (over TLS) to client
243
host: string; available for use by the checker command
244
created: datetime.datetime(); (UTC) object creation
245
last_enabled: datetime.datetime(); (UTC)
247
last_checked_ok: datetime.datetime(); (UTC) or None
248
timeout: datetime.timedelta(); How long from last_checked_ok
249
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)
280
252
checker: subprocess.Popen(); a running checker process used
281
253
to see if the client lives.
282
254
'None' if no process is running.
283
checker_callback_tag: a gobject event source tag, or None
284
checker_command: string; External command which is run to check
285
if client lives. %() expansions are done at
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
286
260
runtime with vars(self) as dict, so that for
287
261
instance %(name)s can be used in the command.
288
checker_initiator_tag: a gobject event source tag, or None
289
created: datetime.datetime(); (UTC) object creation
290
262
current_checker_command: string; current running checker_command
291
disable_hook: If set, called by disable() as disable_hook(self)
292
disable_initiator_tag: a gobject event source tag, or None
294
fingerprint: string (40 or 32 hexadecimal digits); used to
295
uniquely identify the client
296
host: string; available for use by the checker command
297
interval: datetime.timedelta(); How often to start a new checker
298
last_approval_request: datetime.datetime(); (UTC) or None
299
last_checked_ok: datetime.datetime(); (UTC) or None
300
last_enabled: datetime.datetime(); (UTC)
301
name: string; from the config file, used in log messages and
303
secret: bytestring; sent verbatim (over TLS) to client
304
timeout: datetime.timedelta(); How long from last_checked_ok
305
until this client is disabled
306
extended_timeout: extra long timeout when password has been sent
307
runtime_expansions: Allowed attributes for runtime expansion.
308
expires: datetime.datetime(); time (UTC) when a client will be
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
312
runtime_expansions = ("approval_delay", "approval_duration",
313
"created", "enabled", "fingerprint",
314
"host", "interval", "last_checked_ok",
315
"last_enabled", "name", "timeout")
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
317
275
def timeout_milliseconds(self):
318
276
"Return the 'timeout' attribute in milliseconds"
319
return _timedelta_to_milliseconds(self.timeout)
321
def extended_timeout_milliseconds(self):
322
"Return the 'extended_timeout' attribute in milliseconds"
323
return _timedelta_to_milliseconds(self.extended_timeout)
277
return self._timedelta_to_milliseconds(self.timeout)
325
279
def interval_milliseconds(self):
326
280
"Return the 'interval' attribute in milliseconds"
327
return _timedelta_to_milliseconds(self.interval)
329
def approval_delay_milliseconds(self):
330
return _timedelta_to_milliseconds(self.approval_delay)
281
return self._timedelta_to_milliseconds(self.interval)
283
def approved_delay_milliseconds(self):
284
return self._timedelta_to_milliseconds(self.approved_delay)
332
286
def __init__(self, name = None, disable_hook=None, config=None):
333
287
"""Note: the 'checker' key in 'config' sets the
337
291
if config is None:
339
logger.debug("Creating client %r", self.name)
293
logger.debug(u"Creating client %r", self.name)
340
294
# Uppercase and remove spaces from fingerprint for later
341
295
# comparison purposes with return value from the fingerprint()
343
self.fingerprint = (config["fingerprint"].upper()
345
logger.debug(" Fingerprint: %s", self.fingerprint)
346
if "secret" in config:
347
self.secret = config["secret"].decode("base64")
348
elif "secfile" in config:
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:
349
303
with open(os.path.expanduser(os.path.expandvars
350
(config["secfile"])),
304
(config[u"secfile"])),
351
305
"rb") as secfile:
352
306
self.secret = secfile.read()
354
raise TypeError("No secret or secfile for client %s"
308
#XXX Need to allow secret on demand!
309
raise TypeError(u"No secret or secfile for client %s"
356
self.host = config.get("host", "")
311
self.host = config.get(u"host", u"")
357
312
self.created = datetime.datetime.utcnow()
358
313
self.enabled = False
359
self.last_approval_request = None
360
314
self.last_enabled = None
361
315
self.last_checked_ok = None
362
self.timeout = string_to_delta(config["timeout"])
363
self.extended_timeout = string_to_delta(config["extended_timeout"])
364
self.interval = string_to_delta(config["interval"])
316
self.timeout = string_to_delta(config[u"timeout"])
317
self.interval = string_to_delta(config[u"interval"])
365
318
self.disable_hook = disable_hook
366
319
self.checker = None
367
320
self.checker_initiator_tag = None
368
321
self.disable_initiator_tag = None
370
322
self.checker_callback_tag = None
371
self.checker_command = config["checker"]
323
self.checker_command = config[u"checker"]
372
324
self.current_checker_command = None
373
325
self.last_connect = None
326
self.approvals_pending = 0
374
327
self._approved = None
375
self.approved_by_default = config.get("approved_by_default",
328
self.approved_by_default = config.get(u"approved_by_default",
377
self.approvals_pending = 0
378
self.approval_delay = string_to_delta(
379
config["approval_delay"])
380
self.approval_duration = string_to_delta(
381
config["approval_duration"])
330
self.approved_delay = string_to_delta(
331
config[u"approved_delay"])
332
self.approved_duration = string_to_delta(
333
config[u"approved_duration"])
382
334
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
384
336
def send_changedstate(self):
385
337
self.changedstate.acquire()
386
338
self.changedstate.notify_all()
647
588
# No such property
648
raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
+ interface_name + "."
589
raise DBusPropertyNotFound(self.dbus_object_path + u":"
590
+ interface_name + u"."
652
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
593
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
654
595
def Get(self, interface_name, property_name):
655
596
"""Standard D-Bus property Get() method, see D-Bus standard.
657
598
prop = self._get_dbus_property(interface_name, property_name)
658
if prop._dbus_access == "write":
599
if prop._dbus_access == u"write":
659
600
raise DBusPropertyAccessException(property_name)
661
if not hasattr(value, "variant_level"):
602
if not hasattr(value, u"variant_level"):
663
604
return type(value)(value, variant_level=value.variant_level+1)
665
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
606
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
666
607
def Set(self, interface_name, property_name, value):
667
608
"""Standard D-Bus property Set() method, see D-Bus standard.
669
610
prop = self._get_dbus_property(interface_name, property_name)
670
if prop._dbus_access == "read":
611
if prop._dbus_access == u"read":
671
612
raise DBusPropertyAccessException(property_name)
672
if prop._dbus_get_args_options["byte_arrays"]:
613
if prop._dbus_get_args_options[u"byte_arrays"]:
673
614
# The byte_arrays option is not supported yet on
674
615
# signatures other than "ay".
675
if prop._dbus_signature != "ay":
616
if prop._dbus_signature != u"ay":
677
618
value = dbus.ByteArray(''.join(unichr(byte)
678
619
for byte in value))
681
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
out_signature="a{sv}")
622
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
623
out_signature=u"a{sv}")
683
624
def GetAll(self, interface_name):
684
625
"""Standard D-Bus property GetAll() method, see D-Bus
687
628
Note: Will not include properties with access="write".
716
657
document = xml.dom.minidom.parseString(xmlstring)
717
658
def make_tag(document, name, prop):
718
e = document.createElement("property")
719
e.setAttribute("name", name)
720
e.setAttribute("type", prop._dbus_signature)
721
e.setAttribute("access", prop._dbus_access)
659
e = document.createElement(u"property")
660
e.setAttribute(u"name", name)
661
e.setAttribute(u"type", prop._dbus_signature)
662
e.setAttribute(u"access", prop._dbus_access)
723
for if_tag in document.getElementsByTagName("interface"):
664
for if_tag in document.getElementsByTagName(u"interface"):
724
665
for tag in (make_tag(document, name, prop)
726
667
in self._get_all_dbus_properties()
727
668
if prop._dbus_interface
728
== if_tag.getAttribute("name")):
669
== if_tag.getAttribute(u"name")):
729
670
if_tag.appendChild(tag)
730
671
# Add the names to the return values for the
731
672
# "org.freedesktop.DBus.Properties" methods
732
if (if_tag.getAttribute("name")
733
== "org.freedesktop.DBus.Properties"):
734
for cn in if_tag.getElementsByTagName("method"):
735
if cn.getAttribute("name") == "Get":
736
for arg in cn.getElementsByTagName("arg"):
737
if (arg.getAttribute("direction")
739
arg.setAttribute("name", "value")
740
elif cn.getAttribute("name") == "GetAll":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
744
arg.setAttribute("name", "props")
745
xmlstring = document.toxml("utf-8")
673
if (if_tag.getAttribute(u"name")
674
== u"org.freedesktop.DBus.Properties"):
675
for cn in if_tag.getElementsByTagName(u"method"):
676
if cn.getAttribute(u"name") == u"Get":
677
for arg in cn.getElementsByTagName(u"arg"):
678
if (arg.getAttribute(u"direction")
680
arg.setAttribute(u"name", u"value")
681
elif cn.getAttribute(u"name") == u"GetAll":
682
for arg in cn.getElementsByTagName(u"arg"):
683
if (arg.getAttribute(u"direction")
685
arg.setAttribute(u"name", u"props")
686
xmlstring = document.toxml(u"utf-8")
746
687
document.unlink()
747
688
except (AttributeError, xml.dom.DOMException,
748
xml.parsers.expat.ExpatError) as error:
749
logger.error("Failed to override Introspection method",
689
xml.parsers.expat.ExpatError), error:
690
logger.error(u"Failed to override Introspection method",
754
def datetime_to_dbus (dt, variant_level=0):
755
"""Convert a UTC datetime.datetime() to a D-Bus type."""
757
return dbus.String("", variant_level = variant_level)
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
762
695
class ClientDBus(Client, DBusObjectWithProperties):
763
696
"""A Client class using D-Bus
766
699
dbus_object_path: dbus.ObjectPath
767
700
bus: dbus.SystemBus()
770
runtime_expansions = (Client.runtime_expansions
771
+ ("dbus_object_path",))
773
702
# dbus.service.Object doesn't use super(), so we can't either.
775
704
def __init__(self, bus = None, *args, **kwargs):
776
self._approvals_pending = 0
778
706
Client.__init__(self, *args, **kwargs)
779
707
# Only now, when this client is initialized, can it show up on
781
client_object_name = unicode(self.name).translate(
784
709
self.dbus_object_path = (dbus.ObjectPath
785
("/clients/" + client_object_name))
711
+ self.name.replace(u".", u"_")))
786
712
DBusObjectWithProperties.__init__(self, self.bus,
787
713
self.dbus_object_path)
789
def notifychangeproperty(transform_func,
790
dbus_name, type_func=lambda x: x,
792
""" Modify a variable so that its a property that announce its
794
transform_fun: Function that takes a value and transform it to
796
dbus_name: DBus name of the variable
797
type_func: Function that transform the value before sending it
799
variant_level: DBus variant level. default: 1
802
def setter(self, value):
803
old_value = real_value[0]
804
real_value[0] = value
805
if hasattr(self, "dbus_object_path"):
806
if type_func(old_value) != type_func(real_value[0]):
807
dbus_value = transform_func(type_func(real_value[0]),
809
self.PropertyChanged(dbus.String(dbus_name),
812
return property(lambda self: real_value[0], setter)
815
expires = notifychangeproperty(datetime_to_dbus, "Expires")
816
approvals_pending = notifychangeproperty(dbus.Boolean,
819
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
820
last_enabled = notifychangeproperty(datetime_to_dbus,
822
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
823
type_func = lambda checker: checker is not None)
824
last_checked_ok = notifychangeproperty(datetime_to_dbus,
826
last_approval_request = notifychangeproperty(datetime_to_dbus,
827
"LastApprovalRequest")
828
approved_by_default = notifychangeproperty(dbus.Boolean,
830
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
831
type_func = _timedelta_to_milliseconds)
832
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
833
type_func = _timedelta_to_milliseconds)
834
host = notifychangeproperty(dbus.String, "Host")
835
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
836
type_func = _timedelta_to_milliseconds)
837
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
838
type_func = _timedelta_to_milliseconds)
839
interval = notifychangeproperty(dbus.UInt16, "Interval",
840
type_func = _timedelta_to_milliseconds)
841
checker_command = notifychangeproperty(dbus.String, "Checker")
843
del notifychangeproperty
716
def _datetime_to_dbus(dt, variant_level=0):
717
"""Convert a UTC datetime.datetime() to a D-Bus type."""
718
return dbus.String(dt.isoformat(),
719
variant_level=variant_level)
722
oldstate = getattr(self, u"enabled", False)
723
r = Client.enable(self)
724
if oldstate != self.enabled:
726
self.PropertyChanged(dbus.String(u"enabled"),
727
dbus.Boolean(True, variant_level=1))
728
self.PropertyChanged(
729
dbus.String(u"last_enabled"),
730
self._datetime_to_dbus(self.last_enabled,
734
def disable(self, quiet = False):
735
oldstate = getattr(self, u"enabled", False)
736
r = Client.disable(self, quiet=quiet)
737
if not quiet and oldstate != self.enabled:
739
self.PropertyChanged(dbus.String(u"enabled"),
740
dbus.Boolean(False, variant_level=1))
845
743
def __del__(self, *args, **kwargs):
847
745
self.remove_from_connection()
848
746
except LookupError:
850
if hasattr(DBusObjectWithProperties, "__del__"):
748
if hasattr(DBusObjectWithProperties, u"__del__"):
851
749
DBusObjectWithProperties.__del__(self, *args, **kwargs)
852
750
Client.__del__(self, *args, **kwargs)
882
792
and old_checker_pid != self.checker.pid):
883
793
# Emit D-Bus signal
884
794
self.CheckerStarted(self.current_checker_command)
795
self.PropertyChanged(
796
dbus.String(u"checker_running"),
797
dbus.Boolean(True, variant_level=1))
800
def stop_checker(self, *args, **kwargs):
801
old_checker = getattr(self, u"checker", None)
802
r = Client.stop_checker(self, *args, **kwargs)
803
if (old_checker is not None
804
and getattr(self, u"checker", None) is None):
805
self.PropertyChanged(dbus.String(u"checker_running"),
806
dbus.Boolean(False, variant_level=1))
887
809
def _reset_approved(self):
888
810
self._approved = None
891
813
def approve(self, value=True):
892
self.send_changedstate()
893
814
self._approved = value
894
gobject.timeout_add(_timedelta_to_milliseconds
895
(self.approval_duration),
896
self._reset_approved)
815
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
817
def approved_pending(self):
818
return self.approvals_pending > 0
899
821
## D-Bus methods, signals & properties
900
_interface = "se.bsnet.fukt.Mandos.Client"
822
_interface = u"se.bsnet.fukt.Mandos.Client"
904
826
# CheckerCompleted - signal
905
@dbus.service.signal(_interface, signature="nxs")
827
@dbus.service.signal(_interface, signature=u"nxs")
906
828
def CheckerCompleted(self, exitcode, waitstatus, command):
910
832
# CheckerStarted - signal
911
@dbus.service.signal(_interface, signature="s")
833
@dbus.service.signal(_interface, signature=u"s")
912
834
def CheckerStarted(self, command):
916
838
# PropertyChanged - signal
917
@dbus.service.signal(_interface, signature="sv")
839
@dbus.service.signal(_interface, signature=u"sv")
918
840
def PropertyChanged(self, property, value):
922
844
# GotSecret - signal
923
845
@dbus.service.signal(_interface)
924
846
def GotSecret(self):
926
Is sent after a successful transfer of secret from the Mandos
927
server to mandos-client
848
if self.approved_pending():
849
self.PropertyChanged(dbus.String(u"checker_running"),
850
dbus.Boolean(False, variant_level=1))
931
852
# Rejected - signal
932
@dbus.service.signal(_interface, signature="s")
853
@dbus.service.signal(_interface, signature=u"s")
933
854
def Rejected(self, reason):
856
if self.approved_pending():
857
self.PropertyChanged(dbus.String(u"checker_running"),
858
dbus.Boolean(False, variant_level=1))
937
860
# NeedApproval - signal
938
@dbus.service.signal(_interface, signature="tb")
861
@dbus.service.signal(_interface, signature=u"db")
939
862
def NeedApproval(self, timeout, default):
941
return self.need_approval()
864
if not self.approved_pending():
865
self.PropertyChanged(dbus.String(u"approved_pending"),
866
dbus.Boolean(True, variant_level=1))
945
870
# Approve - method
946
@dbus.service.method(_interface, in_signature="b")
871
@dbus.service.method(_interface, in_signature=u"b")
947
872
def Approve(self, value):
948
873
self.approve(value)
950
875
# CheckedOK - method
951
876
@dbus.service.method(_interface)
952
877
def CheckedOK(self):
878
return self.checked_ok()
955
880
# Enable - method
956
881
@dbus.service.method(_interface)
980
# ApprovalPending - property
981
@dbus_service_property(_interface, signature="b", access="read")
982
def ApprovalPending_dbus_property(self):
983
return dbus.Boolean(bool(self.approvals_pending))
985
# ApprovedByDefault - property
986
@dbus_service_property(_interface, signature="b",
988
def ApprovedByDefault_dbus_property(self, value=None):
989
if value is None: # get
990
return dbus.Boolean(self.approved_by_default)
991
self.approved_by_default = bool(value)
993
# ApprovalDelay - property
994
@dbus_service_property(_interface, signature="t",
996
def ApprovalDelay_dbus_property(self, value=None):
997
if value is None: # get
998
return dbus.UInt64(self.approval_delay_milliseconds())
999
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1001
# ApprovalDuration - property
1002
@dbus_service_property(_interface, signature="t",
1004
def ApprovalDuration_dbus_property(self, value=None):
1005
if value is None: # get
1006
return dbus.UInt64(_timedelta_to_milliseconds(
1007
self.approval_duration))
1008
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1011
@dbus_service_property(_interface, signature="s", access="read")
1012
def Name_dbus_property(self):
905
# approved_pending - property
906
@dbus_service_property(_interface, signature=u"b", access=u"read")
907
def approved_pending_dbus_property(self):
908
return dbus.Boolean(self.approved_pending())
910
# approved_by_default - property
911
@dbus_service_property(_interface, signature=u"b",
913
def approved_by_default_dbus_property(self):
914
return dbus.Boolean(self.approved_by_default)
916
# approved_delay - property
917
@dbus_service_property(_interface, signature=u"t",
919
def approved_delay_dbus_property(self):
920
return dbus.UInt64(self.approved_delay_milliseconds())
922
# approved_duration - property
923
@dbus_service_property(_interface, signature=u"t",
925
def approved_duration_dbus_property(self):
926
return dbus.UInt64(self._timedelta_to_milliseconds(
927
self.approved_duration))
930
@dbus_service_property(_interface, signature=u"s", access=u"read")
931
def name_dbus_property(self):
1013
932
return dbus.String(self.name)
1015
# Fingerprint - property
1016
@dbus_service_property(_interface, signature="s", access="read")
1017
def Fingerprint_dbus_property(self):
934
# fingerprint - property
935
@dbus_service_property(_interface, signature=u"s", access=u"read")
936
def fingerprint_dbus_property(self):
1018
937
return dbus.String(self.fingerprint)
1021
@dbus_service_property(_interface, signature="s",
1023
def Host_dbus_property(self, value=None):
940
@dbus_service_property(_interface, signature=u"s",
942
def host_dbus_property(self, value=None):
1024
943
if value is None: # get
1025
944
return dbus.String(self.host)
1026
945
self.host = value
1028
# Created - property
1029
@dbus_service_property(_interface, signature="s", access="read")
1030
def Created_dbus_property(self):
1031
return dbus.String(datetime_to_dbus(self.created))
1033
# LastEnabled - property
1034
@dbus_service_property(_interface, signature="s", access="read")
1035
def LastEnabled_dbus_property(self):
1036
return datetime_to_dbus(self.last_enabled)
1038
# Enabled - property
1039
@dbus_service_property(_interface, signature="b",
1041
def Enabled_dbus_property(self, value=None):
947
self.PropertyChanged(dbus.String(u"host"),
948
dbus.String(value, variant_level=1))
951
@dbus_service_property(_interface, signature=u"s", access=u"read")
952
def created_dbus_property(self):
953
return dbus.String(self._datetime_to_dbus(self.created))
955
# last_enabled - property
956
@dbus_service_property(_interface, signature=u"s", access=u"read")
957
def last_enabled_dbus_property(self):
958
if self.last_enabled is None:
959
return dbus.String(u"")
960
return dbus.String(self._datetime_to_dbus(self.last_enabled))
963
@dbus_service_property(_interface, signature=u"b",
965
def enabled_dbus_property(self, value=None):
1042
966
if value is None: # get
1043
967
return dbus.Boolean(self.enabled)
1049
# LastCheckedOK - property
1050
@dbus_service_property(_interface, signature="s",
1052
def LastCheckedOK_dbus_property(self, value=None):
973
# last_checked_ok - property
974
@dbus_service_property(_interface, signature=u"s",
976
def last_checked_ok_dbus_property(self, value=None):
1053
977
if value is not None:
1054
978
self.checked_ok()
1056
return datetime_to_dbus(self.last_checked_ok)
1058
# Expires - property
1059
@dbus_service_property(_interface, signature="s", access="read")
1060
def Expires_dbus_property(self):
1061
return datetime_to_dbus(self.expires)
1063
# LastApprovalRequest - property
1064
@dbus_service_property(_interface, signature="s", access="read")
1065
def LastApprovalRequest_dbus_property(self):
1066
return datetime_to_dbus(self.last_approval_request)
1068
# Timeout - property
1069
@dbus_service_property(_interface, signature="t",
1071
def Timeout_dbus_property(self, value=None):
980
if self.last_checked_ok is None:
981
return dbus.String(u"")
982
return dbus.String(self._datetime_to_dbus(self
986
@dbus_service_property(_interface, signature=u"t",
988
def timeout_dbus_property(self, value=None):
1072
989
if value is None: # get
1073
990
return dbus.UInt64(self.timeout_milliseconds())
1074
991
self.timeout = datetime.timedelta(0, 0, 0, value)
1075
if getattr(self, "disable_initiator_tag", None) is None:
993
self.PropertyChanged(dbus.String(u"timeout"),
994
dbus.UInt64(value, variant_level=1))
995
if getattr(self, u"disable_initiator_tag", None) is None:
1077
997
# Reschedule timeout
1078
998
gobject.source_remove(self.disable_initiator_tag)
1079
999
self.disable_initiator_tag = None
1081
1000
time_to_die = (self.
1082
1001
_timedelta_to_milliseconds((self
1083
1002
.last_checked_ok
1088
1007
# The timeout has passed
1091
self.expires = (datetime.datetime.utcnow()
1092
+ datetime.timedelta(milliseconds = time_to_die))
1093
1010
self.disable_initiator_tag = (gobject.timeout_add
1094
1011
(time_to_die, self.disable))
1096
# ExtendedTimeout - property
1097
@dbus_service_property(_interface, signature="t",
1099
def ExtendedTimeout_dbus_property(self, value=None):
1100
if value is None: # get
1101
return dbus.UInt64(self.extended_timeout_milliseconds())
1102
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1104
# Interval - property
1105
@dbus_service_property(_interface, signature="t",
1107
def Interval_dbus_property(self, value=None):
1013
# interval - property
1014
@dbus_service_property(_interface, signature=u"t",
1015
access=u"readwrite")
1016
def interval_dbus_property(self, value=None):
1108
1017
if value is None: # get
1109
1018
return dbus.UInt64(self.interval_milliseconds())
1110
1019
self.interval = datetime.timedelta(0, 0, 0, value)
1111
if getattr(self, "checker_initiator_tag", None) is None:
1021
self.PropertyChanged(dbus.String(u"interval"),
1022
dbus.UInt64(value, variant_level=1))
1023
if getattr(self, u"checker_initiator_tag", None) is None:
1113
1025
# Reschedule checker run
1114
1026
gobject.source_remove(self.checker_initiator_tag)
1115
1027
self.checker_initiator_tag = (gobject.timeout_add
1116
1028
(value, self.start_checker))
1117
1029
self.start_checker() # Start one now, too
1119
# Checker - property
1120
@dbus_service_property(_interface, signature="s",
1122
def Checker_dbus_property(self, value=None):
1031
# checker - property
1032
@dbus_service_property(_interface, signature=u"s",
1033
access=u"readwrite")
1034
def checker_dbus_property(self, value=None):
1123
1035
if value is None: # get
1124
1036
return dbus.String(self.checker_command)
1125
1037
self.checker_command = value
1039
self.PropertyChanged(dbus.String(u"checker"),
1040
dbus.String(self.checker_command,
1127
# CheckerRunning - property
1128
@dbus_service_property(_interface, signature="b",
1130
def CheckerRunning_dbus_property(self, value=None):
1043
# checker_running - property
1044
@dbus_service_property(_interface, signature=u"b",
1045
access=u"readwrite")
1046
def checker_running_dbus_property(self, value=None):
1131
1047
if value is None: # get
1132
1048
return dbus.Boolean(self.checker is not None)
1184
1100
def handle(self):
1185
1101
with contextlib.closing(self.server.child_pipe) as child_pipe:
1186
logger.info("TCP connection from: %s",
1102
logger.info(u"TCP connection from: %s",
1187
1103
unicode(self.client_address))
1188
logger.debug("Pipe FD: %d",
1104
logger.debug(u"Pipe FD: %d",
1189
1105
self.server.child_pipe.fileno())
1191
1107
session = (gnutls.connection
1192
1108
.ClientSession(self.request,
1193
1109
gnutls.connection
1194
1110
.X509Credentials()))
1196
1112
# Note: gnutls.connection.X509Credentials is really a
1197
1113
# generic GnuTLS certificate credentials object so long as
1198
1114
# no X.509 keys are added to it. Therefore, we can use it
1199
1115
# here despite using OpenPGP certificates.
1201
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1202
# "+AES-256-CBC", "+SHA1",
1203
# "+COMP-NULL", "+CTYPE-OPENPGP",
1117
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1118
# u"+AES-256-CBC", u"+SHA1",
1119
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1205
1121
# Use a fallback default, since this MUST be set.
1206
1122
priority = self.server.gnutls_priority
1207
1123
if priority is None:
1124
priority = u"NORMAL"
1209
1125
(gnutls.library.functions
1210
1126
.gnutls_priority_set_direct(session._c_object,
1211
1127
priority, None))
1213
1129
# Start communication using the Mandos protocol
1214
1130
# Get protocol number
1215
1131
line = self.request.makefile().readline()
1216
logger.debug("Protocol version: %r", line)
1132
logger.debug(u"Protocol version: %r", line)
1218
1134
if int(line.strip().split()[0]) > 1:
1219
1135
raise RuntimeError
1220
except (ValueError, IndexError, RuntimeError) as error:
1221
logger.error("Unknown protocol version: %s", error)
1136
except (ValueError, IndexError, RuntimeError), error:
1137
logger.error(u"Unknown protocol version: %s", error)
1224
1140
# Start GnuTLS connection
1226
1142
session.handshake()
1227
except gnutls.errors.GNUTLSError as error:
1228
logger.warning("Handshake failed: %s", error)
1143
except gnutls.errors.GNUTLSError, error:
1144
logger.warning(u"Handshake failed: %s", error)
1229
1145
# Do not run session.bye() here: the session is not
1230
1146
# established. Just abandon the request.
1232
logger.debug("Handshake succeeded")
1148
logger.debug(u"Handshake succeeded")
1234
1150
approval_required = False
1237
1153
fpr = self.fingerprint(self.peer_certificate
1240
gnutls.errors.GNUTLSError) as error:
1241
logger.warning("Bad certificate: %s", error)
1155
except (TypeError, gnutls.errors.GNUTLSError), error:
1156
logger.warning(u"Bad certificate: %s", error)
1243
logger.debug("Fingerprint: %s", fpr)
1158
logger.debug(u"Fingerprint: %s", fpr)
1246
1161
client = ProxyClient(child_pipe, fpr,
1247
1162
self.client_address)
1248
1163
except KeyError:
1251
if client.approval_delay:
1252
delay = client.approval_delay
1166
if client.approved_delay:
1167
delay = client.approved_delay
1253
1168
client.approvals_pending += 1
1254
1169
approval_required = True
1257
1172
if not client.enabled:
1258
logger.info("Client %s is disabled",
1173
logger.warning(u"Client %s is disabled",
1260
1175
if self.server.use_dbus:
1261
1176
# Emit D-Bus signal
1262
1177
client.Rejected("Disabled")
1265
if client._approved or not client.approval_delay:
1180
if client._approved or not client.approved_delay:
1266
1181
#We are approved or approval is disabled
1268
1183
elif client._approved is None:
1269
logger.info("Client %s needs approval",
1184
logger.info(u"Client %s need approval",
1271
1186
if self.server.use_dbus:
1272
1187
# Emit D-Bus signal
1273
1188
client.NeedApproval(
1274
client.approval_delay_milliseconds(),
1189
client.approved_delay_milliseconds(),
1275
1190
client.approved_by_default)
1277
logger.warning("Client %s was not approved",
1192
logger.warning(u"Client %s was not approved",
1279
1194
if self.server.use_dbus:
1280
1195
# Emit D-Bus signal
1281
client.Rejected("Denied")
1196
client.Rejected("Disapproved")
1284
1199
#wait until timeout or approved
1580
1484
kwargs = request[3]
1582
1486
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1584
1488
if command == 'getattr':
1585
1489
attrname = request[1]
1586
1490
if callable(client_object.__getattribute__(attrname)):
1587
1491
parent_pipe.send(('function',))
1589
1493
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1591
1495
if command == 'setattr':
1592
1496
attrname = request[1]
1593
1497
value = request[2]
1594
1498
setattr(client_object, attrname, value)
1599
1503
def string_to_delta(interval):
1600
1504
"""Parse a string and return a datetime.timedelta
1602
>>> string_to_delta('7d')
1506
>>> string_to_delta(u'7d')
1603
1507
datetime.timedelta(7)
1604
>>> string_to_delta('60s')
1508
>>> string_to_delta(u'60s')
1605
1509
datetime.timedelta(0, 60)
1606
>>> string_to_delta('60m')
1510
>>> string_to_delta(u'60m')
1607
1511
datetime.timedelta(0, 3600)
1608
>>> string_to_delta('24h')
1512
>>> string_to_delta(u'24h')
1609
1513
datetime.timedelta(1)
1610
>>> string_to_delta('1w')
1514
>>> string_to_delta(u'1w')
1611
1515
datetime.timedelta(7)
1612
>>> string_to_delta('5m 30s')
1516
>>> string_to_delta(u'5m 30s')
1613
1517
datetime.timedelta(0, 330)
1615
1519
timevalue = datetime.timedelta(0)
1689
1593
##################################################################
1690
1594
# Parsing of options, both command line and config file
1692
parser = argparse.ArgumentParser()
1693
parser.add_argument("-v", "--version", action="version",
1694
version = "%%(prog)s %s" % version,
1695
help="show version number and exit")
1696
parser.add_argument("-i", "--interface", metavar="IF",
1697
help="Bind to interface IF")
1698
parser.add_argument("-a", "--address",
1699
help="Address to listen for requests on")
1700
parser.add_argument("-p", "--port", type=int,
1701
help="Port number to receive requests on")
1702
parser.add_argument("--check", action="store_true",
1703
help="Run self-test")
1704
parser.add_argument("--debug", action="store_true",
1705
help="Debug mode; run in foreground and log"
1707
parser.add_argument("--debuglevel", metavar="LEVEL",
1708
help="Debug level for stdout output")
1709
parser.add_argument("--priority", help="GnuTLS"
1710
" priority string (see GnuTLS documentation)")
1711
parser.add_argument("--servicename",
1712
metavar="NAME", help="Zeroconf service name")
1713
parser.add_argument("--configdir",
1714
default="/etc/mandos", metavar="DIR",
1715
help="Directory to search for configuration"
1717
parser.add_argument("--no-dbus", action="store_false",
1718
dest="use_dbus", help="Do not provide D-Bus"
1719
" system bus interface")
1720
parser.add_argument("--no-ipv6", action="store_false",
1721
dest="use_ipv6", help="Do not use IPv6")
1722
options = parser.parse_args()
1596
parser = optparse.OptionParser(version = "%%prog %s" % version)
1597
parser.add_option("-i", u"--interface", type=u"string",
1598
metavar="IF", help=u"Bind to interface IF")
1599
parser.add_option("-a", u"--address", type=u"string",
1600
help=u"Address to listen for requests on")
1601
parser.add_option("-p", u"--port", type=u"int",
1602
help=u"Port number to receive requests on")
1603
parser.add_option("--check", action=u"store_true",
1604
help=u"Run self-test")
1605
parser.add_option("--debug", action=u"store_true",
1606
help=u"Debug mode; run in foreground and log to"
1608
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1609
u" priority string (see GnuTLS documentation)")
1610
parser.add_option("--servicename", type=u"string",
1611
metavar=u"NAME", help=u"Zeroconf service name")
1612
parser.add_option("--configdir", type=u"string",
1613
default=u"/etc/mandos", metavar=u"DIR",
1614
help=u"Directory to search for configuration"
1616
parser.add_option("--no-dbus", action=u"store_false",
1617
dest=u"use_dbus", help=u"Do not provide D-Bus"
1618
u" system bus interface")
1619
parser.add_option("--no-ipv6", action=u"store_false",
1620
dest=u"use_ipv6", help=u"Do not use IPv6")
1621
options = parser.parse_args()[0]
1724
1623
if options.check:
1729
1628
# Default values for config file for server-global settings
1730
server_defaults = { "interface": "",
1735
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1736
"servicename": "Mandos",
1629
server_defaults = { u"interface": u"",
1634
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1635
u"servicename": u"Mandos",
1636
u"use_dbus": u"True",
1637
u"use_ipv6": u"True",
1742
1640
# Parse config file for server-global settings
1743
1641
server_config = configparser.SafeConfigParser(server_defaults)
1744
1642
del server_defaults
1745
1643
server_config.read(os.path.join(options.configdir,
1747
1645
# Convert the SafeConfigParser object to a dict
1748
1646
server_settings = server_config.defaults()
1749
1647
# Use the appropriate methods on the non-string config options
1750
for option in ("debug", "use_dbus", "use_ipv6"):
1751
server_settings[option] = server_config.getboolean("DEFAULT",
1648
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1649
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
1651
if server_settings["port"]:
1754
server_settings["port"] = server_config.getint("DEFAULT",
1652
server_settings["port"] = server_config.getint(u"DEFAULT",
1756
1654
del server_config
1758
1656
# Override the settings from the config file with command line
1759
1657
# options, if set.
1760
for option in ("interface", "address", "port", "debug",
1761
"priority", "servicename", "configdir",
1762
"use_dbus", "use_ipv6", "debuglevel"):
1658
for option in (u"interface", u"address", u"port", u"debug",
1659
u"priority", u"servicename", u"configdir",
1660
u"use_dbus", u"use_ipv6"):
1763
1661
value = getattr(options, option)
1764
1662
if value is not None:
1765
1663
server_settings[option] = value
1773
1671
##################################################################
1775
1673
# For convenience
1776
debug = server_settings["debug"]
1777
debuglevel = server_settings["debuglevel"]
1778
use_dbus = server_settings["use_dbus"]
1779
use_ipv6 = server_settings["use_ipv6"]
1781
if server_settings["servicename"] != "Mandos":
1674
debug = server_settings[u"debug"]
1675
use_dbus = server_settings[u"use_dbus"]
1676
use_ipv6 = server_settings[u"use_ipv6"]
1679
syslogger.setLevel(logging.WARNING)
1680
console.setLevel(logging.WARNING)
1682
if server_settings[u"servicename"] != u"Mandos":
1782
1683
syslogger.setFormatter(logging.Formatter
1783
('Mandos (%s) [%%(process)d]:'
1784
' %%(levelname)s: %%(message)s'
1785
% server_settings["servicename"]))
1684
(u'Mandos (%s) [%%(process)d]:'
1685
u' %%(levelname)s: %%(message)s'
1686
% server_settings[u"servicename"]))
1787
1688
# Parse config file with clients
1788
client_defaults = { "timeout": "5m",
1789
"extended_timeout": "15m",
1791
"checker": "fping -q -- %%(host)s",
1793
"approval_delay": "0s",
1794
"approval_duration": "1s",
1689
client_defaults = { u"timeout": u"1h",
1691
u"checker": u"fping -q -- %%(host)s",
1693
u"approved_delay": u"0s",
1694
u"approved_duration": u"1s",
1796
1696
client_config = configparser.SafeConfigParser(client_defaults)
1797
client_config.read(os.path.join(server_settings["configdir"],
1697
client_config.read(os.path.join(server_settings[u"configdir"],
1800
1700
global mandos_dbus_service
1801
1701
mandos_dbus_service = None
1803
tcp_server = MandosServer((server_settings["address"],
1804
server_settings["port"]),
1703
tcp_server = MandosServer((server_settings[u"address"],
1704
server_settings[u"port"]),
1806
interface=(server_settings["interface"]
1706
interface=server_settings[u"interface"],
1808
1707
use_ipv6=use_ipv6,
1809
1708
gnutls_priority=
1810
server_settings["priority"],
1709
server_settings[u"priority"],
1811
1710
use_dbus=use_dbus)
1813
pidfilename = "/var/run/mandos.pid"
1815
pidfile = open(pidfilename, "w")
1817
logger.error("Could not open file %r", pidfilename)
1711
pidfilename = u"/var/run/mandos.pid"
1713
pidfile = open(pidfilename, u"w")
1715
logger.error(u"Could not open file %r", pidfilename)
1820
uid = pwd.getpwnam("_mandos").pw_uid
1821
gid = pwd.getpwnam("_mandos").pw_gid
1718
uid = pwd.getpwnam(u"_mandos").pw_uid
1719
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
1720
except KeyError:
1824
uid = pwd.getpwnam("mandos").pw_uid
1825
gid = pwd.getpwnam("mandos").pw_gid
1722
uid = pwd.getpwnam(u"mandos").pw_uid
1723
gid = pwd.getpwnam(u"mandos").pw_gid
1826
1724
except KeyError:
1828
uid = pwd.getpwnam("nobody").pw_uid
1829
gid = pwd.getpwnam("nobody").pw_gid
1726
uid = pwd.getpwnam(u"nobody").pw_uid
1727
gid = pwd.getpwnam(u"nobody").pw_gid
1830
1728
except KeyError:
1836
except OSError as error:
1734
except OSError, error:
1837
1735
if error[0] != errno.EPERM:
1840
if not debug and not debuglevel:
1841
syslogger.setLevel(logging.WARNING)
1842
console.setLevel(logging.WARNING)
1844
level = getattr(logging, debuglevel.upper())
1845
syslogger.setLevel(level)
1846
console.setLevel(level)
1738
# Enable all possible GnuTLS debugging
1849
# Enable all possible GnuTLS debugging
1851
1740
# "Use a log level over 10 to enable all debugging options."
1852
1741
# - GnuTLS manual
1853
1742
gnutls.library.functions.gnutls_global_set_log_level(11)
1855
1744
@gnutls.library.types.gnutls_log_func
1856
1745
def debug_gnutls(level, string):
1857
logger.debug("GnuTLS: %s", string[:-1])
1746
logger.debug(u"GnuTLS: %s", string[:-1])
1859
1748
(gnutls.library.functions
1860
1749
.gnutls_global_set_log_function(debug_gnutls))
1862
# Redirect stdin so all checkers get /dev/null
1863
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1864
os.dup2(null, sys.stdin.fileno())
1868
# No console logging
1869
logger.removeHandler(console)
1871
# Need to fork before connecting to D-Bus
1873
# Close all input and output, do double fork, etc.
1876
1751
global main_loop
1877
1752
# From the Avahi example code
1881
1756
# End of Avahi example code
1884
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1759
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1885
1760
bus, do_not_queue=True)
1886
except dbus.exceptions.NameExistsException as e:
1887
logger.error(unicode(e) + ", disabling D-Bus")
1761
except dbus.exceptions.NameExistsException, e:
1762
logger.error(unicode(e) + u", disabling D-Bus")
1888
1763
use_dbus = False
1889
server_settings["use_dbus"] = False
1764
server_settings[u"use_dbus"] = False
1890
1765
tcp_server.use_dbus = False
1891
1766
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1892
service = AvahiService(name = server_settings["servicename"],
1893
servicetype = "_mandos._tcp",
1767
service = AvahiService(name = server_settings[u"servicename"],
1768
servicetype = u"_mandos._tcp",
1894
1769
protocol = protocol, bus = bus)
1895
1770
if server_settings["interface"]:
1896
1771
service.interface = (if_nametoindex
1897
(str(server_settings["interface"])))
1899
global multiprocessing_manager
1900
multiprocessing_manager = multiprocessing.Manager()
1772
(str(server_settings[u"interface"])))
1902
1774
client_class = Client
1945
1828
class MandosDBusService(dbus.service.Object):
1946
1829
"""A D-Bus proxy object"""
1947
1830
def __init__(self):
1948
dbus.service.Object.__init__(self, bus, "/")
1949
_interface = "se.bsnet.fukt.Mandos"
1831
dbus.service.Object.__init__(self, bus, u"/")
1832
_interface = u"se.bsnet.fukt.Mandos"
1951
@dbus.service.signal(_interface, signature="o")
1834
@dbus.service.signal(_interface, signature=u"o")
1952
1835
def ClientAdded(self, objpath):
1956
@dbus.service.signal(_interface, signature="ss")
1839
@dbus.service.signal(_interface, signature=u"ss")
1957
1840
def ClientNotFound(self, fingerprint, address):
1961
@dbus.service.signal(_interface, signature="os")
1844
@dbus.service.signal(_interface, signature=u"os")
1962
1845
def ClientRemoved(self, objpath, name):
1966
@dbus.service.method(_interface, out_signature="ao")
1849
@dbus.service.method(_interface, out_signature=u"ao")
1967
1850
def GetAllClients(self):
1969
1852
return dbus.Array(c.dbus_object_path
1970
1853
for c in tcp_server.clients)
1972
1855
@dbus.service.method(_interface,
1973
out_signature="a{oa{sv}}")
1856
out_signature=u"a{oa{sv}}")
1974
1857
def GetAllClientsWithProperties(self):
1976
1859
return dbus.Dictionary(
1977
((c.dbus_object_path, c.GetAll(""))
1860
((c.dbus_object_path, c.GetAll(u""))
1978
1861
for c in tcp_server.clients),
1862
signature=u"oa{sv}")
1981
@dbus.service.method(_interface, in_signature="o")
1864
@dbus.service.method(_interface, in_signature=u"o")
1982
1865
def RemoveClient(self, object_path):
1984
1867
for c in tcp_server.clients: