82
81
SO_BINDTODEVICE = None
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
89
88
syslogger = (logging.handlers.SysLogHandler
90
89
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
address = str("/dev/log")))
90
address = "/dev/log"))
92
91
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
92
(u'Mandos [%(process)d]: %(levelname)s:'
95
94
logger.addHandler(syslogger)
97
96
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
101
100
logger.addHandler(console)
103
102
class AvahiError(Exception):
154
153
def rename(self):
155
154
"""Derived from the Avahi example code"""
156
155
if self.rename_count >= self.max_renames:
157
logger.critical("No suitable Zeroconf service name found"
158
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
159
158
self.rename_count)
160
raise AvahiServiceError("Too many renames")
159
raise AvahiServiceError(u"Too many renames")
161
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
162
logger.info("Changing Zeroconf service name to %r ...",
161
logger.info(u"Changing Zeroconf service name to %r ...",
164
163
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
171
170
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
171
logger.critical(u"DBusException: %s", error)
175
174
self.rename_count += 1
200
199
self.group.Commit()
201
200
def entry_group_state_changed(self, state, error):
202
201
"""Derived from the Avahi example code"""
203
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
205
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
207
206
elif state == avahi.ENTRY_GROUP_COLLISION:
208
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
210
209
elif state == avahi.ENTRY_GROUP_FAILURE:
211
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
213
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
214
213
% unicode(error))
215
214
def cleanup(self):
216
215
"""Derived from the Avahi example code"""
256
255
created: datetime.datetime(); (UTC) object creation
257
256
current_checker_command: string; current running checker_command
258
257
disable_hook: If set, called by disable() as disable_hook(self)
259
disable_initiator_tag: a gobject event source tag, or None
258
disable_initiator_tag: - '' -
261
260
fingerprint: string (40 or 32 hexadecimal digits); used to
262
261
uniquely identify the client
263
262
host: string; available for use by the checker command
264
263
interval: datetime.timedelta(); How often to start a new checker
265
last_approval_request: datetime.datetime(); (UTC) or None
266
264
last_checked_ok: datetime.datetime(); (UTC) or None
267
265
last_enabled: datetime.datetime(); (UTC)
268
266
name: string; from the config file, used in log messages and
273
271
runtime_expansions: Allowed attributes for runtime expansion.
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
274
runtime_expansions = (u"approval_delay", u"approval_duration",
275
u"created", u"enabled", u"fingerprint",
276
u"host", u"interval", u"last_checked_ok",
277
u"last_enabled", u"name", u"timeout")
282
280
def _timedelta_to_milliseconds(td):
304
302
if config is None:
306
logger.debug("Creating client %r", self.name)
304
logger.debug(u"Creating client %r", self.name)
307
305
# Uppercase and remove spaces from fingerprint for later
308
306
# comparison purposes with return value from the fingerprint()
310
self.fingerprint = (config["fingerprint"].upper()
312
logger.debug(" Fingerprint: %s", self.fingerprint)
313
if "secret" in config:
314
self.secret = config["secret"].decode("base64")
315
elif "secfile" in config:
308
self.fingerprint = (config[u"fingerprint"].upper()
310
logger.debug(u" Fingerprint: %s", self.fingerprint)
311
if u"secret" in config:
312
self.secret = config[u"secret"].decode(u"base64")
313
elif u"secfile" in config:
316
314
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
315
(config[u"secfile"])),
318
316
"rb") as secfile:
319
317
self.secret = secfile.read()
321
raise TypeError("No secret or secfile for client %s"
319
raise TypeError(u"No secret or secfile for client %s"
323
self.host = config.get("host", "")
321
self.host = config.get(u"host", u"")
324
322
self.created = datetime.datetime.utcnow()
325
323
self.enabled = False
326
self.last_approval_request = None
327
324
self.last_enabled = None
328
325
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
331
328
self.disable_hook = disable_hook
332
329
self.checker = None
333
330
self.checker_initiator_tag = None
334
331
self.disable_initiator_tag = None
335
332
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
333
self.checker_command = config[u"checker"]
337
334
self.current_checker_command = None
338
335
self.last_connect = None
339
336
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
337
self.approved_by_default = config.get(u"approved_by_default",
342
339
self.approvals_pending = 0
343
340
self.approval_delay = string_to_delta(
344
config["approval_delay"])
341
config[u"approval_delay"])
345
342
self.approval_duration = string_to_delta(
346
config["approval_duration"])
343
config[u"approval_duration"])
347
344
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
349
346
def send_changedstate(self):
379
376
self.send_changedstate()
381
logger.info("Disabling client %s", self.name)
382
if getattr(self, "disable_initiator_tag", False):
378
logger.info(u"Disabling client %s", self.name)
379
if getattr(self, u"disable_initiator_tag", False):
383
380
gobject.source_remove(self.disable_initiator_tag)
384
381
self.disable_initiator_tag = None
385
if getattr(self, "checker_initiator_tag", False):
382
if getattr(self, u"checker_initiator_tag", False):
386
383
gobject.source_remove(self.checker_initiator_tag)
387
384
self.checker_initiator_tag = None
388
385
self.stop_checker()
464
458
# Escape attributes for the shell
465
459
escaped_attrs = dict(
467
re.escape(unicode(str(getattr(self, attr, "")),
461
re.escape(unicode(str(getattr(self, attr, u"")),
471
465
self.runtime_expansions)
474
468
command = self.checker_command % escaped_attrs
475
469
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
470
logger.error(u'Could not format string "%s":'
471
u' %s', self.checker_command, error)
478
472
return True # Try again later
479
473
self.current_checker_command = command
481
logger.info("Starting checker %r for %s",
475
logger.info(u"Starting checker %r for %s",
482
476
command, self.name)
483
477
# We don't need to redirect stdout and stderr, since
484
478
# in normal mode, that is already done by daemon(),
536
530
# Encoding deeply encoded byte arrays is not supported yet by the
537
531
# "Set" method, so we fail early here:
538
if byte_arrays and signature != "ay":
539
raise ValueError("Byte arrays not supported for non-'ay'"
540
" signature %r" % signature)
532
if byte_arrays and signature != u"ay":
533
raise ValueError(u"Byte arrays not supported for non-'ay'"
534
u" signature %r" % signature)
541
535
def decorator(func):
542
536
func._dbus_is_property = True
543
537
func._dbus_interface = dbus_interface
544
538
func._dbus_signature = signature
545
539
func._dbus_access = access
546
540
func._dbus_name = func.__name__
547
if func._dbus_name.endswith("_dbus_property"):
541
if func._dbus_name.endswith(u"_dbus_property"):
548
542
func._dbus_name = func._dbus_name[:-14]
549
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
543
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
606
600
# No such property
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
613
607
def Get(self, interface_name, property_name):
614
608
"""Standard D-Bus property Get() method, see D-Bus standard.
616
610
prop = self._get_dbus_property(interface_name, property_name)
617
if prop._dbus_access == "write":
611
if prop._dbus_access == u"write":
618
612
raise DBusPropertyAccessException(property_name)
620
if not hasattr(value, "variant_level"):
614
if not hasattr(value, u"variant_level"):
622
616
return type(value)(value, variant_level=value.variant_level+1)
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
625
619
def Set(self, interface_name, property_name, value):
626
620
"""Standard D-Bus property Set() method, see D-Bus standard.
628
622
prop = self._get_dbus_property(interface_name, property_name)
629
if prop._dbus_access == "read":
623
if prop._dbus_access == u"read":
630
624
raise DBusPropertyAccessException(property_name)
631
if prop._dbus_get_args_options["byte_arrays"]:
625
if prop._dbus_get_args_options[u"byte_arrays"]:
632
626
# The byte_arrays option is not supported yet on
633
627
# signatures other than "ay".
634
if prop._dbus_signature != "ay":
628
if prop._dbus_signature != u"ay":
636
630
value = dbus.ByteArray(''.join(unichr(byte)
637
631
for byte in value))
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
642
636
def GetAll(self, interface_name):
643
637
"""Standard D-Bus property GetAll() method, see D-Bus
652
646
# Interface non-empty but did not match
654
648
# Ignore write-only properties
655
if prop._dbus_access == "write":
649
if prop._dbus_access == u"write":
658
if not hasattr(value, "variant_level"):
652
if not hasattr(value, u"variant_level"):
659
653
all[name] = value
661
655
all[name] = type(value)(value, variant_level=
662
656
value.variant_level+1)
663
return dbus.Dictionary(all, signature="sv")
657
return dbus.Dictionary(all, signature=u"sv")
665
659
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
667
661
path_keyword='object_path',
668
662
connection_keyword='connection')
669
663
def Introspect(self, object_path, connection):
675
669
document = xml.dom.minidom.parseString(xmlstring)
676
670
def make_tag(document, name, prop):
677
e = document.createElement("property")
678
e.setAttribute("name", name)
679
e.setAttribute("type", prop._dbus_signature)
680
e.setAttribute("access", prop._dbus_access)
671
e = document.createElement(u"property")
672
e.setAttribute(u"name", name)
673
e.setAttribute(u"type", prop._dbus_signature)
674
e.setAttribute(u"access", prop._dbus_access)
682
for if_tag in document.getElementsByTagName("interface"):
676
for if_tag in document.getElementsByTagName(u"interface"):
683
677
for tag in (make_tag(document, name, prop)
685
679
in self._get_all_dbus_properties()
686
680
if prop._dbus_interface
687
== if_tag.getAttribute("name")):
681
== if_tag.getAttribute(u"name")):
688
682
if_tag.appendChild(tag)
689
683
# Add the names to the return values for the
690
684
# "org.freedesktop.DBus.Properties" methods
691
if (if_tag.getAttribute("name")
692
== "org.freedesktop.DBus.Properties"):
693
for cn in if_tag.getElementsByTagName("method"):
694
if cn.getAttribute("name") == "Get":
695
for arg in cn.getElementsByTagName("arg"):
696
if (arg.getAttribute("direction")
698
arg.setAttribute("name", "value")
699
elif cn.getAttribute("name") == "GetAll":
700
for arg in cn.getElementsByTagName("arg"):
701
if (arg.getAttribute("direction")
703
arg.setAttribute("name", "props")
704
xmlstring = document.toxml("utf-8")
685
if (if_tag.getAttribute(u"name")
686
== u"org.freedesktop.DBus.Properties"):
687
for cn in if_tag.getElementsByTagName(u"method"):
688
if cn.getAttribute(u"name") == u"Get":
689
for arg in cn.getElementsByTagName(u"arg"):
690
if (arg.getAttribute(u"direction")
692
arg.setAttribute(u"name", u"value")
693
elif cn.getAttribute(u"name") == u"GetAll":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"props")
698
xmlstring = document.toxml(u"utf-8")
705
699
document.unlink()
706
700
except (AttributeError, xml.dom.DOMException,
707
701
xml.parsers.expat.ExpatError), error:
708
logger.error("Failed to override Introspection method",
702
logger.error(u"Failed to override Introspection method",
760
754
variant_level=variant_level)
762
756
def enable(self):
763
oldstate = getattr(self, "enabled", False)
757
oldstate = getattr(self, u"enabled", False)
764
758
r = Client.enable(self)
765
759
if oldstate != self.enabled:
766
760
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
761
self.PropertyChanged(dbus.String(u"Enabled"),
768
762
dbus.Boolean(True, variant_level=1))
769
763
self.PropertyChanged(
770
dbus.String("LastEnabled"),
764
dbus.String(u"LastEnabled"),
771
765
self._datetime_to_dbus(self.last_enabled,
772
766
variant_level=1))
775
769
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
770
oldstate = getattr(self, u"enabled", False)
777
771
r = Client.disable(self, quiet=quiet)
778
772
if not quiet and oldstate != self.enabled:
779
773
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
774
self.PropertyChanged(dbus.String(u"Enabled"),
781
775
dbus.Boolean(False, variant_level=1))
816
810
r = Client.checked_ok(self, *args, **kwargs)
817
811
# Emit D-Bus signal
818
812
self.PropertyChanged(
819
dbus.String("LastCheckedOK"),
813
dbus.String(u"LastCheckedOK"),
820
814
(self._datetime_to_dbus(self.last_checked_ok,
821
815
variant_level=1)))
824
def need_approval(self, *args, **kwargs):
825
r = Client.need_approval(self, *args, **kwargs)
827
self.PropertyChanged(
828
dbus.String("LastApprovalRequest"),
829
(self._datetime_to_dbus(self.last_approval_request,
833
818
def start_checker(self, *args, **kwargs):
834
819
old_checker = self.checker
835
820
if self.checker is not None:
843
828
# Emit D-Bus signal
844
829
self.CheckerStarted(self.current_checker_command)
845
830
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
831
dbus.String(u"CheckerRunning"),
847
832
dbus.Boolean(True, variant_level=1))
850
835
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
836
old_checker = getattr(self, u"checker", None)
852
837
r = Client.stop_checker(self, *args, **kwargs)
853
838
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
839
and getattr(self, u"checker", None) is None):
840
self.PropertyChanged(dbus.String(u"CheckerRunning"),
856
841
dbus.Boolean(False, variant_level=1))
871
856
## D-Bus methods, signals & properties
872
_interface = "se.bsnet.fukt.Mandos.Client"
857
_interface = u"se.bsnet.fukt.Mandos.Client"
876
861
# CheckerCompleted - signal
877
@dbus.service.signal(_interface, signature="nxs")
862
@dbus.service.signal(_interface, signature=u"nxs")
878
863
def CheckerCompleted(self, exitcode, waitstatus, command):
882
867
# CheckerStarted - signal
883
@dbus.service.signal(_interface, signature="s")
868
@dbus.service.signal(_interface, signature=u"s")
884
869
def CheckerStarted(self, command):
888
873
# PropertyChanged - signal
889
@dbus.service.signal(_interface, signature="sv")
874
@dbus.service.signal(_interface, signature=u"sv")
890
875
def PropertyChanged(self, property, value):
903
888
# Rejected - signal
904
@dbus.service.signal(_interface, signature="s")
889
@dbus.service.signal(_interface, signature=u"s")
905
890
def Rejected(self, reason):
909
894
# NeedApproval - signal
910
@dbus.service.signal(_interface, signature="tb")
895
@dbus.service.signal(_interface, signature=u"tb")
911
896
def NeedApproval(self, timeout, default):
913
return self.need_approval()
917
902
# Approve - method
918
@dbus.service.method(_interface, in_signature="b")
903
@dbus.service.method(_interface, in_signature=u"b")
919
904
def Approve(self, value):
920
905
self.approve(value)
922
907
# CheckedOK - method
923
908
@dbus.service.method(_interface)
924
909
def CheckedOK(self):
952
937
# ApprovalPending - property
953
@dbus_service_property(_interface, signature="b", access="read")
938
@dbus_service_property(_interface, signature=u"b", access=u"read")
954
939
def ApprovalPending_dbus_property(self):
955
940
return dbus.Boolean(bool(self.approvals_pending))
957
942
# ApprovedByDefault - property
958
@dbus_service_property(_interface, signature="b",
943
@dbus_service_property(_interface, signature=u"b",
960
945
def ApprovedByDefault_dbus_property(self, value=None):
961
946
if value is None: # get
962
947
return dbus.Boolean(self.approved_by_default)
963
948
self.approved_by_default = bool(value)
964
949
# Emit D-Bus signal
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
950
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
966
951
dbus.Boolean(value, variant_level=1))
968
953
# ApprovalDelay - property
969
@dbus_service_property(_interface, signature="t",
954
@dbus_service_property(_interface, signature=u"t",
971
956
def ApprovalDelay_dbus_property(self, value=None):
972
957
if value is None: # get
973
958
return dbus.UInt64(self.approval_delay_milliseconds())
974
959
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
960
# Emit D-Bus signal
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
961
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
977
962
dbus.UInt64(value, variant_level=1))
979
964
# ApprovalDuration - property
980
@dbus_service_property(_interface, signature="t",
965
@dbus_service_property(_interface, signature=u"t",
982
967
def ApprovalDuration_dbus_property(self, value=None):
983
968
if value is None: # get
984
969
return dbus.UInt64(self._timedelta_to_milliseconds(
985
970
self.approval_duration))
986
971
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
972
# Emit D-Bus signal
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
973
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
989
974
dbus.UInt64(value, variant_level=1))
991
976
# Name - property
992
@dbus_service_property(_interface, signature="s", access="read")
977
@dbus_service_property(_interface, signature=u"s", access=u"read")
993
978
def Name_dbus_property(self):
994
979
return dbus.String(self.name)
996
981
# Fingerprint - property
997
@dbus_service_property(_interface, signature="s", access="read")
982
@dbus_service_property(_interface, signature=u"s", access=u"read")
998
983
def Fingerprint_dbus_property(self):
999
984
return dbus.String(self.fingerprint)
1001
986
# Host - property
1002
@dbus_service_property(_interface, signature="s",
987
@dbus_service_property(_interface, signature=u"s",
1004
989
def Host_dbus_property(self, value=None):
1005
990
if value is None: # get
1006
991
return dbus.String(self.host)
1007
992
self.host = value
1008
993
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
994
self.PropertyChanged(dbus.String(u"Host"),
1010
995
dbus.String(value, variant_level=1))
1012
997
# Created - property
1013
@dbus_service_property(_interface, signature="s", access="read")
998
@dbus_service_property(_interface, signature=u"s", access=u"read")
1014
999
def Created_dbus_property(self):
1015
1000
return dbus.String(self._datetime_to_dbus(self.created))
1017
1002
# LastEnabled - property
1018
@dbus_service_property(_interface, signature="s", access="read")
1003
@dbus_service_property(_interface, signature=u"s", access=u"read")
1019
1004
def LastEnabled_dbus_property(self):
1020
1005
if self.last_enabled is None:
1021
return dbus.String("")
1006
return dbus.String(u"")
1022
1007
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1024
1009
# Enabled - property
1025
@dbus_service_property(_interface, signature="b",
1010
@dbus_service_property(_interface, signature=u"b",
1011
access=u"readwrite")
1027
1012
def Enabled_dbus_property(self, value=None):
1028
1013
if value is None: # get
1029
1014
return dbus.Boolean(self.enabled)
1035
1020
# LastCheckedOK - property
1036
@dbus_service_property(_interface, signature="s",
1021
@dbus_service_property(_interface, signature=u"s",
1022
access=u"readwrite")
1038
1023
def LastCheckedOK_dbus_property(self, value=None):
1039
1024
if value is not None:
1040
1025
self.checked_ok()
1042
1027
if self.last_checked_ok is None:
1043
return dbus.String("")
1028
return dbus.String(u"")
1044
1029
return dbus.String(self._datetime_to_dbus(self
1045
1030
.last_checked_ok))
1047
# LastApprovalRequest - property
1048
@dbus_service_property(_interface, signature="s", access="read")
1049
def LastApprovalRequest_dbus_property(self):
1050
if self.last_approval_request is None:
1051
return dbus.String("")
1052
return dbus.String(self.
1053
_datetime_to_dbus(self
1054
.last_approval_request))
1056
1032
# Timeout - property
1057
@dbus_service_property(_interface, signature="t",
1033
@dbus_service_property(_interface, signature=u"t",
1034
access=u"readwrite")
1059
1035
def Timeout_dbus_property(self, value=None):
1060
1036
if value is None: # get
1061
1037
return dbus.UInt64(self.timeout_milliseconds())
1062
1038
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
1039
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
1040
self.PropertyChanged(dbus.String(u"Timeout"),
1065
1041
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
1042
if getattr(self, u"disable_initiator_tag", None) is None:
1068
1044
# Reschedule timeout
1069
1045
gobject.source_remove(self.disable_initiator_tag)
1082
1058
(time_to_die, self.disable))
1084
1060
# Interval - property
1085
@dbus_service_property(_interface, signature="t",
1061
@dbus_service_property(_interface, signature=u"t",
1062
access=u"readwrite")
1087
1063
def Interval_dbus_property(self, value=None):
1088
1064
if value is None: # get
1089
1065
return dbus.UInt64(self.interval_milliseconds())
1090
1066
self.interval = datetime.timedelta(0, 0, 0, value)
1091
1067
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1068
self.PropertyChanged(dbus.String(u"Interval"),
1093
1069
dbus.UInt64(value, variant_level=1))
1094
if getattr(self, "checker_initiator_tag", None) is None:
1070
if getattr(self, u"checker_initiator_tag", None) is None:
1096
1072
# Reschedule checker run
1097
1073
gobject.source_remove(self.checker_initiator_tag)
1100
1076
self.start_checker() # Start one now, too
1102
1078
# Checker - property
1103
@dbus_service_property(_interface, signature="s",
1079
@dbus_service_property(_interface, signature=u"s",
1080
access=u"readwrite")
1105
1081
def Checker_dbus_property(self, value=None):
1106
1082
if value is None: # get
1107
1083
return dbus.String(self.checker_command)
1108
1084
self.checker_command = value
1109
1085
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1086
self.PropertyChanged(dbus.String(u"Checker"),
1111
1087
dbus.String(self.checker_command,
1112
1088
variant_level=1))
1114
1090
# CheckerRunning - property
1115
@dbus_service_property(_interface, signature="b",
1091
@dbus_service_property(_interface, signature=u"b",
1092
access=u"readwrite")
1117
1093
def CheckerRunning_dbus_property(self, value=None):
1118
1094
if value is None: # get
1119
1095
return dbus.Boolean(self.checker is not None)
1185
1161
# no X.509 keys are added to it. Therefore, we can use it
1186
1162
# here despite using OpenPGP certificates.
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1164
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1165
# u"+AES-256-CBC", u"+SHA1",
1166
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1192
1168
# Use a fallback default, since this MUST be set.
1193
1169
priority = self.server.gnutls_priority
1194
1170
if priority is None:
1171
priority = u"NORMAL"
1196
1172
(gnutls.library.functions
1197
1173
.gnutls_priority_set_direct(session._c_object,
1198
1174
priority, None))
1200
1176
# Start communication using the Mandos protocol
1201
1177
# Get protocol number
1202
1178
line = self.request.makefile().readline()
1203
logger.debug("Protocol version: %r", line)
1179
logger.debug(u"Protocol version: %r", line)
1205
1181
if int(line.strip().split()[0]) > 1:
1206
1182
raise RuntimeError
1207
1183
except (ValueError, IndexError, RuntimeError), error:
1208
logger.error("Unknown protocol version: %s", error)
1184
logger.error(u"Unknown protocol version: %s", error)
1211
1187
# Start GnuTLS connection
1213
1189
session.handshake()
1214
1190
except gnutls.errors.GNUTLSError, error:
1215
logger.warning("Handshake failed: %s", error)
1191
logger.warning(u"Handshake failed: %s", error)
1216
1192
# Do not run session.bye() here: the session is not
1217
1193
# established. Just abandon the request.
1219
logger.debug("Handshake succeeded")
1195
logger.debug(u"Handshake succeeded")
1221
1197
approval_required = False
1433
1409
bind to an address or port if they were not specified."""
1434
1410
if self.interface is not None:
1435
1411
if SO_BINDTODEVICE is None:
1436
logger.error("SO_BINDTODEVICE does not exist;"
1437
" cannot bind to interface %s",
1412
logger.error(u"SO_BINDTODEVICE does not exist;"
1413
u" cannot bind to interface %s",
1438
1414
self.interface)
1441
1417
self.socket.setsockopt(socket.SOL_SOCKET,
1442
1418
SO_BINDTODEVICE,
1443
1419
str(self.interface
1445
1421
except socket.error, error:
1446
1422
if error[0] == errno.EPERM:
1447
logger.error("No permission to"
1448
" bind to interface %s",
1423
logger.error(u"No permission to"
1424
u" bind to interface %s",
1449
1425
self.interface)
1450
1426
elif error[0] == errno.ENOPROTOOPT:
1451
logger.error("SO_BINDTODEVICE not available;"
1452
" cannot bind to interface %s",
1427
logger.error(u"SO_BINDTODEVICE not available;"
1428
u" cannot bind to interface %s",
1453
1429
self.interface)
1512
1488
def handle_ipc(self, source, condition, parent_pipe=None,
1513
1489
client_object=None):
1514
1490
condition_names = {
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1491
gobject.IO_IN: u"IN", # There is data to read.
1492
gobject.IO_OUT: u"OUT", # Data can be written (without
1518
gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
gobject.IO_ERR: "ERR", # Error condition.
1520
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1494
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1495
gobject.IO_ERR: u"ERR", # Error condition.
1496
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1521
1497
# broken, usually for pipes and
1583
1559
def string_to_delta(interval):
1584
1560
"""Parse a string and return a datetime.timedelta
1586
>>> string_to_delta('7d')
1562
>>> string_to_delta(u'7d')
1587
1563
datetime.timedelta(7)
1588
>>> string_to_delta('60s')
1564
>>> string_to_delta(u'60s')
1589
1565
datetime.timedelta(0, 60)
1590
>>> string_to_delta('60m')
1566
>>> string_to_delta(u'60m')
1591
1567
datetime.timedelta(0, 3600)
1592
>>> string_to_delta('24h')
1568
>>> string_to_delta(u'24h')
1593
1569
datetime.timedelta(1)
1594
>>> string_to_delta('1w')
1570
>>> string_to_delta(u'1w')
1595
1571
datetime.timedelta(7)
1596
>>> string_to_delta('5m 30s')
1572
>>> string_to_delta(u'5m 30s')
1597
1573
datetime.timedelta(0, 330)
1599
1575
timevalue = datetime.timedelta(0)
1602
1578
suffix = unicode(s[-1])
1603
1579
value = int(s[:-1])
1605
1581
delta = datetime.timedelta(value)
1582
elif suffix == u"s":
1607
1583
delta = datetime.timedelta(0, value)
1584
elif suffix == u"m":
1609
1585
delta = datetime.timedelta(0, 0, 0, 0, value)
1586
elif suffix == u"h":
1611
1587
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1588
elif suffix == u"w":
1613
1589
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1615
raise ValueError("Unknown suffix %r" % suffix)
1591
raise ValueError(u"Unknown suffix %r" % suffix)
1616
1592
except (ValueError, IndexError), e:
1617
raise ValueError(*(e.args))
1593
raise ValueError(e.message)
1618
1594
timevalue += delta
1619
1595
return timevalue
1626
1602
global if_nametoindex
1628
1604
if_nametoindex = (ctypes.cdll.LoadLibrary
1629
(ctypes.util.find_library("c"))
1605
(ctypes.util.find_library(u"c"))
1630
1606
.if_nametoindex)
1631
1607
except (OSError, AttributeError):
1632
logger.warning("Doing if_nametoindex the hard way")
1608
logger.warning(u"Doing if_nametoindex the hard way")
1633
1609
def if_nametoindex(interface):
1634
1610
"Get an interface index the hard way, i.e. using fcntl()"
1635
1611
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1636
1612
with contextlib.closing(socket.socket()) as s:
1637
1613
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
struct.pack(str("16s16x"),
1614
struct.pack(str(u"16s16x"),
1640
interface_index = struct.unpack(str("I"),
1616
interface_index = struct.unpack(str(u"I"),
1641
1617
ifreq[16:20])[0]
1642
1618
return interface_index
1643
1619
return if_nametoindex(interface)
1673
1649
##################################################################
1674
1650
# Parsing of options, both command line and config file
1676
parser = argparse.ArgumentParser()
1677
parser.add_argument("-v", "--version", action="version",
1678
version = "%%(prog)s %s" % version,
1679
help="show version number and exit")
1680
parser.add_argument("-i", "--interface", metavar="IF",
1681
help="Bind to interface IF")
1682
parser.add_argument("-a", "--address",
1683
help="Address to listen for requests on")
1684
parser.add_argument("-p", "--port", type=int,
1685
help="Port number to receive requests on")
1686
parser.add_argument("--check", action="store_true",
1687
help="Run self-test")
1688
parser.add_argument("--debug", action="store_true",
1689
help="Debug mode; run in foreground and log"
1691
parser.add_argument("--debuglevel", metavar="LEVEL",
1692
help="Debug level for stdout output")
1693
parser.add_argument("--priority", help="GnuTLS"
1694
" priority string (see GnuTLS documentation)")
1695
parser.add_argument("--servicename",
1696
metavar="NAME", help="Zeroconf service name")
1697
parser.add_argument("--configdir",
1698
default="/etc/mandos", metavar="DIR",
1699
help="Directory to search for configuration"
1701
parser.add_argument("--no-dbus", action="store_false",
1702
dest="use_dbus", help="Do not provide D-Bus"
1703
" system bus interface")
1704
parser.add_argument("--no-ipv6", action="store_false",
1705
dest="use_ipv6", help="Do not use IPv6")
1706
options = parser.parse_args()
1652
parser = optparse.OptionParser(version = "%%prog %s" % version)
1653
parser.add_option("-i", u"--interface", type=u"string",
1654
metavar="IF", help=u"Bind to interface IF")
1655
parser.add_option("-a", u"--address", type=u"string",
1656
help=u"Address to listen for requests on")
1657
parser.add_option("-p", u"--port", type=u"int",
1658
help=u"Port number to receive requests on")
1659
parser.add_option("--check", action=u"store_true",
1660
help=u"Run self-test")
1661
parser.add_option("--debug", action=u"store_true",
1662
help=u"Debug mode; run in foreground and log to"
1664
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1665
help=u"Debug level for stdout output")
1666
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1667
u" priority string (see GnuTLS documentation)")
1668
parser.add_option("--servicename", type=u"string",
1669
metavar=u"NAME", help=u"Zeroconf service name")
1670
parser.add_option("--configdir", type=u"string",
1671
default=u"/etc/mandos", metavar=u"DIR",
1672
help=u"Directory to search for configuration"
1674
parser.add_option("--no-dbus", action=u"store_false",
1675
dest=u"use_dbus", help=u"Do not provide D-Bus"
1676
u" system bus interface")
1677
parser.add_option("--no-ipv6", action=u"store_false",
1678
dest=u"use_ipv6", help=u"Do not use IPv6")
1679
options = parser.parse_args()[0]
1708
1681
if options.check:
1713
1686
# Default values for config file for server-global settings
1714
server_defaults = { "interface": "",
1719
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1720
"servicename": "Mandos",
1687
server_defaults = { u"interface": u"",
1692
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1693
u"servicename": u"Mandos",
1694
u"use_dbus": u"True",
1695
u"use_ipv6": u"True",
1726
1699
# Parse config file for server-global settings
1727
1700
server_config = configparser.SafeConfigParser(server_defaults)
1728
1701
del server_defaults
1729
1702
server_config.read(os.path.join(options.configdir,
1731
1704
# Convert the SafeConfigParser object to a dict
1732
1705
server_settings = server_config.defaults()
1733
1706
# Use the appropriate methods on the non-string config options
1734
for option in ("debug", "use_dbus", "use_ipv6"):
1735
server_settings[option] = server_config.getboolean("DEFAULT",
1707
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1708
server_settings[option] = server_config.getboolean(u"DEFAULT",
1737
1710
if server_settings["port"]:
1738
server_settings["port"] = server_config.getint("DEFAULT",
1711
server_settings["port"] = server_config.getint(u"DEFAULT",
1740
1713
del server_config
1742
1715
# Override the settings from the config file with command line
1743
1716
# options, if set.
1744
for option in ("interface", "address", "port", "debug",
1745
"priority", "servicename", "configdir",
1746
"use_dbus", "use_ipv6", "debuglevel"):
1717
for option in (u"interface", u"address", u"port", u"debug",
1718
u"priority", u"servicename", u"configdir",
1719
u"use_dbus", u"use_ipv6", u"debuglevel"):
1747
1720
value = getattr(options, option)
1748
1721
if value is not None:
1749
1722
server_settings[option] = value
1757
1730
##################################################################
1759
1732
# For convenience
1760
debug = server_settings["debug"]
1761
debuglevel = server_settings["debuglevel"]
1762
use_dbus = server_settings["use_dbus"]
1763
use_ipv6 = server_settings["use_ipv6"]
1733
debug = server_settings[u"debug"]
1734
debuglevel = server_settings[u"debuglevel"]
1735
use_dbus = server_settings[u"use_dbus"]
1736
use_ipv6 = server_settings[u"use_ipv6"]
1765
if server_settings["servicename"] != "Mandos":
1738
if server_settings[u"servicename"] != u"Mandos":
1766
1739
syslogger.setFormatter(logging.Formatter
1767
('Mandos (%s) [%%(process)d]:'
1768
' %%(levelname)s: %%(message)s'
1769
% server_settings["servicename"]))
1740
(u'Mandos (%s) [%%(process)d]:'
1741
u' %%(levelname)s: %%(message)s'
1742
% server_settings[u"servicename"]))
1771
1744
# Parse config file with clients
1772
client_defaults = { "timeout": "1h",
1774
"checker": "fping -q -- %%(host)s",
1776
"approval_delay": "0s",
1777
"approval_duration": "1s",
1745
client_defaults = { u"timeout": u"1h",
1747
u"checker": u"fping -q -- %%(host)s",
1749
u"approval_delay": u"0s",
1750
u"approval_duration": u"1s",
1779
1752
client_config = configparser.SafeConfigParser(client_defaults)
1780
client_config.read(os.path.join(server_settings["configdir"],
1753
client_config.read(os.path.join(server_settings[u"configdir"],
1783
1756
global mandos_dbus_service
1784
1757
mandos_dbus_service = None
1786
tcp_server = MandosServer((server_settings["address"],
1787
server_settings["port"]),
1759
tcp_server = MandosServer((server_settings[u"address"],
1760
server_settings[u"port"]),
1789
interface=(server_settings["interface"]
1762
interface=(server_settings[u"interface"]
1791
1764
use_ipv6=use_ipv6,
1792
1765
gnutls_priority=
1793
server_settings["priority"],
1766
server_settings[u"priority"],
1794
1767
use_dbus=use_dbus)
1796
pidfilename = "/var/run/mandos.pid"
1769
pidfilename = u"/var/run/mandos.pid"
1798
pidfile = open(pidfilename, "w")
1771
pidfile = open(pidfilename, u"w")
1799
1772
except IOError:
1800
logger.error("Could not open file %r", pidfilename)
1773
logger.error(u"Could not open file %r", pidfilename)
1803
uid = pwd.getpwnam("_mandos").pw_uid
1804
gid = pwd.getpwnam("_mandos").pw_gid
1776
uid = pwd.getpwnam(u"_mandos").pw_uid
1777
gid = pwd.getpwnam(u"_mandos").pw_gid
1805
1778
except KeyError:
1807
uid = pwd.getpwnam("mandos").pw_uid
1808
gid = pwd.getpwnam("mandos").pw_gid
1780
uid = pwd.getpwnam(u"mandos").pw_uid
1781
gid = pwd.getpwnam(u"mandos").pw_gid
1809
1782
except KeyError:
1811
uid = pwd.getpwnam("nobody").pw_uid
1812
gid = pwd.getpwnam("nobody").pw_gid
1784
uid = pwd.getpwnam(u"nobody").pw_uid
1785
gid = pwd.getpwnam(u"nobody").pw_gid
1813
1786
except KeyError:
1864
1833
# End of Avahi example code
1867
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1836
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1868
1837
bus, do_not_queue=True)
1869
1838
except dbus.exceptions.NameExistsException, e:
1870
logger.error(unicode(e) + ", disabling D-Bus")
1839
logger.error(unicode(e) + u", disabling D-Bus")
1871
1840
use_dbus = False
1872
server_settings["use_dbus"] = False
1841
server_settings[u"use_dbus"] = False
1873
1842
tcp_server.use_dbus = False
1874
1843
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1875
service = AvahiService(name = server_settings["servicename"],
1876
servicetype = "_mandos._tcp",
1844
service = AvahiService(name = server_settings[u"servicename"],
1845
servicetype = u"_mandos._tcp",
1877
1846
protocol = protocol, bus = bus)
1878
1847
if server_settings["interface"]:
1879
1848
service.interface = (if_nametoindex
1880
(str(server_settings["interface"])))
1849
(str(server_settings[u"interface"])))
1852
# Close all input and output, do double fork, etc.
1882
1855
global multiprocessing_manager
1883
1856
multiprocessing_manager = multiprocessing.Manager()
1928
1901
class MandosDBusService(dbus.service.Object):
1929
1902
"""A D-Bus proxy object"""
1930
1903
def __init__(self):
1931
dbus.service.Object.__init__(self, bus, "/")
1932
_interface = "se.bsnet.fukt.Mandos"
1904
dbus.service.Object.__init__(self, bus, u"/")
1905
_interface = u"se.bsnet.fukt.Mandos"
1934
@dbus.service.signal(_interface, signature="o")
1907
@dbus.service.signal(_interface, signature=u"o")
1935
1908
def ClientAdded(self, objpath):
1939
@dbus.service.signal(_interface, signature="ss")
1912
@dbus.service.signal(_interface, signature=u"ss")
1940
1913
def ClientNotFound(self, fingerprint, address):
1944
@dbus.service.signal(_interface, signature="os")
1917
@dbus.service.signal(_interface, signature=u"os")
1945
1918
def ClientRemoved(self, objpath, name):
1949
@dbus.service.method(_interface, out_signature="ao")
1922
@dbus.service.method(_interface, out_signature=u"ao")
1950
1923
def GetAllClients(self):
1952
1925
return dbus.Array(c.dbus_object_path
1953
1926
for c in tcp_server.clients)
1955
1928
@dbus.service.method(_interface,
1956
out_signature="a{oa{sv}}")
1929
out_signature=u"a{oa{sv}}")
1957
1930
def GetAllClientsWithProperties(self):
1959
1932
return dbus.Dictionary(
1960
((c.dbus_object_path, c.GetAll(""))
1933
((c.dbus_object_path, c.GetAll(u""))
1961
1934
for c in tcp_server.clients),
1935
signature=u"oa{sv}")
1964
@dbus.service.method(_interface, in_signature="o")
1937
@dbus.service.method(_interface, in_signature=u"o")
1965
1938
def RemoveClient(self, object_path):
1967
1940
for c in tcp_server.clients:
2033
2006
(tcp_server.handle_request
2034
2007
(*args[2:], **kwargs) or True))
2036
logger.debug("Starting main loop")
2009
logger.debug(u"Starting main loop")
2037
2010
main_loop.run()
2038
2011
except AvahiError, error:
2039
logger.critical("AvahiError: %s", error)
2012
logger.critical(u"AvahiError: %s", error)
2042
2015
except KeyboardInterrupt:
2044
print("", file=sys.stderr)
2045
logger.debug("Server received KeyboardInterrupt")
2046
logger.debug("Server exiting")
2018
logger.debug(u"Server received KeyboardInterrupt")
2019
logger.debug(u"Server exiting")
2047
2020
# Must run before the D-Bus bus name gets deregistered