154
150
def rename(self):
155
151
"""Derived from the Avahi example code"""
156
152
if self.rename_count >= self.max_renames:
157
logger.critical("No suitable Zeroconf service name found"
158
" after %i retries, exiting.",
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
159
155
self.rename_count)
160
raise AvahiServiceError("Too many renames")
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
162
logger.info("Changing Zeroconf service name to %r ...",
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
164
160
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
175
166
self.rename_count += 1
176
167
def remove(self):
177
168
"""Derived from the Avahi example code"""
241
231
"""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
234
name: string; from the config file, used in log messages and
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
247
248
checker: subprocess.Popen(); a running checker process used
248
249
to see if the client lives.
249
250
'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
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
253
256
runtime with vars(self) as dict, so that for
254
257
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
258
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.
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
282
262
def _timedelta_to_milliseconds(td):
283
263
"Convert a datetime.timedelta() to milliseconds"
304
281
if config is None:
306
logger.debug("Creating client %r", self.name)
283
logger.debug(u"Creating client %r", self.name)
307
284
# Uppercase and remove spaces from fingerprint for later
308
285
# 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:
316
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
287
self.fingerprint = (config[u"fingerprint"].upper()
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
295
(config[u"secfile"])))) as secfile:
319
296
self.secret = secfile.read()
321
raise TypeError("No secret or secfile for client %s"
298
raise TypeError(u"No secret or secfile for client %s"
323
self.host = config.get("host", "")
300
self.host = config.get(u"host", u"")
324
301
self.created = datetime.datetime.utcnow()
325
302
self.enabled = False
326
self.last_approval_request = None
327
303
self.last_enabled = None
328
304
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
305
self.timeout = string_to_delta(config[u"timeout"])
306
self.interval = string_to_delta(config[u"interval"])
331
307
self.disable_hook = disable_hook
332
308
self.checker = None
333
309
self.checker_initiator_tag = None
334
310
self.disable_initiator_tag = None
335
311
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
312
self.checker_command = config[u"checker"]
337
313
self.current_checker_command = None
338
314
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
342
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"])
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
349
def send_changedstate(self):
350
self.changedstate.acquire()
351
self.changedstate.notify_all()
352
self.changedstate.release()
354
316
def enable(self):
355
317
"""Start this client's checker and timeout hooks"""
356
if getattr(self, "enabled", False):
318
if getattr(self, u"enabled", False):
357
319
# Already enabled
359
self.send_changedstate()
360
321
self.last_enabled = datetime.datetime.utcnow()
361
322
# Schedule a new checker to be started an 'interval' from now,
362
323
# and every interval from then on.
363
324
self.checker_initiator_tag = (gobject.timeout_add
364
325
(self.interval_milliseconds(),
365
326
self.start_checker))
327
# Also start a new checker *right now*.
366
329
# Schedule a disable() when 'timeout' has passed
367
330
self.disable_initiator_tag = (gobject.timeout_add
368
331
(self.timeout_milliseconds(),
370
333
self.enabled = True
371
# Also start a new checker *right now*.
374
def disable(self, quiet=True):
375
336
"""Disable this client."""
376
337
if not getattr(self, "enabled", False):
379
self.send_changedstate()
381
logger.info("Disabling client %s", self.name)
382
if getattr(self, "disable_initiator_tag", False):
339
logger.info(u"Disabling client %s", self.name)
340
if getattr(self, u"disable_initiator_tag", False):
383
341
gobject.source_remove(self.disable_initiator_tag)
384
342
self.disable_initiator_tag = None
385
if getattr(self, "checker_initiator_tag", False):
343
if getattr(self, u"checker_initiator_tag", False):
386
344
gobject.source_remove(self.checker_initiator_tag)
387
345
self.checker_initiator_tag = None
388
346
self.stop_checker()
508
456
if self.checker_callback_tag:
509
457
gobject.source_remove(self.checker_callback_tag)
510
458
self.checker_callback_tag = None
511
if getattr(self, "checker", None) is None:
459
if getattr(self, u"checker", None) is None:
513
logger.debug("Stopping checker for %(name)s", vars(self))
461
logger.debug(u"Stopping checker for %(name)s", vars(self))
515
463
os.kill(self.checker.pid, signal.SIGTERM)
517
465
#if self.checker.poll() is None:
518
466
# os.kill(self.checker.pid, signal.SIGKILL)
519
467
except OSError, error:
520
468
if error.errno != errno.ESRCH: # No such process
522
470
self.checker = None
524
def dbus_service_property(dbus_interface, signature="v",
525
access="readwrite", byte_arrays=False):
472
def still_valid(self):
473
"""Has the timeout not yet passed for this client?"""
474
if not getattr(self, u"enabled", False):
476
now = datetime.datetime.utcnow()
477
if self.last_checked_ok is None:
478
return now < (self.created + self.timeout)
480
return now < (self.last_checked_ok + self.timeout)
483
def dbus_service_property(dbus_interface, signature=u"v",
484
access=u"readwrite", byte_arrays=False):
526
485
"""Decorators for marking methods of a DBusObjectWithProperties to
527
486
become properties on the D-Bus.
606
560
# No such property
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
561
raise DBusPropertyNotFound(self.dbus_object_path + u":"
562
+ interface_name + u"."
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
565
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
613
567
def Get(self, interface_name, property_name):
614
568
"""Standard D-Bus property Get() method, see D-Bus standard.
616
570
prop = self._get_dbus_property(interface_name, property_name)
617
if prop._dbus_access == "write":
571
if prop._dbus_access == u"write":
618
572
raise DBusPropertyAccessException(property_name)
620
if not hasattr(value, "variant_level"):
574
if not hasattr(value, u"variant_level"):
622
576
return type(value)(value, variant_level=value.variant_level+1)
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
578
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
625
579
def Set(self, interface_name, property_name, value):
626
580
"""Standard D-Bus property Set() method, see D-Bus standard.
628
582
prop = self._get_dbus_property(interface_name, property_name)
629
if prop._dbus_access == "read":
583
if prop._dbus_access == u"read":
630
584
raise DBusPropertyAccessException(property_name)
631
if prop._dbus_get_args_options["byte_arrays"]:
632
# The byte_arrays option is not supported yet on
633
# signatures other than "ay".
634
if prop._dbus_signature != "ay":
585
if prop._dbus_get_args_options[u"byte_arrays"]:
636
586
value = dbus.ByteArray(''.join(unichr(byte)
637
587
for byte in value))
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
590
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
591
out_signature=u"a{sv}")
642
592
def GetAll(self, interface_name):
643
593
"""Standard D-Bus property GetAll() method, see D-Bus
652
602
# Interface non-empty but did not match
654
604
# Ignore write-only properties
655
if prop._dbus_access == "write":
605
if prop._dbus_access == u"write":
658
if not hasattr(value, "variant_level"):
608
if not hasattr(value, u"variant_level"):
659
609
all[name] = value
661
611
all[name] = type(value)(value, variant_level=
662
612
value.variant_level+1)
663
return dbus.Dictionary(all, signature="sv")
613
return dbus.Dictionary(all, signature=u"sv")
665
615
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
667
617
path_keyword='object_path',
668
618
connection_keyword='connection')
669
619
def Introspect(self, object_path, connection):
670
620
"""Standard D-Bus method, overloaded to insert property tags.
672
622
xmlstring = dbus.service.Object.Introspect(self, object_path,
675
document = xml.dom.minidom.parseString(xmlstring)
676
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)
682
for if_tag in document.getElementsByTagName("interface"):
683
for tag in (make_tag(document, name, prop)
685
in self._get_all_dbus_properties()
686
if prop._dbus_interface
687
== if_tag.getAttribute("name")):
688
if_tag.appendChild(tag)
689
# Add the names to the return values for the
690
# "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")
706
except (AttributeError, xml.dom.DOMException,
707
xml.parsers.expat.ExpatError), error:
708
logger.error("Failed to override Introspection method",
624
document = xml.dom.minidom.parseString(xmlstring)
626
def make_tag(document, name, prop):
627
e = document.createElement(u"property")
628
e.setAttribute(u"name", name)
629
e.setAttribute(u"type", prop._dbus_signature)
630
e.setAttribute(u"access", prop._dbus_access)
632
for if_tag in document.getElementsByTagName(u"interface"):
633
for tag in (make_tag(document, name, prop)
635
in self._get_all_dbus_properties()
636
if prop._dbus_interface
637
== if_tag.getAttribute(u"name")):
638
if_tag.appendChild(tag)
639
xmlstring = document.toxml(u"utf-8")
717
648
dbus_object_path: dbus.ObjectPath
718
649
bus: dbus.SystemBus()
721
runtime_expansions = (Client.runtime_expansions
722
+ ("dbus_object_path",))
724
651
# dbus.service.Object doesn't use super(), so we can't either.
726
653
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
729
655
Client.__init__(self, *args, **kwargs)
730
656
# Only now, when this client is initialized, can it show up on
732
client_object_name = unicode(self.name).translate(
735
658
self.dbus_object_path = (dbus.ObjectPath
736
("/clients/" + client_object_name))
660
+ self.name.replace(u".", u"_")))
737
661
DBusObjectWithProperties.__init__(self, self.bus,
738
662
self.dbus_object_path)
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
757
665
def _datetime_to_dbus(dt, variant_level=0):
760
668
variant_level=variant_level)
762
670
def enable(self):
763
oldstate = getattr(self, "enabled", False)
671
oldstate = getattr(self, u"enabled", False)
764
672
r = Client.enable(self)
765
673
if oldstate != self.enabled:
766
674
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
675
self.PropertyChanged(dbus.String(u"enabled"),
768
676
dbus.Boolean(True, variant_level=1))
769
677
self.PropertyChanged(
770
dbus.String("LastEnabled"),
678
dbus.String(u"last_enabled"),
771
679
self._datetime_to_dbus(self.last_enabled,
772
680
variant_level=1))
775
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
777
r = Client.disable(self, quiet=quiet)
778
if not quiet and oldstate != self.enabled:
683
def disable(self, signal = True):
684
oldstate = getattr(self, u"enabled", False)
685
r = Client.disable(self)
686
if signal and oldstate != self.enabled:
779
687
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
688
self.PropertyChanged(dbus.String(u"enabled"),
781
689
dbus.Boolean(False, variant_level=1))
843
742
# Emit D-Bus signal
844
743
self.CheckerStarted(self.current_checker_command)
845
744
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
745
dbus.String(u"checker_running"),
847
746
dbus.Boolean(True, variant_level=1))
850
749
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
750
old_checker = getattr(self, u"checker", None)
852
751
r = Client.stop_checker(self, *args, **kwargs)
853
752
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
753
and getattr(self, u"checker", None) is None):
754
self.PropertyChanged(dbus.String(u"checker_running"),
856
755
dbus.Boolean(False, variant_level=1))
859
def _reset_approved(self):
860
self._approved = None
863
def approve(self, value=True):
864
self.send_changedstate()
865
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
867
(self.approval_duration),
868
self._reset_approved)
871
## D-Bus methods, signals & properties
872
_interface = "se.bsnet.fukt.Mandos.Client"
758
## D-Bus methods & signals
759
_interface = u"se.bsnet.fukt.Mandos.Client"
762
@dbus.service.method(_interface)
764
return self.checked_ok()
876
766
# CheckerCompleted - signal
877
@dbus.service.signal(_interface, signature="nxs")
767
@dbus.service.signal(_interface, signature=u"nxs")
878
768
def CheckerCompleted(self, exitcode, waitstatus, command):
882
772
# CheckerStarted - signal
883
@dbus.service.signal(_interface, signature="s")
773
@dbus.service.signal(_interface, signature=u"s")
884
774
def CheckerStarted(self, command):
888
778
# PropertyChanged - signal
889
@dbus.service.signal(_interface, signature="sv")
779
@dbus.service.signal(_interface, signature=u"sv")
890
780
def PropertyChanged(self, property, value):
784
# ReceivedSecret - signal
895
785
@dbus.service.signal(_interface)
898
Is sent after a successful transfer of secret from the Mandos
899
server to mandos-client
786
def ReceivedSecret(self):
903
790
# Rejected - signal
904
@dbus.service.signal(_interface, signature="s")
905
def Rejected(self, reason):
791
@dbus.service.signal(_interface)
909
# NeedApproval - signal
910
@dbus.service.signal(_interface, signature="tb")
911
def NeedApproval(self, timeout, default):
913
return self.need_approval()
918
@dbus.service.method(_interface, in_signature="b")
919
def Approve(self, value):
923
@dbus.service.method(_interface)
925
return self.checked_ok()
927
796
# Enable - method
928
797
@dbus.service.method(_interface)
929
798
def Enable(self):
947
816
def StopChecker(self):
948
817
self.stop_checker()
952
# ApprovalPending - property
953
@dbus_service_property(_interface, signature="b", access="read")
954
def ApprovalPending_dbus_property(self):
955
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):
820
@dbus_service_property(_interface, signature=u"s", access=u"read")
821
def name_dbus_property(self):
994
822
return dbus.String(self.name)
996
# Fingerprint - property
997
@dbus_service_property(_interface, signature="s", access="read")
998
def Fingerprint_dbus_property(self):
824
# fingerprint - property
825
@dbus_service_property(_interface, signature=u"s", access=u"read")
826
def fingerprint_dbus_property(self):
999
827
return dbus.String(self.fingerprint)
1002
@dbus_service_property(_interface, signature="s",
1004
def Host_dbus_property(self, value=None):
830
@dbus_service_property(_interface, signature=u"s",
832
def host_dbus_property(self, value=None):
1005
833
if value is None: # get
1006
834
return dbus.String(self.host)
1007
835
self.host = value
1008
836
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
837
self.PropertyChanged(dbus.String(u"host"),
1010
838
dbus.String(value, variant_level=1))
1012
# Created - property
1013
@dbus_service_property(_interface, signature="s", access="read")
1014
def Created_dbus_property(self):
841
@dbus_service_property(_interface, signature=u"s", access=u"read")
842
def created_dbus_property(self):
1015
843
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):
845
# last_enabled - property
846
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
def last_enabled_dbus_property(self):
1020
848
if self.last_enabled is None:
1021
return dbus.String("")
849
return dbus.String(u"")
1022
850
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):
853
@dbus_service_property(_interface, signature=u"b",
855
def enabled_dbus_property(self, value=None):
1028
856
if value is None: # get
1029
857
return dbus.Boolean(self.enabled)
1035
# LastCheckedOK - property
1036
@dbus_service_property(_interface, signature="s",
1038
def LastCheckedOK_dbus_property(self, value=None):
863
# last_checked_ok - property
864
@dbus_service_property(_interface, signature=u"s",
866
def last_checked_ok_dbus_property(self, value=None):
1039
867
if value is not None:
1040
868
self.checked_ok()
1042
870
if self.last_checked_ok is None:
1043
return dbus.String("")
871
return dbus.String(u"")
1044
872
return dbus.String(self._datetime_to_dbus(self
1045
873
.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):
876
@dbus_service_property(_interface, signature=u"t",
878
def timeout_dbus_property(self, value=None):
1060
879
if value is None: # get
1061
880
return dbus.UInt64(self.timeout_milliseconds())
1062
881
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
882
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
883
self.PropertyChanged(dbus.String(u"timeout"),
1065
884
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
885
if getattr(self, u"disable_initiator_tag", None) is None:
1068
887
# Reschedule timeout
1069
888
gobject.source_remove(self.disable_initiator_tag)
1099
918
(value, self.start_checker))
1100
919
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):
922
@dbus_service_property(_interface, signature=u"s",
924
def checker_dbus_property(self, value=None):
1106
925
if value is None: # get
1107
926
return dbus.String(self.checker_command)
1108
927
self.checker_command = value
1109
928
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
929
self.PropertyChanged(dbus.String(u"checker"),
1111
930
dbus.String(self.checker_command,
1112
931
variant_level=1))
1114
# CheckerRunning - property
1115
@dbus_service_property(_interface, signature="b",
1117
def CheckerRunning_dbus_property(self, value=None):
933
# checker_running - property
934
@dbus_service_property(_interface, signature=u"b",
936
def checker_running_dbus_property(self, value=None):
1118
937
if value is None: # get
1119
938
return dbus.Boolean(self.checker is not None)
1123
942
self.stop_checker()
1125
# ObjectPath - property
1126
@dbus_service_property(_interface, signature="o", access="read")
1127
def ObjectPath_dbus_property(self):
944
# object_path - property
945
@dbus_service_property(_interface, signature=u"o", access=u"read")
946
def object_path_dbus_property(self):
1128
947
return self.dbus_object_path # is already a dbus.ObjectPath
1131
@dbus_service_property(_interface, signature="ay",
1132
access="write", byte_arrays=True)
1133
def Secret_dbus_property(self, value):
950
@dbus_service_property(_interface, signature=u"ay",
951
access=u"write", byte_arrays=True)
952
def secret_dbus_property(self, value):
1134
953
self.secret = str(value)
1139
class ProxyClient(object):
1140
def __init__(self, child_pipe, fpr, address):
1141
self._pipe = child_pipe
1142
self._pipe.send(('init', fpr, address))
1143
if not self._pipe.recv():
1146
def __getattribute__(self, name):
1147
if(name == '_pipe'):
1148
return super(ProxyClient, self).__getattribute__(name)
1149
self._pipe.send(('getattr', name))
1150
data = self._pipe.recv()
1151
if data[0] == 'data':
1153
if data[0] == 'function':
1154
def func(*args, **kwargs):
1155
self._pipe.send(('funcall', name, args, kwargs))
1156
return self._pipe.recv()[1]
1159
def __setattr__(self, name, value):
1160
if(name == '_pipe'):
1161
return super(ProxyClient, self).__setattr__(name, value)
1162
self._pipe.send(('setattr', name, value))
1165
958
class ClientHandler(socketserver.BaseRequestHandler, object):
1166
959
"""A class to handle client connections.
1169
962
Note: This will run in its own forked process."""
1171
964
def handle(self):
1172
with contextlib.closing(self.server.child_pipe) as child_pipe:
1173
logger.info("TCP connection from: %s",
1174
unicode(self.client_address))
1175
logger.debug("Pipe FD: %d",
1176
self.server.child_pipe.fileno())
965
logger.info(u"TCP connection from: %s",
966
unicode(self.client_address))
967
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
968
# Open IPC pipe to parent process
969
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1178
970
session = (gnutls.connection
1179
971
.ClientSession(self.request,
1180
972
gnutls.connection
1181
973
.X509Credentials()))
975
line = self.request.makefile().readline()
976
logger.debug(u"Protocol version: %r", line)
978
if int(line.strip().split()[0]) > 1:
980
except (ValueError, IndexError, RuntimeError), error:
981
logger.error(u"Unknown protocol version: %s", error)
1183
984
# Note: gnutls.connection.X509Credentials is really a
1184
985
# generic GnuTLS certificate credentials object so long as
1185
986
# no X.509 keys are added to it. Therefore, we can use it
1186
987
# here despite using OpenPGP certificates.
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
989
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
990
# u"+AES-256-CBC", u"+SHA1",
991
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1192
993
# Use a fallback default, since this MUST be set.
1193
994
priority = self.server.gnutls_priority
1194
995
if priority is None:
1196
997
(gnutls.library.functions
1197
998
.gnutls_priority_set_direct(session._c_object,
1198
999
priority, None))
1200
# Start communication using the Mandos protocol
1201
# Get protocol number
1202
line = self.request.makefile().readline()
1203
logger.debug("Protocol version: %r", line)
1205
if int(line.strip().split()[0]) > 1:
1207
except (ValueError, IndexError, RuntimeError), error:
1208
logger.error("Unknown protocol version: %s", error)
1211
# Start GnuTLS connection
1213
1002
session.handshake()
1214
1003
except gnutls.errors.GNUTLSError, error:
1215
logger.warning("Handshake failed: %s", error)
1004
logger.warning(u"Handshake failed: %s", error)
1216
1005
# Do not run session.bye() here: the session is not
1217
1006
# established. Just abandon the request.
1219
logger.debug("Handshake succeeded")
1221
approval_required = False
1008
logger.debug(u"Handshake succeeded")
1224
fpr = self.fingerprint(self.peer_certificate
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1227
logger.warning("Bad certificate: %s", error)
1229
logger.debug("Fingerprint: %s", fpr)
1232
client = ProxyClient(child_pipe, fpr,
1233
self.client_address)
1237
if client.approval_delay:
1238
delay = client.approval_delay
1239
client.approvals_pending += 1
1240
approval_required = True
1243
if not client.enabled:
1244
logger.warning("Client %s is disabled",
1246
if self.server.use_dbus:
1248
client.Rejected("Disabled")
1251
if client._approved or not client.approval_delay:
1252
#We are approved or approval is disabled
1254
elif client._approved is None:
1255
logger.info("Client %s needs approval",
1257
if self.server.use_dbus:
1259
client.NeedApproval(
1260
client.approval_delay_milliseconds(),
1261
client.approved_by_default)
1263
logger.warning("Client %s was not approved",
1265
if self.server.use_dbus:
1267
client.Rejected("Denied")
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1272
time = datetime.datetime.now()
1273
client.changedstate.acquire()
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1275
client.changedstate.release()
1276
time2 = datetime.datetime.now()
1277
if (time2 - time) >= delay:
1278
if not client.approved_by_default:
1279
logger.warning("Client %s timed out while"
1280
" waiting for approval",
1282
if self.server.use_dbus:
1284
client.Rejected("Approval timed out")
1289
delay -= time2 - time
1292
while sent_size < len(client.secret):
1294
sent = session.send(client.secret[sent_size:])
1295
except (gnutls.errors.GNUTLSError), error:
1296
logger.warning("gnutls send failed")
1298
logger.debug("Sent: %d, remaining: %d",
1299
sent, len(client.secret)
1300
- (sent_size + sent))
1303
logger.info("Sending secret to %s", client.name)
1304
# bump the timeout as if seen
1306
if self.server.use_dbus:
1010
fpr = self.fingerprint(self.peer_certificate(session))
1011
except (TypeError, gnutls.errors.GNUTLSError), error:
1012
logger.warning(u"Bad certificate: %s", error)
1015
logger.debug(u"Fingerprint: %s", fpr)
1311
if approval_required:
1312
client.approvals_pending -= 1
1315
except (gnutls.errors.GNUTLSError), error:
1316
logger.warning("GnuTLS bye failed")
1017
for c in self.server.clients:
1018
if c.fingerprint == fpr:
1022
ipc.write(u"NOTFOUND %s %s\n"
1023
% (fpr, unicode(self.client_address)))
1026
# Have to check if client.still_valid(), since it is
1027
# possible that the client timed out while establishing
1028
# the GnuTLS session.
1029
if not client.still_valid():
1030
ipc.write(u"INVALID %s\n" % client.name)
1033
ipc.write(u"SENDING %s\n" % client.name)
1035
while sent_size < len(client.secret):
1036
sent = session.send(client.secret[sent_size:])
1037
logger.debug(u"Sent: %d, remaining: %d",
1038
sent, len(client.secret)
1039
- (sent_size + sent))
1319
1044
def peer_certificate(session):
1375
1100
# Convert the buffer to a Python bytestring
1376
1101
fpr = ctypes.string_at(buf, buf_len.value)
1377
1102
# Convert the bytestring to hexadecimal notation
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1103
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1382
class MultiprocessingMixIn(object):
1383
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1384
def sub_process_main(self, request, address):
1386
self.finish_request(request, address)
1388
self.handle_error(request, address)
1389
self.close_request(request)
1391
def process_request(self, request, address):
1392
"""Start a new process to process the request."""
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1397
""" adds a pipe to the MixIn """
1107
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1108
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1398
1109
def process_request(self, request, client_address):
1399
1110
"""Overrides and wraps the original process_request().
1401
1112
This function creates a new pipe in self.pipe
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1405
super(MultiprocessingMixInWithPipe,
1114
self.pipe = os.pipe()
1115
super(ForkingMixInWithPipe,
1406
1116
self).process_request(request, client_address)
1407
self.child_pipe.close()
1408
self.add_pipe(parent_pipe)
1410
def add_pipe(self, parent_pipe):
1117
os.close(self.pipe[1]) # close write end
1118
self.add_pipe(self.pipe[0])
1119
def add_pipe(self, pipe):
1411
1120
"""Dummy function; override as necessary"""
1412
raise NotImplementedError
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1124
class IPv6_TCPServer(ForkingMixInWithPipe,
1415
1125
socketserver.TCPServer, object):
1416
1126
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1502
1212
return socketserver.TCPServer.server_activate(self)
1503
1213
def enable(self):
1504
1214
self.enabled = True
1505
def add_pipe(self, parent_pipe):
1215
def add_pipe(self, pipe):
1506
1216
# Call "handle_ipc" for both data and EOF events
1507
gobject.io_add_watch(parent_pipe.fileno(),
1508
gobject.IO_IN | gobject.IO_HUP,
1509
functools.partial(self.handle_ipc,
1510
parent_pipe = parent_pipe))
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1513
client_object=None):
1217
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1219
def handle_ipc(self, source, condition, file_objects={}):
1514
1220
condition_names = {
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1221
gobject.IO_IN: u"IN", # There is data to read.
1222
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
1224
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1225
gobject.IO_ERR: u"ERR", # Error condition.
1226
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1521
1227
# broken, usually for pipes and
1525
1231
for cond, name in
1526
1232
condition_names.iteritems()
1527
1233
if cond & condition)
1528
# error or the other end of multiprocessing.Pipe has closed
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1532
# Read a request from the child
1533
request = parent_pipe.recv()
1534
command = request[0]
1536
if command == 'init':
1538
address = request[2]
1540
for c in self.clients:
1541
if c.fingerprint == fpr:
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1550
parent_pipe.send(False)
1553
gobject.io_add_watch(parent_pipe.fileno(),
1554
gobject.IO_IN | gobject.IO_HUP,
1555
functools.partial(self.handle_ipc,
1556
parent_pipe = parent_pipe,
1557
client_object = client))
1558
parent_pipe.send(True)
1559
# remove the old hook in favor of the new above hook on same fileno
1561
if command == 'funcall':
1562
funcname = request[1]
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1568
if command == 'getattr':
1569
attrname = request[1]
1570
if callable(client_object.__getattribute__(attrname)):
1571
parent_pipe.send(('function',))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1575
if command == 'setattr':
1576
attrname = request[1]
1578
setattr(client_object, attrname, value)
1234
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1237
# Turn the pipe file descriptor into a Python file object
1238
if source not in file_objects:
1239
file_objects[source] = os.fdopen(source, u"r", 1)
1241
# Read a line from the file object
1242
cmdline = file_objects[source].readline()
1243
if not cmdline: # Empty line means end of file
1244
# close the IPC pipe
1245
file_objects[source].close()
1246
del file_objects[source]
1248
# Stop calling this function
1251
logger.debug(u"IPC command: %r", cmdline)
1253
# Parse and act on command
1254
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1256
if cmd == u"NOTFOUND":
1257
logger.warning(u"Client not found for fingerprint: %s",
1261
mandos_dbus_service.ClientNotFound(args)
1262
elif cmd == u"INVALID":
1263
for client in self.clients:
1264
if client.name == args:
1265
logger.warning(u"Client %s is invalid", args)
1271
logger.error(u"Unknown client %s is invalid", args)
1272
elif cmd == u"SENDING":
1273
for client in self.clients:
1274
if client.name == args:
1275
logger.info(u"Sending secret to %s", client.name)
1279
client.ReceivedSecret()
1282
logger.error(u"Sending secret to unknown client %s",
1285
logger.error(u"Unknown IPC command: %r", cmdline)
1287
# Keep calling this function
1583
1291
def string_to_delta(interval):
1584
1292
"""Parse a string and return a datetime.timedelta
1586
>>> string_to_delta('7d')
1294
>>> string_to_delta(u'7d')
1587
1295
datetime.timedelta(7)
1588
>>> string_to_delta('60s')
1296
>>> string_to_delta(u'60s')
1589
1297
datetime.timedelta(0, 60)
1590
>>> string_to_delta('60m')
1298
>>> string_to_delta(u'60m')
1591
1299
datetime.timedelta(0, 3600)
1592
>>> string_to_delta('24h')
1300
>>> string_to_delta(u'24h')
1593
1301
datetime.timedelta(1)
1594
>>> string_to_delta('1w')
1302
>>> string_to_delta(u'1w')
1595
1303
datetime.timedelta(7)
1596
>>> string_to_delta('5m 30s')
1304
>>> string_to_delta(u'5m 30s')
1597
1305
datetime.timedelta(0, 330)
1599
1307
timevalue = datetime.timedelta(0)
1674
1381
# Parsing of options, both command line and config file
1676
1383
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")
1384
parser.add_option("-i", u"--interface", type=u"string",
1385
metavar="IF", help=u"Bind to interface IF")
1386
parser.add_option("-a", u"--address", type=u"string",
1387
help=u"Address to listen for requests on")
1388
parser.add_option("-p", u"--port", type=u"int",
1389
help=u"Port number to receive requests on")
1390
parser.add_option("--check", action=u"store_true",
1391
help=u"Run self-test")
1392
parser.add_option("--debug", action=u"store_true",
1393
help=u"Debug mode; run in foreground and log to"
1395
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1396
u" priority string (see GnuTLS documentation)")
1397
parser.add_option("--servicename", type=u"string",
1398
metavar=u"NAME", help=u"Zeroconf service name")
1399
parser.add_option("--configdir", type=u"string",
1400
default=u"/etc/mandos", metavar=u"DIR",
1401
help=u"Directory to search for configuration"
1403
parser.add_option("--no-dbus", action=u"store_false",
1404
dest=u"use_dbus", help=u"Do not provide D-Bus"
1405
u" system bus interface")
1406
parser.add_option("--no-ipv6", action=u"store_false",
1407
dest=u"use_ipv6", help=u"Do not use IPv6")
1703
1408
options = parser.parse_args()[0]
1705
1410
if options.check:
1710
1415
# Default values for config file for server-global settings
1711
server_defaults = { "interface": "",
1716
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1717
"servicename": "Mandos",
1416
server_defaults = { u"interface": u"",
1421
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1422
u"servicename": u"Mandos",
1423
u"use_dbus": u"True",
1424
u"use_ipv6": u"True",
1723
1427
# Parse config file for server-global settings
1724
1428
server_config = configparser.SafeConfigParser(server_defaults)
1725
1429
del server_defaults
1726
1430
server_config.read(os.path.join(options.configdir,
1728
1432
# Convert the SafeConfigParser object to a dict
1729
1433
server_settings = server_config.defaults()
1730
1434
# 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",
1435
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1436
server_settings[option] = server_config.getboolean(u"DEFAULT",
1734
1438
if server_settings["port"]:
1735
server_settings["port"] = server_config.getint("DEFAULT",
1439
server_settings["port"] = server_config.getint(u"DEFAULT",
1737
1441
del server_config
1739
1443
# Override the settings from the config file with command line
1740
1444
# options, if set.
1741
for option in ("interface", "address", "port", "debug",
1742
"priority", "servicename", "configdir",
1743
"use_dbus", "use_ipv6", "debuglevel"):
1445
for option in (u"interface", u"address", u"port", u"debug",
1446
u"priority", u"servicename", u"configdir",
1447
u"use_dbus", u"use_ipv6"):
1744
1448
value = getattr(options, option)
1745
1449
if value is not None:
1746
1450
server_settings[option] = value
1754
1458
##################################################################
1756
1460
# 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"]
1762
if server_settings["servicename"] != "Mandos":
1461
debug = server_settings[u"debug"]
1462
use_dbus = server_settings[u"use_dbus"]
1463
use_ipv6 = server_settings[u"use_ipv6"]
1466
syslogger.setLevel(logging.WARNING)
1467
console.setLevel(logging.WARNING)
1469
if server_settings[u"servicename"] != u"Mandos":
1763
1470
syslogger.setFormatter(logging.Formatter
1764
('Mandos (%s) [%%(process)d]:'
1765
' %%(levelname)s: %%(message)s'
1766
% server_settings["servicename"]))
1471
(u'Mandos (%s) [%%(process)d]:'
1472
u' %%(levelname)s: %%(message)s'
1473
% server_settings[u"servicename"]))
1768
1475
# Parse config file with clients
1769
client_defaults = { "timeout": "1h",
1771
"checker": "fping -q -- %%(host)s",
1773
"approval_delay": "0s",
1774
"approval_duration": "1s",
1476
client_defaults = { u"timeout": u"1h",
1478
u"checker": u"fping -q -- %%(host)s",
1776
1481
client_config = configparser.SafeConfigParser(client_defaults)
1777
client_config.read(os.path.join(server_settings["configdir"],
1482
client_config.read(os.path.join(server_settings[u"configdir"],
1780
1485
global mandos_dbus_service
1781
1486
mandos_dbus_service = None
1783
tcp_server = MandosServer((server_settings["address"],
1784
server_settings["port"]),
1488
tcp_server = MandosServer((server_settings[u"address"],
1489
server_settings[u"port"]),
1786
interface=(server_settings["interface"]
1491
interface=server_settings[u"interface"],
1788
1492
use_ipv6=use_ipv6,
1789
1493
gnutls_priority=
1790
server_settings["priority"],
1494
server_settings[u"priority"],
1791
1495
use_dbus=use_dbus)
1793
pidfilename = "/var/run/mandos.pid"
1795
pidfile = open(pidfilename, "w")
1797
logger.error("Could not open file %r", pidfilename)
1496
pidfilename = u"/var/run/mandos.pid"
1498
pidfile = open(pidfilename, u"w")
1500
logger.error(u"Could not open file %r", pidfilename)
1800
uid = pwd.getpwnam("_mandos").pw_uid
1801
gid = pwd.getpwnam("_mandos").pw_gid
1503
uid = pwd.getpwnam(u"_mandos").pw_uid
1504
gid = pwd.getpwnam(u"_mandos").pw_gid
1802
1505
except KeyError:
1804
uid = pwd.getpwnam("mandos").pw_uid
1805
gid = pwd.getpwnam("mandos").pw_gid
1507
uid = pwd.getpwnam(u"mandos").pw_uid
1508
gid = pwd.getpwnam(u"mandos").pw_gid
1806
1509
except KeyError:
1808
uid = pwd.getpwnam("nobody").pw_uid
1809
gid = pwd.getpwnam("nobody").pw_gid
1511
uid = pwd.getpwnam(u"nobody").pw_uid
1512
gid = pwd.getpwnam(u"nobody").pw_gid
1810
1513
except KeyError:
1817
1520
if error[0] != errno.EPERM:
1820
if not debug and not debuglevel:
1821
syslogger.setLevel(logging.WARNING)
1822
console.setLevel(logging.WARNING)
1824
level = getattr(logging, debuglevel.upper())
1825
syslogger.setLevel(level)
1826
console.setLevel(level)
1523
# Enable all possible GnuTLS debugging
1829
# Enable all possible GnuTLS debugging
1831
1525
# "Use a log level over 10 to enable all debugging options."
1832
1526
# - GnuTLS manual
1833
1527
gnutls.library.functions.gnutls_global_set_log_level(11)
1835
1529
@gnutls.library.types.gnutls_log_func
1836
1530
def debug_gnutls(level, string):
1837
logger.debug("GnuTLS: %s", string[:-1])
1531
logger.debug(u"GnuTLS: %s", string[:-1])
1839
1533
(gnutls.library.functions
1840
1534
.gnutls_global_set_log_function(debug_gnutls))
1842
# Redirect stdin so all checkers get /dev/null
1843
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1844
os.dup2(null, sys.stdin.fileno())
1848
# No console logging
1849
logger.removeHandler(console)
1851
# Need to fork before connecting to D-Bus
1853
# Close all input and output, do double fork, etc.
1856
1536
global main_loop
1857
1537
# From the Avahi example code
1860
1540
bus = dbus.SystemBus()
1861
1541
# End of Avahi example code
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1865
bus, do_not_queue=True)
1866
except dbus.exceptions.NameExistsException, e:
1867
logger.error(unicode(e) + ", disabling D-Bus")
1869
server_settings["use_dbus"] = False
1870
tcp_server.use_dbus = False
1543
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1871
1544
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1545
service = AvahiService(name = server_settings[u"servicename"],
1546
servicetype = u"_mandos._tcp",
1874
1547
protocol = protocol, bus = bus)
1875
1548
if server_settings["interface"]:
1876
1549
service.interface = (if_nametoindex
1877
(str(server_settings["interface"])))
1879
global multiprocessing_manager
1880
multiprocessing_manager = multiprocessing.Manager()
1550
(str(server_settings[u"interface"])))
1882
1552
client_class = Client
1884
1554
client_class = functools.partial(ClientDBus, bus = bus)
1885
def client_config_items(config, section):
1886
special_settings = {
1887
"approved_by_default":
1888
lambda: config.getboolean(section,
1889
"approved_by_default"),
1891
for name, value in config.items(section):
1893
yield (name, special_settings[name]())
1897
1555
tcp_server.clients.update(set(
1898
1556
client_class(name = section,
1899
config= dict(client_config_items(
1900
client_config, section)))
1557
config= dict(client_config.items(section)))
1901
1558
for section in client_config.sections()))
1902
1559
if not tcp_server.clients:
1903
logger.warning("No clients defined")
1560
logger.warning(u"No clients defined")
1563
# Redirect stdin so all checkers get /dev/null
1564
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1565
os.dup2(null, sys.stdin.fileno())
1569
# No console logging
1570
logger.removeHandler(console)
1571
# Close all input and output, do double fork, etc.
1575
with closing(pidfile):
1577
pidfile.write(str(pid) + "\n")
1580
logger.error(u"Could not write to file %r with PID %d",
1583
# "pidfile" was never created
1588
"Cleanup function; run on exit"
1591
while tcp_server.clients:
1592
client = tcp_server.clients.pop()
1593
client.disable_hook = None
1596
atexit.register(cleanup)
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
1599
signal.signal(signal.SIGINT, signal.SIG_IGN)
1921
1600
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1922
1601
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1925
1604
class MandosDBusService(dbus.service.Object):
1926
1605
"""A D-Bus proxy object"""
1927
1606
def __init__(self):
1928
dbus.service.Object.__init__(self, bus, "/")
1929
_interface = "se.bsnet.fukt.Mandos"
1931
@dbus.service.signal(_interface, signature="o")
1932
def ClientAdded(self, objpath):
1936
@dbus.service.signal(_interface, signature="ss")
1937
def ClientNotFound(self, fingerprint, address):
1941
@dbus.service.signal(_interface, signature="os")
1607
dbus.service.Object.__init__(self, bus, u"/")
1608
_interface = u"se.bsnet.fukt.Mandos"
1610
@dbus.service.signal(_interface, signature=u"oa{sv}")
1611
def ClientAdded(self, objpath, properties):
1615
@dbus.service.signal(_interface, signature=u"s")
1616
def ClientNotFound(self, fingerprint):
1620
@dbus.service.signal(_interface, signature=u"os")
1942
1621
def ClientRemoved(self, objpath, name):
1946
@dbus.service.method(_interface, out_signature="ao")
1625
@dbus.service.method(_interface, out_signature=u"ao")
1947
1626
def GetAllClients(self):
1949
1628
return dbus.Array(c.dbus_object_path
1950
1629
for c in tcp_server.clients)
1952
1631
@dbus.service.method(_interface,
1953
out_signature="a{oa{sv}}")
1632
out_signature=u"a{oa{sv}}")
1954
1633
def GetAllClientsWithProperties(self):
1956
1635
return dbus.Dictionary(
1957
((c.dbus_object_path, c.GetAll(""))
1636
((c.dbus_object_path, c.GetAll(u""))
1958
1637
for c in tcp_server.clients),
1638
signature=u"oa{sv}")
1961
@dbus.service.method(_interface, in_signature="o")
1640
@dbus.service.method(_interface, in_signature=u"o")
1962
1641
def RemoveClient(self, object_path):
1964
1643
for c in tcp_server.clients: