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
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
175
169
self.rename_count += 1
176
170
def remove(self):
177
171
"""Derived from the Avahi example code"""
200
194
self.group.Commit()
201
195
def entry_group_state_changed(self, state, error):
202
196
"""Derived from the Avahi example code"""
203
logger.debug("Avahi entry group state change: %i", state)
197
logger.debug(u"Avahi state change: %i", state)
205
199
if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
logger.debug("Zeroconf service established.")
200
logger.debug(u"Zeroconf service established.")
207
201
elif state == avahi.ENTRY_GROUP_COLLISION:
208
logger.info("Zeroconf service name collision.")
202
logger.warning(u"Zeroconf service name collision.")
210
204
elif state == avahi.ENTRY_GROUP_FAILURE:
211
logger.critical("Avahi: Error in group state changed %s",
205
logger.critical(u"Avahi: Error in group state changed %s",
213
raise AvahiGroupError("State changed: %s"
207
raise AvahiGroupError(u"State changed: %s"
214
208
% unicode(error))
215
209
def cleanup(self):
216
210
"""Derived from the Avahi example code"""
241
234
"""A representation of a client host served by this server.
244
_approved: bool(); 'None' if not yet approved/disapproved
245
approval_delay: datetime.timedelta(); Time to wait for approval
246
approval_duration: datetime.timedelta(); Duration of one approval
237
name: string; from the config file, used in log messages and
239
fingerprint: string (40 or 32 hexadecimal digits); used to
240
uniquely identify the client
241
secret: bytestring; sent verbatim (over TLS) to client
242
host: string; available for use by the checker command
243
created: datetime.datetime(); (UTC) object creation
244
last_enabled: datetime.datetime(); (UTC)
246
last_checked_ok: datetime.datetime(); (UTC) or None
247
timeout: datetime.timedelta(); How long from last_checked_ok
248
until this client is disabled
249
interval: datetime.timedelta(); How often to start a new checker
250
disable_hook: If set, called by disable() as disable_hook(self)
247
251
checker: subprocess.Popen(); a running checker process used
248
252
to see if the client lives.
249
253
'None' if no process is running.
250
checker_callback_tag: a gobject event source tag, or None
251
checker_command: string; External command which is run to check
252
if client lives. %() expansions are done at
254
checker_initiator_tag: a gobject event source tag, or None
255
disable_initiator_tag: - '' -
256
checker_callback_tag: - '' -
257
checker_command: string; External command which is run to check if
258
client lives. %() expansions are done at
253
259
runtime with vars(self) as dict, so that for
254
260
instance %(name)s can be used in the command.
255
checker_initiator_tag: a gobject event source tag, or None
256
created: datetime.datetime(); (UTC) object creation
257
261
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
259
disable_initiator_tag: a gobject event source tag, or None
261
fingerprint: string (40 or 32 hexadecimal digits); used to
262
uniquely identify the client
263
host: string; available for use by the checker command
264
interval: datetime.timedelta(); How often to start a new checker
265
last_approval_request: datetime.datetime(); (UTC) or None
266
last_checked_ok: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
268
name: string; from the config file, used in log messages and
270
secret: bytestring; sent verbatim (over TLS) to client
271
timeout: datetime.timedelta(); How long from last_checked_ok
272
until this client is disabled
273
runtime_expansions: Allowed attributes for runtime expansion.
262
approved_delay: datetime.timedelta(); Time to wait for approval
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approved_duration: datetime.timedelta(); Duration of one approval
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
282
268
def _timedelta_to_milliseconds(td):
283
269
"Convert a datetime.timedelta() to milliseconds"
304
290
if config is None:
306
logger.debug("Creating client %r", self.name)
292
logger.debug(u"Creating client %r", self.name)
307
293
# Uppercase and remove spaces from fingerprint for later
308
294
# 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:
296
self.fingerprint = (config[u"fingerprint"].upper()
298
logger.debug(u" Fingerprint: %s", self.fingerprint)
299
if u"secret" in config:
300
self.secret = config[u"secret"].decode(u"base64")
301
elif u"secfile" in config:
316
302
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
303
(config[u"secfile"])),
318
304
"rb") as secfile:
319
305
self.secret = secfile.read()
321
raise TypeError("No secret or secfile for client %s"
307
raise TypeError(u"No secret or secfile for client %s"
323
self.host = config.get("host", "")
309
self.host = config.get(u"host", u"")
324
310
self.created = datetime.datetime.utcnow()
325
311
self.enabled = False
326
self.last_approval_request = None
327
312
self.last_enabled = None
328
313
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
314
self.timeout = string_to_delta(config[u"timeout"])
315
self.interval = string_to_delta(config[u"interval"])
331
316
self.disable_hook = disable_hook
332
317
self.checker = None
333
318
self.checker_initiator_tag = None
334
319
self.disable_initiator_tag = None
335
320
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
321
self.checker_command = config[u"checker"]
337
322
self.current_checker_command = None
338
323
self.last_connect = None
339
324
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
325
self.approved_by_default = config.get(u"approved_by_default",
342
327
self.approvals_pending = 0
343
self.approval_delay = string_to_delta(
344
config["approval_delay"])
345
self.approval_duration = string_to_delta(
346
config["approval_duration"])
328
self.approved_delay = string_to_delta(
329
config[u"approved_delay"])
330
self.approved_duration = string_to_delta(
331
config[u"approved_duration"])
347
332
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
349
334
def send_changedstate(self):
462
444
command = self.checker_command % self.host
463
445
except TypeError:
464
446
# Escape attributes for the shell
465
escaped_attrs = dict(
467
re.escape(unicode(str(getattr(self, attr, "")),
471
self.runtime_expansions)
447
escaped_attrs = dict((key,
448
re.escape(unicode(str(val),
452
vars(self).iteritems())
474
454
command = self.checker_command % escaped_attrs
475
455
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
456
logger.error(u'Could not format string "%s":'
457
u' %s', self.checker_command, error)
478
458
return True # Try again later
479
459
self.current_checker_command = command
481
logger.info("Starting checker %r for %s",
461
logger.info(u"Starting checker %r for %s",
482
462
command, self.name)
483
463
# We don't need to redirect stdout and stderr, since
484
464
# in normal mode, that is already done by daemon(),
536
516
# Encoding deeply encoded byte arrays is not supported yet by the
537
517
# "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)
518
if byte_arrays and signature != u"ay":
519
raise ValueError(u"Byte arrays not supported for non-'ay'"
520
u" signature %r" % signature)
541
521
def decorator(func):
542
522
func._dbus_is_property = True
543
523
func._dbus_interface = dbus_interface
544
524
func._dbus_signature = signature
545
525
func._dbus_access = access
546
526
func._dbus_name = func.__name__
547
if func._dbus_name.endswith("_dbus_property"):
527
if func._dbus_name.endswith(u"_dbus_property"):
548
528
func._dbus_name = func._dbus_name[:-14]
549
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
529
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
606
586
# No such property
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
587
raise DBusPropertyNotFound(self.dbus_object_path + u":"
588
+ interface_name + u"."
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
591
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
613
593
def Get(self, interface_name, property_name):
614
594
"""Standard D-Bus property Get() method, see D-Bus standard.
616
596
prop = self._get_dbus_property(interface_name, property_name)
617
if prop._dbus_access == "write":
597
if prop._dbus_access == u"write":
618
598
raise DBusPropertyAccessException(property_name)
620
if not hasattr(value, "variant_level"):
600
if not hasattr(value, u"variant_level"):
622
602
return type(value)(value, variant_level=value.variant_level+1)
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
604
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
625
605
def Set(self, interface_name, property_name, value):
626
606
"""Standard D-Bus property Set() method, see D-Bus standard.
628
608
prop = self._get_dbus_property(interface_name, property_name)
629
if prop._dbus_access == "read":
609
if prop._dbus_access == u"read":
630
610
raise DBusPropertyAccessException(property_name)
631
if prop._dbus_get_args_options["byte_arrays"]:
611
if prop._dbus_get_args_options[u"byte_arrays"]:
632
612
# The byte_arrays option is not supported yet on
633
613
# signatures other than "ay".
634
if prop._dbus_signature != "ay":
614
if prop._dbus_signature != u"ay":
636
616
value = dbus.ByteArray(''.join(unichr(byte)
637
617
for byte in value))
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
620
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
621
out_signature=u"a{sv}")
642
622
def GetAll(self, interface_name):
643
623
"""Standard D-Bus property GetAll() method, see D-Bus
675
655
document = xml.dom.minidom.parseString(xmlstring)
676
656
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)
657
e = document.createElement(u"property")
658
e.setAttribute(u"name", name)
659
e.setAttribute(u"type", prop._dbus_signature)
660
e.setAttribute(u"access", prop._dbus_access)
682
for if_tag in document.getElementsByTagName("interface"):
662
for if_tag in document.getElementsByTagName(u"interface"):
683
663
for tag in (make_tag(document, name, prop)
685
665
in self._get_all_dbus_properties()
686
666
if prop._dbus_interface
687
== if_tag.getAttribute("name")):
667
== if_tag.getAttribute(u"name")):
688
668
if_tag.appendChild(tag)
689
669
# Add the names to the return values for the
690
670
# "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")
671
if (if_tag.getAttribute(u"name")
672
== u"org.freedesktop.DBus.Properties"):
673
for cn in if_tag.getElementsByTagName(u"method"):
674
if cn.getAttribute(u"name") == u"Get":
675
for arg in cn.getElementsByTagName(u"arg"):
676
if (arg.getAttribute(u"direction")
678
arg.setAttribute(u"name", u"value")
679
elif cn.getAttribute(u"name") == u"GetAll":
680
for arg in cn.getElementsByTagName(u"arg"):
681
if (arg.getAttribute(u"direction")
683
arg.setAttribute(u"name", u"props")
684
xmlstring = document.toxml(u"utf-8")
705
685
document.unlink()
706
686
except (AttributeError, xml.dom.DOMException,
707
687
xml.parsers.expat.ExpatError), error:
708
logger.error("Failed to override Introspection method",
688
logger.error(u"Failed to override Introspection method",
760
734
variant_level=variant_level)
762
736
def enable(self):
763
oldstate = getattr(self, "enabled", False)
737
oldstate = getattr(self, u"enabled", False)
764
738
r = Client.enable(self)
765
739
if oldstate != self.enabled:
766
740
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
741
self.PropertyChanged(dbus.String(u"enabled"),
768
742
dbus.Boolean(True, variant_level=1))
769
743
self.PropertyChanged(
770
dbus.String("LastEnabled"),
744
dbus.String(u"last_enabled"),
771
745
self._datetime_to_dbus(self.last_enabled,
772
746
variant_level=1))
775
749
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
750
oldstate = getattr(self, u"enabled", False)
777
751
r = Client.disable(self, quiet=quiet)
778
752
if not quiet and oldstate != self.enabled:
779
753
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
754
self.PropertyChanged(dbus.String(u"enabled"),
781
755
dbus.Boolean(False, variant_level=1))
843
808
# Emit D-Bus signal
844
809
self.CheckerStarted(self.current_checker_command)
845
810
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
811
dbus.String(u"checker_running"),
847
812
dbus.Boolean(True, variant_level=1))
850
815
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
816
old_checker = getattr(self, u"checker", None)
852
817
r = Client.stop_checker(self, *args, **kwargs)
853
818
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
819
and getattr(self, u"checker", None) is None):
820
self.PropertyChanged(dbus.String(u"checker_running"),
856
821
dbus.Boolean(False, variant_level=1))
863
828
def approve(self, value=True):
864
829
self.send_changedstate()
865
830
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
867
(self.approval_duration),
831
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
868
832
self._reset_approved)
871
835
## D-Bus methods, signals & properties
872
_interface = "se.bsnet.fukt.Mandos.Client"
836
_interface = u"se.bsnet.fukt.Mandos.Client"
876
840
# CheckerCompleted - signal
877
@dbus.service.signal(_interface, signature="nxs")
841
@dbus.service.signal(_interface, signature=u"nxs")
878
842
def CheckerCompleted(self, exitcode, waitstatus, command):
882
846
# CheckerStarted - signal
883
@dbus.service.signal(_interface, signature="s")
847
@dbus.service.signal(_interface, signature=u"s")
884
848
def CheckerStarted(self, command):
888
852
# PropertyChanged - signal
889
@dbus.service.signal(_interface, signature="sv")
853
@dbus.service.signal(_interface, signature=u"sv")
890
854
def PropertyChanged(self, property, value):
952
# ApprovalPending - property
953
@dbus_service_property(_interface, signature="b", access="read")
954
def ApprovalPending_dbus_property(self):
916
# approved_pending - property
917
@dbus_service_property(_interface, signature=u"b", access=u"read")
918
def approved_pending_dbus_property(self):
955
919
return dbus.Boolean(bool(self.approvals_pending))
957
# ApprovedByDefault - property
958
@dbus_service_property(_interface, signature="b",
960
def ApprovedByDefault_dbus_property(self, value=None):
961
if value is None: # get
962
return dbus.Boolean(self.approved_by_default)
963
self.approved_by_default = bool(value)
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
dbus.Boolean(value, variant_level=1))
968
# ApprovalDelay - property
969
@dbus_service_property(_interface, signature="t",
971
def ApprovalDelay_dbus_property(self, value=None):
972
if value is None: # get
973
return dbus.UInt64(self.approval_delay_milliseconds())
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
979
# ApprovalDuration - property
980
@dbus_service_property(_interface, signature="t",
982
def ApprovalDuration_dbus_property(self, value=None):
983
if value is None: # get
984
return dbus.UInt64(self._timedelta_to_milliseconds(
985
self.approval_duration))
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
992
@dbus_service_property(_interface, signature="s", access="read")
993
def Name_dbus_property(self):
921
# approved_by_default - property
922
@dbus_service_property(_interface, signature=u"b",
924
def approved_by_default_dbus_property(self):
925
return dbus.Boolean(self.approved_by_default)
927
# approved_delay - property
928
@dbus_service_property(_interface, signature=u"t",
930
def approved_delay_dbus_property(self):
931
return dbus.UInt64(self.approved_delay_milliseconds())
933
# approved_duration - property
934
@dbus_service_property(_interface, signature=u"t",
936
def approved_duration_dbus_property(self):
937
return dbus.UInt64(self._timedelta_to_milliseconds(
938
self.approved_duration))
941
@dbus_service_property(_interface, signature=u"s", access=u"read")
942
def name_dbus_property(self):
994
943
return dbus.String(self.name)
996
# Fingerprint - property
997
@dbus_service_property(_interface, signature="s", access="read")
998
def Fingerprint_dbus_property(self):
945
# fingerprint - property
946
@dbus_service_property(_interface, signature=u"s", access=u"read")
947
def fingerprint_dbus_property(self):
999
948
return dbus.String(self.fingerprint)
1002
@dbus_service_property(_interface, signature="s",
1004
def Host_dbus_property(self, value=None):
951
@dbus_service_property(_interface, signature=u"s",
953
def host_dbus_property(self, value=None):
1005
954
if value is None: # get
1006
955
return dbus.String(self.host)
1007
956
self.host = value
1008
957
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
958
self.PropertyChanged(dbus.String(u"host"),
1010
959
dbus.String(value, variant_level=1))
1012
# Created - property
1013
@dbus_service_property(_interface, signature="s", access="read")
1014
def Created_dbus_property(self):
962
@dbus_service_property(_interface, signature=u"s", access=u"read")
963
def created_dbus_property(self):
1015
964
return dbus.String(self._datetime_to_dbus(self.created))
1017
# LastEnabled - property
1018
@dbus_service_property(_interface, signature="s", access="read")
1019
def LastEnabled_dbus_property(self):
966
# last_enabled - property
967
@dbus_service_property(_interface, signature=u"s", access=u"read")
968
def last_enabled_dbus_property(self):
1020
969
if self.last_enabled is None:
1021
return dbus.String("")
970
return dbus.String(u"")
1022
971
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1024
# Enabled - property
1025
@dbus_service_property(_interface, signature="b",
1027
def Enabled_dbus_property(self, value=None):
974
@dbus_service_property(_interface, signature=u"b",
976
def enabled_dbus_property(self, value=None):
1028
977
if value is None: # get
1029
978
return dbus.Boolean(self.enabled)
1035
# LastCheckedOK - property
1036
@dbus_service_property(_interface, signature="s",
1038
def LastCheckedOK_dbus_property(self, value=None):
984
# last_checked_ok - property
985
@dbus_service_property(_interface, signature=u"s",
987
def last_checked_ok_dbus_property(self, value=None):
1039
988
if value is not None:
1040
989
self.checked_ok()
1042
991
if self.last_checked_ok is None:
1043
return dbus.String("")
992
return dbus.String(u"")
1044
993
return dbus.String(self._datetime_to_dbus(self
1045
994
.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
# Timeout - property
1057
@dbus_service_property(_interface, signature="t",
1059
def Timeout_dbus_property(self, value=None):
997
@dbus_service_property(_interface, signature=u"t",
999
def timeout_dbus_property(self, value=None):
1060
1000
if value is None: # get
1061
1001
return dbus.UInt64(self.timeout_milliseconds())
1062
1002
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
1003
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
1004
self.PropertyChanged(dbus.String(u"timeout"),
1065
1005
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
1006
if getattr(self, u"disable_initiator_tag", None) is None:
1068
1008
# Reschedule timeout
1069
1009
gobject.source_remove(self.disable_initiator_tag)
1081
1021
self.disable_initiator_tag = (gobject.timeout_add
1082
1022
(time_to_die, self.disable))
1084
# Interval - property
1085
@dbus_service_property(_interface, signature="t",
1087
def Interval_dbus_property(self, value=None):
1024
# interval - property
1025
@dbus_service_property(_interface, signature=u"t",
1026
access=u"readwrite")
1027
def interval_dbus_property(self, value=None):
1088
1028
if value is None: # get
1089
1029
return dbus.UInt64(self.interval_milliseconds())
1090
1030
self.interval = datetime.timedelta(0, 0, 0, value)
1091
1031
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1032
self.PropertyChanged(dbus.String(u"interval"),
1093
1033
dbus.UInt64(value, variant_level=1))
1094
if getattr(self, "checker_initiator_tag", None) is None:
1034
if getattr(self, u"checker_initiator_tag", None) is None:
1096
1036
# Reschedule checker run
1097
1037
gobject.source_remove(self.checker_initiator_tag)
1099
1039
(value, self.start_checker))
1100
1040
self.start_checker() # Start one now, too
1102
# Checker - property
1103
@dbus_service_property(_interface, signature="s",
1105
def Checker_dbus_property(self, value=None):
1042
# checker - property
1043
@dbus_service_property(_interface, signature=u"s",
1044
access=u"readwrite")
1045
def checker_dbus_property(self, value=None):
1106
1046
if value is None: # get
1107
1047
return dbus.String(self.checker_command)
1108
1048
self.checker_command = value
1109
1049
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1050
self.PropertyChanged(dbus.String(u"checker"),
1111
1051
dbus.String(self.checker_command,
1112
1052
variant_level=1))
1114
# CheckerRunning - property
1115
@dbus_service_property(_interface, signature="b",
1117
def CheckerRunning_dbus_property(self, value=None):
1054
# checker_running - property
1055
@dbus_service_property(_interface, signature=u"b",
1056
access=u"readwrite")
1057
def checker_running_dbus_property(self, value=None):
1118
1058
if value is None: # get
1119
1059
return dbus.Boolean(self.checker is not None)
1185
1125
# no X.509 keys are added to it. Therefore, we can use it
1186
1126
# here despite using OpenPGP certificates.
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1128
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1129
# u"+AES-256-CBC", u"+SHA1",
1130
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1192
1132
# Use a fallback default, since this MUST be set.
1193
1133
priority = self.server.gnutls_priority
1194
1134
if priority is None:
1135
priority = u"NORMAL"
1196
1136
(gnutls.library.functions
1197
1137
.gnutls_priority_set_direct(session._c_object,
1198
1138
priority, None))
1200
1140
# Start communication using the Mandos protocol
1201
1141
# Get protocol number
1202
1142
line = self.request.makefile().readline()
1203
logger.debug("Protocol version: %r", line)
1143
logger.debug(u"Protocol version: %r", line)
1205
1145
if int(line.strip().split()[0]) > 1:
1206
1146
raise RuntimeError
1207
1147
except (ValueError, IndexError, RuntimeError), error:
1208
logger.error("Unknown protocol version: %s", error)
1148
logger.error(u"Unknown protocol version: %s", error)
1211
1151
# Start GnuTLS connection
1213
1153
session.handshake()
1214
1154
except gnutls.errors.GNUTLSError, error:
1215
logger.warning("Handshake failed: %s", error)
1155
logger.warning(u"Handshake failed: %s", error)
1216
1156
# Do not run session.bye() here: the session is not
1217
1157
# established. Just abandon the request.
1219
logger.debug("Handshake succeeded")
1159
logger.debug(u"Handshake succeeded")
1221
1161
approval_required = False
1234
1174
except KeyError:
1237
if client.approval_delay:
1238
delay = client.approval_delay
1177
if client.approved_delay:
1178
delay = client.approved_delay
1239
1179
client.approvals_pending += 1
1240
1180
approval_required = True
1243
1183
if not client.enabled:
1244
logger.warning("Client %s is disabled",
1184
logger.warning(u"Client %s is disabled",
1246
1186
if self.server.use_dbus:
1247
1187
# Emit D-Bus signal
1248
1188
client.Rejected("Disabled")
1251
if client._approved or not client.approval_delay:
1191
if client._approved or not client.approved_delay:
1252
1192
#We are approved or approval is disabled
1254
1194
elif client._approved is None:
1255
logger.info("Client %s needs approval",
1195
logger.info(u"Client %s need approval",
1257
1197
if self.server.use_dbus:
1258
1198
# Emit D-Bus signal
1259
1199
client.NeedApproval(
1260
client.approval_delay_milliseconds(),
1200
client.approved_delay_milliseconds(),
1261
1201
client.approved_by_default)
1263
logger.warning("Client %s was not approved",
1203
logger.warning(u"Client %s was not approved",
1265
1205
if self.server.use_dbus:
1266
1206
# Emit D-Bus signal
1267
client.Rejected("Denied")
1207
client.Rejected("Disapproved")
1270
1210
#wait until timeout or approved
1433
1373
bind to an address or port if they were not specified."""
1434
1374
if self.interface is not None:
1435
1375
if SO_BINDTODEVICE is None:
1436
logger.error("SO_BINDTODEVICE does not exist;"
1437
" cannot bind to interface %s",
1376
logger.error(u"SO_BINDTODEVICE does not exist;"
1377
u" cannot bind to interface %s",
1438
1378
self.interface)
1441
1381
self.socket.setsockopt(socket.SOL_SOCKET,
1442
1382
SO_BINDTODEVICE,
1443
1383
str(self.interface
1445
1385
except socket.error, error:
1446
1386
if error[0] == errno.EPERM:
1447
logger.error("No permission to"
1448
" bind to interface %s",
1387
logger.error(u"No permission to"
1388
u" bind to interface %s",
1449
1389
self.interface)
1450
1390
elif error[0] == errno.ENOPROTOOPT:
1451
logger.error("SO_BINDTODEVICE not available;"
1452
" cannot bind to interface %s",
1391
logger.error(u"SO_BINDTODEVICE not available;"
1392
u" cannot bind to interface %s",
1453
1393
self.interface)
1512
1452
def handle_ipc(self, source, condition, parent_pipe=None,
1513
1453
client_object=None):
1514
1454
condition_names = {
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1455
gobject.IO_IN: u"IN", # There is data to read.
1456
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
1458
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1459
gobject.IO_ERR: u"ERR", # Error condition.
1460
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1521
1461
# broken, usually for pipes and
1583
1527
def string_to_delta(interval):
1584
1528
"""Parse a string and return a datetime.timedelta
1586
>>> string_to_delta('7d')
1530
>>> string_to_delta(u'7d')
1587
1531
datetime.timedelta(7)
1588
>>> string_to_delta('60s')
1532
>>> string_to_delta(u'60s')
1589
1533
datetime.timedelta(0, 60)
1590
>>> string_to_delta('60m')
1534
>>> string_to_delta(u'60m')
1591
1535
datetime.timedelta(0, 3600)
1592
>>> string_to_delta('24h')
1536
>>> string_to_delta(u'24h')
1593
1537
datetime.timedelta(1)
1594
>>> string_to_delta('1w')
1538
>>> string_to_delta(u'1w')
1595
1539
datetime.timedelta(7)
1596
>>> string_to_delta('5m 30s')
1540
>>> string_to_delta(u'5m 30s')
1597
1541
datetime.timedelta(0, 330)
1599
1543
timevalue = datetime.timedelta(0)
1602
1546
suffix = unicode(s[-1])
1603
1547
value = int(s[:-1])
1605
1549
delta = datetime.timedelta(value)
1550
elif suffix == u"s":
1607
1551
delta = datetime.timedelta(0, value)
1552
elif suffix == u"m":
1609
1553
delta = datetime.timedelta(0, 0, 0, 0, value)
1554
elif suffix == u"h":
1611
1555
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1556
elif suffix == u"w":
1613
1557
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1615
raise ValueError("Unknown suffix %r" % suffix)
1559
raise ValueError(u"Unknown suffix %r" % suffix)
1616
1560
except (ValueError, IndexError), e:
1617
raise ValueError(*(e.args))
1561
raise ValueError(e.message)
1618
1562
timevalue += delta
1619
1563
return timevalue
1626
1570
global if_nametoindex
1628
1572
if_nametoindex = (ctypes.cdll.LoadLibrary
1629
(ctypes.util.find_library("c"))
1573
(ctypes.util.find_library(u"c"))
1630
1574
.if_nametoindex)
1631
1575
except (OSError, AttributeError):
1632
logger.warning("Doing if_nametoindex the hard way")
1576
logger.warning(u"Doing if_nametoindex the hard way")
1633
1577
def if_nametoindex(interface):
1634
1578
"Get an interface index the hard way, i.e. using fcntl()"
1635
1579
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1636
1580
with contextlib.closing(socket.socket()) as s:
1637
1581
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
struct.pack(str("16s16x"),
1582
struct.pack(str(u"16s16x"),
1640
interface_index = struct.unpack(str("I"),
1584
interface_index = struct.unpack(str(u"I"),
1641
1585
ifreq[16:20])[0]
1642
1586
return interface_index
1643
1587
return if_nametoindex(interface)
1674
1618
# Parsing of options, both command line and config file
1676
1620
parser = optparse.OptionParser(version = "%%prog %s" % version)
1677
parser.add_option("-i", "--interface", type="string",
1678
metavar="IF", help="Bind to interface IF")
1679
parser.add_option("-a", "--address", type="string",
1680
help="Address to listen for requests on")
1681
parser.add_option("-p", "--port", type="int",
1682
help="Port number to receive requests on")
1683
parser.add_option("--check", action="store_true",
1684
help="Run self-test")
1685
parser.add_option("--debug", action="store_true",
1686
help="Debug mode; run in foreground and log to"
1688
parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
help="Debug level for stdout output")
1690
parser.add_option("--priority", type="string", help="GnuTLS"
1691
" priority string (see GnuTLS documentation)")
1692
parser.add_option("--servicename", type="string",
1693
metavar="NAME", help="Zeroconf service name")
1694
parser.add_option("--configdir", type="string",
1695
default="/etc/mandos", metavar="DIR",
1696
help="Directory to search for configuration"
1698
parser.add_option("--no-dbus", action="store_false",
1699
dest="use_dbus", help="Do not provide D-Bus"
1700
" system bus interface")
1701
parser.add_option("--no-ipv6", action="store_false",
1702
dest="use_ipv6", help="Do not use IPv6")
1621
parser.add_option("-i", u"--interface", type=u"string",
1622
metavar="IF", help=u"Bind to interface IF")
1623
parser.add_option("-a", u"--address", type=u"string",
1624
help=u"Address to listen for requests on")
1625
parser.add_option("-p", u"--port", type=u"int",
1626
help=u"Port number to receive requests on")
1627
parser.add_option("--check", action=u"store_true",
1628
help=u"Run self-test")
1629
parser.add_option("--debug", action=u"store_true",
1630
help=u"Debug mode; run in foreground and log to"
1632
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1633
help=u"Debug level for stdout output")
1634
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1635
u" priority string (see GnuTLS documentation)")
1636
parser.add_option("--servicename", type=u"string",
1637
metavar=u"NAME", help=u"Zeroconf service name")
1638
parser.add_option("--configdir", type=u"string",
1639
default=u"/etc/mandos", metavar=u"DIR",
1640
help=u"Directory to search for configuration"
1642
parser.add_option("--no-dbus", action=u"store_false",
1643
dest=u"use_dbus", help=u"Do not provide D-Bus"
1644
u" system bus interface")
1645
parser.add_option("--no-ipv6", action=u"store_false",
1646
dest=u"use_ipv6", help=u"Do not use IPv6")
1703
1647
options = parser.parse_args()[0]
1705
1649
if options.check:
1710
1654
# Default values for config file for server-global settings
1711
server_defaults = { "interface": "",
1716
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1717
"servicename": "Mandos",
1655
server_defaults = { u"interface": u"",
1660
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1661
u"servicename": u"Mandos",
1662
u"use_dbus": u"True",
1663
u"use_ipv6": u"True",
1723
1667
# Parse config file for server-global settings
1724
1668
server_config = configparser.SafeConfigParser(server_defaults)
1725
1669
del server_defaults
1726
1670
server_config.read(os.path.join(options.configdir,
1728
1672
# Convert the SafeConfigParser object to a dict
1729
1673
server_settings = server_config.defaults()
1730
1674
# Use the appropriate methods on the non-string config options
1731
for option in ("debug", "use_dbus", "use_ipv6"):
1732
server_settings[option] = server_config.getboolean("DEFAULT",
1675
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1676
server_settings[option] = server_config.getboolean(u"DEFAULT",
1734
1678
if server_settings["port"]:
1735
server_settings["port"] = server_config.getint("DEFAULT",
1679
server_settings["port"] = server_config.getint(u"DEFAULT",
1737
1681
del server_config
1739
1683
# Override the settings from the config file with command line
1740
1684
# options, if set.
1741
for option in ("interface", "address", "port", "debug",
1742
"priority", "servicename", "configdir",
1743
"use_dbus", "use_ipv6", "debuglevel"):
1685
for option in (u"interface", u"address", u"port", u"debug",
1686
u"priority", u"servicename", u"configdir",
1687
u"use_dbus", u"use_ipv6", u"debuglevel"):
1744
1688
value = getattr(options, option)
1745
1689
if value is not None:
1746
1690
server_settings[option] = value
1754
1698
##################################################################
1756
1700
# For convenience
1757
debug = server_settings["debug"]
1758
debuglevel = server_settings["debuglevel"]
1759
use_dbus = server_settings["use_dbus"]
1760
use_ipv6 = server_settings["use_ipv6"]
1701
debug = server_settings[u"debug"]
1702
debuglevel = server_settings[u"debuglevel"]
1703
use_dbus = server_settings[u"use_dbus"]
1704
use_ipv6 = server_settings[u"use_ipv6"]
1762
if server_settings["servicename"] != "Mandos":
1706
if server_settings[u"servicename"] != u"Mandos":
1763
1707
syslogger.setFormatter(logging.Formatter
1764
('Mandos (%s) [%%(process)d]:'
1765
' %%(levelname)s: %%(message)s'
1766
% server_settings["servicename"]))
1708
(u'Mandos (%s) [%%(process)d]:'
1709
u' %%(levelname)s: %%(message)s'
1710
% server_settings[u"servicename"]))
1768
1712
# Parse config file with clients
1769
client_defaults = { "timeout": "1h",
1771
"checker": "fping -q -- %%(host)s",
1773
"approval_delay": "0s",
1774
"approval_duration": "1s",
1713
client_defaults = { u"timeout": u"1h",
1715
u"checker": u"fping -q -- %%(host)s",
1717
u"approved_delay": u"0s",
1718
u"approved_duration": u"1s",
1776
1720
client_config = configparser.SafeConfigParser(client_defaults)
1777
client_config.read(os.path.join(server_settings["configdir"],
1721
client_config.read(os.path.join(server_settings[u"configdir"],
1780
1724
global mandos_dbus_service
1781
1725
mandos_dbus_service = None
1783
tcp_server = MandosServer((server_settings["address"],
1784
server_settings["port"]),
1727
tcp_server = MandosServer((server_settings[u"address"],
1728
server_settings[u"port"]),
1786
interface=(server_settings["interface"]
1730
interface=server_settings[u"interface"],
1788
1731
use_ipv6=use_ipv6,
1789
1732
gnutls_priority=
1790
server_settings["priority"],
1733
server_settings[u"priority"],
1791
1734
use_dbus=use_dbus)
1793
pidfilename = "/var/run/mandos.pid"
1795
pidfile = open(pidfilename, "w")
1797
logger.error("Could not open file %r", pidfilename)
1735
pidfilename = u"/var/run/mandos.pid"
1737
pidfile = open(pidfilename, u"w")
1739
logger.error(u"Could not open file %r", pidfilename)
1800
uid = pwd.getpwnam("_mandos").pw_uid
1801
gid = pwd.getpwnam("_mandos").pw_gid
1742
uid = pwd.getpwnam(u"_mandos").pw_uid
1743
gid = pwd.getpwnam(u"_mandos").pw_gid
1802
1744
except KeyError:
1804
uid = pwd.getpwnam("mandos").pw_uid
1805
gid = pwd.getpwnam("mandos").pw_gid
1746
uid = pwd.getpwnam(u"mandos").pw_uid
1747
gid = pwd.getpwnam(u"mandos").pw_gid
1806
1748
except KeyError:
1808
uid = pwd.getpwnam("nobody").pw_uid
1809
gid = pwd.getpwnam("nobody").pw_gid
1750
uid = pwd.getpwnam(u"nobody").pw_uid
1751
gid = pwd.getpwnam(u"nobody").pw_gid
1810
1752
except KeyError:
1861
1800
# End of Avahi example code
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1803
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1865
1804
bus, do_not_queue=True)
1866
1805
except dbus.exceptions.NameExistsException, e:
1867
logger.error(unicode(e) + ", disabling D-Bus")
1806
logger.error(unicode(e) + u", disabling D-Bus")
1868
1807
use_dbus = False
1869
server_settings["use_dbus"] = False
1808
server_settings[u"use_dbus"] = False
1870
1809
tcp_server.use_dbus = False
1871
1810
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1811
service = AvahiService(name = server_settings[u"servicename"],
1812
servicetype = u"_mandos._tcp",
1874
1813
protocol = protocol, bus = bus)
1875
1814
if server_settings["interface"]:
1876
1815
service.interface = (if_nametoindex
1877
(str(server_settings["interface"])))
1816
(str(server_settings[u"interface"])))
1819
# Close all input and output, do double fork, etc.
1879
1822
global multiprocessing_manager
1880
1823
multiprocessing_manager = multiprocessing.Manager()
1900
1843
client_config, section)))
1901
1844
for section in client_config.sections()))
1902
1845
if not tcp_server.clients:
1903
logger.warning("No clients defined")
1846
logger.warning(u"No clients defined")
1851
pidfile.write(str(pid) + "\n")
1854
logger.error(u"Could not write to file %r with PID %d",
1857
# "pidfile" was never created
1909
pidfile.write(str(pid) + "\n".encode("utf-8"))
1912
logger.error("Could not write to file %r with PID %d",
1915
# "pidfile" was never created
1919
1862
signal.signal(signal.SIGINT, signal.SIG_IGN)
1921
1863
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1922
1864
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1925
1867
class MandosDBusService(dbus.service.Object):
1926
1868
"""A D-Bus proxy object"""
1927
1869
def __init__(self):
1928
dbus.service.Object.__init__(self, bus, "/")
1929
_interface = "se.bsnet.fukt.Mandos"
1870
dbus.service.Object.__init__(self, bus, u"/")
1871
_interface = u"se.bsnet.fukt.Mandos"
1931
@dbus.service.signal(_interface, signature="o")
1873
@dbus.service.signal(_interface, signature=u"o")
1932
1874
def ClientAdded(self, objpath):
1936
@dbus.service.signal(_interface, signature="ss")
1878
@dbus.service.signal(_interface, signature=u"ss")
1937
1879
def ClientNotFound(self, fingerprint, address):
1941
@dbus.service.signal(_interface, signature="os")
1883
@dbus.service.signal(_interface, signature=u"os")
1942
1884
def ClientRemoved(self, objpath, name):
1946
@dbus.service.method(_interface, out_signature="ao")
1888
@dbus.service.method(_interface, out_signature=u"ao")
1947
1889
def GetAllClients(self):
1949
1891
return dbus.Array(c.dbus_object_path
1950
1892
for c in tcp_server.clients)
1952
1894
@dbus.service.method(_interface,
1953
out_signature="a{oa{sv}}")
1895
out_signature=u"a{oa{sv}}")
1954
1896
def GetAllClientsWithProperties(self):
1956
1898
return dbus.Dictionary(
1957
((c.dbus_object_path, c.GetAll(""))
1899
((c.dbus_object_path, c.GetAll(u""))
1958
1900
for c in tcp_server.clients),
1901
signature=u"oa{sv}")
1961
@dbus.service.method(_interface, in_signature="o")
1903
@dbus.service.method(_interface, in_signature=u"o")
1962
1904
def RemoveClient(self, object_path):
1964
1906
for c in tcp_server.clients: