81
81
SO_BINDTODEVICE = None
86
#logger = logging.getLogger('mandos')
87
logger = logging.Logger('mandos')
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
88
88
syslogger = (logging.handlers.SysLogHandler
89
89
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
90
address = "/dev/log"))
91
91
syslogger.setFormatter(logging.Formatter
92
('Mandos [%(process)d]: %(levelname)s:'
92
(u'Mandos [%(process)d]: %(levelname)s:'
94
94
logger.addHandler(syslogger)
96
96
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
100
100
logger.addHandler(console)
102
102
class AvahiError(Exception):
153
153
def rename(self):
154
154
"""Derived from the Avahi example code"""
155
155
if self.rename_count >= self.max_renames:
156
logger.critical("No suitable Zeroconf service name found"
157
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
158
158
self.rename_count)
159
raise AvahiServiceError("Too many renames")
159
raise AvahiServiceError(u"Too many renames")
160
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info("Changing Zeroconf service name to %r ...",
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
163
syslogger.setFormatter(logging.Formatter
164
('Mandos (%s) [%%(process)d]:'
165
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
170
170
except dbus.exceptions.DBusException, error:
171
logger.critical("DBusException: %s", error)
171
logger.critical(u"DBusException: %s", error)
174
174
self.rename_count += 1
199
199
self.group.Commit()
200
200
def entry_group_state_changed(self, state, error):
201
201
"""Derived from the Avahi example code"""
202
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
204
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
206
206
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
209
209
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
212
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
213
213
% unicode(error))
214
214
def cleanup(self):
215
215
"""Derived from the Avahi example code"""
240
240
"""A representation of a client host served by this server.
243
_approved: bool(); 'None' if not yet approved/disapproved
244
approval_delay: datetime.timedelta(); Time to wait for approval
245
approval_duration: datetime.timedelta(); Duration of one approval
243
name: string; from the config file, used in log messages and
245
fingerprint: string (40 or 32 hexadecimal digits); used to
246
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
250
last_enabled: datetime.datetime(); (UTC)
252
last_checked_ok: datetime.datetime(); (UTC) or None
253
timeout: datetime.timedelta(); How long from last_checked_ok
254
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
246
257
checker: subprocess.Popen(); a running checker process used
247
258
to see if the client lives.
248
259
'None' if no process is running.
249
checker_callback_tag: a gobject event source tag, or None
250
checker_command: string; External command which is run to check
251
if client lives. %() expansions are done at
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
252
265
runtime with vars(self) as dict, so that for
253
266
instance %(name)s can be used in the command.
254
checker_initiator_tag: a gobject event source tag, or None
255
created: datetime.datetime(); (UTC) object creation
256
267
current_checker_command: string; current running checker_command
257
disable_hook: If set, called by disable() as disable_hook(self)
258
disable_initiator_tag: a gobject event source tag, or None
260
fingerprint: string (40 or 32 hexadecimal digits); used to
261
uniquely identify the client
262
host: string; available for use by the checker command
263
interval: datetime.timedelta(); How often to start a new checker
264
last_approval_request: datetime.datetime(); (UTC) or None
265
last_checked_ok: datetime.datetime(); (UTC) or None
266
last_enabled: datetime.datetime(); (UTC)
267
name: string; from the config file, used in log messages and
269
secret: bytestring; sent verbatim (over TLS) to client
270
timeout: datetime.timedelta(); How long from last_checked_ok
271
until this client is disabled
272
runtime_expansions: Allowed attributes for runtime expansion.
268
approval_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approval_duration: datetime.timedelta(); Duration of one approval
275
runtime_expansions = ("approval_delay", "approval_duration",
276
"created", "enabled", "fingerprint",
277
"host", "interval", "last_checked_ok",
278
"last_enabled", "name", "timeout")
281
274
def _timedelta_to_milliseconds(td):
282
275
"Convert a datetime.timedelta() to milliseconds"
303
296
if config is None:
305
logger.debug("Creating client %r", self.name)
298
logger.debug(u"Creating client %r", self.name)
306
299
# Uppercase and remove spaces from fingerprint for later
307
300
# comparison purposes with return value from the fingerprint()
309
self.fingerprint = (config["fingerprint"].upper()
311
logger.debug(" Fingerprint: %s", self.fingerprint)
312
if "secret" in config:
313
self.secret = config["secret"].decode("base64")
314
elif "secfile" in config:
302
self.fingerprint = (config[u"fingerprint"].upper()
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
elif u"secfile" in config:
315
308
with open(os.path.expanduser(os.path.expandvars
316
(config["secfile"])),
309
(config[u"secfile"])),
317
310
"rb") as secfile:
318
311
self.secret = secfile.read()
320
raise TypeError("No secret or secfile for client %s"
313
raise TypeError(u"No secret or secfile for client %s"
322
self.host = config.get("host", "")
315
self.host = config.get(u"host", u"")
323
316
self.created = datetime.datetime.utcnow()
324
317
self.enabled = False
325
self.last_approval_request = None
326
318
self.last_enabled = None
327
319
self.last_checked_ok = None
328
self.timeout = string_to_delta(config["timeout"])
329
self.interval = string_to_delta(config["interval"])
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
330
322
self.disable_hook = disable_hook
331
323
self.checker = None
332
324
self.checker_initiator_tag = None
333
325
self.disable_initiator_tag = None
334
326
self.checker_callback_tag = None
335
self.checker_command = config["checker"]
327
self.checker_command = config[u"checker"]
336
328
self.current_checker_command = None
337
329
self.last_connect = None
338
330
self._approved = None
339
self.approved_by_default = config.get("approved_by_default",
331
self.approved_by_default = config.get(u"approved_by_default",
341
333
self.approvals_pending = 0
342
334
self.approval_delay = string_to_delta(
343
config["approval_delay"])
335
config[u"approval_delay"])
344
336
self.approval_duration = string_to_delta(
345
config["approval_duration"])
337
config[u"approval_duration"])
346
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
348
340
def send_changedstate(self):
378
370
self.send_changedstate()
380
logger.info("Disabling client %s", self.name)
381
if getattr(self, "disable_initiator_tag", False):
372
logger.info(u"Disabling client %s", self.name)
373
if getattr(self, u"disable_initiator_tag", False):
382
374
gobject.source_remove(self.disable_initiator_tag)
383
375
self.disable_initiator_tag = None
384
if getattr(self, "checker_initiator_tag", False):
376
if getattr(self, u"checker_initiator_tag", False):
385
377
gobject.source_remove(self.checker_initiator_tag)
386
378
self.checker_initiator_tag = None
387
379
self.stop_checker()
461
450
command = self.checker_command % self.host
462
451
except TypeError:
463
452
# Escape attributes for the shell
464
escaped_attrs = dict(
466
re.escape(unicode(str(getattr(self, attr, "")),
470
self.runtime_expansions)
453
escaped_attrs = dict((key,
454
re.escape(unicode(str(val),
458
vars(self).iteritems())
473
460
command = self.checker_command % escaped_attrs
474
461
except TypeError, error:
475
logger.error('Could not format string "%s":'
476
' %s', self.checker_command, error)
462
logger.error(u'Could not format string "%s":'
463
u' %s', self.checker_command, error)
477
464
return True # Try again later
478
465
self.current_checker_command = command
480
logger.info("Starting checker %r for %s",
467
logger.info(u"Starting checker %r for %s",
481
468
command, self.name)
482
469
# We don't need to redirect stdout and stderr, since
483
470
# in normal mode, that is already done by daemon(),
535
522
# Encoding deeply encoded byte arrays is not supported yet by the
536
523
# "Set" method, so we fail early here:
537
if byte_arrays and signature != "ay":
538
raise ValueError("Byte arrays not supported for non-'ay'"
539
" signature %r" % signature)
524
if byte_arrays and signature != u"ay":
525
raise ValueError(u"Byte arrays not supported for non-'ay'"
526
u" signature %r" % signature)
540
527
def decorator(func):
541
528
func._dbus_is_property = True
542
529
func._dbus_interface = dbus_interface
543
530
func._dbus_signature = signature
544
531
func._dbus_access = access
545
532
func._dbus_name = func.__name__
546
if func._dbus_name.endswith("_dbus_property"):
533
if func._dbus_name.endswith(u"_dbus_property"):
547
534
func._dbus_name = func._dbus_name[:-14]
548
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
535
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
605
592
# No such property
606
raise DBusPropertyNotFound(self.dbus_object_path + ":"
607
+ interface_name + "."
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
612
599
def Get(self, interface_name, property_name):
613
600
"""Standard D-Bus property Get() method, see D-Bus standard.
615
602
prop = self._get_dbus_property(interface_name, property_name)
616
if prop._dbus_access == "write":
603
if prop._dbus_access == u"write":
617
604
raise DBusPropertyAccessException(property_name)
619
if not hasattr(value, "variant_level"):
606
if not hasattr(value, u"variant_level"):
621
608
return type(value)(value, variant_level=value.variant_level+1)
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
624
611
def Set(self, interface_name, property_name, value):
625
612
"""Standard D-Bus property Set() method, see D-Bus standard.
627
614
prop = self._get_dbus_property(interface_name, property_name)
628
if prop._dbus_access == "read":
615
if prop._dbus_access == u"read":
629
616
raise DBusPropertyAccessException(property_name)
630
if prop._dbus_get_args_options["byte_arrays"]:
617
if prop._dbus_get_args_options[u"byte_arrays"]:
631
618
# The byte_arrays option is not supported yet on
632
619
# signatures other than "ay".
633
if prop._dbus_signature != "ay":
620
if prop._dbus_signature != u"ay":
635
622
value = dbus.ByteArray(''.join(unichr(byte)
636
623
for byte in value))
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
640
out_signature="a{sv}")
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
641
628
def GetAll(self, interface_name):
642
629
"""Standard D-Bus property GetAll() method, see D-Bus
651
638
# Interface non-empty but did not match
653
640
# Ignore write-only properties
654
if prop._dbus_access == "write":
641
if prop._dbus_access == u"write":
657
if not hasattr(value, "variant_level"):
644
if not hasattr(value, u"variant_level"):
658
645
all[name] = value
660
647
all[name] = type(value)(value, variant_level=
661
648
value.variant_level+1)
662
return dbus.Dictionary(all, signature="sv")
649
return dbus.Dictionary(all, signature=u"sv")
664
651
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
666
653
path_keyword='object_path',
667
654
connection_keyword='connection')
668
655
def Introspect(self, object_path, connection):
674
661
document = xml.dom.minidom.parseString(xmlstring)
675
662
def make_tag(document, name, prop):
676
e = document.createElement("property")
677
e.setAttribute("name", name)
678
e.setAttribute("type", prop._dbus_signature)
679
e.setAttribute("access", prop._dbus_access)
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
681
for if_tag in document.getElementsByTagName("interface"):
668
for if_tag in document.getElementsByTagName(u"interface"):
682
669
for tag in (make_tag(document, name, prop)
684
671
in self._get_all_dbus_properties()
685
672
if prop._dbus_interface
686
== if_tag.getAttribute("name")):
673
== if_tag.getAttribute(u"name")):
687
674
if_tag.appendChild(tag)
688
675
# Add the names to the return values for the
689
676
# "org.freedesktop.DBus.Properties" methods
690
if (if_tag.getAttribute("name")
691
== "org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName("method"):
693
if cn.getAttribute("name") == "Get":
694
for arg in cn.getElementsByTagName("arg"):
695
if (arg.getAttribute("direction")
697
arg.setAttribute("name", "value")
698
elif cn.getAttribute("name") == "GetAll":
699
for arg in cn.getElementsByTagName("arg"):
700
if (arg.getAttribute("direction")
702
arg.setAttribute("name", "props")
703
xmlstring = document.toxml("utf-8")
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
704
691
document.unlink()
705
692
except (AttributeError, xml.dom.DOMException,
706
693
xml.parsers.expat.ExpatError), error:
707
logger.error("Failed to override Introspection method",
694
logger.error(u"Failed to override Introspection method",
759
740
variant_level=variant_level)
761
742
def enable(self):
762
oldstate = getattr(self, "enabled", False)
743
oldstate = getattr(self, u"enabled", False)
763
744
r = Client.enable(self)
764
745
if oldstate != self.enabled:
765
746
# Emit D-Bus signals
766
self.PropertyChanged(dbus.String("Enabled"),
747
self.PropertyChanged(dbus.String(u"Enabled"),
767
748
dbus.Boolean(True, variant_level=1))
768
749
self.PropertyChanged(
769
dbus.String("LastEnabled"),
750
dbus.String(u"LastEnabled"),
770
751
self._datetime_to_dbus(self.last_enabled,
771
752
variant_level=1))
774
755
def disable(self, quiet = False):
775
oldstate = getattr(self, "enabled", False)
756
oldstate = getattr(self, u"enabled", False)
776
757
r = Client.disable(self, quiet=quiet)
777
758
if not quiet and oldstate != self.enabled:
778
759
# Emit D-Bus signal
779
self.PropertyChanged(dbus.String("Enabled"),
760
self.PropertyChanged(dbus.String(u"Enabled"),
780
761
dbus.Boolean(False, variant_level=1))
815
796
r = Client.checked_ok(self, *args, **kwargs)
816
797
# Emit D-Bus signal
817
798
self.PropertyChanged(
818
dbus.String("LastCheckedOK"),
799
dbus.String(u"LastCheckedOK"),
819
800
(self._datetime_to_dbus(self.last_checked_ok,
820
801
variant_level=1)))
823
def need_approval(self, *args, **kwargs):
824
r = Client.need_approval(self, *args, **kwargs)
826
self.PropertyChanged(
827
dbus.String("LastApprovalRequest"),
828
(self._datetime_to_dbus(self.last_approval_request,
832
804
def start_checker(self, *args, **kwargs):
833
805
old_checker = self.checker
834
806
if self.checker is not None:
842
814
# Emit D-Bus signal
843
815
self.CheckerStarted(self.current_checker_command)
844
816
self.PropertyChanged(
845
dbus.String("CheckerRunning"),
817
dbus.String(u"CheckerRunning"),
846
818
dbus.Boolean(True, variant_level=1))
849
821
def stop_checker(self, *args, **kwargs):
850
old_checker = getattr(self, "checker", None)
822
old_checker = getattr(self, u"checker", None)
851
823
r = Client.stop_checker(self, *args, **kwargs)
852
824
if (old_checker is not None
853
and getattr(self, "checker", None) is None):
854
self.PropertyChanged(dbus.String("CheckerRunning"),
825
and getattr(self, u"checker", None) is None):
826
self.PropertyChanged(dbus.String(u"CheckerRunning"),
855
827
dbus.Boolean(False, variant_level=1))
870
842
## D-Bus methods, signals & properties
871
_interface = "se.bsnet.fukt.Mandos.Client"
843
_interface = u"se.bsnet.fukt.Mandos.Client"
875
847
# CheckerCompleted - signal
876
@dbus.service.signal(_interface, signature="nxs")
848
@dbus.service.signal(_interface, signature=u"nxs")
877
849
def CheckerCompleted(self, exitcode, waitstatus, command):
881
853
# CheckerStarted - signal
882
@dbus.service.signal(_interface, signature="s")
854
@dbus.service.signal(_interface, signature=u"s")
883
855
def CheckerStarted(self, command):
887
859
# PropertyChanged - signal
888
@dbus.service.signal(_interface, signature="sv")
860
@dbus.service.signal(_interface, signature=u"sv")
889
861
def PropertyChanged(self, property, value):
902
874
# Rejected - signal
903
@dbus.service.signal(_interface, signature="s")
875
@dbus.service.signal(_interface, signature=u"s")
904
876
def Rejected(self, reason):
908
880
# NeedApproval - signal
909
@dbus.service.signal(_interface, signature="tb")
881
@dbus.service.signal(_interface, signature=u"tb")
910
882
def NeedApproval(self, timeout, default):
912
return self.need_approval()
916
888
# Approve - method
917
@dbus.service.method(_interface, in_signature="b")
889
@dbus.service.method(_interface, in_signature=u"b")
918
890
def Approve(self, value):
919
891
self.approve(value)
921
893
# CheckedOK - method
922
894
@dbus.service.method(_interface)
923
895
def CheckedOK(self):
951
923
# ApprovalPending - property
952
@dbus_service_property(_interface, signature="b", access="read")
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
953
925
def ApprovalPending_dbus_property(self):
954
926
return dbus.Boolean(bool(self.approvals_pending))
956
928
# ApprovedByDefault - property
957
@dbus_service_property(_interface, signature="b",
929
@dbus_service_property(_interface, signature=u"b",
959
931
def ApprovedByDefault_dbus_property(self, value=None):
960
932
if value is None: # get
961
933
return dbus.Boolean(self.approved_by_default)
962
934
self.approved_by_default = bool(value)
963
935
# Emit D-Bus signal
964
self.PropertyChanged(dbus.String("ApprovedByDefault"),
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
937
dbus.Boolean(value, variant_level=1))
967
939
# ApprovalDelay - property
968
@dbus_service_property(_interface, signature="t",
940
@dbus_service_property(_interface, signature=u"t",
970
942
def ApprovalDelay_dbus_property(self, value=None):
971
943
if value is None: # get
972
944
return dbus.UInt64(self.approval_delay_milliseconds())
973
945
self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
946
# Emit D-Bus signal
975
self.PropertyChanged(dbus.String("ApprovalDelay"),
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
948
dbus.UInt64(value, variant_level=1))
978
950
# ApprovalDuration - property
979
@dbus_service_property(_interface, signature="t",
951
@dbus_service_property(_interface, signature=u"t",
981
953
def ApprovalDuration_dbus_property(self, value=None):
982
954
if value is None: # get
983
955
return dbus.UInt64(self._timedelta_to_milliseconds(
984
956
self.approval_duration))
985
957
self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
958
# Emit D-Bus signal
987
self.PropertyChanged(dbus.String("ApprovalDuration"),
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
960
dbus.UInt64(value, variant_level=1))
990
962
# Name - property
991
@dbus_service_property(_interface, signature="s", access="read")
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
992
964
def Name_dbus_property(self):
993
965
return dbus.String(self.name)
995
967
# Fingerprint - property
996
@dbus_service_property(_interface, signature="s", access="read")
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
997
969
def Fingerprint_dbus_property(self):
998
970
return dbus.String(self.fingerprint)
1000
972
# Host - property
1001
@dbus_service_property(_interface, signature="s",
973
@dbus_service_property(_interface, signature=u"s",
1003
975
def Host_dbus_property(self, value=None):
1004
976
if value is None: # get
1005
977
return dbus.String(self.host)
1006
978
self.host = value
1007
979
# Emit D-Bus signal
1008
self.PropertyChanged(dbus.String("Host"),
980
self.PropertyChanged(dbus.String(u"Host"),
1009
981
dbus.String(value, variant_level=1))
1011
983
# Created - property
1012
@dbus_service_property(_interface, signature="s", access="read")
984
@dbus_service_property(_interface, signature=u"s", access=u"read")
1013
985
def Created_dbus_property(self):
1014
986
return dbus.String(self._datetime_to_dbus(self.created))
1016
988
# LastEnabled - property
1017
@dbus_service_property(_interface, signature="s", access="read")
989
@dbus_service_property(_interface, signature=u"s", access=u"read")
1018
990
def LastEnabled_dbus_property(self):
1019
991
if self.last_enabled is None:
1020
return dbus.String("")
992
return dbus.String(u"")
1021
993
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1023
995
# Enabled - property
1024
@dbus_service_property(_interface, signature="b",
996
@dbus_service_property(_interface, signature=u"b",
1026
998
def Enabled_dbus_property(self, value=None):
1027
999
if value is None: # get
1028
1000
return dbus.Boolean(self.enabled)
1034
1006
# LastCheckedOK - property
1035
@dbus_service_property(_interface, signature="s",
1007
@dbus_service_property(_interface, signature=u"s",
1008
access=u"readwrite")
1037
1009
def LastCheckedOK_dbus_property(self, value=None):
1038
1010
if value is not None:
1039
1011
self.checked_ok()
1041
1013
if self.last_checked_ok is None:
1042
return dbus.String("")
1014
return dbus.String(u"")
1043
1015
return dbus.String(self._datetime_to_dbus(self
1044
1016
.last_checked_ok))
1046
# LastApprovalRequest - property
1047
@dbus_service_property(_interface, signature="s", access="read")
1048
def LastApprovalRequest_dbus_property(self):
1049
if self.last_approval_request is None:
1050
return dbus.String("")
1051
return dbus.String(self.
1052
_datetime_to_dbus(self
1053
.last_approval_request))
1055
1018
# Timeout - property
1056
@dbus_service_property(_interface, signature="t",
1019
@dbus_service_property(_interface, signature=u"t",
1020
access=u"readwrite")
1058
1021
def Timeout_dbus_property(self, value=None):
1059
1022
if value is None: # get
1060
1023
return dbus.UInt64(self.timeout_milliseconds())
1061
1024
self.timeout = datetime.timedelta(0, 0, 0, value)
1062
1025
# Emit D-Bus signal
1063
self.PropertyChanged(dbus.String("Timeout"),
1026
self.PropertyChanged(dbus.String(u"Timeout"),
1064
1027
dbus.UInt64(value, variant_level=1))
1065
if getattr(self, "disable_initiator_tag", None) is None:
1028
if getattr(self, u"disable_initiator_tag", None) is None:
1067
1030
# Reschedule timeout
1068
1031
gobject.source_remove(self.disable_initiator_tag)
1081
1044
(time_to_die, self.disable))
1083
1046
# Interval - property
1084
@dbus_service_property(_interface, signature="t",
1047
@dbus_service_property(_interface, signature=u"t",
1048
access=u"readwrite")
1086
1049
def Interval_dbus_property(self, value=None):
1087
1050
if value is None: # get
1088
1051
return dbus.UInt64(self.interval_milliseconds())
1089
1052
self.interval = datetime.timedelta(0, 0, 0, value)
1090
1053
# Emit D-Bus signal
1091
self.PropertyChanged(dbus.String("Interval"),
1054
self.PropertyChanged(dbus.String(u"Interval"),
1092
1055
dbus.UInt64(value, variant_level=1))
1093
if getattr(self, "checker_initiator_tag", None) is None:
1056
if getattr(self, u"checker_initiator_tag", None) is None:
1095
1058
# Reschedule checker run
1096
1059
gobject.source_remove(self.checker_initiator_tag)
1099
1062
self.start_checker() # Start one now, too
1101
1064
# Checker - property
1102
@dbus_service_property(_interface, signature="s",
1065
@dbus_service_property(_interface, signature=u"s",
1066
access=u"readwrite")
1104
1067
def Checker_dbus_property(self, value=None):
1105
1068
if value is None: # get
1106
1069
return dbus.String(self.checker_command)
1107
1070
self.checker_command = value
1108
1071
# Emit D-Bus signal
1109
self.PropertyChanged(dbus.String("Checker"),
1072
self.PropertyChanged(dbus.String(u"Checker"),
1110
1073
dbus.String(self.checker_command,
1111
1074
variant_level=1))
1113
1076
# CheckerRunning - property
1114
@dbus_service_property(_interface, signature="b",
1077
@dbus_service_property(_interface, signature=u"b",
1078
access=u"readwrite")
1116
1079
def CheckerRunning_dbus_property(self, value=None):
1117
1080
if value is None: # get
1118
1081
return dbus.Boolean(self.checker is not None)
1184
1147
# no X.509 keys are added to it. Therefore, we can use it
1185
1148
# here despite using OpenPGP certificates.
1187
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1188
# "+AES-256-CBC", "+SHA1",
1189
# "+COMP-NULL", "+CTYPE-OPENPGP",
1150
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
# u"+AES-256-CBC", u"+SHA1",
1152
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1191
1154
# Use a fallback default, since this MUST be set.
1192
1155
priority = self.server.gnutls_priority
1193
1156
if priority is None:
1157
priority = u"NORMAL"
1195
1158
(gnutls.library.functions
1196
1159
.gnutls_priority_set_direct(session._c_object,
1197
1160
priority, None))
1199
1162
# Start communication using the Mandos protocol
1200
1163
# Get protocol number
1201
1164
line = self.request.makefile().readline()
1202
logger.debug("Protocol version: %r", line)
1165
logger.debug(u"Protocol version: %r", line)
1204
1167
if int(line.strip().split()[0]) > 1:
1205
1168
raise RuntimeError
1206
1169
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error("Unknown protocol version: %s", error)
1170
logger.error(u"Unknown protocol version: %s", error)
1210
1173
# Start GnuTLS connection
1212
1175
session.handshake()
1213
1176
except gnutls.errors.GNUTLSError, error:
1214
logger.warning("Handshake failed: %s", error)
1177
logger.warning(u"Handshake failed: %s", error)
1215
1178
# Do not run session.bye() here: the session is not
1216
1179
# established. Just abandon the request.
1218
logger.debug("Handshake succeeded")
1181
logger.debug(u"Handshake succeeded")
1220
1183
approval_required = False
1432
1395
bind to an address or port if they were not specified."""
1433
1396
if self.interface is not None:
1434
1397
if SO_BINDTODEVICE is None:
1435
logger.error("SO_BINDTODEVICE does not exist;"
1436
" cannot bind to interface %s",
1398
logger.error(u"SO_BINDTODEVICE does not exist;"
1399
u" cannot bind to interface %s",
1437
1400
self.interface)
1440
1403
self.socket.setsockopt(socket.SOL_SOCKET,
1441
1404
SO_BINDTODEVICE,
1442
1405
str(self.interface
1444
1407
except socket.error, error:
1445
1408
if error[0] == errno.EPERM:
1446
logger.error("No permission to"
1447
" bind to interface %s",
1409
logger.error(u"No permission to"
1410
u" bind to interface %s",
1448
1411
self.interface)
1449
1412
elif error[0] == errno.ENOPROTOOPT:
1450
logger.error("SO_BINDTODEVICE not available;"
1451
" cannot bind to interface %s",
1413
logger.error(u"SO_BINDTODEVICE not available;"
1414
u" cannot bind to interface %s",
1452
1415
self.interface)
1511
1474
def handle_ipc(self, source, condition, parent_pipe=None,
1512
1475
client_object=None):
1513
1476
condition_names = {
1514
gobject.IO_IN: "IN", # There is data to read.
1515
gobject.IO_OUT: "OUT", # Data can be written (without
1477
gobject.IO_IN: u"IN", # There is data to read.
1478
gobject.IO_OUT: u"OUT", # Data can be written (without
1517
gobject.IO_PRI: "PRI", # There is urgent data to read.
1518
gobject.IO_ERR: "ERR", # Error condition.
1519
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1480
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1481
gobject.IO_ERR: u"ERR", # Error condition.
1482
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1520
1483
# broken, usually for pipes and
1582
1549
def string_to_delta(interval):
1583
1550
"""Parse a string and return a datetime.timedelta
1585
>>> string_to_delta('7d')
1552
>>> string_to_delta(u'7d')
1586
1553
datetime.timedelta(7)
1587
>>> string_to_delta('60s')
1554
>>> string_to_delta(u'60s')
1588
1555
datetime.timedelta(0, 60)
1589
>>> string_to_delta('60m')
1556
>>> string_to_delta(u'60m')
1590
1557
datetime.timedelta(0, 3600)
1591
>>> string_to_delta('24h')
1558
>>> string_to_delta(u'24h')
1592
1559
datetime.timedelta(1)
1593
>>> string_to_delta('1w')
1560
>>> string_to_delta(u'1w')
1594
1561
datetime.timedelta(7)
1595
>>> string_to_delta('5m 30s')
1562
>>> string_to_delta(u'5m 30s')
1596
1563
datetime.timedelta(0, 330)
1598
1565
timevalue = datetime.timedelta(0)
1601
1568
suffix = unicode(s[-1])
1602
1569
value = int(s[:-1])
1604
1571
delta = datetime.timedelta(value)
1572
elif suffix == u"s":
1606
1573
delta = datetime.timedelta(0, value)
1574
elif suffix == u"m":
1608
1575
delta = datetime.timedelta(0, 0, 0, 0, value)
1576
elif suffix == u"h":
1610
1577
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1578
elif suffix == u"w":
1612
1579
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1614
raise ValueError("Unknown suffix %r" % suffix)
1581
raise ValueError(u"Unknown suffix %r" % suffix)
1615
1582
except (ValueError, IndexError), e:
1616
1583
raise ValueError(e.message)
1617
1584
timevalue += delta
1625
1592
global if_nametoindex
1627
1594
if_nametoindex = (ctypes.cdll.LoadLibrary
1628
(ctypes.util.find_library("c"))
1595
(ctypes.util.find_library(u"c"))
1629
1596
.if_nametoindex)
1630
1597
except (OSError, AttributeError):
1631
logger.warning("Doing if_nametoindex the hard way")
1598
logger.warning(u"Doing if_nametoindex the hard way")
1632
1599
def if_nametoindex(interface):
1633
1600
"Get an interface index the hard way, i.e. using fcntl()"
1634
1601
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1635
1602
with contextlib.closing(socket.socket()) as s:
1636
1603
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
struct.pack(str("16s16x"),
1604
struct.pack(str(u"16s16x"),
1639
interface_index = struct.unpack(str("I"),
1606
interface_index = struct.unpack(str(u"I"),
1640
1607
ifreq[16:20])[0]
1641
1608
return interface_index
1642
1609
return if_nametoindex(interface)
1673
1640
# Parsing of options, both command line and config file
1675
1642
parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
parser.add_option("-i", "--interface", type="string",
1677
metavar="IF", help="Bind to interface IF")
1678
parser.add_option("-a", "--address", type="string",
1679
help="Address to listen for requests on")
1680
parser.add_option("-p", "--port", type="int",
1681
help="Port number to receive requests on")
1682
parser.add_option("--check", action="store_true",
1683
help="Run self-test")
1684
parser.add_option("--debug", action="store_true",
1685
help="Debug mode; run in foreground and log to"
1687
parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1688
help="Debug level for stdout output")
1689
parser.add_option("--priority", type="string", help="GnuTLS"
1690
" priority string (see GnuTLS documentation)")
1691
parser.add_option("--servicename", type="string",
1692
metavar="NAME", help="Zeroconf service name")
1693
parser.add_option("--configdir", type="string",
1694
default="/etc/mandos", metavar="DIR",
1695
help="Directory to search for configuration"
1697
parser.add_option("--no-dbus", action="store_false",
1698
dest="use_dbus", help="Do not provide D-Bus"
1699
" system bus interface")
1700
parser.add_option("--no-ipv6", action="store_false",
1701
dest="use_ipv6", help="Do not use IPv6")
1643
parser.add_option("-i", u"--interface", type=u"string",
1644
metavar="IF", help=u"Bind to interface IF")
1645
parser.add_option("-a", u"--address", type=u"string",
1646
help=u"Address to listen for requests on")
1647
parser.add_option("-p", u"--port", type=u"int",
1648
help=u"Port number to receive requests on")
1649
parser.add_option("--check", action=u"store_true",
1650
help=u"Run self-test")
1651
parser.add_option("--debug", action=u"store_true",
1652
help=u"Debug mode; run in foreground and log to"
1654
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1655
help=u"Debug level for stdout output")
1656
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1657
u" priority string (see GnuTLS documentation)")
1658
parser.add_option("--servicename", type=u"string",
1659
metavar=u"NAME", help=u"Zeroconf service name")
1660
parser.add_option("--configdir", type=u"string",
1661
default=u"/etc/mandos", metavar=u"DIR",
1662
help=u"Directory to search for configuration"
1664
parser.add_option("--no-dbus", action=u"store_false",
1665
dest=u"use_dbus", help=u"Do not provide D-Bus"
1666
u" system bus interface")
1667
parser.add_option("--no-ipv6", action=u"store_false",
1668
dest=u"use_ipv6", help=u"Do not use IPv6")
1702
1669
options = parser.parse_args()[0]
1704
1671
if options.check:
1709
1676
# Default values for config file for server-global settings
1710
server_defaults = { "interface": "",
1715
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
"servicename": "Mandos",
1677
server_defaults = { u"interface": u"",
1682
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1683
u"servicename": u"Mandos",
1684
u"use_dbus": u"True",
1685
u"use_ipv6": u"True",
1722
1689
# Parse config file for server-global settings
1723
1690
server_config = configparser.SafeConfigParser(server_defaults)
1724
1691
del server_defaults
1725
1692
server_config.read(os.path.join(options.configdir,
1727
1694
# Convert the SafeConfigParser object to a dict
1728
1695
server_settings = server_config.defaults()
1729
1696
# Use the appropriate methods on the non-string config options
1730
for option in ("debug", "use_dbus", "use_ipv6"):
1731
server_settings[option] = server_config.getboolean("DEFAULT",
1697
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1698
server_settings[option] = server_config.getboolean(u"DEFAULT",
1733
1700
if server_settings["port"]:
1734
server_settings["port"] = server_config.getint("DEFAULT",
1701
server_settings["port"] = server_config.getint(u"DEFAULT",
1736
1703
del server_config
1738
1705
# Override the settings from the config file with command line
1739
1706
# options, if set.
1740
for option in ("interface", "address", "port", "debug",
1741
"priority", "servicename", "configdir",
1742
"use_dbus", "use_ipv6", "debuglevel"):
1707
for option in (u"interface", u"address", u"port", u"debug",
1708
u"priority", u"servicename", u"configdir",
1709
u"use_dbus", u"use_ipv6", u"debuglevel"):
1743
1710
value = getattr(options, option)
1744
1711
if value is not None:
1745
1712
server_settings[option] = value
1753
1720
##################################################################
1755
1722
# For convenience
1756
debug = server_settings["debug"]
1757
debuglevel = server_settings["debuglevel"]
1758
use_dbus = server_settings["use_dbus"]
1759
use_ipv6 = server_settings["use_ipv6"]
1723
debug = server_settings[u"debug"]
1724
debuglevel = server_settings[u"debuglevel"]
1725
use_dbus = server_settings[u"use_dbus"]
1726
use_ipv6 = server_settings[u"use_ipv6"]
1761
if server_settings["servicename"] != "Mandos":
1728
if server_settings[u"servicename"] != u"Mandos":
1762
1729
syslogger.setFormatter(logging.Formatter
1763
('Mandos (%s) [%%(process)d]:'
1764
' %%(levelname)s: %%(message)s'
1765
% server_settings["servicename"]))
1730
(u'Mandos (%s) [%%(process)d]:'
1731
u' %%(levelname)s: %%(message)s'
1732
% server_settings[u"servicename"]))
1767
1734
# Parse config file with clients
1768
client_defaults = { "timeout": "1h",
1770
"checker": "fping -q -- %%(host)s",
1772
"approval_delay": "0s",
1773
"approval_duration": "1s",
1735
client_defaults = { u"timeout": u"1h",
1737
u"checker": u"fping -q -- %%(host)s",
1739
u"approval_delay": u"0s",
1740
u"approval_duration": u"1s",
1775
1742
client_config = configparser.SafeConfigParser(client_defaults)
1776
client_config.read(os.path.join(server_settings["configdir"],
1743
client_config.read(os.path.join(server_settings[u"configdir"],
1779
1746
global mandos_dbus_service
1780
1747
mandos_dbus_service = None
1782
tcp_server = MandosServer((server_settings["address"],
1783
server_settings["port"]),
1749
tcp_server = MandosServer((server_settings[u"address"],
1750
server_settings[u"port"]),
1785
interface=(server_settings["interface"]
1752
interface=(server_settings[u"interface"]
1787
1754
use_ipv6=use_ipv6,
1788
1755
gnutls_priority=
1789
server_settings["priority"],
1756
server_settings[u"priority"],
1790
1757
use_dbus=use_dbus)
1792
pidfilename = "/var/run/mandos.pid"
1794
pidfile = open(pidfilename, "w")
1796
logger.error("Could not open file %r", pidfilename)
1758
pidfilename = u"/var/run/mandos.pid"
1760
pidfile = open(pidfilename, u"w")
1762
logger.error(u"Could not open file %r", pidfilename)
1799
uid = pwd.getpwnam("_mandos").pw_uid
1800
gid = pwd.getpwnam("_mandos").pw_gid
1765
uid = pwd.getpwnam(u"_mandos").pw_uid
1766
gid = pwd.getpwnam(u"_mandos").pw_gid
1801
1767
except KeyError:
1803
uid = pwd.getpwnam("mandos").pw_uid
1804
gid = pwd.getpwnam("mandos").pw_gid
1769
uid = pwd.getpwnam(u"mandos").pw_uid
1770
gid = pwd.getpwnam(u"mandos").pw_gid
1805
1771
except KeyError:
1807
uid = pwd.getpwnam("nobody").pw_uid
1808
gid = pwd.getpwnam("nobody").pw_gid
1773
uid = pwd.getpwnam(u"nobody").pw_uid
1774
gid = pwd.getpwnam(u"nobody").pw_gid
1809
1775
except KeyError:
1860
1822
# End of Avahi example code
1863
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1825
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1864
1826
bus, do_not_queue=True)
1865
1827
except dbus.exceptions.NameExistsException, e:
1866
logger.error(unicode(e) + ", disabling D-Bus")
1828
logger.error(unicode(e) + u", disabling D-Bus")
1867
1829
use_dbus = False
1868
server_settings["use_dbus"] = False
1830
server_settings[u"use_dbus"] = False
1869
1831
tcp_server.use_dbus = False
1870
1832
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1871
service = AvahiService(name = server_settings["servicename"],
1872
servicetype = "_mandos._tcp",
1833
service = AvahiService(name = server_settings[u"servicename"],
1834
servicetype = u"_mandos._tcp",
1873
1835
protocol = protocol, bus = bus)
1874
1836
if server_settings["interface"]:
1875
1837
service.interface = (if_nametoindex
1876
(str(server_settings["interface"])))
1838
(str(server_settings[u"interface"])))
1841
# Close all input and output, do double fork, etc.
1878
1844
global multiprocessing_manager
1879
1845
multiprocessing_manager = multiprocessing.Manager()
1899
1865
client_config, section)))
1900
1866
for section in client_config.sections()))
1901
1867
if not tcp_server.clients:
1902
logger.warning("No clients defined")
1868
logger.warning(u"No clients defined")
1873
pidfile.write(str(pid) + "\n")
1876
logger.error(u"Could not write to file %r with PID %d",
1879
# "pidfile" was never created
1908
pidfile.write(str(pid) + "\n".encode("utf-8"))
1911
logger.error("Could not write to file %r with PID %d",
1914
# "pidfile" was never created
1918
1884
signal.signal(signal.SIGINT, signal.SIG_IGN)
1920
1885
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1921
1886
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1924
1889
class MandosDBusService(dbus.service.Object):
1925
1890
"""A D-Bus proxy object"""
1926
1891
def __init__(self):
1927
dbus.service.Object.__init__(self, bus, "/")
1928
_interface = "se.bsnet.fukt.Mandos"
1892
dbus.service.Object.__init__(self, bus, u"/")
1893
_interface = u"se.bsnet.fukt.Mandos"
1930
@dbus.service.signal(_interface, signature="o")
1895
@dbus.service.signal(_interface, signature=u"o")
1931
1896
def ClientAdded(self, objpath):
1935
@dbus.service.signal(_interface, signature="ss")
1900
@dbus.service.signal(_interface, signature=u"ss")
1936
1901
def ClientNotFound(self, fingerprint, address):
1940
@dbus.service.signal(_interface, signature="os")
1905
@dbus.service.signal(_interface, signature=u"os")
1941
1906
def ClientRemoved(self, objpath, name):
1945
@dbus.service.method(_interface, out_signature="ao")
1910
@dbus.service.method(_interface, out_signature=u"ao")
1946
1911
def GetAllClients(self):
1948
1913
return dbus.Array(c.dbus_object_path
1949
1914
for c in tcp_server.clients)
1951
1916
@dbus.service.method(_interface,
1952
out_signature="a{oa{sv}}")
1917
out_signature=u"a{oa{sv}}")
1953
1918
def GetAllClientsWithProperties(self):
1955
1920
return dbus.Dictionary(
1956
((c.dbus_object_path, c.GetAll(""))
1921
((c.dbus_object_path, c.GetAll(u""))
1957
1922
for c in tcp_server.clients),
1923
signature=u"oa{sv}")
1960
@dbus.service.method(_interface, in_signature="o")
1925
@dbus.service.method(_interface, in_signature=u"o")
1961
1926
def RemoveClient(self, object_path):
1963
1928
for c in tcp_server.clients:
2029
1994
(tcp_server.handle_request
2030
1995
(*args[2:], **kwargs) or True))
2032
logger.debug("Starting main loop")
1997
logger.debug(u"Starting main loop")
2033
1998
main_loop.run()
2034
1999
except AvahiError, error:
2035
logger.critical("AvahiError: %s", error)
2000
logger.critical(u"AvahiError: %s", error)
2038
2003
except KeyboardInterrupt:
2040
2005
print >> sys.stderr
2041
logger.debug("Server received KeyboardInterrupt")
2042
logger.debug("Server exiting")
2006
logger.debug(u"Server received KeyboardInterrupt")
2007
logger.debug(u"Server exiting")
2043
2008
# Must run before the D-Bus bus name gets deregistered