189
322
dbus.UInt16(self.port),
190
323
avahi.string_array_to_txt_array(self.TXT))
191
324
self.group.Commit()
192
326
def entry_group_state_changed(self, state, error):
193
327
"""Derived from the Avahi example code"""
194
logger.debug(u"Avahi state change: %i", state)
328
logger.debug("Avahi entry group state change: %i", state)
196
330
if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
logger.debug(u"Zeroconf service established.")
331
logger.debug("Zeroconf service established.")
198
332
elif state == avahi.ENTRY_GROUP_COLLISION:
199
logger.warning(u"Zeroconf service name collision.")
333
logger.info("Zeroconf service name collision.")
201
335
elif state == avahi.ENTRY_GROUP_FAILURE:
202
logger.critical(u"Avahi: Error in group state changed %s",
336
logger.critical("Avahi: Error in group state changed %s",
204
raise AvahiGroupError(u"State changed: %s"
338
raise AvahiGroupError("State changed: {!s}"
206
341
def cleanup(self):
207
342
"""Derived from the Avahi example code"""
208
343
if self.group is not None:
346
except (dbus.exceptions.UnknownMethodException,
347
dbus.exceptions.DBusException):
210
349
self.group = None
211
def server_state_changed(self, state):
352
def server_state_changed(self, state, error=None):
212
353
"""Derived from the Avahi example code"""
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
354
logger.debug("Avahi server state change: %i", state)
355
bad_states = { avahi.SERVER_INVALID:
356
"Zeroconf server invalid",
357
avahi.SERVER_REGISTERING: None,
358
avahi.SERVER_COLLISION:
359
"Zeroconf server name collision",
360
avahi.SERVER_FAILURE:
361
"Zeroconf server failure" }
362
if state in bad_states:
363
if bad_states[state] is not None:
365
logger.error(bad_states[state])
367
logger.error(bad_states[state] + ": %r", error)
216
369
elif state == avahi.SERVER_RUNNING:
373
logger.debug("Unknown state: %r", state)
375
logger.debug("Unknown state: %r: %r", state, error)
218
377
def activate(self):
219
378
"""Derived from the Avahi example code"""
220
379
if self.server is None:
221
380
self.server = dbus.Interface(
222
381
self.bus.get_object(avahi.DBUS_NAME,
223
avahi.DBUS_PATH_SERVER),
382
avahi.DBUS_PATH_SERVER,
383
follow_name_owner_changes=True),
224
384
avahi.DBUS_INTERFACE_SERVER)
225
self.server.connect_to_signal(u"StateChanged",
385
self.server.connect_to_signal("StateChanged",
226
386
self.server_state_changed)
227
387
self.server_state_changed(self.server.GetState())
390
class AvahiServiceToSyslog(AvahiService):
392
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
230
401
class Client(object):
231
402
"""A representation of a client host served by this server.
234
name: string; from the config file, used in log messages and
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
405
approved: bool(); 'None' if not yet approved/disapproved
406
approval_delay: datetime.timedelta(); Time to wait for approval
407
approval_duration: datetime.timedelta(); Duration of one approval
248
408
checker: subprocess.Popen(); a running checker process used
249
409
to see if the client lives.
250
410
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
411
checker_callback_tag: a gobject event source tag, or None
412
checker_command: string; External command which is run to check
413
if client lives. %() expansions are done at
256
414
runtime with vars(self) as dict, so that for
257
415
instance %(name)s can be used in the command.
416
checker_initiator_tag: a gobject event source tag, or None
417
created: datetime.datetime(); (UTC) object creation
418
client_structure: Object describing what attributes a client has
419
and is used for storing the client at exit
258
420
current_checker_command: string; current running checker_command
421
disable_initiator_tag: a gobject event source tag, or None
423
fingerprint: string (40 or 32 hexadecimal digits); used to
424
uniquely identify the client
425
host: string; available for use by the checker command
426
interval: datetime.timedelta(); How often to start a new checker
427
last_approval_request: datetime.datetime(); (UTC) or None
428
last_checked_ok: datetime.datetime(); (UTC) or None
429
last_checker_status: integer between 0 and 255 reflecting exit
430
status of last checker. -1 reflects crashed
431
checker, -2 means no checker completed yet.
432
last_enabled: datetime.datetime(); (UTC) or None
433
name: string; from the config file, used in log messages and
435
secret: bytestring; sent verbatim (over TLS) to client
436
timeout: datetime.timedelta(); How long from last_checked_ok
437
until this client is disabled
438
extended_timeout: extra long timeout when secret has been sent
439
runtime_expansions: Allowed attributes for runtime expansion.
440
expires: datetime.datetime(); time (UTC) when a client will be
442
server_settings: The server_settings dict from main()
445
runtime_expansions = ("approval_delay", "approval_duration",
446
"created", "enabled", "expires",
447
"fingerprint", "host", "interval",
448
"last_approval_request", "last_checked_ok",
449
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
453
"checker": "fping -q -- %%(host)s",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
262
def _timedelta_to_milliseconds(td):
263
"Convert a datetime.timedelta() to milliseconds"
264
return ((td.days * 24 * 60 * 60 * 1000)
265
+ (td.seconds * 1000)
266
+ (td.microseconds // 1000))
268
def timeout_milliseconds(self):
269
"Return the 'timeout' attribute in milliseconds"
270
return self._timedelta_to_milliseconds(self.timeout)
272
def interval_milliseconds(self):
273
"Return the 'interval' attribute in milliseconds"
274
return self._timedelta_to_milliseconds(self.interval)
276
def __init__(self, name = None, disable_hook=None, config=None):
277
"""Note: the 'checker' key in 'config' sets the
278
'checker_command' attribute and *not* the 'checker'
462
def config_parser(config):
463
"""Construct a new dict of client settings of this form:
464
{ client_name: {setting_name: value, ...}, ...}
465
with exceptions for any special settings as defined above.
466
NOTE: Must be a pure function. Must return the same result
467
value given the same arguments.
470
for client_name in config.sections():
471
section = dict(config.items(client_name))
472
client = settings[client_name] = {}
474
client["host"] = section["host"]
475
# Reformat values from string types to Python types
476
client["approved_by_default"] = config.getboolean(
477
client_name, "approved_by_default")
478
client["enabled"] = config.getboolean(client_name,
481
client["fingerprint"] = (section["fingerprint"].upper()
483
if "secret" in section:
484
client["secret"] = section["secret"].decode("base64")
485
elif "secfile" in section:
486
with open(os.path.expanduser(os.path.expandvars
487
(section["secfile"])),
489
client["secret"] = secfile.read()
491
raise TypeError("No secret or secfile for section {}"
493
client["timeout"] = string_to_delta(section["timeout"])
494
client["extended_timeout"] = string_to_delta(
495
section["extended_timeout"])
496
client["interval"] = string_to_delta(section["interval"])
497
client["approval_delay"] = string_to_delta(
498
section["approval_delay"])
499
client["approval_duration"] = string_to_delta(
500
section["approval_duration"])
501
client["checker_command"] = section["checker"]
502
client["last_approval_request"] = None
503
client["last_checked_ok"] = None
504
client["last_checker_status"] = -2
508
def __init__(self, settings, name = None, server_settings=None):
283
logger.debug(u"Creating client %r", self.name)
510
if server_settings is None:
512
self.server_settings = server_settings
513
# adding all client settings
514
for setting, value in settings.items():
515
setattr(self, setting, value)
518
if not hasattr(self, "last_enabled"):
519
self.last_enabled = datetime.datetime.utcnow()
520
if not hasattr(self, "expires"):
521
self.expires = (datetime.datetime.utcnow()
524
self.last_enabled = None
527
logger.debug("Creating client %r", self.name)
284
528
# Uppercase and remove spaces from fingerprint for later
285
529
# comparison purposes with return value from the fingerprint()
287
self.fingerprint = (config[u"fingerprint"].upper()
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
295
(config[u"secfile"])),
297
self.secret = secfile.read()
299
raise TypeError(u"No secret or secfile for client %s"
301
self.host = config.get(u"host", u"")
302
self.created = datetime.datetime.utcnow()
304
self.last_enabled = None
305
self.last_checked_ok = None
306
self.timeout = string_to_delta(config[u"timeout"])
307
self.interval = string_to_delta(config[u"interval"])
308
self.disable_hook = disable_hook
531
logger.debug(" Fingerprint: %s", self.fingerprint)
532
self.created = settings.get("created",
533
datetime.datetime.utcnow())
535
# attributes specific for this server instance
309
536
self.checker = None
310
537
self.checker_initiator_tag = None
311
538
self.disable_initiator_tag = None
312
539
self.checker_callback_tag = None
313
self.checker_command = config[u"checker"]
314
540
self.current_checker_command = None
315
self.last_connect = None
542
self.approvals_pending = 0
543
self.changedstate = (multiprocessing_manager
544
.Condition(multiprocessing_manager
546
self.client_structure = [attr for attr in
547
self.__dict__.iterkeys()
548
if not attr.startswith("_")]
549
self.client_structure.append("client_structure")
551
for name, t in inspect.getmembers(type(self),
555
if not name.startswith("_"):
556
self.client_structure.append(name)
558
# Send notice to process children that client state has changed
559
def send_changedstate(self):
560
with self.changedstate:
561
self.changedstate.notify_all()
317
563
def enable(self):
318
564
"""Start this client's checker and timeout hooks"""
319
if getattr(self, u"enabled", False):
565
if getattr(self, "enabled", False):
320
566
# Already enabled
568
self.expires = datetime.datetime.utcnow() + self.timeout
322
570
self.last_enabled = datetime.datetime.utcnow()
572
self.send_changedstate()
574
def disable(self, quiet=True):
575
"""Disable this client."""
576
if not getattr(self, "enabled", False):
579
logger.info("Disabling client %s", self.name)
580
if getattr(self, "disable_initiator_tag", None) is not None:
581
gobject.source_remove(self.disable_initiator_tag)
582
self.disable_initiator_tag = None
584
if getattr(self, "checker_initiator_tag", None) is not None:
585
gobject.source_remove(self.checker_initiator_tag)
586
self.checker_initiator_tag = None
590
self.send_changedstate()
591
# Do not run this again if called by a gobject.timeout_add
597
def init_checker(self):
323
598
# Schedule a new checker to be started an 'interval' from now,
324
599
# and every interval from then on.
600
if self.checker_initiator_tag is not None:
601
gobject.source_remove(self.checker_initiator_tag)
325
602
self.checker_initiator_tag = (gobject.timeout_add
326
(self.interval_milliseconds(),
604
.total_seconds() * 1000),
327
605
self.start_checker))
606
# Schedule a disable() when 'timeout' has passed
607
if self.disable_initiator_tag is not None:
608
gobject.source_remove(self.disable_initiator_tag)
609
self.disable_initiator_tag = (gobject.timeout_add
611
.total_seconds() * 1000),
328
613
# Also start a new checker *right now*.
329
614
self.start_checker()
330
# Schedule a disable() when 'timeout' has passed
331
self.disable_initiator_tag = (gobject.timeout_add
332
(self.timeout_milliseconds(),
337
"""Disable this client."""
338
if not getattr(self, "enabled", False):
340
logger.info(u"Disabling client %s", self.name)
341
if getattr(self, u"disable_initiator_tag", False):
342
gobject.source_remove(self.disable_initiator_tag)
343
self.disable_initiator_tag = None
344
if getattr(self, u"checker_initiator_tag", False):
345
gobject.source_remove(self.checker_initiator_tag)
346
self.checker_initiator_tag = None
348
if self.disable_hook:
349
self.disable_hook(self)
351
# Do not run this again if called by a gobject.timeout_add
355
self.disable_hook = None
358
616
def checker_callback(self, pid, condition, command):
359
617
"""The checker has completed, so take appropriate actions."""
360
618
self.checker_callback_tag = None
361
619
self.checker = None
362
620
if os.WIFEXITED(condition):
363
exitstatus = os.WEXITSTATUS(condition)
365
logger.info(u"Checker for %(name)s succeeded",
621
self.last_checker_status = os.WEXITSTATUS(condition)
622
if self.last_checker_status == 0:
623
logger.info("Checker for %(name)s succeeded",
367
625
self.checked_ok()
369
logger.info(u"Checker for %(name)s failed",
627
logger.info("Checker for %(name)s failed",
372
logger.warning(u"Checker for %(name)s crashed?",
630
self.last_checker_status = -1
631
logger.warning("Checker for %(name)s crashed?",
375
634
def checked_ok(self):
376
"""Bump up the timeout for this client.
378
This should only be called when the client has been seen,
635
"""Assert that the client has been seen, alive and well."""
381
636
self.last_checked_ok = datetime.datetime.utcnow()
382
gobject.source_remove(self.disable_initiator_tag)
383
self.disable_initiator_tag = (gobject.timeout_add
384
(self.timeout_milliseconds(),
637
self.last_checker_status = 0
640
def bump_timeout(self, timeout=None):
641
"""Bump up the timeout for this client."""
643
timeout = self.timeout
644
if self.disable_initiator_tag is not None:
645
gobject.source_remove(self.disable_initiator_tag)
646
self.disable_initiator_tag = None
647
if getattr(self, "enabled", False):
648
self.disable_initiator_tag = (gobject.timeout_add
649
(int(timeout.total_seconds()
650
* 1000), self.disable))
651
self.expires = datetime.datetime.utcnow() + timeout
653
def need_approval(self):
654
self.last_approval_request = datetime.datetime.utcnow()
387
656
def start_checker(self):
388
657
"""Start a new checker subprocess if one is not running.
533
845
class DBusObjectWithProperties(dbus.service.Object):
534
846
"""A D-Bus object with properties.
536
848
Classes inheriting from this can use the dbus_service_property
537
849
decorator to expose methods as D-Bus properties. It exposes the
538
850
standard Get(), Set(), and GetAll() methods on the D-Bus.
542
def _is_dbus_property(obj):
543
return getattr(obj, u"_dbus_is_property", False)
854
def _is_dbus_thing(thing):
855
"""Returns a function testing if an attribute is a D-Bus thing
857
If called like _is_dbus_thing("method") it returns a function
858
suitable for use as predicate to inspect.getmembers().
860
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
545
def _get_all_dbus_properties(self):
863
def _get_all_dbus_things(self, thing):
546
864
"""Returns a generator of (name, attribute) pairs
548
return ((prop._dbus_name, prop)
550
inspect.getmembers(self, self._is_dbus_property))
866
return ((getattr(athing.__get__(self), "_dbus_name",
868
athing.__get__(self))
869
for cls in self.__class__.__mro__
871
inspect.getmembers(cls,
872
self._is_dbus_thing(thing)))
552
874
def _get_dbus_property(self, interface_name, property_name):
553
875
"""Returns a bound method if one exists which is a D-Bus
554
876
property with the specified name and interface.
556
for name in (property_name,
557
property_name + u"_dbus_property"):
558
prop = getattr(self, name, None)
560
or not self._is_dbus_property(prop)
561
or prop._dbus_name != property_name
562
or (interface_name and prop._dbus_interface
563
and interface_name != prop._dbus_interface)):
878
for cls in self.__class__.__mro__:
879
for name, value in (inspect.getmembers
881
self._is_dbus_thing("property"))):
882
if (value._dbus_name == property_name
883
and value._dbus_interface == interface_name):
884
return value.__get__(self)
566
886
# No such property
567
raise DBusPropertyNotFound(self.dbus_object_path + u":"
568
+ interface_name + u"."
887
raise DBusPropertyNotFound(self.dbus_object_path + ":"
888
+ interface_name + "."
571
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
891
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
573
893
def Get(self, interface_name, property_name):
574
894
"""Standard D-Bus property Get() method, see D-Bus standard.
576
896
prop = self._get_dbus_property(interface_name, property_name)
577
if prop._dbus_access == u"write":
897
if prop._dbus_access == "write":
578
898
raise DBusPropertyAccessException(property_name)
580
if not hasattr(value, u"variant_level"):
900
if not hasattr(value, "variant_level"):
582
902
return type(value)(value, variant_level=value.variant_level+1)
584
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
904
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
585
905
def Set(self, interface_name, property_name, value):
586
906
"""Standard D-Bus property Set() method, see D-Bus standard.
588
908
prop = self._get_dbus_property(interface_name, property_name)
589
if prop._dbus_access == u"read":
909
if prop._dbus_access == "read":
590
910
raise DBusPropertyAccessException(property_name)
591
if prop._dbus_get_args_options[u"byte_arrays"]:
592
value = dbus.ByteArray(''.join(unichr(byte)
911
if prop._dbus_get_args_options["byte_arrays"]:
912
# The byte_arrays option is not supported yet on
913
# signatures other than "ay".
914
if prop._dbus_signature != "ay":
915
raise ValueError("Byte arrays not supported for non-"
916
"'ay' signature {!r}"
917
.format(prop._dbus_signature))
918
value = dbus.ByteArray(b''.join(chr(byte)
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
out_signature=u"a{sv}")
922
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
923
out_signature="a{sv}")
598
924
def GetAll(self, interface_name):
599
925
"""Standard D-Bus property GetAll() method, see D-Bus
602
928
Note: Will not include properties with access="write".
605
for name, prop in self._get_all_dbus_properties():
931
for name, prop in self._get_all_dbus_things("property"):
606
932
if (interface_name
607
933
and interface_name != prop._dbus_interface):
608
934
# Interface non-empty but did not match
610
936
# Ignore write-only properties
611
if prop._dbus_access == u"write":
937
if prop._dbus_access == "write":
614
if not hasattr(value, u"variant_level"):
940
if not hasattr(value, "variant_level"):
941
properties[name] = value
617
all[name] = type(value)(value, variant_level=
618
value.variant_level+1)
619
return dbus.Dictionary(all, signature=u"sv")
943
properties[name] = type(value)(value, variant_level=
944
value.variant_level+1)
945
return dbus.Dictionary(properties, signature="sv")
621
947
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
623
949
path_keyword='object_path',
624
950
connection_keyword='connection')
625
951
def Introspect(self, object_path, connection):
626
"""Standard D-Bus method, overloaded to insert property tags.
952
"""Overloading of standard D-Bus method.
954
Inserts property tags and interface annotation tags.
628
956
xmlstring = dbus.service.Object.Introspect(self, object_path,
630
document = xml.dom.minidom.parseString(xmlstring)
632
def make_tag(document, name, prop):
633
e = document.createElement(u"property")
634
e.setAttribute(u"name", name)
635
e.setAttribute(u"type", prop._dbus_signature)
636
e.setAttribute(u"access", prop._dbus_access)
638
for if_tag in document.getElementsByTagName(u"interface"):
639
for tag in (make_tag(document, name, prop)
641
in self._get_all_dbus_properties()
642
if prop._dbus_interface
643
== if_tag.getAttribute(u"name")):
644
if_tag.appendChild(tag)
645
xmlstring = document.toxml(u"utf-8")
959
document = xml.dom.minidom.parseString(xmlstring)
960
def make_tag(document, name, prop):
961
e = document.createElement("property")
962
e.setAttribute("name", name)
963
e.setAttribute("type", prop._dbus_signature)
964
e.setAttribute("access", prop._dbus_access)
966
for if_tag in document.getElementsByTagName("interface"):
968
for tag in (make_tag(document, name, prop)
970
in self._get_all_dbus_things("property")
971
if prop._dbus_interface
972
== if_tag.getAttribute("name")):
973
if_tag.appendChild(tag)
974
# Add annotation tags
975
for typ in ("method", "signal", "property"):
976
for tag in if_tag.getElementsByTagName(typ):
978
for name, prop in (self.
979
_get_all_dbus_things(typ)):
980
if (name == tag.getAttribute("name")
981
and prop._dbus_interface
982
== if_tag.getAttribute("name")):
983
annots.update(getattr
987
for name, value in annots.items():
988
ann_tag = document.createElement(
990
ann_tag.setAttribute("name", name)
991
ann_tag.setAttribute("value", value)
992
tag.appendChild(ann_tag)
993
# Add interface annotation tags
994
for annotation, value in dict(
995
itertools.chain.from_iterable(
996
annotations().items()
997
for name, annotations in
998
self._get_all_dbus_things("interface")
999
if name == if_tag.getAttribute("name")
1001
ann_tag = document.createElement("annotation")
1002
ann_tag.setAttribute("name", annotation)
1003
ann_tag.setAttribute("value", value)
1004
if_tag.appendChild(ann_tag)
1005
# Add the names to the return values for the
1006
# "org.freedesktop.DBus.Properties" methods
1007
if (if_tag.getAttribute("name")
1008
== "org.freedesktop.DBus.Properties"):
1009
for cn in if_tag.getElementsByTagName("method"):
1010
if cn.getAttribute("name") == "Get":
1011
for arg in cn.getElementsByTagName("arg"):
1012
if (arg.getAttribute("direction")
1014
arg.setAttribute("name", "value")
1015
elif cn.getAttribute("name") == "GetAll":
1016
for arg in cn.getElementsByTagName("arg"):
1017
if (arg.getAttribute("direction")
1019
arg.setAttribute("name", "props")
1020
xmlstring = document.toxml("utf-8")
1022
except (AttributeError, xml.dom.DOMException,
1023
xml.parsers.expat.ExpatError) as error:
1024
logger.error("Failed to override Introspection method",
647
1026
return xmlstring
1029
def datetime_to_dbus(dt, variant_level=0):
1030
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1032
return dbus.String("", variant_level = variant_level)
1033
return dbus.String(dt.isoformat(),
1034
variant_level=variant_level)
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1038
"""A class decorator; applied to a subclass of
1039
dbus.service.Object, it will add alternate D-Bus attributes with
1040
interface names according to the "alt_interface_names" mapping.
1043
@alternate_dbus_interfaces({"org.example.Interface":
1044
"net.example.AlternateInterface"})
1045
class SampleDBusObject(dbus.service.Object):
1046
@dbus.service.method("org.example.Interface")
1047
def SampleDBusMethod():
1050
The above "SampleDBusMethod" on "SampleDBusObject" will be
1051
reachable via two interfaces: "org.example.Interface" and
1052
"net.example.AlternateInterface", the latter of which will have
1053
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1054
"true", unless "deprecate" is passed with a False value.
1056
This works for methods and signals, and also for D-Bus properties
1057
(from DBusObjectWithProperties) and interfaces (from the
1058
dbus_interface_annotations decorator).
1061
for orig_interface_name, alt_interface_name in (
1062
alt_interface_names.items()):
1064
interface_names = set()
1065
# Go though all attributes of the class
1066
for attrname, attribute in inspect.getmembers(cls):
1067
# Ignore non-D-Bus attributes, and D-Bus attributes
1068
# with the wrong interface name
1069
if (not hasattr(attribute, "_dbus_interface")
1070
or not attribute._dbus_interface
1071
.startswith(orig_interface_name)):
1073
# Create an alternate D-Bus interface name based on
1075
alt_interface = (attribute._dbus_interface
1076
.replace(orig_interface_name,
1077
alt_interface_name))
1078
interface_names.add(alt_interface)
1079
# Is this a D-Bus signal?
1080
if getattr(attribute, "_dbus_is_signal", False):
1081
# Extract the original non-method undecorated
1082
# function by black magic
1083
nonmethod_func = (dict(
1084
zip(attribute.func_code.co_freevars,
1085
attribute.__closure__))["func"]
1087
# Create a new, but exactly alike, function
1088
# object, and decorate it to be a new D-Bus signal
1089
# with the alternate D-Bus interface name
1090
new_function = (dbus.service.signal
1092
attribute._dbus_signature)
1093
(types.FunctionType(
1094
nonmethod_func.func_code,
1095
nonmethod_func.func_globals,
1096
nonmethod_func.func_name,
1097
nonmethod_func.func_defaults,
1098
nonmethod_func.func_closure)))
1099
# Copy annotations, if any
1101
new_function._dbus_annotations = (
1102
dict(attribute._dbus_annotations))
1103
except AttributeError:
1105
# Define a creator of a function to call both the
1106
# original and alternate functions, so both the
1107
# original and alternate signals gets sent when
1108
# the function is called
1109
def fixscope(func1, func2):
1110
"""This function is a scope container to pass
1111
func1 and func2 to the "call_both" function
1112
outside of its arguments"""
1113
def call_both(*args, **kwargs):
1114
"""This function will emit two D-Bus
1115
signals by calling func1 and func2"""
1116
func1(*args, **kwargs)
1117
func2(*args, **kwargs)
1119
# Create the "call_both" function and add it to
1121
attr[attrname] = fixscope(attribute, new_function)
1122
# Is this a D-Bus method?
1123
elif getattr(attribute, "_dbus_is_method", False):
1124
# Create a new, but exactly alike, function
1125
# object. Decorate it to be a new D-Bus method
1126
# with the alternate D-Bus interface name. Add it
1128
attr[attrname] = (dbus.service.method
1130
attribute._dbus_in_signature,
1131
attribute._dbus_out_signature)
1133
(attribute.func_code,
1134
attribute.func_globals,
1135
attribute.func_name,
1136
attribute.func_defaults,
1137
attribute.func_closure)))
1138
# Copy annotations, if any
1140
attr[attrname]._dbus_annotations = (
1141
dict(attribute._dbus_annotations))
1142
except AttributeError:
1144
# Is this a D-Bus property?
1145
elif getattr(attribute, "_dbus_is_property", False):
1146
# Create a new, but exactly alike, function
1147
# object, and decorate it to be a new D-Bus
1148
# property with the alternate D-Bus interface
1149
# name. Add it to the class.
1150
attr[attrname] = (dbus_service_property
1152
attribute._dbus_signature,
1153
attribute._dbus_access,
1155
._dbus_get_args_options
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1163
# Copy annotations, if any
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1167
except AttributeError:
1169
# Is this a D-Bus interface?
1170
elif getattr(attribute, "_dbus_is_interface", False):
1171
# Create a new, but exactly alike, function
1172
# object. Decorate it to be a new D-Bus interface
1173
# with the alternate D-Bus interface name. Add it
1175
attr[attrname] = (dbus_interface_annotations
1178
(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1184
# Deprecate all alternate interfaces
1185
iname="_AlternateDBusNames_interface_annotation{}"
1186
for interface_name in interface_names:
1187
@dbus_interface_annotations(interface_name)
1189
return { "org.freedesktop.DBus.Deprecated":
1191
# Find an unused name
1192
for aname in (iname.format(i)
1193
for i in itertools.count()):
1194
if aname not in attr:
1198
# Replace the class with a new subclass of it with
1199
# methods, signals, etc. as created above.
1200
cls = type(b"{}Alternate".format(cls.__name__),
1206
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
"se.bsnet.fukt.Mandos"})
650
1208
class ClientDBus(Client, DBusObjectWithProperties):
651
1209
"""A Client class using D-Bus
869
# last_checked_ok - property
870
@dbus_service_property(_interface, signature=u"s",
872
def last_checked_ok_dbus_property(self, value=None):
1510
# LastCheckedOK - property
1511
@dbus_service_property(_interface, signature="s",
1513
def LastCheckedOK_dbus_property(self, value=None):
873
1514
if value is not None:
874
1515
self.checked_ok()
876
if self.last_checked_ok is None:
877
return dbus.String(u"")
878
return dbus.String(self._datetime_to_dbus(self
882
@dbus_service_property(_interface, signature=u"t",
884
def timeout_dbus_property(self, value=None):
1517
return datetime_to_dbus(self.last_checked_ok)
1519
# LastCheckerStatus - property
1520
@dbus_service_property(_interface, signature="n",
1522
def LastCheckerStatus_dbus_property(self):
1523
return dbus.Int16(self.last_checker_status)
1525
# Expires - property
1526
@dbus_service_property(_interface, signature="s", access="read")
1527
def Expires_dbus_property(self):
1528
return datetime_to_dbus(self.expires)
1530
# LastApprovalRequest - property
1531
@dbus_service_property(_interface, signature="s", access="read")
1532
def LastApprovalRequest_dbus_property(self):
1533
return datetime_to_dbus(self.last_approval_request)
1535
# Timeout - property
1536
@dbus_service_property(_interface, signature="t",
1538
def Timeout_dbus_property(self, value=None):
885
1539
if value is None: # get
886
return dbus.UInt64(self.timeout_milliseconds())
1540
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1541
old_timeout = self.timeout
887
1542
self.timeout = datetime.timedelta(0, 0, 0, value)
889
self.PropertyChanged(dbus.String(u"timeout"),
890
dbus.UInt64(value, variant_level=1))
891
if getattr(self, u"disable_initiator_tag", None) is None:
894
gobject.source_remove(self.disable_initiator_tag)
895
self.disable_initiator_tag = None
897
_timedelta_to_milliseconds((self
903
# The timeout has passed
906
self.disable_initiator_tag = (gobject.timeout_add
907
(time_to_die, self.disable))
909
# interval - property
910
@dbus_service_property(_interface, signature=u"t",
912
def interval_dbus_property(self, value=None):
913
if value is None: # get
914
return dbus.UInt64(self.interval_milliseconds())
1543
# Reschedule disabling
1545
now = datetime.datetime.utcnow()
1546
self.expires += self.timeout - old_timeout
1547
if self.expires <= now:
1548
# The timeout has passed
1551
if (getattr(self, "disable_initiator_tag", None)
1554
gobject.source_remove(self.disable_initiator_tag)
1555
self.disable_initiator_tag = (
1556
gobject.timeout_add(
1557
int((self.expires - now).total_seconds()
1558
* 1000), self.disable))
1560
# ExtendedTimeout - property
1561
@dbus_service_property(_interface, signature="t",
1563
def ExtendedTimeout_dbus_property(self, value=None):
1564
if value is None: # get
1565
return dbus.UInt64(self.extended_timeout.total_seconds()
1567
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1569
# Interval - property
1570
@dbus_service_property(_interface, signature="t",
1572
def Interval_dbus_property(self, value=None):
1573
if value is None: # get
1574
return dbus.UInt64(self.interval.total_seconds() * 1000)
915
1575
self.interval = datetime.timedelta(0, 0, 0, value)
917
self.PropertyChanged(dbus.String(u"interval"),
918
dbus.UInt64(value, variant_level=1))
919
if getattr(self, u"checker_initiator_tag", None) is None:
1576
if getattr(self, "checker_initiator_tag", None) is None:
921
# Reschedule checker run
922
gobject.source_remove(self.checker_initiator_tag)
923
self.checker_initiator_tag = (gobject.timeout_add
924
(value, self.start_checker))
925
self.start_checker() # Start one now, too
928
@dbus_service_property(_interface, signature=u"s",
930
def checker_dbus_property(self, value=None):
1579
# Reschedule checker run
1580
gobject.source_remove(self.checker_initiator_tag)
1581
self.checker_initiator_tag = (gobject.timeout_add
1582
(value, self.start_checker))
1583
self.start_checker() # Start one now, too
1585
# Checker - property
1586
@dbus_service_property(_interface, signature="s",
1588
def Checker_dbus_property(self, value=None):
931
1589
if value is None: # get
932
1590
return dbus.String(self.checker_command)
933
self.checker_command = value
935
self.PropertyChanged(dbus.String(u"checker"),
936
dbus.String(self.checker_command,
1591
self.checker_command = unicode(value)
939
# checker_running - property
940
@dbus_service_property(_interface, signature=u"b",
942
def checker_running_dbus_property(self, value=None):
1593
# CheckerRunning - property
1594
@dbus_service_property(_interface, signature="b",
1596
def CheckerRunning_dbus_property(self, value=None):
943
1597
if value is None: # get
944
1598
return dbus.Boolean(self.checker is not None)
968
1648
Note: This will run in its own forked process."""
970
1650
def handle(self):
971
logger.info(u"TCP connection from: %s",
972
unicode(self.client_address))
973
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
974
# Open IPC pipe to parent process
975
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1651
with contextlib.closing(self.server.child_pipe) as child_pipe:
1652
logger.info("TCP connection from: %s",
1653
unicode(self.client_address))
1654
logger.debug("Pipe FD: %d",
1655
self.server.child_pipe.fileno())
976
1657
session = (gnutls.connection
977
1658
.ClientSession(self.request,
978
1659
gnutls.connection
979
1660
.X509Credentials()))
981
line = self.request.makefile().readline()
982
logger.debug(u"Protocol version: %r", line)
984
if int(line.strip().split()[0]) > 1:
986
except (ValueError, IndexError, RuntimeError), error:
987
logger.error(u"Unknown protocol version: %s", error)
990
1662
# Note: gnutls.connection.X509Credentials is really a
991
1663
# generic GnuTLS certificate credentials object so long as
992
1664
# no X.509 keys are added to it. Therefore, we can use it
993
1665
# here despite using OpenPGP certificates.
995
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
996
# u"+AES-256-CBC", u"+SHA1",
997
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1667
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1668
# "+AES-256-CBC", "+SHA1",
1669
# "+COMP-NULL", "+CTYPE-OPENPGP",
999
1671
# Use a fallback default, since this MUST be set.
1000
1672
priority = self.server.gnutls_priority
1001
1673
if priority is None:
1002
priority = u"NORMAL"
1003
1675
(gnutls.library.functions
1004
1676
.gnutls_priority_set_direct(session._c_object,
1005
1677
priority, None))
1679
# Start communication using the Mandos protocol
1680
# Get protocol number
1681
line = self.request.makefile().readline()
1682
logger.debug("Protocol version: %r", line)
1684
if int(line.strip().split()[0]) > 1:
1685
raise RuntimeError(line)
1686
except (ValueError, IndexError, RuntimeError) as error:
1687
logger.error("Unknown protocol version: %s", error)
1690
# Start GnuTLS connection
1008
1692
session.handshake()
1009
except gnutls.errors.GNUTLSError, error:
1010
logger.warning(u"Handshake failed: %s", error)
1693
except gnutls.errors.GNUTLSError as error:
1694
logger.warning("Handshake failed: %s", error)
1011
1695
# Do not run session.bye() here: the session is not
1012
1696
# established. Just abandon the request.
1014
logger.debug(u"Handshake succeeded")
1698
logger.debug("Handshake succeeded")
1700
approval_required = False
1016
fpr = self.fingerprint(self.peer_certificate(session))
1017
except (TypeError, gnutls.errors.GNUTLSError), error:
1018
logger.warning(u"Bad certificate: %s", error)
1021
logger.debug(u"Fingerprint: %s", fpr)
1703
fpr = self.fingerprint(self.peer_certificate
1706
gnutls.errors.GNUTLSError) as error:
1707
logger.warning("Bad certificate: %s", error)
1709
logger.debug("Fingerprint: %s", fpr)
1712
client = ProxyClient(child_pipe, fpr,
1713
self.client_address)
1717
if client.approval_delay:
1718
delay = client.approval_delay
1719
client.approvals_pending += 1
1720
approval_required = True
1723
if not client.enabled:
1724
logger.info("Client %s is disabled",
1726
if self.server.use_dbus:
1728
client.Rejected("Disabled")
1731
if client.approved or not client.approval_delay:
1732
#We are approved or approval is disabled
1734
elif client.approved is None:
1735
logger.info("Client %s needs approval",
1737
if self.server.use_dbus:
1739
client.NeedApproval(
1740
client.approval_delay.total_seconds()
1741
* 1000, client.approved_by_default)
1743
logger.warning("Client %s was not approved",
1745
if self.server.use_dbus:
1747
client.Rejected("Denied")
1750
#wait until timeout or approved
1751
time = datetime.datetime.now()
1752
client.changedstate.acquire()
1753
client.changedstate.wait(delay.total_seconds())
1754
client.changedstate.release()
1755
time2 = datetime.datetime.now()
1756
if (time2 - time) >= delay:
1757
if not client.approved_by_default:
1758
logger.warning("Client %s timed out while"
1759
" waiting for approval",
1761
if self.server.use_dbus:
1763
client.Rejected("Approval timed out")
1768
delay -= time2 - time
1771
while sent_size < len(client.secret):
1773
sent = session.send(client.secret[sent_size:])
1774
except gnutls.errors.GNUTLSError as error:
1775
logger.warning("gnutls send failed",
1778
logger.debug("Sent: %d, remaining: %d",
1779
sent, len(client.secret)
1780
- (sent_size + sent))
1783
logger.info("Sending secret to %s", client.name)
1784
# bump the timeout using extended_timeout
1785
client.bump_timeout(client.extended_timeout)
1786
if self.server.use_dbus:
1023
for c in self.server.clients:
1024
if c.fingerprint == fpr:
1028
ipc.write(u"NOTFOUND %s %s\n"
1029
% (fpr, unicode(self.client_address)))
1032
# Have to check if client.still_valid(), since it is
1033
# possible that the client timed out while establishing
1034
# the GnuTLS session.
1035
if not client.still_valid():
1036
ipc.write(u"INVALID %s\n" % client.name)
1039
ipc.write(u"SENDING %s\n" % client.name)
1041
while sent_size < len(client.secret):
1042
sent = session.send(client.secret[sent_size:])
1043
logger.debug(u"Sent: %d, remaining: %d",
1044
sent, len(client.secret)
1045
- (sent_size + sent))
1791
if approval_required:
1792
client.approvals_pending -= 1
1795
except gnutls.errors.GNUTLSError as error:
1796
logger.warning("GnuTLS bye failed",
1050
1800
def peer_certificate(session):
1203
2004
def __init__(self, server_address, RequestHandlerClass,
1204
2005
interface=None, use_ipv6=True, clients=None,
1205
gnutls_priority=None, use_dbus=True):
2006
gnutls_priority=None, use_dbus=True, socketfd=None):
1206
2007
self.enabled = False
1207
2008
self.clients = clients
1208
2009
if self.clients is None:
1209
self.clients = set()
1210
2011
self.use_dbus = use_dbus
1211
2012
self.gnutls_priority = gnutls_priority
1212
2013
IPv6_TCPServer.__init__(self, server_address,
1213
2014
RequestHandlerClass,
1214
2015
interface = interface,
1215
use_ipv6 = use_ipv6)
2016
use_ipv6 = use_ipv6,
2017
socketfd = socketfd)
1216
2018
def server_activate(self):
1217
2019
if self.enabled:
1218
2020
return socketserver.TCPServer.server_activate(self)
1219
2022
def enable(self):
1220
2023
self.enabled = True
1221
def add_pipe(self, pipe):
2025
def add_pipe(self, parent_pipe, proc):
1222
2026
# Call "handle_ipc" for both data and EOF events
1223
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1225
def handle_ipc(self, source, condition, file_objects={}):
1227
gobject.IO_IN: u"IN", # There is data to read.
1228
gobject.IO_OUT: u"OUT", # Data can be written (without
1230
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1231
gobject.IO_ERR: u"ERR", # Error condition.
1232
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1233
# broken, usually for pipes and
1236
conditions_string = ' | '.join(name
1238
condition_names.iteritems()
1239
if cond & condition)
1240
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1243
# Turn the pipe file descriptor into a Python file object
1244
if source not in file_objects:
1245
file_objects[source] = os.fdopen(source, u"r", 1)
1247
# Read a line from the file object
1248
cmdline = file_objects[source].readline()
1249
if not cmdline: # Empty line means end of file
1250
# close the IPC pipe
1251
file_objects[source].close()
1252
del file_objects[source]
1254
# Stop calling this function
1257
logger.debug(u"IPC command: %r", cmdline)
1259
# Parse and act on command
1260
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1262
if cmd == u"NOTFOUND":
1263
logger.warning(u"Client not found for fingerprint: %s",
1267
mandos_dbus_service.ClientNotFound(args)
1268
elif cmd == u"INVALID":
1269
for client in self.clients:
1270
if client.name == args:
1271
logger.warning(u"Client %s is invalid", args)
1277
logger.error(u"Unknown client %s is invalid", args)
1278
elif cmd == u"SENDING":
1279
for client in self.clients:
1280
if client.name == args:
1281
logger.info(u"Sending secret to %s", client.name)
1285
client.ReceivedSecret()
1288
logger.error(u"Sending secret to unknown client %s",
2027
gobject.io_add_watch(parent_pipe.fileno(),
2028
gobject.IO_IN | gobject.IO_HUP,
2029
functools.partial(self.handle_ipc,
2034
def handle_ipc(self, source, condition, parent_pipe=None,
2035
proc = None, client_object=None):
2036
# error, or the other end of multiprocessing.Pipe has closed
2037
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2038
# Wait for other process to exit
2042
# Read a request from the child
2043
request = parent_pipe.recv()
2044
command = request[0]
2046
if command == 'init':
2048
address = request[2]
2050
for c in self.clients.itervalues():
2051
if c.fingerprint == fpr:
2055
logger.info("Client not found for fingerprint: %s, ad"
2056
"dress: %s", fpr, address)
2059
mandos_dbus_service.ClientNotFound(fpr,
2061
parent_pipe.send(False)
2064
gobject.io_add_watch(parent_pipe.fileno(),
2065
gobject.IO_IN | gobject.IO_HUP,
2066
functools.partial(self.handle_ipc,
2072
parent_pipe.send(True)
2073
# remove the old hook in favor of the new above hook on
2076
if command == 'funcall':
2077
funcname = request[1]
2081
parent_pipe.send(('data', getattr(client_object,
2085
if command == 'getattr':
2086
attrname = request[1]
2087
if callable(client_object.__getattribute__(attrname)):
2088
parent_pipe.send(('function',))
2090
parent_pipe.send(('data', client_object
2091
.__getattribute__(attrname)))
2093
if command == 'setattr':
2094
attrname = request[1]
2096
setattr(client_object, attrname, value)
2101
def rfc3339_duration_to_delta(duration):
2102
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2104
>>> rfc3339_duration_to_delta("P7D")
2105
datetime.timedelta(7)
2106
>>> rfc3339_duration_to_delta("PT60S")
2107
datetime.timedelta(0, 60)
2108
>>> rfc3339_duration_to_delta("PT60M")
2109
datetime.timedelta(0, 3600)
2110
>>> rfc3339_duration_to_delta("PT24H")
2111
datetime.timedelta(1)
2112
>>> rfc3339_duration_to_delta("P1W")
2113
datetime.timedelta(7)
2114
>>> rfc3339_duration_to_delta("PT5M30S")
2115
datetime.timedelta(0, 330)
2116
>>> rfc3339_duration_to_delta("P1DT3M20S")
2117
datetime.timedelta(1, 200)
2120
# Parsing an RFC 3339 duration with regular expressions is not
2121
# possible - there would have to be multiple places for the same
2122
# values, like seconds. The current code, while more esoteric, is
2123
# cleaner without depending on a parsing library. If Python had a
2124
# built-in library for parsing we would use it, but we'd like to
2125
# avoid excessive use of external libraries.
2127
# New type for defining tokens, syntax, and semantics all-in-one
2128
Token = collections.namedtuple("Token",
2129
("regexp", # To match token; if
2130
# "value" is not None,
2131
# must have a "group"
2133
"value", # datetime.timedelta or
2135
"followers")) # Tokens valid after
2137
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2138
# the "duration" ABNF definition in RFC 3339, Appendix A.
2139
token_end = Token(re.compile(r"$"), None, frozenset())
2140
token_second = Token(re.compile(r"(\d+)S"),
2141
datetime.timedelta(seconds=1),
2142
frozenset((token_end,)))
2143
token_minute = Token(re.compile(r"(\d+)M"),
2144
datetime.timedelta(minutes=1),
2145
frozenset((token_second, token_end)))
2146
token_hour = Token(re.compile(r"(\d+)H"),
2147
datetime.timedelta(hours=1),
2148
frozenset((token_minute, token_end)))
2149
token_time = Token(re.compile(r"T"),
2151
frozenset((token_hour, token_minute,
2153
token_day = Token(re.compile(r"(\d+)D"),
2154
datetime.timedelta(days=1),
2155
frozenset((token_time, token_end)))
2156
token_month = Token(re.compile(r"(\d+)M"),
2157
datetime.timedelta(weeks=4),
2158
frozenset((token_day, token_end)))
2159
token_year = Token(re.compile(r"(\d+)Y"),
2160
datetime.timedelta(weeks=52),
2161
frozenset((token_month, token_end)))
2162
token_week = Token(re.compile(r"(\d+)W"),
2163
datetime.timedelta(weeks=1),
2164
frozenset((token_end,)))
2165
token_duration = Token(re.compile(r"P"), None,
2166
frozenset((token_year, token_month,
2167
token_day, token_time,
2169
# Define starting values
2170
value = datetime.timedelta() # Value so far
2172
followers = frozenset((token_duration,)) # Following valid tokens
2173
s = duration # String left to parse
2174
# Loop until end token is found
2175
while found_token is not token_end:
2176
# Search for any currently valid tokens
2177
for token in followers:
2178
match = token.regexp.match(s)
2179
if match is not None:
2181
if token.value is not None:
2182
# Value found, parse digits
2183
factor = int(match.group(1), 10)
2184
# Add to value so far
2185
value += factor * token.value
2186
# Strip token from string
2187
s = token.regexp.sub("", s, 1)
2190
# Set valid next tokens
2191
followers = found_token.followers
1291
logger.error(u"Unknown IPC command: %r", cmdline)
1293
# Keep calling this function
2194
# No currently valid tokens were found
2195
raise ValueError("Invalid RFC 3339 duration")
1297
2200
def string_to_delta(interval):
1298
2201
"""Parse a string and return a datetime.timedelta
1300
>>> string_to_delta(u'7d')
2203
>>> string_to_delta('7d')
1301
2204
datetime.timedelta(7)
1302
>>> string_to_delta(u'60s')
2205
>>> string_to_delta('60s')
1303
2206
datetime.timedelta(0, 60)
1304
>>> string_to_delta(u'60m')
2207
>>> string_to_delta('60m')
1305
2208
datetime.timedelta(0, 3600)
1306
>>> string_to_delta(u'24h')
2209
>>> string_to_delta('24h')
1307
2210
datetime.timedelta(1)
1308
>>> string_to_delta(u'1w')
2211
>>> string_to_delta('1w')
1309
2212
datetime.timedelta(7)
1310
>>> string_to_delta(u'5m 30s')
2213
>>> string_to_delta('5m 30s')
1311
2214
datetime.timedelta(0, 330)
2218
return rfc3339_duration_to_delta(interval)
1313
2222
timevalue = datetime.timedelta(0)
1314
2223
for s in interval.split():
1316
suffix = unicode(s[-1])
1317
2226
value = int(s[:-1])
1319
2228
delta = datetime.timedelta(value)
1320
elif suffix == u"s":
1321
2230
delta = datetime.timedelta(0, value)
1322
elif suffix == u"m":
1323
2232
delta = datetime.timedelta(0, 0, 0, 0, value)
1324
elif suffix == u"h":
1325
2234
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1326
elif suffix == u"w":
1327
2236
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1330
except (ValueError, IndexError):
2238
raise ValueError("Unknown suffix {!r}"
2240
except IndexError as e:
2241
raise ValueError(*(e.args))
1332
2242
timevalue += delta
1333
2243
return timevalue
1336
def if_nametoindex(interface):
1337
"""Call the C function if_nametoindex(), or equivalent
1339
Note: This function cannot accept a unicode string."""
1340
global if_nametoindex
1342
if_nametoindex = (ctypes.cdll.LoadLibrary
1343
(ctypes.util.find_library(u"c"))
1345
except (OSError, AttributeError):
1346
logger.warning(u"Doing if_nametoindex the hard way")
1347
def if_nametoindex(interface):
1348
"Get an interface index the hard way, i.e. using fcntl()"
1349
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1350
with closing(socket.socket()) as s:
1351
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1352
struct.pack(str(u"16s16x"),
1354
interface_index = struct.unpack(str(u"I"),
1356
return interface_index
1357
return if_nametoindex(interface)
1360
2246
def daemon(nochdir = False, noclose = False):
1361
2247
"""See daemon(3). Standard BSD Unix function.
1386
2272
##################################################################
1387
2273
# Parsing of options, both command line and config file
1389
parser = optparse.OptionParser(version = "%%prog %s" % version)
1390
parser.add_option("-i", u"--interface", type=u"string",
1391
metavar="IF", help=u"Bind to interface IF")
1392
parser.add_option("-a", u"--address", type=u"string",
1393
help=u"Address to listen for requests on")
1394
parser.add_option("-p", u"--port", type=u"int",
1395
help=u"Port number to receive requests on")
1396
parser.add_option("--check", action=u"store_true",
1397
help=u"Run self-test")
1398
parser.add_option("--debug", action=u"store_true",
1399
help=u"Debug mode; run in foreground and log to"
1401
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1402
u" priority string (see GnuTLS documentation)")
1403
parser.add_option("--servicename", type=u"string",
1404
metavar=u"NAME", help=u"Zeroconf service name")
1405
parser.add_option("--configdir", type=u"string",
1406
default=u"/etc/mandos", metavar=u"DIR",
1407
help=u"Directory to search for configuration"
1409
parser.add_option("--no-dbus", action=u"store_false",
1410
dest=u"use_dbus", help=u"Do not provide D-Bus"
1411
u" system bus interface")
1412
parser.add_option("--no-ipv6", action=u"store_false",
1413
dest=u"use_ipv6", help=u"Do not use IPv6")
1414
options = parser.parse_args()[0]
2275
parser = argparse.ArgumentParser()
2276
parser.add_argument("-v", "--version", action="version",
2277
version = "%(prog)s {}".format(version),
2278
help="show version number and exit")
2279
parser.add_argument("-i", "--interface", metavar="IF",
2280
help="Bind to interface IF")
2281
parser.add_argument("-a", "--address",
2282
help="Address to listen for requests on")
2283
parser.add_argument("-p", "--port", type=int,
2284
help="Port number to receive requests on")
2285
parser.add_argument("--check", action="store_true",
2286
help="Run self-test")
2287
parser.add_argument("--debug", action="store_true",
2288
help="Debug mode; run in foreground and log"
2289
" to terminal", default=None)
2290
parser.add_argument("--debuglevel", metavar="LEVEL",
2291
help="Debug level for stdout output")
2292
parser.add_argument("--priority", help="GnuTLS"
2293
" priority string (see GnuTLS documentation)")
2294
parser.add_argument("--servicename",
2295
metavar="NAME", help="Zeroconf service name")
2296
parser.add_argument("--configdir",
2297
default="/etc/mandos", metavar="DIR",
2298
help="Directory to search for configuration"
2300
parser.add_argument("--no-dbus", action="store_false",
2301
dest="use_dbus", help="Do not provide D-Bus"
2302
" system bus interface", default=None)
2303
parser.add_argument("--no-ipv6", action="store_false",
2304
dest="use_ipv6", help="Do not use IPv6",
2306
parser.add_argument("--no-restore", action="store_false",
2307
dest="restore", help="Do not restore stored"
2308
" state", default=None)
2309
parser.add_argument("--socket", type=int,
2310
help="Specify a file descriptor to a network"
2311
" socket to use instead of creating one")
2312
parser.add_argument("--statedir", metavar="DIR",
2313
help="Directory to save/restore state in")
2314
parser.add_argument("--foreground", action="store_true",
2315
help="Run in foreground", default=None)
2316
parser.add_argument("--no-zeroconf", action="store_false",
2317
dest="zeroconf", help="Do not use Zeroconf",
2320
options = parser.parse_args()
1416
2322
if options.check:
2324
fail_count, test_count = doctest.testmod()
2325
sys.exit(os.EX_OK if fail_count == 0 else 1)
1421
2327
# Default values for config file for server-global settings
1422
server_defaults = { u"interface": u"",
1427
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1428
u"servicename": u"Mandos",
1429
u"use_dbus": u"True",
1430
u"use_ipv6": u"True",
2328
server_defaults = { "interface": "",
2333
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2334
"servicename": "Mandos",
2340
"statedir": "/var/lib/mandos",
2341
"foreground": "False",
1433
2345
# Parse config file for server-global settings
1434
2346
server_config = configparser.SafeConfigParser(server_defaults)
1435
2347
del server_defaults
1436
2348
server_config.read(os.path.join(options.configdir,
1438
2350
# Convert the SafeConfigParser object to a dict
1439
2351
server_settings = server_config.defaults()
1440
2352
# Use the appropriate methods on the non-string config options
1441
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1442
server_settings[option] = server_config.getboolean(u"DEFAULT",
2353
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2354
server_settings[option] = server_config.getboolean("DEFAULT",
1444
2356
if server_settings["port"]:
1445
server_settings["port"] = server_config.getint(u"DEFAULT",
2357
server_settings["port"] = server_config.getint("DEFAULT",
2359
if server_settings["socket"]:
2360
server_settings["socket"] = server_config.getint("DEFAULT",
2362
# Later, stdin will, and stdout and stderr might, be dup'ed
2363
# over with an opened os.devnull. But we don't want this to
2364
# happen with a supplied network socket.
2365
if 0 <= server_settings["socket"] <= 2:
2366
server_settings["socket"] = os.dup(server_settings
1447
2368
del server_config
1449
2370
# Override the settings from the config file with command line
1450
2371
# options, if set.
1451
for option in (u"interface", u"address", u"port", u"debug",
1452
u"priority", u"servicename", u"configdir",
1453
u"use_dbus", u"use_ipv6"):
2372
for option in ("interface", "address", "port", "debug",
2373
"priority", "servicename", "configdir",
2374
"use_dbus", "use_ipv6", "debuglevel", "restore",
2375
"statedir", "socket", "foreground", "zeroconf"):
1454
2376
value = getattr(options, option)
1455
2377
if value is not None:
1456
2378
server_settings[option] = value
1458
2380
# Force all strings to be unicode
1459
2381
for option in server_settings.keys():
1460
if type(server_settings[option]) is str:
1461
server_settings[option] = unicode(server_settings[option])
2382
if isinstance(server_settings[option], bytes):
2383
server_settings[option] = (server_settings[option]
2385
# Force all boolean options to be boolean
2386
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2387
"foreground", "zeroconf"):
2388
server_settings[option] = bool(server_settings[option])
2389
# Debug implies foreground
2390
if server_settings["debug"]:
2391
server_settings["foreground"] = True
1462
2392
# Now we have our good server settings in "server_settings"
1464
2394
##################################################################
2396
if (not server_settings["zeroconf"] and
2397
not (server_settings["port"]
2398
or server_settings["socket"] != "")):
2399
parser.error("Needs port or socket to work without"
1466
2402
# For convenience
1467
debug = server_settings[u"debug"]
1468
use_dbus = server_settings[u"use_dbus"]
1469
use_ipv6 = server_settings[u"use_ipv6"]
1472
syslogger.setLevel(logging.WARNING)
1473
console.setLevel(logging.WARNING)
1475
if server_settings[u"servicename"] != u"Mandos":
2403
debug = server_settings["debug"]
2404
debuglevel = server_settings["debuglevel"]
2405
use_dbus = server_settings["use_dbus"]
2406
use_ipv6 = server_settings["use_ipv6"]
2407
stored_state_path = os.path.join(server_settings["statedir"],
2409
foreground = server_settings["foreground"]
2410
zeroconf = server_settings["zeroconf"]
2413
initlogger(debug, logging.DEBUG)
2418
level = getattr(logging, debuglevel.upper())
2419
initlogger(debug, level)
2421
if server_settings["servicename"] != "Mandos":
1476
2422
syslogger.setFormatter(logging.Formatter
1477
(u'Mandos (%s) [%%(process)d]:'
1478
u' %%(levelname)s: %%(message)s'
1479
% server_settings[u"servicename"]))
2423
('Mandos ({}) [%(process)d]:'
2424
' %(levelname)s: %(message)s'
2425
.format(server_settings
1481
2428
# Parse config file with clients
1482
client_defaults = { u"timeout": u"1h",
1484
u"checker": u"fping -q -- %%(host)s",
1487
client_config = configparser.SafeConfigParser(client_defaults)
1488
client_config.read(os.path.join(server_settings[u"configdir"],
2429
client_config = configparser.SafeConfigParser(Client
2431
client_config.read(os.path.join(server_settings["configdir"],
1491
2434
global mandos_dbus_service
1492
2435
mandos_dbus_service = None
1494
tcp_server = MandosServer((server_settings[u"address"],
1495
server_settings[u"port"]),
2438
if server_settings["socket"] != "":
2439
socketfd = server_settings["socket"]
2440
tcp_server = MandosServer((server_settings["address"],
2441
server_settings["port"]),
1497
interface=server_settings[u"interface"],
2443
interface=(server_settings["interface"]
1498
2445
use_ipv6=use_ipv6,
1499
2446
gnutls_priority=
1500
server_settings[u"priority"],
1502
pidfilename = u"/var/run/mandos.pid"
1504
pidfile = open(pidfilename, u"w")
1506
logger.error(u"Could not open file %r", pidfilename)
2447
server_settings["priority"],
2451
pidfilename = "/run/mandos.pid"
2452
if not os.path.isdir("/run/."):
2453
pidfilename = "/var/run/mandos.pid"
2456
pidfile = open(pidfilename, "w")
2457
except IOError as e:
2458
logger.error("Could not open file %r", pidfilename,
1509
uid = pwd.getpwnam(u"_mandos").pw_uid
1510
gid = pwd.getpwnam(u"_mandos").pw_gid
2461
for name in ("_mandos", "mandos", "nobody"):
1513
uid = pwd.getpwnam(u"mandos").pw_uid
1514
gid = pwd.getpwnam(u"mandos").pw_gid
2463
uid = pwd.getpwnam(name).pw_uid
2464
gid = pwd.getpwnam(name).pw_gid
1515
2466
except KeyError:
1517
uid = pwd.getpwnam(u"nobody").pw_uid
1518
gid = pwd.getpwnam(u"nobody").pw_gid
1525
except OSError, error:
1526
if error[0] != errno.EPERM:
2474
except OSError as error:
2475
if error.errno != errno.EPERM:
1529
# Enable all possible GnuTLS debugging
2479
# Enable all possible GnuTLS debugging
1531
2481
# "Use a log level over 10 to enable all debugging options."
1532
2482
# - GnuTLS manual
1533
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
1535
2485
@gnutls.library.types.gnutls_log_func
1536
2486
def debug_gnutls(level, string):
1537
logger.debug(u"GnuTLS: %s", string[:-1])
2487
logger.debug("GnuTLS: %s", string[:-1])
1539
2489
(gnutls.library.functions
1540
2490
.gnutls_global_set_log_function(debug_gnutls))
2492
# Redirect stdin so all checkers get /dev/null
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2494
os.dup2(null, sys.stdin.fileno())
2498
# Need to fork before connecting to D-Bus
2500
# Close all input and output, do double fork, etc.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
1542
2507
global main_loop
1543
2508
# From the Avahi example code
1544
DBusGMainLoop(set_as_default=True )
2509
DBusGMainLoop(set_as_default=True)
1545
2510
main_loop = gobject.MainLoop()
1546
2511
bus = dbus.SystemBus()
1547
2512
# End of Avahi example code
1549
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1550
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1551
service = AvahiService(name = server_settings[u"servicename"],
1552
servicetype = u"_mandos._tcp",
1553
protocol = protocol, bus = bus)
1554
if server_settings["interface"]:
1555
service.interface = (if_nametoindex
1556
(str(server_settings[u"interface"])))
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
2521
logger.error("Disabling D-Bus:", exc_info=e)
2523
server_settings["use_dbus"] = False
2524
tcp_server.use_dbus = False
2526
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2527
service = AvahiServiceToSyslog(name =
2528
server_settings["servicename"],
2529
servicetype = "_mandos._tcp",
2530
protocol = protocol, bus = bus)
2531
if server_settings["interface"]:
2532
service.interface = (if_nametoindex
2533
(server_settings["interface"]
2536
global multiprocessing_manager
2537
multiprocessing_manager = multiprocessing.Manager()
1558
2539
client_class = Client
1560
2541
client_class = functools.partial(ClientDBus, bus = bus)
1561
tcp_server.clients.update(set(
1562
client_class(name = section,
1563
config= dict(client_config.items(section)))
1564
for section in client_config.sections()))
2543
client_settings = Client.config_parser(client_config)
2544
old_client_settings = {}
2547
# This is used to redirect stdout and stderr for checker processes
2549
wnull = open(os.devnull, "w") # A writable /dev/null
2550
# Only used if server is running in foreground but not in debug
2552
if debug or not foreground:
2555
# Get client data and settings from last running state.
2556
if server_settings["restore"]:
2558
with open(stored_state_path, "rb") as stored_state:
2559
clients_data, old_client_settings = (pickle.load
2561
os.remove(stored_state_path)
2562
except IOError as e:
2563
if e.errno == errno.ENOENT:
2564
logger.warning("Could not load persistent state: {}"
2565
.format(os.strerror(e.errno)))
2567
logger.critical("Could not load persistent state:",
2570
except EOFError as e:
2571
logger.warning("Could not load persistent state: "
2572
"EOFError:", exc_info=e)
2574
with PGPEngine() as pgp:
2575
for client_name, client in clients_data.items():
2576
# Skip removed clients
2577
if client_name not in client_settings:
2580
# Decide which value to use after restoring saved state.
2581
# We have three different values: Old config file,
2582
# new config file, and saved state.
2583
# New config value takes precedence if it differs from old
2584
# config value, otherwise use saved state.
2585
for name, value in client_settings[client_name].items():
2587
# For each value in new config, check if it
2588
# differs from the old config value (Except for
2589
# the "secret" attribute)
2590
if (name != "secret" and
2591
value != old_client_settings[client_name]
2593
client[name] = value
2597
# Clients who has passed its expire date can still be
2598
# enabled if its last checker was successful. Clients
2599
# whose checker succeeded before we stored its state is
2600
# assumed to have successfully run all checkers during
2602
if client["enabled"]:
2603
if datetime.datetime.utcnow() >= client["expires"]:
2604
if not client["last_checked_ok"]:
2606
"disabling client {} - Client never "
2607
"performed a successful checker"
2608
.format(client_name))
2609
client["enabled"] = False
2610
elif client["last_checker_status"] != 0:
2612
"disabling client {} - Client last"
2613
" checker failed with error code {}"
2614
.format(client_name,
2615
client["last_checker_status"]))
2616
client["enabled"] = False
2618
client["expires"] = (datetime.datetime
2620
+ client["timeout"])
2621
logger.debug("Last checker succeeded,"
2622
" keeping {} enabled"
2623
.format(client_name))
2625
client["secret"] = (
2626
pgp.decrypt(client["encrypted_secret"],
2627
client_settings[client_name]
2630
# If decryption fails, we use secret from new settings
2631
logger.debug("Failed to decrypt {} old secret"
2632
.format(client_name))
2633
client["secret"] = (
2634
client_settings[client_name]["secret"])
2636
# Add/remove clients based on new changes made to config
2637
for client_name in (set(old_client_settings)
2638
- set(client_settings)):
2639
del clients_data[client_name]
2640
for client_name in (set(client_settings)
2641
- set(old_client_settings)):
2642
clients_data[client_name] = client_settings[client_name]
2644
# Create all client objects
2645
for client_name, client in clients_data.items():
2646
tcp_server.clients[client_name] = client_class(
2647
name = client_name, settings = client,
2648
server_settings = server_settings)
1565
2650
if not tcp_server.clients:
1566
logger.warning(u"No clients defined")
1569
# Redirect stdin so all checkers get /dev/null
1570
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1571
os.dup2(null, sys.stdin.fileno())
1575
# No console logging
1576
logger.removeHandler(console)
1577
# Close all input and output, do double fork, etc.
1581
with closing(pidfile):
1583
pidfile.write(str(pid) + "\n")
2651
logger.warning("No clients defined")
2654
if pidfile is not None:
2658
pidfile.write("{}\n".format(pid).encode("utf-8"))
2660
logger.error("Could not write to file %r with PID %d",
1586
logger.error(u"Could not write to file %r with PID %d",
1589
# "pidfile" was never created
1594
"Cleanup function; run on exit"
1597
while tcp_server.clients:
1598
client = tcp_server.clients.pop()
1599
client.disable_hook = None
1602
atexit.register(cleanup)
1605
signal.signal(signal.SIGINT, signal.SIG_IGN)
1606
2665
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1607
2666
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1610
class MandosDBusService(dbus.service.Object):
2669
@alternate_dbus_interfaces({"se.recompile.Mandos":
2670
"se.bsnet.fukt.Mandos"})
2671
class MandosDBusService(DBusObjectWithProperties):
1611
2672
"""A D-Bus proxy object"""
1612
2673
def __init__(self):
1613
dbus.service.Object.__init__(self, bus, u"/")
1614
_interface = u"se.bsnet.fukt.Mandos"
1616
@dbus.service.signal(_interface, signature=u"oa{sv}")
1617
def ClientAdded(self, objpath, properties):
1621
@dbus.service.signal(_interface, signature=u"s")
1622
def ClientNotFound(self, fingerprint):
1626
@dbus.service.signal(_interface, signature=u"os")
2674
dbus.service.Object.__init__(self, bus, "/")
2675
_interface = "se.recompile.Mandos"
2677
@dbus_interface_annotations(_interface)
2679
return { "org.freedesktop.DBus.Property"
2680
".EmitsChangedSignal":
2683
@dbus.service.signal(_interface, signature="o")
2684
def ClientAdded(self, objpath):
2688
@dbus.service.signal(_interface, signature="ss")
2689
def ClientNotFound(self, fingerprint, address):
2693
@dbus.service.signal(_interface, signature="os")
1627
2694
def ClientRemoved(self, objpath, name):
1631
@dbus.service.method(_interface, out_signature=u"ao")
2698
@dbus.service.method(_interface, out_signature="ao")
1632
2699
def GetAllClients(self):
1634
2701
return dbus.Array(c.dbus_object_path
1635
for c in tcp_server.clients)
2703
tcp_server.clients.itervalues())
1637
2705
@dbus.service.method(_interface,
1638
out_signature=u"a{oa{sv}}")
2706
out_signature="a{oa{sv}}")
1639
2707
def GetAllClientsWithProperties(self):
1641
2709
return dbus.Dictionary(
1642
((c.dbus_object_path, c.GetAll(u""))
1643
for c in tcp_server.clients),
1644
signature=u"oa{sv}")
2710
((c.dbus_object_path, c.GetAll(""))
2711
for c in tcp_server.clients.itervalues()),
1646
@dbus.service.method(_interface, in_signature=u"o")
2714
@dbus.service.method(_interface, in_signature="o")
1647
2715
def RemoveClient(self, object_path):
1649
for c in tcp_server.clients:
2717
for c in tcp_server.clients.itervalues():
1650
2718
if c.dbus_object_path == object_path:
1651
tcp_server.clients.remove(c)
2719
del tcp_server.clients[c.name]
1652
2720
c.remove_from_connection()
1653
2721
# Don't signal anything except ClientRemoved
1654
c.disable(signal=False)
2722
c.disable(quiet=True)
1655
2723
# Emit D-Bus signal
1656
2724
self.ClientRemoved(object_path, c.name)
2726
raise KeyError(object_path)
1662
2730
mandos_dbus_service = MandosDBusService()
1664
for client in tcp_server.clients:
2733
"Cleanup function; run on exit"
2737
multiprocessing.active_children()
2739
if not (tcp_server.clients or client_settings):
2742
# Store client before exiting. Secrets are encrypted with key
2743
# based on what config file has. If config file is
2744
# removed/edited, old secret will thus be unrecovable.
2746
with PGPEngine() as pgp:
2747
for client in tcp_server.clients.itervalues():
2748
key = client_settings[client.name]["secret"]
2749
client.encrypted_secret = pgp.encrypt(client.secret,
2753
# A list of attributes that can not be pickled
2755
exclude = { "bus", "changedstate", "secret",
2756
"checker", "server_settings" }
2757
for name, typ in (inspect.getmembers
2758
(dbus.service.Object)):
2761
client_dict["encrypted_secret"] = (client
2763
for attr in client.client_structure:
2764
if attr not in exclude:
2765
client_dict[attr] = getattr(client, attr)
2767
clients[client.name] = client_dict
2768
del client_settings[client.name]["secret"]
2771
with (tempfile.NamedTemporaryFile
2772
(mode='wb', suffix=".pickle", prefix='clients-',
2773
dir=os.path.dirname(stored_state_path),
2774
delete=False)) as stored_state:
2775
pickle.dump((clients, client_settings), stored_state)
2776
tempname=stored_state.name
2777
os.rename(tempname, stored_state_path)
2778
except (IOError, OSError) as e:
2784
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2785
logger.warning("Could not save persistent state: {}"
2786
.format(os.strerror(e.errno)))
2788
logger.warning("Could not save persistent state:",
2792
# Delete all clients, and settings from config
2793
while tcp_server.clients:
2794
name, client = tcp_server.clients.popitem()
2796
client.remove_from_connection()
2797
# Don't signal anything except ClientRemoved
2798
client.disable(quiet=True)
2801
mandos_dbus_service.ClientRemoved(client
2804
client_settings.clear()
2806
atexit.register(cleanup)
2808
for client in tcp_server.clients.itervalues():
1666
2810
# Emit D-Bus signal
1667
mandos_dbus_service.ClientAdded(client.dbus_object_path,
2811
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2812
# Need to initiate checking of clients
2814
client.init_checker()
1671
2816
tcp_server.enable()
1672
2817
tcp_server.server_activate()
1674
2819
# Find out what port we got
1675
service.port = tcp_server.socket.getsockname()[1]
2821
service.port = tcp_server.socket.getsockname()[1]
1677
logger.info(u"Now listening on address %r, port %d,"
1678
" flowinfo %d, scope_id %d"
1679
% tcp_server.socket.getsockname())
2823
logger.info("Now listening on address %r, port %d,"
2824
" flowinfo %d, scope_id %d",
2825
*tcp_server.socket.getsockname())
1681
logger.info(u"Now listening on address %r, port %d"
1682
% tcp_server.socket.getsockname())
2827
logger.info("Now listening on address %r, port %d",
2828
*tcp_server.socket.getsockname())
1684
2830
#service.interface = tcp_server.socket.getsockname()[3]
1687
# From the Avahi example code
1690
except dbus.exceptions.DBusException, error:
1691
logger.critical(u"DBusException: %s", error)
1693
# End of Avahi example code
2834
# From the Avahi example code
2837
except dbus.exceptions.DBusException as error:
2838
logger.critical("D-Bus Exception", exc_info=error)
2841
# End of Avahi example code
1695
2843
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1696
2844
lambda *args, **kwargs:
1697
2845
(tcp_server.handle_request
1698
2846
(*args[2:], **kwargs) or True))
1700
logger.debug(u"Starting main loop")
2848
logger.debug("Starting main loop")
1701
2849
main_loop.run()
1702
except AvahiError, error:
1703
logger.critical(u"AvahiError: %s", error)
2850
except AvahiError as error:
2851
logger.critical("Avahi Error", exc_info=error)
1705
2854
except KeyboardInterrupt:
1708
logger.debug(u"Server received KeyboardInterrupt")
1709
logger.debug(u"Server exiting")
2856
print("", file=sys.stderr)
2857
logger.debug("Server received KeyboardInterrupt")
2858
logger.debug("Server exiting")
2859
# Must run before the D-Bus bus name gets deregistered
1711
2862
if __name__ == '__main__':