460
186
dbus.UInt16(self.port),
461
187
avahi.string_array_to_txt_array(self.TXT))
462
188
self.group.Commit()
464
189
def entry_group_state_changed(self, state, error):
465
190
"""Derived from the Avahi example code"""
466
log.debug("Avahi entry group state change: %i", state)
191
logger.debug(u"Avahi state change: %i", state)
468
193
if state == avahi.ENTRY_GROUP_ESTABLISHED:
469
log.debug("Zeroconf service established.")
194
logger.debug(u"Zeroconf service established.")
470
195
elif state == avahi.ENTRY_GROUP_COLLISION:
471
log.info("Zeroconf service name collision.")
196
logger.warning(u"Zeroconf service name collision.")
473
198
elif state == avahi.ENTRY_GROUP_FAILURE:
474
log.critical("Avahi: Error in group state changed %s",
476
raise AvahiGroupError("State changed: {!s}".format(error))
199
logger.critical(u"Avahi: Error in group state changed %s",
201
raise AvahiGroupError(u"State changed: %s"
478
203
def cleanup(self):
479
204
"""Derived from the Avahi example code"""
480
205
if self.group is not None:
483
except (dbus.exceptions.UnknownMethodException,
484
dbus.exceptions.DBusException):
486
207
self.group = None
489
def server_state_changed(self, state, error=None):
208
def server_state_changed(self, state):
490
209
"""Derived from the Avahi example code"""
491
log.debug("Avahi server state change: %i", state)
493
avahi.SERVER_INVALID: "Zeroconf server invalid",
494
avahi.SERVER_REGISTERING: None,
495
avahi.SERVER_COLLISION: "Zeroconf server name collision",
496
avahi.SERVER_FAILURE: "Zeroconf server failure",
498
if state in bad_states:
499
if bad_states[state] is not None:
501
log.error(bad_states[state])
503
log.error(bad_states[state] + ": %r", error)
210
if state == avahi.SERVER_COLLISION:
211
logger.error(u"Zeroconf server name collision")
505
213
elif state == avahi.SERVER_RUNNING:
508
except dbus.exceptions.DBusException as error:
509
if (error.get_dbus_name()
510
== "org.freedesktop.Avahi.CollisionError"):
511
log.info("Local Zeroconf service name collision.")
512
return self.rename(remove=False)
514
log.critical("D-Bus Exception", exc_info=error)
519
log.debug("Unknown state: %r", state)
521
log.debug("Unknown state: %r: %r", state, error)
523
215
def activate(self):
524
216
"""Derived from the Avahi example code"""
525
217
if self.server is None:
526
218
self.server = dbus.Interface(
527
219
self.bus.get_object(avahi.DBUS_NAME,
528
avahi.DBUS_PATH_SERVER,
529
follow_name_owner_changes=True),
220
avahi.DBUS_PATH_SERVER),
530
221
avahi.DBUS_INTERFACE_SERVER)
531
self.server.connect_to_signal("StateChanged",
532
self.server_state_changed)
222
self.server.connect_to_signal(u"StateChanged",
223
self.server_state_changed)
533
224
self.server_state_changed(self.server.GetState())
536
class AvahiServiceToSyslog(AvahiService):
537
def rename(self, *args, **kwargs):
538
"""Add the new name to the syslog messages"""
539
ret = super(AvahiServiceToSyslog, self).rename(*args,
541
syslogger.setFormatter(logging.Formatter(
542
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
547
# Pretend that we have a GnuTLS module
549
"""This isn't so much a class as it is a module-like namespace."""
551
library = ctypes.util.find_library("gnutls")
553
library = ctypes.util.find_library("gnutls-deb0")
554
_library = ctypes.cdll.LoadLibrary(library)
557
# Unless otherwise indicated, the constants and types below are
558
# all from the gnutls/gnutls.h C header file.
569
E_NO_CERTIFICATE_FOUND = -49
574
KEYID_USE_SHA256 = 1 # gnutls/x509.h
575
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
578
class _session_int(ctypes.Structure):
580
session_t = ctypes.POINTER(_session_int)
582
class certificate_credentials_st(ctypes.Structure):
584
certificate_credentials_t = ctypes.POINTER(
585
certificate_credentials_st)
586
certificate_type_t = ctypes.c_int
588
class datum_t(ctypes.Structure):
589
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
590
("size", ctypes.c_uint)]
592
class _openpgp_crt_int(ctypes.Structure):
594
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
595
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
596
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
597
credentials_type_t = ctypes.c_int
598
transport_ptr_t = ctypes.c_void_p
599
close_request_t = ctypes.c_int
602
class Error(Exception):
603
def __init__(self, message=None, code=None, args=()):
604
# Default usage is by a message string, but if a return
605
# code is passed, convert it to a string with
608
if message is None and code is not None:
609
message = gnutls.strerror(code).decode(
610
"utf-8", errors="replace")
611
return super(gnutls.Error, self).__init__(
614
class CertificateSecurityError(Error):
618
def __init__(self, cls):
621
def from_param(self, obj):
622
if not isinstance(obj, self.cls):
623
raise TypeError("Not of type {}: {!r}"
624
.format(self.cls.__name__, obj))
625
return ctypes.byref(obj.from_param(obj))
627
class CastToVoidPointer:
628
def __init__(self, cls):
631
def from_param(self, obj):
632
if not isinstance(obj, self.cls):
633
raise TypeError("Not of type {}: {!r}"
634
.format(self.cls.__name__, obj))
635
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
637
class With_from_param:
639
def from_param(cls, obj):
640
return obj._as_parameter_
643
class Credentials(With_from_param):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
647
self.type = gnutls.CRD_CERTIFICATE
650
gnutls.certificate_free_credentials(self)
652
class ClientSession(With_from_param):
653
def __init__(self, socket, credentials=None):
654
self._as_parameter_ = gnutls.session_t()
655
gnutls_flags = gnutls.CLIENT
656
if gnutls.check_version(b"3.5.6"):
657
gnutls_flags |= gnutls.NO_TICKETS
659
gnutls_flags |= gnutls.ENABLE_RAWPK
660
gnutls.init(self, gnutls_flags)
662
gnutls.set_default_priority(self)
663
gnutls.transport_set_ptr(self, socket.fileno())
664
gnutls.handshake_set_private_extensions(self, True)
666
if credentials is None:
667
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
670
self.credentials = credentials
676
return gnutls.handshake(self)
678
def send(self, data):
682
data_len -= gnutls.record_send(self, data[-data_len:],
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
688
# Error handling functions
689
def _error_code(result):
690
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
694
if result == gnutls.E_NO_CERTIFICATE_FOUND:
695
raise gnutls.CertificateSecurityError(code=result)
696
raise gnutls.Error(code=result)
698
def _retry_on_error(result, func, arguments,
699
_error_code=_error_code):
700
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
703
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
return _error_code(result)
705
result = func(*arguments)
708
# Unless otherwise indicated, the function declarations below are
709
# all from the gnutls/gnutls.h C header file.
712
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
714
ctypes.POINTER(ctypes.c_char_p)]
715
priority_set_direct.restype = _error_code
717
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
719
init.restype = _error_code
721
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
723
set_default_priority.restype = _error_code
725
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
728
record_send.restype = ctypes.c_ssize_t
729
record_send.errcheck = _retry_on_error
731
certificate_allocate_credentials = (
732
_library.gnutls_certificate_allocate_credentials)
733
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
735
certificate_allocate_credentials.restype = _error_code
737
certificate_free_credentials = (
738
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
740
certificate_free_credentials.restype = None
742
handshake_set_private_extensions = (
743
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
746
handshake_set_private_extensions.restype = None
748
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
751
credentials_set.restype = _error_code
753
strerror = _library.gnutls_strerror
754
strerror.argtypes = [ctypes.c_int]
755
strerror.restype = ctypes.c_char_p
757
certificate_type_get = _library.gnutls_certificate_type_get
758
certificate_type_get.argtypes = [ClientSession]
759
certificate_type_get.restype = _error_code
761
certificate_get_peers = _library.gnutls_certificate_get_peers
762
certificate_get_peers.argtypes = [ClientSession,
763
ctypes.POINTER(ctypes.c_uint)]
764
certificate_get_peers.restype = ctypes.POINTER(datum_t)
766
global_set_log_level = _library.gnutls_global_set_log_level
767
global_set_log_level.argtypes = [ctypes.c_int]
768
global_set_log_level.restype = None
770
global_set_log_function = _library.gnutls_global_set_log_function
771
global_set_log_function.argtypes = [log_func]
772
global_set_log_function.restype = None
774
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
776
deinit.restype = None
778
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
781
handshake.errcheck = _retry_on_error
783
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
785
transport_set_ptr.restype = None
787
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
790
bye.errcheck = _retry_on_error
792
check_version = _library.gnutls_check_version
793
check_version.argtypes = [ctypes.c_char_p]
794
check_version.restype = ctypes.c_char_p
796
_need_version = b"3.3.0"
797
if check_version(_need_version) is None:
798
raise self.Error("Needs GnuTLS {} or later"
799
.format(_need_version))
801
_tls_rawpk_version = b"3.6.6"
802
has_rawpk = bool(check_version(_tls_rawpk_version))
806
class pubkey_st(ctypes.Structure):
808
pubkey_t = ctypes.POINTER(pubkey_st)
810
x509_crt_fmt_t = ctypes.c_int
812
# All the function declarations below are from
814
pubkey_init = _library.gnutls_pubkey_init
815
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
816
pubkey_init.restype = _error_code
818
pubkey_import = _library.gnutls_pubkey_import
819
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
821
pubkey_import.restype = _error_code
823
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
824
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
825
ctypes.POINTER(ctypes.c_ubyte),
826
ctypes.POINTER(ctypes.c_size_t)]
827
pubkey_get_key_id.restype = _error_code
829
pubkey_deinit = _library.gnutls_pubkey_deinit
830
pubkey_deinit.argtypes = [pubkey_t]
831
pubkey_deinit.restype = None
833
# All the function declarations below are from
836
openpgp_crt_init = _library.gnutls_openpgp_crt_init
837
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
838
openpgp_crt_init.restype = _error_code
840
openpgp_crt_import = _library.gnutls_openpgp_crt_import
841
openpgp_crt_import.argtypes = [openpgp_crt_t,
842
ctypes.POINTER(datum_t),
844
openpgp_crt_import.restype = _error_code
846
openpgp_crt_verify_self = \
847
_library.gnutls_openpgp_crt_verify_self
848
openpgp_crt_verify_self.argtypes = [
851
ctypes.POINTER(ctypes.c_uint),
853
openpgp_crt_verify_self.restype = _error_code
855
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
856
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
857
openpgp_crt_deinit.restype = None
859
openpgp_crt_get_fingerprint = (
860
_library.gnutls_openpgp_crt_get_fingerprint)
861
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
865
openpgp_crt_get_fingerprint.restype = _error_code
867
if check_version(b"3.6.4"):
868
certificate_type_get2 = _library.gnutls_certificate_type_get2
869
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
870
certificate_type_get2.restype = _error_code
872
# Remove non-public functions
873
del _error_code, _retry_on_error
876
def call_pipe(connection, # : multiprocessing.Connection
877
func, *args, **kwargs):
878
"""This function is meant to be called by multiprocessing.Process
880
This function runs func(*args, **kwargs), and writes the resulting
881
return value on the provided multiprocessing.Connection.
883
connection.send(func(*args, **kwargs))
227
class Client(object):
888
228
"""A representation of a client host served by this server.
891
approved: bool(); None if not yet approved/disapproved
892
approval_delay: datetime.timedelta(); Time to wait for approval
893
approval_duration: datetime.timedelta(); Duration of one approval
894
checker: multiprocessing.Process(); a running checker process used
895
to see if the client lives. None if no process is
897
checker_callback_tag: a GLib event source tag, or None
898
checker_command: string; External command which is run to check
899
if client lives. %() expansions are done at
900
runtime with vars(self) as dict, so that for
901
instance %(name)s can be used in the command.
902
checker_initiator_tag: a GLib event source tag, or None
231
name: string; from the config file, used in log messages and
233
fingerprint: string (40 or 32 hexadecimal digits); used to
234
uniquely identify the client
235
secret: bytestring; sent verbatim (over TLS) to client
236
host: string; available for use by the checker command
903
237
created: datetime.datetime(); (UTC) object creation
904
client_structure: Object describing what attributes a client has
905
and is used for storing the client at exit
906
current_checker_command: string; current running checker_command
907
disable_initiator_tag: a GLib event source tag, or None
238
last_enabled: datetime.datetime(); (UTC)
909
fingerprint: string (40 or 32 hexadecimal digits); used to
910
uniquely identify an OpenPGP client
911
key_id: string (64 hexadecimal digits); used to uniquely identify
912
a client using raw public keys
913
host: string; available for use by the checker command
914
interval: datetime.timedelta(); How often to start a new checker
915
last_approval_request: datetime.datetime(); (UTC) or None
916
240
last_checked_ok: datetime.datetime(); (UTC) or None
917
last_checker_status: integer between 0 and 255 reflecting exit
918
status of last checker. -1 reflects crashed
919
checker, -2 means no checker completed yet.
920
last_checker_signal: The signal which killed the last checker, if
921
last_checker_status is -1
922
last_enabled: datetime.datetime(); (UTC) or None
923
name: string; from the config file, used in log messages and
925
secret: bytestring; sent verbatim (over TLS) to client
926
241
timeout: datetime.timedelta(); How long from last_checked_ok
927
until this client is disabled
928
extended_timeout: extra long timeout when secret has been sent
929
runtime_expansions: Allowed attributes for runtime expansion.
930
expires: datetime.datetime(); time (UTC) when a client will be
932
server_settings: The server_settings dict from main()
242
until this client is invalid
243
interval: datetime.timedelta(); How often to start a new checker
244
disable_hook: If set, called by disable() as disable_hook(self)
245
checker: subprocess.Popen(); a running checker process used
246
to see if the client lives.
247
'None' if no process is running.
248
checker_initiator_tag: a gobject event source tag, or None
249
disable_initiator_tag: - '' -
250
checker_callback_tag: - '' -
251
checker_command: string; External command which is run to check if
252
client lives. %() expansions are done at
253
runtime with vars(self) as dict, so that for
254
instance %(name)s can be used in the command.
255
current_checker_command: string; current running checker_command
935
runtime_expansions = ("approval_delay", "approval_duration",
936
"created", "enabled", "expires", "key_id",
937
"fingerprint", "host", "interval",
938
"last_approval_request", "last_checked_ok",
939
"last_enabled", "name", "timeout")
942
"extended_timeout": "PT15M",
944
"checker": "fping -q -- %%(host)s",
946
"approval_delay": "PT0S",
947
"approval_duration": "PT1S",
948
"approved_by_default": "True",
953
def config_parser(config):
954
"""Construct a new dict of client settings of this form:
955
{ client_name: {setting_name: value, ...}, ...}
956
with exceptions for any special settings as defined above.
957
NOTE: Must be a pure function. Must return the same result
958
value given the same arguments.
961
for client_name in config.sections():
962
section = dict(config.items(client_name))
963
client = settings[client_name] = {}
965
client["host"] = section["host"]
966
# Reformat values from string types to Python types
967
client["approved_by_default"] = config.getboolean(
968
client_name, "approved_by_default")
969
client["enabled"] = config.getboolean(client_name,
972
# Uppercase and remove spaces from key_id and fingerprint
973
# for later comparison purposes with return value from the
974
# key_id() and fingerprint() functions
975
client["key_id"] = (section.get("key_id", "").upper()
977
client["fingerprint"] = (section.get("fingerprint",
980
if not (client["key_id"] or client["fingerprint"]):
981
log.error("Skipping client %s without key_id or"
982
" fingerprint", client_name)
983
del settings[client_name]
985
if "secret" in section:
986
client["secret"] = codecs.decode(section["secret"]
989
elif "secfile" in section:
990
with open(os.path.expanduser(os.path.expandvars
991
(section["secfile"])),
993
client["secret"] = secfile.read()
995
raise TypeError("No secret or secfile for section {}"
997
client["timeout"] = string_to_delta(section["timeout"])
998
client["extended_timeout"] = string_to_delta(
999
section["extended_timeout"])
1000
client["interval"] = string_to_delta(section["interval"])
1001
client["approval_delay"] = string_to_delta(
1002
section["approval_delay"])
1003
client["approval_duration"] = string_to_delta(
1004
section["approval_duration"])
1005
client["checker_command"] = section["checker"]
1006
client["last_approval_request"] = None
1007
client["last_checked_ok"] = None
1008
client["last_checker_status"] = -2
1012
def __init__(self, settings, name=None, server_settings=None):
259
def _datetime_to_milliseconds(dt):
260
"Convert a datetime.datetime() to milliseconds"
261
return ((dt.days * 24 * 60 * 60 * 1000)
262
+ (dt.seconds * 1000)
263
+ (dt.microseconds // 1000))
265
def timeout_milliseconds(self):
266
"Return the 'timeout' attribute in milliseconds"
267
return self._datetime_to_milliseconds(self.timeout)
269
def interval_milliseconds(self):
270
"Return the 'interval' attribute in milliseconds"
271
return self._datetime_to_milliseconds(self.interval)
273
def __init__(self, name = None, disable_hook=None, config=None):
274
"""Note: the 'checker' key in 'config' sets the
275
'checker_command' attribute and *not* the 'checker'
1013
277
self.name = name
1014
if server_settings is None:
1015
server_settings = {}
1016
self.server_settings = server_settings
1017
# adding all client settings
1018
for setting, value in settings.items():
1019
setattr(self, setting, value)
1022
if not hasattr(self, "last_enabled"):
1023
self.last_enabled = datetime.datetime.utcnow()
1024
if not hasattr(self, "expires"):
1025
self.expires = (datetime.datetime.utcnow()
280
logger.debug(u"Creating client %r", self.name)
281
# Uppercase and remove spaces from fingerprint for later
282
# comparison purposes with return value from the fingerprint()
284
self.fingerprint = (config[u"fingerprint"].upper()
286
logger.debug(u" Fingerprint: %s", self.fingerprint)
287
if u"secret" in config:
288
self.secret = config[u"secret"].decode(u"base64")
289
elif u"secfile" in config:
290
with closing(open(os.path.expanduser
292
(config[u"secfile"])))) as secfile:
293
self.secret = secfile.read()
1028
self.last_enabled = None
1031
log.debug("Creating client %r", self.name)
1032
log.debug(" Key ID: %s", self.key_id)
1033
log.debug(" Fingerprint: %s", self.fingerprint)
1034
self.created = settings.get("created",
1035
datetime.datetime.utcnow())
1037
# attributes specific for this server instance
295
raise TypeError(u"No secret or secfile for client %s"
297
self.host = config.get(u"host", u"")
298
self.created = datetime.datetime.utcnow()
300
self.last_enabled = None
301
self.last_checked_ok = None
302
self.timeout = string_to_delta(config[u"timeout"])
303
self.interval = string_to_delta(config[u"interval"])
304
self.disable_hook = disable_hook
1038
305
self.checker = None
1039
306
self.checker_initiator_tag = None
1040
307
self.disable_initiator_tag = None
1041
308
self.checker_callback_tag = None
309
self.checker_command = config[u"checker"]
1042
310
self.current_checker_command = None
1043
self.approved = None
1044
self.approvals_pending = 0
1045
self.changedstate = multiprocessing_manager.Condition(
1046
multiprocessing_manager.Lock())
1047
self.client_structure = [attr
1048
for attr in self.__dict__.keys()
1049
if not attr.startswith("_")]
1050
self.client_structure.append("client_structure")
1052
for name, t in inspect.getmembers(
1053
type(self), lambda obj: isinstance(obj, property)):
1054
if not name.startswith("_"):
1055
self.client_structure.append(name)
1057
# Send notice to process children that client state has changed
1058
def send_changedstate(self):
1059
with self.changedstate:
1060
self.changedstate.notify_all()
311
self.last_connect = None
1062
313
def enable(self):
1063
314
"""Start this client's checker and timeout hooks"""
1064
if getattr(self, "enabled", False):
315
if getattr(self, u"enabled", False):
1065
316
# Already enabled
1068
318
self.last_enabled = datetime.datetime.utcnow()
1070
self.send_changedstate()
1072
def disable(self, quiet=True):
319
# Schedule a new checker to be started an 'interval' from now,
320
# and every interval from then on.
321
self.checker_initiator_tag = (gobject.timeout_add
322
(self.interval_milliseconds(),
324
# Also start a new checker *right now*.
326
# Schedule a disable() when 'timeout' has passed
327
self.disable_initiator_tag = (gobject.timeout_add
328
(self.timeout_milliseconds(),
1073
333
"""Disable this client."""
1074
334
if not getattr(self, "enabled", False):
1077
log.info("Disabling client %s", self.name)
1078
if getattr(self, "disable_initiator_tag", None) is not None:
1079
GLib.source_remove(self.disable_initiator_tag)
336
logger.info(u"Disabling client %s", self.name)
337
if getattr(self, u"disable_initiator_tag", False):
338
gobject.source_remove(self.disable_initiator_tag)
1080
339
self.disable_initiator_tag = None
1082
if getattr(self, "checker_initiator_tag", None) is not None:
1083
GLib.source_remove(self.checker_initiator_tag)
340
if getattr(self, u"checker_initiator_tag", False):
341
gobject.source_remove(self.checker_initiator_tag)
1084
342
self.checker_initiator_tag = None
1085
343
self.stop_checker()
344
if self.disable_hook:
345
self.disable_hook(self)
1086
346
self.enabled = False
1088
self.send_changedstate()
1089
# Do not run this again if called by a GLib.timeout_add
347
# Do not run this again if called by a gobject.timeout_add
1092
350
def __del__(self):
351
self.disable_hook = None
1095
def init_checker(self, randomize_start=False):
1096
# Schedule a new checker to be started a randomly selected
1097
# time (a fraction of 'interval') from now. This spreads out
1098
# the startup of checkers over time when the server is
1100
if self.checker_initiator_tag is not None:
1101
GLib.source_remove(self.checker_initiator_tag)
1102
interval_milliseconds = int(self.interval.total_seconds()
1105
delay_milliseconds = random.randrange(
1106
interval_milliseconds + 1)
1108
delay_milliseconds = interval_milliseconds
1109
self.checker_initiator_tag = GLib.timeout_add(
1110
delay_milliseconds, self.start_checker, randomize_start)
1111
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1112
# A checker might take up to an 'interval' of time, so we can
1113
# expire at the soonest one interval after a checker was
1114
# started. Since the initial checker is delayed, the expire
1115
# time might have to be extended.
1116
now = datetime.datetime.utcnow()
1117
self.expires = now + delay + self.interval
1118
# Schedule a disable() at expire time
1119
if self.disable_initiator_tag is not None:
1120
GLib.source_remove(self.disable_initiator_tag)
1121
self.disable_initiator_tag = GLib.timeout_add(
1122
int((self.expires - now).total_seconds() * 1000),
1125
def checker_callback(self, source, condition, connection,
354
def checker_callback(self, pid, condition, command):
1127
355
"""The checker has completed, so take appropriate actions."""
1128
# Read return code from connection (see call_pipe)
1129
returncode = connection.recv()
1131
if self.checker is not None:
1133
356
self.checker_callback_tag = None
1134
357
self.checker = None
1137
self.last_checker_status = returncode
1138
self.last_checker_signal = None
1139
if self.last_checker_status == 0:
1140
log.info("Checker for %(name)s succeeded", vars(self))
358
if os.WIFEXITED(condition):
359
exitstatus = os.WEXITSTATUS(condition)
361
logger.info(u"Checker for %(name)s succeeded",
1141
363
self.checked_ok()
1143
log.info("Checker for %(name)s failed", vars(self))
365
logger.info(u"Checker for %(name)s failed",
1145
self.last_checker_status = -1
1146
self.last_checker_signal = -returncode
1147
log.warning("Checker for %(name)s crashed?", vars(self))
368
logger.warning(u"Checker for %(name)s crashed?",
1150
371
def checked_ok(self):
1151
"""Assert that the client has been seen, alive and well."""
372
"""Bump up the timeout for this client.
374
This should only be called when the client has been seen,
1152
377
self.last_checked_ok = datetime.datetime.utcnow()
1153
self.last_checker_status = 0
1154
self.last_checker_signal = None
1157
def bump_timeout(self, timeout=None):
1158
"""Bump up the timeout for this client."""
1160
timeout = self.timeout
1161
if self.disable_initiator_tag is not None:
1162
GLib.source_remove(self.disable_initiator_tag)
1163
self.disable_initiator_tag = None
1164
if getattr(self, "enabled", False):
1165
self.disable_initiator_tag = GLib.timeout_add(
1166
int(timeout.total_seconds() * 1000), self.disable)
1167
self.expires = datetime.datetime.utcnow() + timeout
1169
def need_approval(self):
1170
self.last_approval_request = datetime.datetime.utcnow()
1172
def start_checker(self, start_was_randomized=False):
378
gobject.source_remove(self.disable_initiator_tag)
379
self.disable_initiator_tag = (gobject.timeout_add
380
(self.timeout_milliseconds(),
383
def start_checker(self):
1173
384
"""Start a new checker subprocess if one is not running.
1175
386
If a checker already exists, leave it running and do
1177
388
# The reason for not killing a running checker is that if we
1178
# did that, and if a checker (for some reason) started running
1179
# slowly and taking more than 'interval' time, then the client
1180
# would inevitably timeout, since no checker would get a
1181
# chance to run to completion. If we instead leave running
389
# did that, then if a checker (for some reason) started
390
# running slowly and taking more than 'interval' time, the
391
# client would inevitably timeout, since no checker would get
392
# a chance to run to completion. If we instead leave running
1182
393
# checkers alone, the checker would have to take more time
1183
# than 'timeout' for the client to be disabled, which is as it
1186
if self.checker is not None and not self.checker.is_alive():
1187
log.warning("Checker was not alive; joining")
394
# than 'timeout' for the client to be declared invalid, which
395
# is as it should be.
397
# If a checker exists, make sure it is not a zombie
398
if self.checker is not None:
399
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
401
logger.warning(u"Checker was a zombie")
402
gobject.source_remove(self.checker_callback_tag)
403
self.checker_callback(pid, status,
404
self.current_checker_command)
1190
405
# Start a new checker if needed
1191
406
if self.checker is None:
1192
# Escape attributes for the shell
1194
attr: shlex.quote(str(getattr(self, attr)))
1195
for attr in self.runtime_expansions}
1197
command = self.checker_command % escaped_attrs
1198
except TypeError as error:
1199
log.error('Could not format string "%s"',
1200
self.checker_command, exc_info=error)
1201
return True # Try again later
408
# In case checker_command has exactly one % operator
409
command = self.checker_command % self.host
411
# Escape attributes for the shell
412
escaped_attrs = dict((key,
413
re.escape(unicode(str(val),
417
vars(self).iteritems())
419
command = self.checker_command % escaped_attrs
420
except TypeError, error:
421
logger.error(u'Could not format string "%s":'
422
u' %s', self.checker_command, error)
423
return True # Try again later
1202
424
self.current_checker_command = command
1203
log.info("Starting checker %r for %s", command, self.name)
1204
# We don't need to redirect stdout and stderr, since
1205
# in normal mode, that is already done by daemon(),
1206
# and in debug mode we don't want to. (Stdin is
1207
# always replaced by /dev/null.)
1208
# The exception is when not debugging but nevertheless
1209
# running in the foreground; use the previously
1211
popen_args = {"close_fds": True,
1214
if (not self.server_settings["debug"]
1215
and self.server_settings["foreground"]):
1216
popen_args.update({"stdout": wnull,
1218
pipe = multiprocessing.Pipe(duplex=False)
1219
self.checker = multiprocessing.Process(
1221
args=(pipe[1], subprocess.call, command),
1223
self.checker.start()
1224
self.checker_callback_tag = GLib.io_add_watch(
1225
GLib.IOChannel.unix_new(pipe[0].fileno()),
1226
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1227
self.checker_callback, pipe[0], command)
1228
if start_was_randomized:
1229
# We were started after a random delay; Schedule a new
1230
# checker to be started an 'interval' from now, and every
1231
# interval from then on.
1232
now = datetime.datetime.utcnow()
1233
self.checker_initiator_tag = GLib.timeout_add(
1234
int(self.interval.total_seconds() * 1000),
1236
self.expires = max(self.expires, now + self.interval)
1237
# Don't start a new checker again after same random delay
1239
# Re-run this periodically if run by GLib.timeout_add
426
logger.info(u"Starting checker %r for %s",
428
# We don't need to redirect stdout and stderr, since
429
# in normal mode, that is already done by daemon(),
430
# and in debug mode we don't want to. (Stdin is
431
# always replaced by /dev/null.)
432
self.checker = subprocess.Popen(command,
434
shell=True, cwd=u"/")
435
self.checker_callback_tag = (gobject.child_watch_add
437
self.checker_callback,
439
# The checker may have completed before the gobject
440
# watch was added. Check for this.
441
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
443
gobject.source_remove(self.checker_callback_tag)
444
self.checker_callback(pid, status, command)
445
except OSError, error:
446
logger.error(u"Failed to start subprocess: %s",
448
# Re-run this periodically if run by gobject.timeout_add
1242
451
def stop_checker(self):
1243
452
"""Force the checker process, if any, to stop."""
1244
453
if self.checker_callback_tag:
1245
GLib.source_remove(self.checker_callback_tag)
454
gobject.source_remove(self.checker_callback_tag)
1246
455
self.checker_callback_tag = None
1247
if getattr(self, "checker", None) is None:
456
if getattr(self, u"checker", None) is None:
1249
log.debug("Stopping checker for %(name)s", vars(self))
1250
self.checker.terminate()
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
460
os.kill(self.checker.pid, signal.SIGTERM)
462
#if self.checker.poll() is None:
463
# os.kill(self.checker.pid, signal.SIGKILL)
464
except OSError, error:
465
if error.errno != errno.ESRCH: # No such process
1251
467
self.checker = None
1254
def dbus_service_property(dbus_interface,
1258
"""Decorators for marking methods of a DBusObjectWithProperties to
1259
become properties on the D-Bus.
1261
The decorated method will be called with no arguments by "Get"
1262
and with one argument by "Set".
1264
The parameters, where they are supported, are the same as
1265
dbus.service.method, except there is only "signature", since the
1266
type from Get() and the type sent to Set() is the same.
1268
# Encoding deeply encoded byte arrays is not supported yet by the
1269
# "Set" method, so we fail early here:
1270
if byte_arrays and signature != "ay":
1271
raise ValueError("Byte arrays not supported for non-'ay'"
1272
" signature {!r}".format(signature))
1274
def decorator(func):
1275
func._dbus_is_property = True
1276
func._dbus_interface = dbus_interface
1277
func._dbus_signature = signature
1278
func._dbus_access = access
1279
func._dbus_name = func.__name__
1280
if func._dbus_name.endswith("_dbus_property"):
1281
func._dbus_name = func._dbus_name[:-14]
1282
func._dbus_get_args_options = {"byte_arrays": byte_arrays}
1288
def dbus_interface_annotations(dbus_interface):
1289
"""Decorator for marking functions returning interface annotations
1293
@dbus_interface_annotations("org.example.Interface")
1294
def _foo(self): # Function name does not matter
1295
return {"org.freedesktop.DBus.Deprecated": "true",
1296
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1300
def decorator(func):
1301
func._dbus_is_interface = True
1302
func._dbus_interface = dbus_interface
1303
func._dbus_name = dbus_interface
1309
def dbus_annotations(annotations):
1310
"""Decorator to annotate D-Bus methods, signals or properties
1313
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1314
"org.freedesktop.DBus.Property."
1315
"EmitsChangedSignal": "false"})
1316
@dbus_service_property("org.example.Interface", signature="b",
1318
def Property_dbus_property(self):
1319
return dbus.Boolean(False)
1321
See also the DBusObjectWithAnnotations class.
1324
def decorator(func):
1325
func._dbus_annotations = annotations
1331
class DBusPropertyException(dbus.exceptions.DBusException):
1332
"""A base class for D-Bus property-related exceptions
1337
class DBusPropertyAccessException(DBusPropertyException):
1338
"""A property's access permissions disallows an operation.
1343
class DBusPropertyNotFound(DBusPropertyException):
1344
"""An attempt was made to access a non-existing property.
1349
class DBusObjectWithAnnotations(dbus.service.Object):
1350
"""A D-Bus object with annotations.
1352
Classes inheriting from this can use the dbus_annotations
1353
decorator to add annotations to methods or signals.
1357
def _is_dbus_thing(thing):
1358
"""Returns a function testing if an attribute is a D-Bus thing
1360
If called like _is_dbus_thing("method") it returns a function
1361
suitable for use as predicate to inspect.getmembers().
1363
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1366
def _get_all_dbus_things(self, thing):
1367
"""Returns a generator of (name, attribute) pairs
1369
return ((getattr(athing.__get__(self), "_dbus_name", name),
1370
athing.__get__(self))
1371
for cls in self.__class__.__mro__
1373
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1375
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1377
path_keyword="object_path",
1378
connection_keyword="connection")
1379
def Introspect(self, object_path, connection):
1380
"""Overloading of standard D-Bus method.
1382
Inserts annotation tags on methods and signals.
1384
xmlstring = dbus.service.Object.Introspect(self, object_path,
1387
document = xml.dom.minidom.parseString(xmlstring)
1389
for if_tag in document.getElementsByTagName("interface"):
1390
# Add annotation tags
1391
for typ in ("method", "signal"):
1392
for tag in if_tag.getElementsByTagName(typ):
1394
for name, prop in (self.
1395
_get_all_dbus_things(typ)):
1396
if (name == tag.getAttribute("name")
1397
and prop._dbus_interface
1398
== if_tag.getAttribute("name")):
1399
annots.update(getattr(
1400
prop, "_dbus_annotations", {}))
1401
for name, value in annots.items():
1402
ann_tag = document.createElement(
1404
ann_tag.setAttribute("name", name)
1405
ann_tag.setAttribute("value", value)
1406
tag.appendChild(ann_tag)
1407
# Add interface annotation tags
1408
for annotation, value in dict(
1409
itertools.chain.from_iterable(
1410
annotations().items()
1411
for name, annotations
1412
in self._get_all_dbus_things("interface")
1413
if name == if_tag.getAttribute("name")
1415
ann_tag = document.createElement("annotation")
1416
ann_tag.setAttribute("name", annotation)
1417
ann_tag.setAttribute("value", value)
1418
if_tag.appendChild(ann_tag)
1419
# Fix argument name for the Introspect method itself
1420
if (if_tag.getAttribute("name")
1421
== dbus.INTROSPECTABLE_IFACE):
1422
for cn in if_tag.getElementsByTagName("method"):
1423
if cn.getAttribute("name") == "Introspect":
1424
for arg in cn.getElementsByTagName("arg"):
1425
if (arg.getAttribute("direction")
1427
arg.setAttribute("name",
1429
xmlstring = document.toxml("utf-8")
1431
except (AttributeError, xml.dom.DOMException,
1432
xml.parsers.expat.ExpatError) as error:
1433
log.error("Failed to override Introspection method",
1438
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1439
"""A D-Bus object with properties.
1441
Classes inheriting from this can use the dbus_service_property
1442
decorator to expose methods as D-Bus properties. It exposes the
1443
standard Get(), Set(), and GetAll() methods on the D-Bus.
1446
def _get_dbus_property(self, interface_name, property_name):
1447
"""Returns a bound method if one exists which is a D-Bus
1448
property with the specified name and interface.
1450
for cls in self.__class__.__mro__:
1451
for name, value in inspect.getmembers(
1452
cls, self._is_dbus_thing("property")):
1453
if (value._dbus_name == property_name
1454
and value._dbus_interface == interface_name):
1455
return value.__get__(self)
1458
raise DBusPropertyNotFound("{}:{}.{}".format(
1459
self.dbus_object_path, interface_name, property_name))
1462
def _get_all_interface_names(cls):
1463
"""Get a sequence of all interfaces supported by an object"""
1464
return (name for name in set(getattr(getattr(x, attr),
1465
"_dbus_interface", None)
1466
for x in (inspect.getmro(cls))
1468
if name is not None)
1470
@dbus.service.method(dbus.PROPERTIES_IFACE,
1473
def Get(self, interface_name, property_name):
1474
"""Standard D-Bus property Get() method, see D-Bus standard.
1476
prop = self._get_dbus_property(interface_name, property_name)
1477
if prop._dbus_access == "write":
1478
raise DBusPropertyAccessException(property_name)
1480
if not hasattr(value, "variant_level"):
1482
return type(value)(value, variant_level=value.variant_level+1)
1484
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
1485
def Set(self, interface_name, property_name, value):
1486
"""Standard D-Bus property Set() method, see D-Bus standard.
1488
prop = self._get_dbus_property(interface_name, property_name)
1489
if prop._dbus_access == "read":
1490
raise DBusPropertyAccessException(property_name)
1491
if prop._dbus_get_args_options["byte_arrays"]:
1492
# The byte_arrays option is not supported yet on
1493
# signatures other than "ay".
1494
if prop._dbus_signature != "ay":
1495
raise ValueError("Byte arrays not supported for non-"
1496
"'ay' signature {!r}"
1497
.format(prop._dbus_signature))
1498
value = dbus.ByteArray(bytes(value))
1501
@dbus.service.method(dbus.PROPERTIES_IFACE,
1503
out_signature="a{sv}")
1504
def GetAll(self, interface_name):
1505
"""Standard D-Bus property GetAll() method, see D-Bus
1508
Note: Will not include properties with access="write".
1511
for name, prop in self._get_all_dbus_things("property"):
1513
and interface_name != prop._dbus_interface):
1514
# Interface non-empty but did not match
1516
# Ignore write-only properties
1517
if prop._dbus_access == "write":
1520
if not hasattr(value, "variant_level"):
1521
properties[name] = value
1523
properties[name] = type(value)(
1524
value, variant_level=value.variant_level + 1)
1525
return dbus.Dictionary(properties, signature="sv")
1527
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1528
def PropertiesChanged(self, interface_name, changed_properties,
1529
invalidated_properties):
1530
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1535
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1537
path_keyword="object_path",
1538
connection_keyword="connection")
1539
def Introspect(self, object_path, connection):
1540
"""Overloading of standard D-Bus method.
1542
Inserts property tags and interface annotation tags.
1544
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1548
document = xml.dom.minidom.parseString(xmlstring)
1550
def make_tag(document, name, prop):
1551
e = document.createElement("property")
1552
e.setAttribute("name", name)
1553
e.setAttribute("type", prop._dbus_signature)
1554
e.setAttribute("access", prop._dbus_access)
1557
for if_tag in document.getElementsByTagName("interface"):
1559
for tag in (make_tag(document, name, prop)
1561
in self._get_all_dbus_things("property")
1562
if prop._dbus_interface
1563
== if_tag.getAttribute("name")):
1564
if_tag.appendChild(tag)
1565
# Add annotation tags for properties
1566
for tag in if_tag.getElementsByTagName("property"):
1568
for name, prop in self._get_all_dbus_things(
1570
if (name == tag.getAttribute("name")
1571
and prop._dbus_interface
1572
== if_tag.getAttribute("name")):
1573
annots.update(getattr(
1574
prop, "_dbus_annotations", {}))
1575
for name, value in annots.items():
1576
ann_tag = document.createElement(
1578
ann_tag.setAttribute("name", name)
1579
ann_tag.setAttribute("value", value)
1580
tag.appendChild(ann_tag)
1581
# Add the names to the return values for the
1582
# "org.freedesktop.DBus.Properties" methods
1583
if (if_tag.getAttribute("name")
1584
== "org.freedesktop.DBus.Properties"):
1585
for cn in if_tag.getElementsByTagName("method"):
1586
if cn.getAttribute("name") == "Get":
1587
for arg in cn.getElementsByTagName("arg"):
1588
if (arg.getAttribute("direction")
1590
arg.setAttribute("name", "value")
1591
elif cn.getAttribute("name") == "GetAll":
1592
for arg in cn.getElementsByTagName("arg"):
1593
if (arg.getAttribute("direction")
1595
arg.setAttribute("name", "props")
1596
xmlstring = document.toxml("utf-8")
1598
except (AttributeError, xml.dom.DOMException,
1599
xml.parsers.expat.ExpatError) as error:
1600
log.error("Failed to override Introspection method",
1606
dbus.OBJECT_MANAGER_IFACE
1607
except AttributeError:
1608
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1611
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1612
"""A D-Bus object with an ObjectManager.
1614
Classes inheriting from this exposes the standard
1615
GetManagedObjects call and the InterfacesAdded and
1616
InterfacesRemoved signals on the standard
1617
"org.freedesktop.DBus.ObjectManager" interface.
1619
Note: No signals are sent automatically; they must be sent
1622
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1623
out_signature="a{oa{sa{sv}}}")
1624
def GetManagedObjects(self):
1625
"""This function must be overridden"""
1626
raise NotImplementedError()
1628
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1629
signature="oa{sa{sv}}")
1630
def InterfacesAdded(self, object_path, interfaces_and_properties):
1633
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1634
def InterfacesRemoved(self, object_path, interfaces):
1637
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1639
path_keyword="object_path",
1640
connection_keyword="connection")
1641
def Introspect(self, object_path, connection):
1642
"""Overloading of standard D-Bus method.
1644
Override return argument name of GetManagedObjects to be
1645
"objpath_interfaces_and_properties"
1647
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1651
document = xml.dom.minidom.parseString(xmlstring)
1653
for if_tag in document.getElementsByTagName("interface"):
1654
# Fix argument name for the GetManagedObjects method
1655
if (if_tag.getAttribute("name")
1656
== dbus.OBJECT_MANAGER_IFACE):
1657
for cn in if_tag.getElementsByTagName("method"):
1658
if (cn.getAttribute("name")
1659
== "GetManagedObjects"):
1660
for arg in cn.getElementsByTagName("arg"):
1661
if (arg.getAttribute("direction")
1665
"objpath_interfaces"
1667
xmlstring = document.toxml("utf-8")
1669
except (AttributeError, xml.dom.DOMException,
1670
xml.parsers.expat.ExpatError) as error:
1671
log.error("Failed to override Introspection method",
1676
def datetime_to_dbus(dt, variant_level=0):
1677
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1679
return dbus.String("", variant_level=variant_level)
1680
return dbus.String(dt.isoformat(), variant_level=variant_level)
1683
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1684
"""A class decorator; applied to a subclass of
1685
dbus.service.Object, it will add alternate D-Bus attributes with
1686
interface names according to the "alt_interface_names" mapping.
1689
@alternate_dbus_interfaces({"org.example.Interface":
1690
"net.example.AlternateInterface"})
1691
class SampleDBusObject(dbus.service.Object):
1692
@dbus.service.method("org.example.Interface")
1693
def SampleDBusMethod():
1696
The above "SampleDBusMethod" on "SampleDBusObject" will be
1697
reachable via two interfaces: "org.example.Interface" and
1698
"net.example.AlternateInterface", the latter of which will have
1699
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1700
"true", unless "deprecate" is passed with a False value.
1702
This works for methods and signals, and also for D-Bus properties
1703
(from DBusObjectWithProperties) and interfaces (from the
1704
dbus_interface_annotations decorator).
1708
for orig_interface_name, alt_interface_name in (
1709
alt_interface_names.items()):
1711
interface_names = set()
1712
# Go though all attributes of the class
1713
for attrname, attribute in inspect.getmembers(cls):
1714
# Ignore non-D-Bus attributes, and D-Bus attributes
1715
# with the wrong interface name
1716
if (not hasattr(attribute, "_dbus_interface")
1717
or not attribute._dbus_interface.startswith(
1718
orig_interface_name)):
1720
# Create an alternate D-Bus interface name based on
1722
alt_interface = attribute._dbus_interface.replace(
1723
orig_interface_name, alt_interface_name)
1724
interface_names.add(alt_interface)
1725
# Is this a D-Bus signal?
1726
if getattr(attribute, "_dbus_is_signal", False):
1727
# Extract the original non-method undecorated
1728
# function by black magic
1729
if sys.version_info.major == 2:
1730
nonmethod_func = (dict(
1731
zip(attribute.func_code.co_freevars,
1732
attribute.__closure__))
1733
["func"].cell_contents)
1735
nonmethod_func = (dict(
1736
zip(attribute.__code__.co_freevars,
1737
attribute.__closure__))
1738
["func"].cell_contents)
1739
# Create a new, but exactly alike, function
1740
# object, and decorate it to be a new D-Bus signal
1741
# with the alternate D-Bus interface name
1742
new_function = copy_function(nonmethod_func)
1743
new_function = (dbus.service.signal(
1745
attribute._dbus_signature)(new_function))
1746
# Copy annotations, if any
1748
new_function._dbus_annotations = dict(
1749
attribute._dbus_annotations)
1750
except AttributeError:
1753
# Define a creator of a function to call both the
1754
# original and alternate functions, so both the
1755
# original and alternate signals gets sent when
1756
# the function is called
1757
def fixscope(func1, func2):
1758
"""This function is a scope container to pass
1759
func1 and func2 to the "call_both" function
1760
outside of its arguments"""
1762
@functools.wraps(func2)
1763
def call_both(*args, **kwargs):
1764
"""This function will emit two D-Bus
1765
signals by calling func1 and func2"""
1766
func1(*args, **kwargs)
1767
func2(*args, **kwargs)
1768
# Make wrapper function look like a D-Bus
1770
for name, attr in inspect.getmembers(func2):
1771
if name.startswith("_dbus_"):
1772
setattr(call_both, name, attr)
1775
# Create the "call_both" function and add it to
1777
attr[attrname] = fixscope(attribute, new_function)
1778
# Is this a D-Bus method?
1779
elif getattr(attribute, "_dbus_is_method", False):
1780
# Create a new, but exactly alike, function
1781
# object. Decorate it to be a new D-Bus method
1782
# with the alternate D-Bus interface name. Add it
1785
dbus.service.method(
1787
attribute._dbus_in_signature,
1788
attribute._dbus_out_signature)
1789
(copy_function(attribute)))
1790
# Copy annotations, if any
1792
attr[attrname]._dbus_annotations = dict(
1793
attribute._dbus_annotations)
1794
except AttributeError:
1796
# Is this a D-Bus property?
1797
elif getattr(attribute, "_dbus_is_property", False):
1798
# Create a new, but exactly alike, function
1799
# object, and decorate it to be a new D-Bus
1800
# property with the alternate D-Bus interface
1801
# name. Add it to the class.
1802
attr[attrname] = (dbus_service_property(
1803
alt_interface, attribute._dbus_signature,
1804
attribute._dbus_access,
1805
attribute._dbus_get_args_options
1807
(copy_function(attribute)))
1808
# Copy annotations, if any
1810
attr[attrname]._dbus_annotations = dict(
1811
attribute._dbus_annotations)
1812
except AttributeError:
1814
# Is this a D-Bus interface?
1815
elif getattr(attribute, "_dbus_is_interface", False):
1816
# Create a new, but exactly alike, function
1817
# object. Decorate it to be a new D-Bus interface
1818
# with the alternate D-Bus interface name. Add it
1821
dbus_interface_annotations(alt_interface)
1822
(copy_function(attribute)))
1824
# Deprecate all alternate interfaces
1825
iname = "_AlternateDBusNames_interface_annotation{}"
1826
for interface_name in interface_names:
1828
@dbus_interface_annotations(interface_name)
1830
return {"org.freedesktop.DBus.Deprecated":
1832
# Find an unused name
1833
for aname in (iname.format(i)
1834
for i in itertools.count()):
1835
if aname not in attr:
1839
# Replace the class with a new subclass of it with
1840
# methods, signals, etc. as created above.
1841
if sys.version_info.major == 2:
1842
cls = type(b"{}Alternate".format(cls.__name__),
1845
cls = type("{}Alternate".format(cls.__name__),
1852
@alternate_dbus_interfaces({"se.recompile.Mandos":
1853
"se.bsnet.fukt.Mandos"})
1854
class ClientDBus(Client, DBusObjectWithProperties):
469
def still_valid(self):
470
"""Has the timeout not yet passed for this client?"""
471
if not getattr(self, u"enabled", False):
473
now = datetime.datetime.utcnow()
474
if self.last_checked_ok is None:
475
return now < (self.created + self.timeout)
477
return now < (self.last_checked_ok + self.timeout)
480
class ClientDBus(Client, dbus.service.Object):
1855
481
"""A Client class using D-Bus
1858
484
dbus_object_path: dbus.ObjectPath
1859
485
bus: dbus.SystemBus()
1862
runtime_expansions = (Client.runtime_expansions
1863
+ ("dbus_object_path", ))
1865
_interface = "se.recompile.Mandos.Client"
1867
487
# dbus.service.Object doesn't use super(), so we can't either.
1869
def __init__(self, bus=None, *args, **kwargs):
489
def __init__(self, bus = None, *args, **kwargs):
1871
491
Client.__init__(self, *args, **kwargs)
1872
492
# Only now, when this client is initialized, can it show up on
1874
client_object_name = str(self.name).translate(
1875
{ord("."): ord("_"),
1876
ord("-"): ord("_")})
1877
self.dbus_object_path = dbus.ObjectPath(
1878
"/clients/" + client_object_name)
1879
DBusObjectWithProperties.__init__(self, self.bus,
1880
self.dbus_object_path)
1882
def notifychangeproperty(transform_func, dbus_name,
1883
type_func=lambda x: x,
1885
invalidate_only=False,
1886
_interface=_interface):
1887
""" Modify a variable so that it's a property which announces
1888
its changes to DBus.
1890
transform_fun: Function that takes a value and a variant_level
1891
and transforms it to a D-Bus type.
1892
dbus_name: D-Bus name of the variable
1893
type_func: Function that transform the value before sending it
1894
to the D-Bus. Default: no transform
1895
variant_level: D-Bus variant level. Default: 1
1897
attrname = "_{}".format(dbus_name)
1899
def setter(self, value):
1900
if hasattr(self, "dbus_object_path"):
1901
if (not hasattr(self, attrname) or
1902
type_func(getattr(self, attrname, None))
1903
!= type_func(value)):
1905
self.PropertiesChanged(
1906
_interface, dbus.Dictionary(),
1907
dbus.Array((dbus_name, )))
1909
dbus_value = transform_func(
1911
variant_level=variant_level)
1912
self.PropertyChanged(dbus.String(dbus_name),
1914
self.PropertiesChanged(
1916
dbus.Dictionary({dbus.String(dbus_name):
1919
setattr(self, attrname, value)
1921
return property(lambda self: getattr(self, attrname), setter)
1923
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1924
approvals_pending = notifychangeproperty(dbus.Boolean,
1927
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1928
last_enabled = notifychangeproperty(datetime_to_dbus,
1930
checker = notifychangeproperty(
1931
dbus.Boolean, "CheckerRunning",
1932
type_func=lambda checker: checker is not None)
1933
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1935
last_checker_status = notifychangeproperty(dbus.Int16,
1936
"LastCheckerStatus")
1937
last_approval_request = notifychangeproperty(
1938
datetime_to_dbus, "LastApprovalRequest")
1939
approved_by_default = notifychangeproperty(dbus.Boolean,
1940
"ApprovedByDefault")
1941
approval_delay = notifychangeproperty(
1942
dbus.UInt64, "ApprovalDelay",
1943
type_func=lambda td: td.total_seconds() * 1000)
1944
approval_duration = notifychangeproperty(
1945
dbus.UInt64, "ApprovalDuration",
1946
type_func=lambda td: td.total_seconds() * 1000)
1947
host = notifychangeproperty(dbus.String, "Host")
1948
timeout = notifychangeproperty(
1949
dbus.UInt64, "Timeout",
1950
type_func=lambda td: td.total_seconds() * 1000)
1951
extended_timeout = notifychangeproperty(
1952
dbus.UInt64, "ExtendedTimeout",
1953
type_func=lambda td: td.total_seconds() * 1000)
1954
interval = notifychangeproperty(
1955
dbus.UInt64, "Interval",
1956
type_func=lambda td: td.total_seconds() * 1000)
1957
checker_command = notifychangeproperty(dbus.String, "Checker")
1958
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1959
invalidate_only=True)
1961
del notifychangeproperty
494
self.dbus_object_path = (dbus.ObjectPath
496
+ self.name.replace(u".", u"_")))
497
dbus.service.Object.__init__(self, self.bus,
498
self.dbus_object_path)
501
def _datetime_to_dbus(dt, variant_level=0):
502
"""Convert a UTC datetime.datetime() to a D-Bus type."""
503
return dbus.String(dt.isoformat(),
504
variant_level=variant_level)
507
oldstate = getattr(self, u"enabled", False)
508
r = Client.enable(self)
509
if oldstate != self.enabled:
511
self.PropertyChanged(dbus.String(u"enabled"),
512
dbus.Boolean(True, variant_level=1))
513
self.PropertyChanged(
514
dbus.String(u"last_enabled"),
515
self._datetime_to_dbus(self.last_enabled,
519
def disable(self, signal = True):
520
oldstate = getattr(self, u"enabled", False)
521
r = Client.disable(self)
522
if signal and oldstate != self.enabled:
524
self.PropertyChanged(dbus.String(u"enabled"),
525
dbus.Boolean(False, variant_level=1))
1963
528
def __del__(self, *args, **kwargs):
1965
530
self.remove_from_connection()
1966
531
except LookupError:
1968
if hasattr(DBusObjectWithProperties, "__del__"):
1969
DBusObjectWithProperties.__del__(self, *args, **kwargs)
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
1970
535
Client.__del__(self, *args, **kwargs)
1972
def checker_callback(self, source, condition,
1973
connection, command, *args, **kwargs):
1974
ret = Client.checker_callback(self, source, condition,
1975
connection, command, *args,
1977
exitstatus = self.last_checker_status
537
def checker_callback(self, pid, condition, command,
539
self.checker_callback_tag = None
542
self.PropertyChanged(dbus.String(u"checker_running"),
543
dbus.Boolean(False, variant_level=1))
544
if os.WIFEXITED(condition):
545
exitstatus = os.WEXITSTATUS(condition)
1979
546
# Emit D-Bus signal
1980
547
self.CheckerCompleted(dbus.Int16(exitstatus),
1981
# This is specific to GNU libC
1982
dbus.Int64(exitstatus << 8),
548
dbus.Int64(condition),
1983
549
dbus.String(command))
1985
551
# Emit D-Bus signal
1986
552
self.CheckerCompleted(dbus.Int16(-1),
1988
# This is specific to GNU libC
1990
| self.last_checker_signal),
553
dbus.Int64(condition),
1991
554
dbus.String(command))
556
return Client.checker_callback(self, pid, condition, command,
559
def checked_ok(self, *args, **kwargs):
560
r = Client.checked_ok(self, *args, **kwargs)
562
self.PropertyChanged(
563
dbus.String(u"last_checked_ok"),
564
(self._datetime_to_dbus(self.last_checked_ok,
1994
568
def start_checker(self, *args, **kwargs):
1995
old_checker_pid = getattr(self.checker, "pid", None)
569
old_checker = self.checker
570
if self.checker is not None:
571
old_checker_pid = self.checker.pid
573
old_checker_pid = None
1996
574
r = Client.start_checker(self, *args, **kwargs)
1997
575
# Only if new checker process was started
1998
576
if (self.checker is not None
1999
577
and old_checker_pid != self.checker.pid):
2000
578
# Emit D-Bus signal
2001
579
self.CheckerStarted(self.current_checker_command)
2004
def _reset_approved(self):
2005
self.approved = None
2008
def approve(self, value=True):
2009
self.approved = value
2010
GLib.timeout_add(int(self.approval_duration.total_seconds()
2011
* 1000), self._reset_approved)
2012
self.send_changedstate()
2014
# D-Bus methods, signals & properties
580
self.PropertyChanged(
581
dbus.String(u"checker_running"),
582
dbus.Boolean(True, variant_level=1))
585
def stop_checker(self, *args, **kwargs):
586
old_checker = getattr(self, u"checker", None)
587
r = Client.stop_checker(self, *args, **kwargs)
588
if (old_checker is not None
589
and getattr(self, u"checker", None) is None):
590
self.PropertyChanged(dbus.String(u"checker_running"),
591
dbus.Boolean(False, variant_level=1))
594
## D-Bus methods & signals
595
_interface = u"se.bsnet.fukt.Mandos.Client"
598
@dbus.service.method(_interface)
600
return self.checked_ok()
2020
602
# CheckerCompleted - signal
2021
@dbus.service.signal(_interface, signature="nxs")
603
@dbus.service.signal(_interface, signature=u"nxs")
2022
604
def CheckerCompleted(self, exitcode, waitstatus, command):
2026
608
# CheckerStarted - signal
2027
@dbus.service.signal(_interface, signature="s")
609
@dbus.service.signal(_interface, signature=u"s")
2028
610
def CheckerStarted(self, command):
614
# GetAllProperties - method
615
@dbus.service.method(_interface, out_signature=u"a{sv}")
616
def GetAllProperties(self):
618
return dbus.Dictionary({
619
dbus.String(u"name"):
620
dbus.String(self.name, variant_level=1),
621
dbus.String(u"fingerprint"):
622
dbus.String(self.fingerprint, variant_level=1),
623
dbus.String(u"host"):
624
dbus.String(self.host, variant_level=1),
625
dbus.String(u"created"):
626
self._datetime_to_dbus(self.created,
628
dbus.String(u"last_enabled"):
629
(self._datetime_to_dbus(self.last_enabled,
631
if self.last_enabled is not None
632
else dbus.Boolean(False, variant_level=1)),
633
dbus.String(u"enabled"):
634
dbus.Boolean(self.enabled, variant_level=1),
635
dbus.String(u"last_checked_ok"):
636
(self._datetime_to_dbus(self.last_checked_ok,
638
if self.last_checked_ok is not None
639
else dbus.Boolean (False, variant_level=1)),
640
dbus.String(u"timeout"):
641
dbus.UInt64(self.timeout_milliseconds(),
643
dbus.String(u"interval"):
644
dbus.UInt64(self.interval_milliseconds(),
646
dbus.String(u"checker"):
647
dbus.String(self.checker_command,
649
dbus.String(u"checker_running"):
650
dbus.Boolean(self.checker is not None,
652
dbus.String(u"object_path"):
653
dbus.ObjectPath(self.dbus_object_path,
657
# IsStillValid - method
658
@dbus.service.method(_interface, out_signature=u"b")
659
def IsStillValid(self):
660
return self.still_valid()
2032
662
# PropertyChanged - signal
2033
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2034
@dbus.service.signal(_interface, signature="sv")
663
@dbus.service.signal(_interface, signature=u"sv")
2035
664
def PropertyChanged(self, property, value):
2039
# GotSecret - signal
668
# ReceivedSecret - signal
2040
669
@dbus.service.signal(_interface)
2041
def GotSecret(self):
2043
Is sent after a successful transfer of secret from the Mandos
2044
server to mandos-client
670
def ReceivedSecret(self):
2048
674
# Rejected - signal
2049
@dbus.service.signal(_interface, signature="s")
2050
def Rejected(self, reason):
675
@dbus.service.signal(_interface)
2054
# NeedApproval - signal
2055
@dbus.service.signal(_interface, signature="tb")
2056
def NeedApproval(self, timeout, default):
2058
return self.need_approval()
2063
@dbus.service.method(_interface, in_signature="b")
2064
def Approve(self, value):
2067
# CheckedOK - method
2068
@dbus.service.method(_interface)
2069
def CheckedOK(self):
680
# SetChecker - method
681
@dbus.service.method(_interface, in_signature=u"s")
682
def SetChecker(self, checker):
683
"D-Bus setter method"
684
self.checker_command = checker
686
self.PropertyChanged(dbus.String(u"checker"),
687
dbus.String(self.checker_command,
691
@dbus.service.method(_interface, in_signature=u"s")
692
def SetHost(self, host):
693
"D-Bus setter method"
696
self.PropertyChanged(dbus.String(u"host"),
697
dbus.String(self.host, variant_level=1))
699
# SetInterval - method
700
@dbus.service.method(_interface, in_signature=u"t")
701
def SetInterval(self, milliseconds):
702
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
704
self.PropertyChanged(dbus.String(u"interval"),
705
(dbus.UInt64(self.interval_milliseconds(),
709
@dbus.service.method(_interface, in_signature=u"ay",
711
def SetSecret(self, secret):
712
"D-Bus setter method"
713
self.secret = str(secret)
715
# SetTimeout - method
716
@dbus.service.method(_interface, in_signature=u"t")
717
def SetTimeout(self, milliseconds):
718
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
720
self.PropertyChanged(dbus.String(u"timeout"),
721
(dbus.UInt64(self.timeout_milliseconds(),
2072
724
# Enable - method
2073
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2074
725
@dbus.service.method(_interface)
2075
726
def Enable(self):
2079
730
# StartChecker - method
2080
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2081
731
@dbus.service.method(_interface)
2082
732
def StartChecker(self):
2084
734
self.start_checker()
2086
736
# Disable - method
2087
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2088
737
@dbus.service.method(_interface)
2089
738
def Disable(self):
2093
742
# StopChecker - method
2094
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2095
743
@dbus.service.method(_interface)
2096
744
def StopChecker(self):
2097
745
self.stop_checker()
2101
# ApprovalPending - property
2102
@dbus_service_property(_interface, signature="b", access="read")
2103
def ApprovalPending_dbus_property(self):
2104
return dbus.Boolean(bool(self.approvals_pending))
2106
# ApprovedByDefault - property
2107
@dbus_service_property(_interface,
2110
def ApprovedByDefault_dbus_property(self, value=None):
2111
if value is None: # get
2112
return dbus.Boolean(self.approved_by_default)
2113
self.approved_by_default = bool(value)
2115
# ApprovalDelay - property
2116
@dbus_service_property(_interface,
2119
def ApprovalDelay_dbus_property(self, value=None):
2120
if value is None: # get
2121
return dbus.UInt64(self.approval_delay.total_seconds()
2123
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2125
# ApprovalDuration - property
2126
@dbus_service_property(_interface,
2129
def ApprovalDuration_dbus_property(self, value=None):
2130
if value is None: # get
2131
return dbus.UInt64(self.approval_duration.total_seconds()
2133
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2137
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2138
@dbus_service_property(_interface, signature="s", access="read")
2139
def Name_dbus_property(self):
2140
return dbus.String(self.name)
2144
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2145
@dbus_service_property(_interface, signature="s", access="read")
2146
def KeyID_dbus_property(self):
2147
return dbus.String(self.key_id)
2149
# Fingerprint - property
2151
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2152
@dbus_service_property(_interface, signature="s", access="read")
2153
def Fingerprint_dbus_property(self):
2154
return dbus.String(self.fingerprint)
2157
@dbus_service_property(_interface,
2160
def Host_dbus_property(self, value=None):
2161
if value is None: # get
2162
return dbus.String(self.host)
2163
self.host = str(value)
2165
# Created - property
2167
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2168
@dbus_service_property(_interface, signature="s", access="read")
2169
def Created_dbus_property(self):
2170
return datetime_to_dbus(self.created)
2172
# LastEnabled - property
2173
@dbus_service_property(_interface, signature="s", access="read")
2174
def LastEnabled_dbus_property(self):
2175
return datetime_to_dbus(self.last_enabled)
2177
# Enabled - property
2178
@dbus_service_property(_interface,
2181
def Enabled_dbus_property(self, value=None):
2182
if value is None: # get
2183
return dbus.Boolean(self.enabled)
2189
# LastCheckedOK - property
2190
@dbus_service_property(_interface,
2193
def LastCheckedOK_dbus_property(self, value=None):
2194
if value is not None:
2197
return datetime_to_dbus(self.last_checked_ok)
2199
# LastCheckerStatus - property
2200
@dbus_service_property(_interface, signature="n", access="read")
2201
def LastCheckerStatus_dbus_property(self):
2202
return dbus.Int16(self.last_checker_status)
2204
# Expires - property
2205
@dbus_service_property(_interface, signature="s", access="read")
2206
def Expires_dbus_property(self):
2207
return datetime_to_dbus(self.expires)
2209
# LastApprovalRequest - property
2210
@dbus_service_property(_interface, signature="s", access="read")
2211
def LastApprovalRequest_dbus_property(self):
2212
return datetime_to_dbus(self.last_approval_request)
2214
# Timeout - property
2215
@dbus_service_property(_interface,
2218
def Timeout_dbus_property(self, value=None):
2219
if value is None: # get
2220
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2221
old_timeout = self.timeout
2222
self.timeout = datetime.timedelta(0, 0, 0, value)
2223
# Reschedule disabling
2225
now = datetime.datetime.utcnow()
2226
self.expires += self.timeout - old_timeout
2227
if self.expires <= now:
2228
# The timeout has passed
2231
if (getattr(self, "disable_initiator_tag", None)
2234
GLib.source_remove(self.disable_initiator_tag)
2235
self.disable_initiator_tag = GLib.timeout_add(
2236
int((self.expires - now).total_seconds() * 1000),
2239
# ExtendedTimeout - property
2240
@dbus_service_property(_interface,
2243
def ExtendedTimeout_dbus_property(self, value=None):
2244
if value is None: # get
2245
return dbus.UInt64(self.extended_timeout.total_seconds()
2247
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2249
# Interval - property
2250
@dbus_service_property(_interface,
2253
def Interval_dbus_property(self, value=None):
2254
if value is None: # get
2255
return dbus.UInt64(self.interval.total_seconds() * 1000)
2256
self.interval = datetime.timedelta(0, 0, 0, value)
2257
if getattr(self, "checker_initiator_tag", None) is None:
2260
# Reschedule checker run
2261
GLib.source_remove(self.checker_initiator_tag)
2262
self.checker_initiator_tag = GLib.timeout_add(
2263
value, self.start_checker)
2264
self.start_checker() # Start one now, too
2266
# Checker - property
2267
@dbus_service_property(_interface,
2270
def Checker_dbus_property(self, value=None):
2271
if value is None: # get
2272
return dbus.String(self.checker_command)
2273
self.checker_command = str(value)
2275
# CheckerRunning - property
2276
@dbus_service_property(_interface,
2279
def CheckerRunning_dbus_property(self, value=None):
2280
if value is None: # get
2281
return dbus.Boolean(self.checker is not None)
2283
self.start_checker()
2287
# ObjectPath - property
2289
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2290
"org.freedesktop.DBus.Deprecated": "true"})
2291
@dbus_service_property(_interface, signature="o", access="read")
2292
def ObjectPath_dbus_property(self):
2293
return self.dbus_object_path # is already a dbus.ObjectPath
2297
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2299
@dbus_service_property(_interface,
2303
def Secret_dbus_property(self, value):
2304
self.secret = bytes(value)
2310
def __init__(self, child_pipe, key_id, fpr, address):
2311
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
2313
if not self._pipe.recv():
2314
raise KeyError(key_id or fpr)
2316
def __getattribute__(self, name):
2318
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
2320
data = self._pipe.recv()
2321
if data[0] == "data":
2323
if data[0] == "function":
2325
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
2327
return self._pipe.recv()[1]
2331
def __setattr__(self, name, value):
2333
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
2337
750
class ClientHandler(socketserver.BaseRequestHandler, object):
2338
751
"""A class to handle client connections.
2340
753
Instantiated once for each connection to handle it.
2341
754
Note: This will run in its own forked process."""
2343
756
def handle(self):
2344
with contextlib.closing(self.server.child_pipe) as child_pipe:
2345
log.info("TCP connection from: %s",
2346
str(self.client_address))
2347
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2349
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2352
# "+AES-256-CBC", "+SHA1",
2353
# "+COMP-NULL", "+CTYPE-OPENPGP",
757
logger.info(u"TCP connection from: %s",
758
unicode(self.client_address))
759
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
# Open IPC pipe to parent process
761
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
762
session = (gnutls.connection
763
.ClientSession(self.request,
767
line = self.request.makefile().readline()
768
logger.debug(u"Protocol version: %r", line)
770
if int(line.strip().split()[0]) > 1:
772
except (ValueError, IndexError, RuntimeError), error:
773
logger.error(u"Unknown protocol version: %s", error)
776
# Note: gnutls.connection.X509Credentials is really a
777
# generic GnuTLS certificate credentials object so long as
778
# no X.509 keys are added to it. Therefore, we can use it
779
# here despite using OpenPGP certificates.
781
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
# u"+AES-256-CBC", u"+SHA1",
783
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
2355
785
# Use a fallback default, since this MUST be set.
2356
786
priority = self.server.gnutls_priority
2357
787
if priority is None:
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
2362
# Start communication using the Mandos protocol
2363
# Get protocol number
2364
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
2367
if int(line.strip().split()[0]) > 1:
2368
raise RuntimeError(line)
2369
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
2373
# Start GnuTLS connection
789
(gnutls.library.functions
790
.gnutls_priority_set_direct(session._c_object,
2375
794
session.handshake()
2376
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
795
except gnutls.errors.GNUTLSError, error:
796
logger.warning(u"Handshake failed: %s", error)
2378
797
# Do not run session.bye() here: the session is not
2379
798
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
2383
approval_required = False
800
logger.debug(u"Handshake succeeded")
2385
if gnutls.has_rawpk:
2388
key_id = self.key_id(
2389
self.peer_certificate(session))
2390
except (TypeError, gnutls.Error) as error:
2391
log.warning("Bad certificate: %s", error)
2393
log.debug("Key ID: %s",
2394
key_id.decode("utf-8",
2400
fpr = self.fingerprint(
2401
self.peer_certificate(session))
2402
except (TypeError, gnutls.Error) as error:
2403
log.warning("Bad certificate: %s", error)
2405
log.debug("Fingerprint: %s", fpr)
2408
client = ProxyClient(child_pipe, key_id, fpr,
2409
self.client_address)
2413
if client.approval_delay:
2414
delay = client.approval_delay
2415
client.approvals_pending += 1
2416
approval_required = True
2419
if not client.enabled:
2420
log.info("Client %s is disabled", client.name)
2421
if self.server.use_dbus:
2423
client.Rejected("Disabled")
2426
if client.approved or not client.approval_delay:
2427
# We are approved or approval is disabled
2429
elif client.approved is None:
2430
log.info("Client %s needs approval",
2432
if self.server.use_dbus:
2434
client.NeedApproval(
2435
client.approval_delay.total_seconds()
2436
* 1000, client.approved_by_default)
2438
log.warning("Client %s was not approved",
2440
if self.server.use_dbus:
2442
client.Rejected("Denied")
2445
# wait until timeout or approved
2446
time = datetime.datetime.now()
2447
client.changedstate.acquire()
2448
client.changedstate.wait(delay.total_seconds())
2449
client.changedstate.release()
2450
time2 = datetime.datetime.now()
2451
if (time2 - time) >= delay:
2452
if not client.approved_by_default:
2453
log.warning("Client %s timed out while"
2454
" waiting for approval",
2456
if self.server.use_dbus:
2458
client.Rejected("Approval timed out")
2463
delay -= time2 - time
2466
session.send(client.secret)
2467
except gnutls.Error as error:
2468
log.warning("gnutls send failed", exc_info=error)
2471
log.info("Sending secret to %s", client.name)
2472
# bump the timeout using extended_timeout
2473
client.bump_timeout(client.extended_timeout)
2474
if self.server.use_dbus:
2479
if approval_required:
2480
client.approvals_pending -= 1
2483
except gnutls.Error as error:
2484
log.warning("GnuTLS bye failed", exc_info=error)
802
fpr = self.fingerprint(self.peer_certificate(session))
803
except (TypeError, gnutls.errors.GNUTLSError), error:
804
logger.warning(u"Bad certificate: %s", error)
807
logger.debug(u"Fingerprint: %s", fpr)
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
814
ipc.write(u"NOTFOUND %s %s\n"
815
% (fpr, unicode(self.client_address)))
818
# Have to check if client.still_valid(), since it is
819
# possible that the client timed out while establishing
820
# the GnuTLS session.
821
if not client.still_valid():
822
ipc.write(u"INVALID %s\n" % client.name)
825
ipc.write(u"SENDING %s\n" % client.name)
827
while sent_size < len(client.secret):
828
sent = session.send(client.secret[sent_size:])
829
logger.debug(u"Sent: %d, remaining: %d",
830
sent, len(client.secret)
831
- (sent_size + sent))
2487
836
def peer_certificate(session):
2488
"Return the peer's certificate as a bytestring"
2490
cert_type = gnutls.certificate_type_get2(
2491
session, gnutls.CTYPE_PEERS)
2492
except AttributeError:
2493
cert_type = gnutls.certificate_type_get(session)
2494
if gnutls.has_rawpk:
2495
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2497
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2498
# If not a valid certificate type...
2499
if cert_type not in valid_cert_types:
2500
log.info("Cert type %r not in %r", cert_type,
2502
# ...return invalid data
837
"Return the peer's OpenPGP certificate as a bytestring"
838
# If not an OpenPGP certificate...
839
if (gnutls.library.functions
840
.gnutls_certificate_type_get(session._c_object)
841
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
842
# ...do the normal thing
843
return session.peer_certificate
2504
844
list_size = ctypes.c_uint(1)
2505
cert_list = (gnutls.certificate_get_peers
2506
(session, ctypes.byref(list_size)))
845
cert_list = (gnutls.library.functions
846
.gnutls_certificate_get_peers
847
(session._c_object, ctypes.byref(list_size)))
2507
848
if not bool(cert_list) and list_size.value != 0:
2508
raise gnutls.Error("error getting peer certificate")
849
raise gnutls.errors.GNUTLSError(u"error getting peer"
2509
851
if list_size.value == 0:
2511
853
cert = cert_list[0]
2512
854
return ctypes.string_at(cert.data, cert.size)
2515
def key_id(certificate):
2516
"Convert a certificate bytestring to a hexdigit key ID"
2517
# New GnuTLS "datum" with the public key
2518
datum = gnutls.datum_t(
2519
ctypes.cast(ctypes.c_char_p(certificate),
2520
ctypes.POINTER(ctypes.c_ubyte)),
2521
ctypes.c_uint(len(certificate)))
2522
# XXX all these need to be created in the gnutls "module"
2523
# New empty GnuTLS certificate
2524
pubkey = gnutls.pubkey_t()
2525
gnutls.pubkey_init(ctypes.byref(pubkey))
2526
# Import the raw public key into the certificate
2527
gnutls.pubkey_import(pubkey,
2528
ctypes.byref(datum),
2529
gnutls.X509_FMT_DER)
2530
# New buffer for the key ID
2531
buf = ctypes.create_string_buffer(32)
2532
buf_len = ctypes.c_size_t(len(buf))
2533
# Get the key ID from the raw public key into the buffer
2534
gnutls.pubkey_get_key_id(
2536
gnutls.KEYID_USE_SHA256,
2537
ctypes.cast(ctypes.byref(buf),
2538
ctypes.POINTER(ctypes.c_ubyte)),
2539
ctypes.byref(buf_len))
2540
# Deinit the certificate
2541
gnutls.pubkey_deinit(pubkey)
2543
# Convert the buffer to a Python bytestring
2544
key_id = ctypes.string_at(buf, buf_len.value)
2545
# Convert the bytestring to hexadecimal notation
2546
hex_key_id = binascii.hexlify(key_id).upper()
2550
857
def fingerprint(openpgp):
2551
858
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2552
859
# New GnuTLS "datum" with the OpenPGP public key
2553
datum = gnutls.datum_t(
2554
ctypes.cast(ctypes.c_char_p(openpgp),
2555
ctypes.POINTER(ctypes.c_ubyte)),
2556
ctypes.c_uint(len(openpgp)))
860
datum = (gnutls.library.types
861
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
864
ctypes.c_uint(len(openpgp))))
2557
865
# New empty GnuTLS certificate
2558
crt = gnutls.openpgp_crt_t()
2559
gnutls.openpgp_crt_init(ctypes.byref(crt))
866
crt = gnutls.library.types.gnutls_openpgp_crt_t()
867
(gnutls.library.functions
868
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2560
869
# Import the OpenPGP public key into the certificate
2561
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2562
gnutls.OPENPGP_FMT_RAW)
870
(gnutls.library.functions
871
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
872
gnutls.library.constants
873
.GNUTLS_OPENPGP_FMT_RAW))
2563
874
# Verify the self signature in the key
2564
875
crtverify = ctypes.c_uint()
2565
gnutls.openpgp_crt_verify_self(crt, 0,
2566
ctypes.byref(crtverify))
876
(gnutls.library.functions
877
.gnutls_openpgp_crt_verify_self(crt, 0,
878
ctypes.byref(crtverify)))
2567
879
if crtverify.value != 0:
2568
gnutls.openpgp_crt_deinit(crt)
2569
raise gnutls.CertificateSecurityError(code
880
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
881
raise (gnutls.errors.CertificateSecurityError
2571
883
# New buffer for the fingerprint
2572
884
buf = ctypes.create_string_buffer(20)
2573
885
buf_len = ctypes.c_size_t()
2574
886
# Get the fingerprint from the certificate into the buffer
2575
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2576
ctypes.byref(buf_len))
887
(gnutls.library.functions
888
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
889
ctypes.byref(buf_len)))
2577
890
# Deinit the certificate
2578
gnutls.openpgp_crt_deinit(crt)
891
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2579
892
# Convert the buffer to a Python bytestring
2580
893
fpr = ctypes.string_at(buf, buf_len.value)
2581
894
# Convert the bytestring to hexadecimal notation
2582
hex_fpr = binascii.hexlify(fpr).upper()
895
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
2586
class MultiprocessingMixIn:
2587
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2589
def sub_process_main(self, request, address):
2591
self.finish_request(request, address)
2593
self.handle_error(request, address)
2594
self.close_request(request)
2596
def process_request(self, request, address):
2597
"""Start a new process to process the request."""
2598
proc = multiprocessing.Process(target=self.sub_process_main,
2599
args=(request, address))
2604
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2605
""" adds a pipe to the MixIn """
899
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
900
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
2607
901
def process_request(self, request, client_address):
2608
902
"""Overrides and wraps the original process_request().
2610
904
This function creates a new pipe in self.pipe
2612
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2614
proc = MultiprocessingMixIn.process_request(self, request,
2616
self.child_pipe.close()
2617
self.add_pipe(parent_pipe, proc)
2619
def add_pipe(self, parent_pipe, proc):
906
self.pipe = os.pipe()
907
super(ForkingMixInWithPipe,
908
self).process_request(request, client_address)
909
os.close(self.pipe[1]) # close write end
910
self.add_pipe(self.pipe[0])
911
def add_pipe(self, pipe):
2620
912
"""Dummy function; override as necessary"""
2621
raise NotImplementedError()
2624
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2625
socketserver.TCPServer):
2626
"""IPv6-capable TCP server. Accepts None as address and/or port
916
class IPv6_TCPServer(ForkingMixInWithPipe,
917
socketserver.TCPServer, object):
918
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2629
921
enabled: Boolean; whether this server is activated yet
2630
922
interface: None or a network interface name (string)
2631
923
use_ipv6: Boolean; to use IPv6 or not
2634
925
def __init__(self, server_address, RequestHandlerClass,
2638
"""If socketfd is set, use that file descriptor instead of
2639
creating a new one with socket.socket().
926
interface=None, use_ipv6=True):
2641
927
self.interface = interface
2643
929
self.address_family = socket.AF_INET6
2644
if socketfd is not None:
2645
# Save the file descriptor
2646
self.socketfd = socketfd
2647
# Save the original socket.socket() function
2648
self.socket_socket = socket.socket
2650
# To implement --socket, we monkey patch socket.socket.
2652
# (When socketserver.TCPServer is a new-style class, we
2653
# could make self.socket into a property instead of monkey
2654
# patching socket.socket.)
2656
# Create a one-time-only replacement for socket.socket()
2657
@functools.wraps(socket.socket)
2658
def socket_wrapper(*args, **kwargs):
2659
# Restore original function so subsequent calls are
2661
socket.socket = self.socket_socket
2662
del self.socket_socket
2663
# This time only, return a new socket object from the
2664
# saved file descriptor.
2665
return socket.fromfd(self.socketfd, *args, **kwargs)
2666
# Replace socket.socket() function with wrapper
2667
socket.socket = socket_wrapper
2668
# The socketserver.TCPServer.__init__ will call
2669
# socket.socket(), which might be our replacement,
2670
# socket_wrapper(), if socketfd was set.
2671
930
socketserver.TCPServer.__init__(self, server_address,
2672
931
RequestHandlerClass)
2674
932
def server_bind(self):
2675
933
"""This overrides the normal server_bind() function
2676
934
to bind to an interface if one was specified, and also NOT to
2677
935
bind to an address or port if they were not specified."""
2678
global SO_BINDTODEVICE
2679
936
if self.interface is not None:
2680
937
if SO_BINDTODEVICE is None:
2681
# Fall back to a hard-coded value which seems to be
2683
log.warning("SO_BINDTODEVICE not found, trying 25")
2684
SO_BINDTODEVICE = 25
2686
self.socket.setsockopt(
2687
socket.SOL_SOCKET, SO_BINDTODEVICE,
2688
(self.interface + "\0").encode("utf-8"))
2689
except socket.error as error:
2690
if error.errno == errno.EPERM:
2691
log.error("No permission to bind to interface %s",
2693
elif error.errno == errno.ENOPROTOOPT:
2694
log.error("SO_BINDTODEVICE not available; cannot"
2695
" bind to interface %s", self.interface)
2696
elif error.errno == errno.ENODEV:
2697
log.error("Interface %s does not exist, cannot"
2698
" bind", self.interface)
938
logger.error(u"SO_BINDTODEVICE does not exist;"
939
u" cannot bind to interface %s",
943
self.socket.setsockopt(socket.SOL_SOCKET,
947
except socket.error, error:
948
if error[0] == errno.EPERM:
949
logger.error(u"No permission to"
950
u" bind to interface %s",
952
elif error[0] == errno.ENOPROTOOPT:
953
logger.error(u"SO_BINDTODEVICE not available;"
954
u" cannot bind to interface %s",
2701
958
# Only bind(2) the socket if we really need to.
2702
959
if self.server_address[0] or self.server_address[1]:
2703
if self.server_address[1]:
2704
self.allow_reuse_address = True
2705
960
if not self.server_address[0]:
2706
961
if self.address_family == socket.AF_INET6:
2707
any_address = "::" # in6addr_any
962
any_address = u"::" # in6addr_any
2709
any_address = "0.0.0.0" # INADDR_ANY
964
any_address = socket.INADDR_ANY
2710
965
self.server_address = (any_address,
2711
966
self.server_address[1])
2712
967
elif not self.server_address[1]:
2713
self.server_address = (self.server_address[0], 0)
968
self.server_address = (self.server_address[0],
2714
970
# if self.interface:
2715
971
# self.server_address = (self.server_address[0],
3018
##################################################################
1175
######################################################################
3019
1176
# Parsing of options, both command line and config file
3021
parser = argparse.ArgumentParser()
3022
parser.add_argument("-v", "--version", action="version",
3023
version="%(prog)s {}".format(version),
3024
help="show version number and exit")
3025
parser.add_argument("-i", "--interface", metavar="IF",
3026
help="Bind to interface IF")
3027
parser.add_argument("-a", "--address",
3028
help="Address to listen for requests on")
3029
parser.add_argument("-p", "--port", type=int,
3030
help="Port number to receive requests on")
3031
parser.add_argument("--check", action="store_true",
3032
help="Run self-test")
3033
parser.add_argument("--debug", action="store_true",
3034
help="Debug mode; run in foreground and log"
3035
" to terminal", default=None)
3036
parser.add_argument("--debuglevel", metavar="LEVEL",
3037
help="Debug level for stdout output")
3038
parser.add_argument("--priority", help="GnuTLS"
3039
" priority string (see GnuTLS documentation)")
3040
parser.add_argument("--servicename",
3041
metavar="NAME", help="Zeroconf service name")
3042
parser.add_argument("--configdir",
3043
default="/etc/mandos", metavar="DIR",
3044
help="Directory to search for configuration"
3046
parser.add_argument("--no-dbus", action="store_false",
3047
dest="use_dbus", help="Do not provide D-Bus"
3048
" system bus interface", default=None)
3049
parser.add_argument("--no-ipv6", action="store_false",
3050
dest="use_ipv6", help="Do not use IPv6",
3052
parser.add_argument("--no-restore", action="store_false",
3053
dest="restore", help="Do not restore stored"
3054
" state", default=None)
3055
parser.add_argument("--socket", type=int,
3056
help="Specify a file descriptor to a network"
3057
" socket to use instead of creating one")
3058
parser.add_argument("--statedir", metavar="DIR",
3059
help="Directory to save/restore state in")
3060
parser.add_argument("--foreground", action="store_true",
3061
help="Run in foreground", default=None)
3062
parser.add_argument("--no-zeroconf", action="store_false",
3063
dest="zeroconf", help="Do not use Zeroconf",
3066
options = parser.parse_args()
1178
parser = optparse.OptionParser(version = "%%prog %s" % version)
1179
parser.add_option("-i", u"--interface", type=u"string",
1180
metavar="IF", help=u"Bind to interface IF")
1181
parser.add_option("-a", u"--address", type=u"string",
1182
help=u"Address to listen for requests on")
1183
parser.add_option("-p", u"--port", type=u"int",
1184
help=u"Port number to receive requests on")
1185
parser.add_option("--check", action=u"store_true",
1186
help=u"Run self-test")
1187
parser.add_option("--debug", action=u"store_true",
1188
help=u"Debug mode; run in foreground and log to"
1190
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1191
u" priority string (see GnuTLS documentation)")
1192
parser.add_option("--servicename", type=u"string",
1193
metavar=u"NAME", help=u"Zeroconf service name")
1194
parser.add_option("--configdir", type=u"string",
1195
default=u"/etc/mandos", metavar=u"DIR",
1196
help=u"Directory to search for configuration"
1198
parser.add_option("--no-dbus", action=u"store_false",
1199
dest=u"use_dbus", help=u"Do not provide D-Bus"
1200
u" system bus interface")
1201
parser.add_option("--no-ipv6", action=u"store_false",
1202
dest=u"use_ipv6", help=u"Do not use IPv6")
1203
options = parser.parse_args()[0]
3068
1210
# Default values for config file for server-global settings
3069
if gnutls.has_rawpk:
3070
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3071
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3073
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3074
":+SIGN-DSA-SHA256")
3075
server_defaults = {"interface": "",
3079
"priority": priority,
3080
"servicename": "Mandos",
3086
"statedir": "/var/lib/mandos",
3087
"foreground": "False",
1211
server_defaults = { u"interface": u"",
1216
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1217
u"servicename": u"Mandos",
1218
u"use_dbus": u"True",
1219
u"use_ipv6": u"True",
3092
1222
# Parse config file for server-global settings
3093
server_config = configparser.ConfigParser(server_defaults)
1223
server_config = configparser.SafeConfigParser(server_defaults)
3094
1224
del server_defaults
3095
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3096
# Convert the ConfigParser object to a dict
1225
server_config.read(os.path.join(options.configdir,
1227
# Convert the SafeConfigParser object to a dict
3097
1228
server_settings = server_config.defaults()
3098
1229
# Use the appropriate methods on the non-string config options
3099
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3100
"foreground", "zeroconf"):
3101
server_settings[option] = server_config.getboolean("DEFAULT",
1230
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1231
server_settings[option] = server_config.getboolean(u"DEFAULT",
3103
1233
if server_settings["port"]:
3104
server_settings["port"] = server_config.getint("DEFAULT",
3106
if server_settings["socket"]:
3107
server_settings["socket"] = server_config.getint("DEFAULT",
3109
# Later, stdin will, and stdout and stderr might, be dup'ed
3110
# over with an opened os.devnull. But we don't want this to
3111
# happen with a supplied network socket.
3112
while 0 <= server_settings["socket"] <= 2:
3113
server_settings["socket"] = os.dup(server_settings
3115
os.set_inheritable(server_settings["socket"], False)
1234
server_settings["port"] = server_config.getint(u"DEFAULT",
3116
1236
del server_config
3118
1238
# Override the settings from the config file with command line
3119
1239
# options, if set.
3120
for option in ("interface", "address", "port", "debug",
3121
"priority", "servicename", "configdir", "use_dbus",
3122
"use_ipv6", "debuglevel", "restore", "statedir",
3123
"socket", "foreground", "zeroconf"):
1240
for option in (u"interface", u"address", u"port", u"debug",
1241
u"priority", u"servicename", u"configdir",
1242
u"use_dbus", u"use_ipv6"):
3124
1243
value = getattr(options, option)
3125
1244
if value is not None:
3126
1245
server_settings[option] = value
3128
1247
# Force all strings to be unicode
3129
1248
for option in server_settings.keys():
3130
if isinstance(server_settings[option], bytes):
3131
server_settings[option] = (server_settings[option]
3133
# Force all boolean options to be boolean
3134
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3135
"foreground", "zeroconf"):
3136
server_settings[option] = bool(server_settings[option])
3137
# Debug implies foreground
3138
if server_settings["debug"]:
3139
server_settings["foreground"] = True
1249
if type(server_settings[option]) is str:
1250
server_settings[option] = unicode(server_settings[option])
3140
1251
# Now we have our good server settings in "server_settings"
3142
1253
##################################################################
3144
if (not server_settings["zeroconf"]
3145
and not (server_settings["port"]
3146
or server_settings["socket"] != "")):
3147
parser.error("Needs port or socket to work without Zeroconf")
3149
1255
# For convenience
3150
debug = server_settings["debug"]
3151
debuglevel = server_settings["debuglevel"]
3152
use_dbus = server_settings["use_dbus"]
3153
use_ipv6 = server_settings["use_ipv6"]
3154
stored_state_path = os.path.join(server_settings["statedir"],
3156
foreground = server_settings["foreground"]
3157
zeroconf = server_settings["zeroconf"]
3160
initlogger(debug, logging.DEBUG)
3165
level = getattr(logging, debuglevel.upper())
3166
initlogger(debug, level)
3168
if server_settings["servicename"] != "Mandos":
3169
syslogger.setFormatter(
3170
logging.Formatter("Mandos ({}) [%(process)d]:"
3171
" %(levelname)s: %(message)s".format(
3172
server_settings["servicename"])))
1256
debug = server_settings[u"debug"]
1257
use_dbus = server_settings[u"use_dbus"]
1258
use_ipv6 = server_settings[u"use_ipv6"]
1261
syslogger.setLevel(logging.WARNING)
1262
console.setLevel(logging.WARNING)
1264
if server_settings[u"servicename"] != u"Mandos":
1265
syslogger.setFormatter(logging.Formatter
1266
(u'Mandos (%s) [%%(process)d]:'
1267
u' %%(levelname)s: %%(message)s'
1268
% server_settings[u"servicename"]))
3174
1270
# Parse config file with clients
3175
client_config = configparser.ConfigParser(Client.client_defaults)
3176
client_config.read(os.path.join(server_settings["configdir"],
1271
client_defaults = { u"timeout": u"1h",
1273
u"checker": u"fping -q -- %%(host)s",
1276
client_config = configparser.SafeConfigParser(client_defaults)
1277
client_config.read(os.path.join(server_settings[u"configdir"],
3179
1280
global mandos_dbus_service
3180
1281
mandos_dbus_service = None
3183
if server_settings["socket"] != "":
3184
socketfd = server_settings["socket"]
3185
tcp_server = MandosServer(
3186
(server_settings["address"], server_settings["port"]),
3188
interface=(server_settings["interface"] or None),
3190
gnutls_priority=server_settings["priority"],
3194
pidfilename = "/run/mandos.pid"
3195
if not os.path.isdir("/run/."):
3196
pidfilename = "/var/run/mandos.pid"
3199
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3200
except IOError as e:
3201
log.error("Could not open file %r", pidfilename,
3204
for name, group in (("_mandos", "_mandos"),
3205
("mandos", "mandos"),
3206
("nobody", "nogroup")):
3208
uid = pwd.getpwnam(name).pw_uid
3209
gid = pwd.getpwnam(group).pw_gid
1283
tcp_server = MandosServer((server_settings[u"address"],
1284
server_settings[u"port"]),
1286
interface=server_settings[u"interface"],
1289
server_settings[u"priority"],
1291
pidfilename = u"/var/run/mandos.pid"
1293
pidfile = open(pidfilename, u"w")
1295
logger.error(u"Could not open file %r", pidfilename)
1298
uid = pwd.getpwnam(u"_mandos").pw_uid
1299
gid = pwd.getpwnam(u"_mandos").pw_gid
1302
uid = pwd.getpwnam(u"mandos").pw_uid
1303
gid = pwd.getpwnam(u"mandos").pw_gid
3211
1304
except KeyError:
1306
uid = pwd.getpwnam(u"nobody").pw_uid
1307
gid = pwd.getpwnam(u"nobody").pw_gid
3219
log.debug("Did setuid/setgid to %s:%s", uid, gid)
3220
except OSError as error:
3221
log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3222
os.strerror(error.errno))
3223
if error.errno != errno.EPERM:
1314
except OSError, error:
1315
if error[0] != errno.EPERM:
1318
# Enable all possible GnuTLS debugging
3227
# Enable all possible GnuTLS debugging
3229
1320
# "Use a log level over 10 to enable all debugging options."
3230
1321
# - GnuTLS manual
3231
gnutls.global_set_log_level(11)
1322
gnutls.library.functions.gnutls_global_set_log_level(11)
1324
@gnutls.library.types.gnutls_log_func
3234
1325
def debug_gnutls(level, string):
3235
log.debug("GnuTLS: %s",
3236
string[:-1].decode("utf-8", errors="replace"))
3238
gnutls.global_set_log_function(debug_gnutls)
3240
# Redirect stdin so all checkers get /dev/null
3241
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3242
os.dup2(null, sys.stdin.fileno())
3246
# Need to fork before connecting to D-Bus
3248
# Close all input and output, do double fork, etc.
3251
if gi.version_info < (3, 10, 2):
3252
# multiprocessing will use threads, so before we use GLib we
3253
# need to inform GLib that threads will be used.
1326
logger.debug(u"GnuTLS: %s", string[:-1])
1328
(gnutls.library.functions
1329
.gnutls_global_set_log_function(debug_gnutls))
3256
1331
global main_loop
3257
1332
# From the Avahi example code
3258
DBusGMainLoop(set_as_default=True)
3259
main_loop = GLib.MainLoop()
3260
if use_dbus or zeroconf:
3261
bus = dbus.SystemBus()
1333
DBusGMainLoop(set_as_default=True )
1334
main_loop = gobject.MainLoop()
1335
bus = dbus.SystemBus()
3262
1336
# End of Avahi example code
3265
bus_name = dbus.service.BusName("se.recompile.Mandos",
3268
old_bus_name = dbus.service.BusName(
3269
"se.bsnet.fukt.Mandos", bus,
3271
except dbus.exceptions.DBusException as e:
3272
log.error("Disabling D-Bus:", exc_info=e)
3274
server_settings["use_dbus"] = False
3275
tcp_server.use_dbus = False
3277
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3278
service = AvahiServiceToSyslog(
3279
name=server_settings["servicename"],
3280
servicetype="_mandos._tcp",
3283
if server_settings["interface"]:
3284
service.interface = if_nametoindex(
3285
server_settings["interface"].encode("utf-8"))
3287
global multiprocessing_manager
3288
multiprocessing_manager = multiprocessing.Manager()
1338
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1339
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1340
service = AvahiService(name = server_settings[u"servicename"],
1341
servicetype = u"_mandos._tcp",
1342
protocol = protocol, bus = bus)
1343
if server_settings["interface"]:
1344
service.interface = (if_nametoindex
1345
(str(server_settings[u"interface"])))
3290
1347
client_class = Client
3292
client_class = functools.partial(ClientDBus, bus=bus)
3294
client_settings = Client.config_parser(client_config)
3295
old_client_settings = {}
3298
# This is used to redirect stdout and stderr for checker processes
3300
wnull = open(os.devnull, "w") # A writable /dev/null
3301
# Only used if server is running in foreground but not in debug
3303
if debug or not foreground:
3306
# Get client data and settings from last running state.
3307
if server_settings["restore"]:
3309
with open(stored_state_path, "rb") as stored_state:
3310
if sys.version_info.major == 2:
3311
clients_data, old_client_settings = pickle.load(
3314
bytes_clients_data, bytes_old_client_settings = (
3315
pickle.load(stored_state, encoding="bytes"))
3316
# Fix bytes to strings
3319
clients_data = {(key.decode("utf-8")
3320
if isinstance(key, bytes)
3323
bytes_clients_data.items()}
3324
del bytes_clients_data
3325
for key in clients_data:
3326
value = {(k.decode("utf-8")
3327
if isinstance(k, bytes) else k): v
3329
clients_data[key].items()}
3330
clients_data[key] = value
3332
value["client_structure"] = [
3334
if isinstance(s, bytes)
3336
value["client_structure"]]
3337
# .name, .host, and .checker_command
3338
for k in ("name", "host", "checker_command"):
3339
if isinstance(value[k], bytes):
3340
value[k] = value[k].decode("utf-8")
3341
if "key_id" not in value:
3342
value["key_id"] = ""
3343
elif "fingerprint" not in value:
3344
value["fingerprint"] = ""
3345
# old_client_settings
3347
old_client_settings = {
3348
(key.decode("utf-8")
3349
if isinstance(key, bytes)
3352
bytes_old_client_settings.items()}
3353
del bytes_old_client_settings
3354
# .host and .checker_command
3355
for value in old_client_settings.values():
3356
for attribute in ("host", "checker_command"):
3357
if isinstance(value[attribute], bytes):
3358
value[attribute] = (value[attribute]
3360
os.remove(stored_state_path)
3361
except IOError as e:
3362
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
3366
log.critical("Could not load persistent state:",
3369
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
3373
with PGPEngine() as pgp:
3374
for client_name, client in clients_data.items():
3375
# Skip removed clients
3376
if client_name not in client_settings:
3379
# Decide which value to use after restoring saved state.
3380
# We have three different values: Old config file,
3381
# new config file, and saved state.
3382
# New config value takes precedence if it differs from old
3383
# config value, otherwise use saved state.
3384
for name, value in client_settings[client_name].items():
3386
# For each value in new config, check if it
3387
# differs from the old config value (Except for
3388
# the "secret" attribute)
3389
if (name != "secret"
3391
old_client_settings[client_name][name])):
3392
client[name] = value
3396
# Clients who has passed its expire date can still be
3397
# enabled if its last checker was successful. A Client
3398
# whose checker succeeded before we stored its state is
3399
# assumed to have successfully run all checkers during
3401
if client["enabled"]:
3402
if datetime.datetime.utcnow() >= client["expires"]:
3403
if not client["last_checked_ok"]:
3404
log.warning("disabling client %s - Client"
3405
" never performed a successful"
3406
" checker", client_name)
3407
client["enabled"] = False
3408
elif client["last_checker_status"] != 0:
3409
log.warning("disabling client %s - Client"
3410
" last checker failed with error"
3411
" code %s", client_name,
3412
client["last_checker_status"])
3413
client["enabled"] = False
3415
client["expires"] = (
3416
datetime.datetime.utcnow()
3417
+ client["timeout"])
3418
log.debug("Last checker succeeded, keeping %s"
3419
" enabled", client_name)
3421
client["secret"] = pgp.decrypt(
3422
client["encrypted_secret"],
3423
client_settings[client_name]["secret"])
3425
# If decryption fails, we use secret from new settings
3426
log.debug("Failed to decrypt %s old secret",
3428
client["secret"] = (client_settings[client_name]
3431
# Add/remove clients based on new changes made to config
3432
for client_name in (set(old_client_settings)
3433
- set(client_settings)):
3434
del clients_data[client_name]
3435
for client_name in (set(client_settings)
3436
- set(old_client_settings)):
3437
clients_data[client_name] = client_settings[client_name]
3439
# Create all client objects
3440
for client_name, client in clients_data.items():
3441
tcp_server.clients[client_name] = client_class(
3444
server_settings=server_settings)
1349
client_class = functools.partial(ClientDBus, bus = bus)
1350
tcp_server.clients.update(set(
1351
client_class(name = section,
1352
config= dict(client_config.items(section)))
1353
for section in client_config.sections()))
3446
1354
if not tcp_server.clients:
3447
log.warning("No clients defined")
3450
if pidfile is not None:
1355
logger.warning(u"No clients defined")
1358
# Redirect stdin so all checkers get /dev/null
1359
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1360
os.dup2(null, sys.stdin.fileno())
1364
# No console logging
1365
logger.removeHandler(console)
1366
# Close all input and output, do double fork, etc.
1370
with closing(pidfile):
3451
1371
pid = os.getpid()
3454
print(pid, file=pidfile)
3456
log.error("Could not write to file %r with PID %d",
1372
pidfile.write(str(pid) + "\n")
3461
for termsig in (signal.SIGHUP, signal.SIGTERM):
3462
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3463
lambda: main_loop.quit() and False)
1375
logger.error(u"Could not write to file %r with PID %d",
1378
# "pidfile" was never created
1383
"Cleanup function; run on exit"
1386
while tcp_server.clients:
1387
client = tcp_server.clients.pop()
1388
client.disable_hook = None
1391
atexit.register(cleanup)
1394
signal.signal(signal.SIGINT, signal.SIG_IGN)
1395
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1396
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3467
@alternate_dbus_interfaces(
3468
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3469
class MandosDBusService(DBusObjectWithObjectManager):
1399
class MandosDBusService(dbus.service.Object):
3470
1400
"""A D-Bus proxy object"""
3472
1401
def __init__(self):
3473
dbus.service.Object.__init__(self, bus, "/")
3475
_interface = "se.recompile.Mandos"
3477
@dbus.service.signal(_interface, signature="o")
3478
def ClientAdded(self, objpath):
3482
@dbus.service.signal(_interface, signature="ss")
3483
def ClientNotFound(self, key_id, address):
3487
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3489
@dbus.service.signal(_interface, signature="os")
1402
dbus.service.Object.__init__(self, bus, u"/")
1403
_interface = u"se.bsnet.fukt.Mandos"
1405
@dbus.service.signal(_interface, signature=u"oa{sv}")
1406
def ClientAdded(self, objpath, properties):
1410
@dbus.service.signal(_interface, signature=u"s")
1411
def ClientNotFound(self, fingerprint):
1415
@dbus.service.signal(_interface, signature=u"os")
3490
1416
def ClientRemoved(self, objpath, name):
3494
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3496
@dbus.service.method(_interface, out_signature="ao")
1420
@dbus.service.method(_interface, out_signature=u"ao")
3497
1421
def GetAllClients(self):
3499
return dbus.Array(c.dbus_object_path for c in
3500
tcp_server.clients.values())
3502
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
1423
return dbus.Array(c.dbus_object_path
1424
for c in tcp_server.clients)
3504
1426
@dbus.service.method(_interface,
3505
out_signature="a{oa{sv}}")
1427
out_signature=u"a{oa{sv}}")
3506
1428
def GetAllClientsWithProperties(self):
3508
1430
return dbus.Dictionary(
3509
{c.dbus_object_path: c.GetAll(
3510
"se.recompile.Mandos.Client")
3511
for c in tcp_server.clients.values()},
3514
@dbus.service.method(_interface, in_signature="o")
1431
((c.dbus_object_path, c.GetAllProperties())
1432
for c in tcp_server.clients),
1433
signature=u"oa{sv}")
1435
@dbus.service.method(_interface, in_signature=u"o")
3515
1436
def RemoveClient(self, object_path):
3517
for c in tcp_server.clients.values():
1438
for c in tcp_server.clients:
3518
1439
if c.dbus_object_path == object_path:
3519
del tcp_server.clients[c.name]
1440
tcp_server.clients.remove(c)
3520
1441
c.remove_from_connection()
3521
# Don't signal the disabling
3522
c.disable(quiet=True)
3523
# Emit D-Bus signal for removal
3524
self.client_removed_signal(c)
1442
# Don't signal anything except ClientRemoved
1443
c.disable(signal=False)
1445
self.ClientRemoved(object_path, c.name)
3526
raise KeyError(object_path)
3530
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3531
out_signature="a{oa{sa{sv}}}")
3532
def GetManagedObjects(self):
3534
return dbus.Dictionary(
3535
{client.dbus_object_path:
3537
{interface: client.GetAll(interface)
3539
client._get_all_interface_names()})
3540
for client in tcp_server.clients.values()})
3542
def client_added_signal(self, client):
3543
"""Send the new standard signal and the old signal"""
3545
# New standard signal
3546
self.InterfacesAdded(
3547
client.dbus_object_path,
3549
{interface: client.GetAll(interface)
3551
client._get_all_interface_names()}))
3553
self.ClientAdded(client.dbus_object_path)
3555
def client_removed_signal(self, client):
3556
"""Send the new standard signal and the old signal"""
3558
# New standard signal
3559
self.InterfacesRemoved(
3560
client.dbus_object_path,
3561
client._get_all_interface_names())
3563
self.ClientRemoved(client.dbus_object_path,
3566
1451
mandos_dbus_service = MandosDBusService()
3568
# Save modules to variables to exempt the modules from being
3569
# unloaded before the function registered with atexit() is run.
3570
mp = multiprocessing
3574
"Cleanup function; run on exit"
3578
mp.active_children()
3580
if not (tcp_server.clients or client_settings):
3583
# Store client before exiting. Secrets are encrypted with key
3584
# based on what config file has. If config file is
3585
# removed/edited, old secret will thus be unrecovable.
3587
with PGPEngine() as pgp:
3588
for client in tcp_server.clients.values():
3589
key = client_settings[client.name]["secret"]
3590
client.encrypted_secret = pgp.encrypt(client.secret,
3594
# A list of attributes that can not be pickled
3596
exclude = {"bus", "changedstate", "secret",
3597
"checker", "server_settings"}
3598
for name, typ in inspect.getmembers(dbus.service
3602
client_dict["encrypted_secret"] = (client
3604
for attr in client.client_structure:
3605
if attr not in exclude:
3606
client_dict[attr] = getattr(client, attr)
3608
clients[client.name] = client_dict
3609
del client_settings[client.name]["secret"]
3612
with tempfile.NamedTemporaryFile(
3616
dir=os.path.dirname(stored_state_path),
3617
delete=False) as stored_state:
3618
pickle.dump((clients, client_settings), stored_state,
3620
tempname = stored_state.name
3621
os.rename(tempname, stored_state_path)
3622
except (IOError, OSError) as e:
3628
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3629
log.warning("Could not save persistent state: %s",
3630
os.strerror(e.errno))
3632
log.warning("Could not save persistent state:",
3636
# Delete all clients, and settings from config
3637
while tcp_server.clients:
3638
name, client = tcp_server.clients.popitem()
3640
client.remove_from_connection()
3641
# Don't signal the disabling
3642
client.disable(quiet=True)
3643
# Emit D-Bus signal for removal
3645
mandos_dbus_service.client_removed_signal(client)
3646
client_settings.clear()
3648
atexit.register(cleanup)
3650
for client in tcp_server.clients.values():
1453
for client in tcp_server.clients:
3652
# Emit D-Bus signal for adding
3653
mandos_dbus_service.client_added_signal(client)
3654
# Need to initiate checking of clients
3656
client.init_checker(randomize_start=True)
1456
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1457
client.GetAllProperties())
3658
1460
tcp_server.enable()
3659
1461
tcp_server.server_activate()
3661
1463
# Find out what port we got
3663
service.port = tcp_server.socket.getsockname()[1]
1464
service.port = tcp_server.socket.getsockname()[1]
3665
log.info("Now listening on address %r, port %d, flowinfo %d,"
3666
" scope_id %d", *tcp_server.socket.getsockname())
1466
logger.info(u"Now listening on address %r, port %d,"
1467
" flowinfo %d, scope_id %d"
1468
% tcp_server.socket.getsockname())
3668
log.info("Now listening on address %r, port %d",
3669
*tcp_server.socket.getsockname())
3671
# service.interface = tcp_server.socket.getsockname()[3]
1470
logger.info(u"Now listening on address %r, port %d"
1471
% tcp_server.socket.getsockname())
1473
#service.interface = tcp_server.socket.getsockname()[3]
3675
# From the Avahi example code
3678
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3682
# End of Avahi example code
3685
GLib.IOChannel.unix_new(tcp_server.fileno()),
3686
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3687
lambda *args, **kwargs: (tcp_server.handle_request
3688
(*args[2:], **kwargs) or True))
3690
log.debug("Starting main loop")
1476
# From the Avahi example code
1479
except dbus.exceptions.DBusException, error:
1480
logger.critical(u"DBusException: %s", error)
1482
# End of Avahi example code
1484
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1485
lambda *args, **kwargs:
1486
(tcp_server.handle_request
1487
(*args[2:], **kwargs) or True))
1489
logger.debug(u"Starting main loop")
3691
1490
main_loop.run()
3692
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
1491
except AvahiError, error:
1492
logger.critical(u"AvahiError: %s", error)
3696
1494
except KeyboardInterrupt:
3698
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
3701
# Must run before the D-Bus bus name gets deregistered
3705
def parse_test_args():
3706
# type: () -> argparse.Namespace
3707
parser = argparse.ArgumentParser(add_help=False)
3708
parser.add_argument("--check", action="store_true")
3709
parser.add_argument("--prefix", )
3710
args, unknown_args = parser.parse_known_args()
3712
# Remove test options from sys.argv
3713
sys.argv[1:] = unknown_args
3716
# Add all tests from doctest strings
3717
def load_tests(loader, tests, none):
3719
tests.addTests(doctest.DocTestSuite())
3722
if __name__ == "__main__":
3723
options = parse_test_args()
3726
extra_test_prefix = options.prefix
3727
if extra_test_prefix is not None:
3728
if not (unittest.main(argv=[""], exit=False)
3729
.result.wasSuccessful()):
3731
class ExtraTestLoader(unittest.TestLoader):
3732
testMethodPrefix = extra_test_prefix
3733
# Call using ./scriptname --test [--verbose]
3734
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3736
unittest.main(argv=[""])
3744
# (lambda (&optional extra)
3745
# (if (not (funcall run-tests-in-test-buffer default-directory
3747
# (funcall show-test-buffer-in-test-window)
3748
# (funcall remove-test-window)
3749
# (if extra (message "Extra tests run successfully!"))))
3750
# run-tests-in-test-buffer:
3751
# (lambda (dir &optional extra)
3752
# (with-current-buffer (get-buffer-create "*Test*")
3753
# (setq buffer-read-only nil
3754
# default-directory dir)
3756
# (compilation-mode))
3757
# (let ((process-result
3758
# (let ((inhibit-read-only t))
3759
# (process-file-shell-command
3760
# (funcall get-command-line extra) nil "*Test*"))))
3761
# (and (numberp process-result)
3762
# (= process-result 0))))
3764
# (lambda (&optional extra)
3765
# (let ((quoted-script
3766
# (shell-quote-argument (funcall get-script-name))))
3768
# (concat "%s --check" (if extra " --prefix=atest" ""))
3772
# (if (fboundp 'file-local-name)
3773
# (file-local-name (buffer-file-name))
3774
# (or (file-remote-p (buffer-file-name) 'localname)
3775
# (buffer-file-name))))
3776
# remove-test-window:
3778
# (let ((test-window (get-buffer-window "*Test*")))
3779
# (if test-window (delete-window test-window))))
3780
# show-test-buffer-in-test-window:
3782
# (when (not (get-buffer-window-list "*Test*"))
3783
# (setq next-error-last-buffer (get-buffer "*Test*"))
3784
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3785
# (display-buffer-overriding-action
3786
# `((display-buffer-in-side-window) (side . ,side)
3787
# (window-height . fit-window-to-buffer)
3788
# (window-width . fit-window-to-buffer))))
3789
# (display-buffer "*Test*"))))
3792
# (let* ((run-extra-tests (lambda () (interactive)
3793
# (funcall run-tests t)))
3794
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3795
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3796
# (setq minor-mode-overriding-map-alist
3797
# (cons `(run-tests . ,outer-keymap)
3798
# minor-mode-overriding-map-alist)))
3799
# (add-hook 'after-save-hook run-tests 90 t))
1497
logger.debug(u"Server received KeyboardInterrupt")
1498
logger.debug(u"Server exiting")
1500
if __name__ == '__main__':