265
195
.replace(b"\n", b"\\n")
266
196
.replace(b"\0", b"\\x00"))
269
199
def encrypt(self, data, password):
270
200
passphrase = self.password_encode(password)
271
201
with tempfile.NamedTemporaryFile(
272
202
dir=self.tempdir) as passfile:
273
203
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
205
proc = subprocess.Popen(['gpg', '--symmetric',
278
208
+ self.gnupgargs,
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
209
stdin = subprocess.PIPE,
210
stdout = subprocess.PIPE,
211
stderr = subprocess.PIPE)
212
ciphertext, err = proc.communicate(input = data)
283
213
if proc.returncode != 0:
284
214
raise PGPError(err)
285
215
return ciphertext
287
217
def decrypt(self, data, password):
288
218
passphrase = self.password_encode(password)
289
219
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
220
dir = self.tempdir) as passfile:
291
221
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
223
proc = subprocess.Popen(['gpg', '--decrypt',
296
226
+ self.gnupgargs,
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
227
stdin = subprocess.PIPE,
228
stdout = subprocess.PIPE,
229
stderr = subprocess.PIPE)
230
decrypted_plaintext, err = proc.communicate(input = data)
301
231
if proc.returncode != 0:
302
232
raise PGPError(err)
303
233
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
236
class AvahiError(Exception):
333
237
def __init__(self, value, *args, **kwargs):
334
238
self.value = value
523
417
class AvahiServiceToSyslog(AvahiService):
524
418
def rename(self, *args, **kwargs):
525
419
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
420
ret = AvahiService.rename(self, *args, **kwargs)
528
421
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
422
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
423
.format(self.name)))
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
608
def from_param(self, obj):
609
if not isinstance(obj, self.cls):
610
raise TypeError("Not of type {}: {!r}"
611
.format(self.cls.__name__, obj))
612
return ctypes.byref(obj.from_param(obj))
614
class CastToVoidPointer:
615
def __init__(self, cls):
618
def from_param(self, obj):
619
if not isinstance(obj, self.cls):
620
raise TypeError("Not of type {}: {!r}"
621
.format(self.cls.__name__, obj))
622
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
630
class Credentials(With_from_param):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
634
self.type = gnutls.CRD_CERTIFICATE
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
640
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
642
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
644
gnutls_flags |= gnutls.NO_TICKETS
646
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
653
if credentials is None:
654
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
657
self.credentials = credentials
663
return gnutls.handshake(self)
665
def send(self, data):
669
data_len -= gnutls.record_send(self, data[-data_len:],
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
676
def _error_code(result):
677
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
raise gnutls.CertificateSecurityError(code=result)
683
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
687
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
return _error_code(result)
692
result = func(*arguments)
695
# Unless otherwise indicated, the function declarations below are
696
# all from the gnutls/gnutls.h C header file.
699
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
ctypes.POINTER(ctypes.c_char_p)]
702
priority_set_direct.restype = _error_code
704
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
init.restype = _error_code
708
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
710
set_default_priority.restype = _error_code
712
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
715
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
certificate_allocate_credentials = (
719
_library.gnutls_certificate_allocate_credentials)
720
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
722
certificate_allocate_credentials.restype = _error_code
724
certificate_free_credentials = (
725
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
727
certificate_free_credentials.restype = None
729
handshake_set_private_extensions = (
730
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
733
handshake_set_private_extensions.restype = None
735
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
738
credentials_set.restype = _error_code
740
strerror = _library.gnutls_strerror
741
strerror.argtypes = [ctypes.c_int]
742
strerror.restype = ctypes.c_char_p
744
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
746
certificate_type_get.restype = _error_code
748
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
750
ctypes.POINTER(ctypes.c_uint)]
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
global_set_log_level = _library.gnutls_global_set_log_level
754
global_set_log_level.argtypes = [ctypes.c_int]
755
global_set_log_level.restype = None
757
global_set_log_function = _library.gnutls_global_set_log_function
758
global_set_log_function.argtypes = [log_func]
759
global_set_log_function.restype = None
761
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
763
deinit.restype = None
765
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
770
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
transport_set_ptr.restype = None
774
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
779
check_version = _library.gnutls_check_version
780
check_version.argtypes = [ctypes.c_char_p]
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
789
has_rawpk = bool(check_version(_tls_rawpk_version))
793
class pubkey_st(ctypes.Structure):
795
pubkey_t = ctypes.POINTER(pubkey_st)
797
x509_crt_fmt_t = ctypes.c_int
799
# All the function declarations below are from
801
pubkey_init = _library.gnutls_pubkey_init
802
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
pubkey_init.restype = _error_code
805
pubkey_import = _library.gnutls_pubkey_import
806
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
808
pubkey_import.restype = _error_code
810
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
ctypes.POINTER(ctypes.c_ubyte),
813
ctypes.POINTER(ctypes.c_size_t)]
814
pubkey_get_key_id.restype = _error_code
816
pubkey_deinit = _library.gnutls_pubkey_deinit
817
pubkey_deinit.argtypes = [pubkey_t]
818
pubkey_deinit.restype = None
820
# All the function declarations below are from
823
openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
openpgp_crt_init.restype = _error_code
827
openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
openpgp_crt_import.argtypes = [openpgp_crt_t,
829
ctypes.POINTER(datum_t),
831
openpgp_crt_import.restype = _error_code
833
openpgp_crt_verify_self = \
834
_library.gnutls_openpgp_crt_verify_self
835
openpgp_crt_verify_self.argtypes = [
838
ctypes.POINTER(ctypes.c_uint),
840
openpgp_crt_verify_self.restype = _error_code
842
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
openpgp_crt_deinit.restype = None
846
openpgp_crt_get_fingerprint = (
847
_library.gnutls_openpgp_crt_get_fingerprint)
848
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
852
openpgp_crt_get_fingerprint.restype = _error_code
854
if check_version(b"3.6.4"):
855
certificate_type_get2 = _library.gnutls_certificate_type_get2
856
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
certificate_type_get2.restype = _error_code
859
# Remove non-public functions
860
del _error_code, _retry_on_error
863
def call_pipe(connection, # : multiprocessing.Connection
864
func, *args, **kwargs):
865
"""This function is meant to be called by multiprocessing.Process
867
This function runs func(*args, **kwargs), and writes the resulting
868
return value on the provided multiprocessing.Connection.
870
connection.send(func(*args, **kwargs))
427
class Client(object):
875
428
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
431
approved: bool(); 'None' if not yet approved/disapproved
879
432
approval_delay: datetime.timedelta(); Time to wait for approval
880
433
approval_duration: datetime.timedelta(); Duration of one approval
881
checker: multiprocessing.Process(); a running checker process used
882
to see if the client lives. None if no process is
884
checker_callback_tag: a GLib event source tag, or None
434
checker: subprocess.Popen(); a running checker process used
435
to see if the client lives.
436
'None' if no process is running.
437
checker_callback_tag: a gobject event source tag, or None
885
438
checker_command: string; External command which is run to check
886
439
if client lives. %() expansions are done at
887
440
runtime with vars(self) as dict, so that for
888
441
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
442
checker_initiator_tag: a gobject event source tag, or None
890
443
created: datetime.datetime(); (UTC) object creation
891
444
client_structure: Object describing what attributes a client has
892
445
and is used for storing the client at exit
893
446
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
447
disable_initiator_tag: a gobject event source tag, or None
896
449
fingerprint: string (40 or 32 hexadecimal digits); used to
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
450
uniquely identify the client
900
451
host: string; available for use by the checker command
901
452
interval: datetime.timedelta(); How often to start a new checker
902
453
last_approval_request: datetime.datetime(); (UTC) or None
1026
570
self.changedstate = multiprocessing_manager.Condition(
1027
571
multiprocessing_manager.Lock())
1028
572
self.client_structure = [attr
1029
for attr in self.__dict__.keys()
573
for attr in self.__dict__.iterkeys()
1030
574
if not attr.startswith("_")]
1031
575
self.client_structure.append("client_structure")
1033
577
for name, t in inspect.getmembers(
1034
578
type(self), lambda obj: isinstance(obj, property)):
1035
579
if not name.startswith("_"):
1036
580
self.client_structure.append(name)
1038
582
# Send notice to process children that client state has changed
1039
583
def send_changedstate(self):
1040
584
with self.changedstate:
1041
585
self.changedstate.notify_all()
1043
587
def enable(self):
1044
588
"""Start this client's checker and timeout hooks"""
1045
589
if getattr(self, "enabled", False):
1046
590
# Already enabled
592
self.expires = datetime.datetime.utcnow() + self.timeout
1048
593
self.enabled = True
1049
594
self.last_enabled = datetime.datetime.utcnow()
1050
595
self.init_checker()
1051
596
self.send_changedstate()
1053
598
def disable(self, quiet=True):
1054
599
"""Disable this client."""
1055
600
if not getattr(self, "enabled", False):
1058
log.info("Disabling client %s", self.name)
603
logger.info("Disabling client %s", self.name)
1059
604
if getattr(self, "disable_initiator_tag", None) is not None:
1060
GLib.source_remove(self.disable_initiator_tag)
605
gobject.source_remove(self.disable_initiator_tag)
1061
606
self.disable_initiator_tag = None
1062
607
self.expires = None
1063
608
if getattr(self, "checker_initiator_tag", None) is not None:
1064
GLib.source_remove(self.checker_initiator_tag)
609
gobject.source_remove(self.checker_initiator_tag)
1065
610
self.checker_initiator_tag = None
1066
611
self.stop_checker()
1067
612
self.enabled = False
1069
614
self.send_changedstate()
1070
# Do not run this again if called by a GLib.timeout_add
615
# Do not run this again if called by a gobject.timeout_add
1073
618
def __del__(self):
1076
def init_checker(self, randomize_start=False):
1077
# Schedule a new checker to be started a randomly selected
1078
# time (a fraction of 'interval') from now. This spreads out
1079
# the startup of checkers over time when the server is
621
def init_checker(self):
622
# Schedule a new checker to be started an 'interval' from now,
623
# and every interval from then on.
1081
624
if self.checker_initiator_tag is not None:
1082
GLib.source_remove(self.checker_initiator_tag)
1083
interval_milliseconds = int(self.interval.total_seconds()
1086
delay_milliseconds = random.randrange(
1087
interval_milliseconds + 1)
1089
delay_milliseconds = interval_milliseconds
1090
self.checker_initiator_tag = GLib.timeout_add(
1091
delay_milliseconds, self.start_checker, randomize_start)
1092
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1093
# A checker might take up to an 'interval' of time, so we can
1094
# expire at the soonest one interval after a checker was
1095
# started. Since the initial checker is delayed, the expire
1096
# time might have to be extended.
1097
now = datetime.datetime.utcnow()
1098
self.expires = now + delay + self.interval
1099
# Schedule a disable() at expire time
625
gobject.source_remove(self.checker_initiator_tag)
626
self.checker_initiator_tag = gobject.timeout_add(
627
int(self.interval.total_seconds() * 1000),
629
# Schedule a disable() when 'timeout' has passed
1100
630
if self.disable_initiator_tag is not None:
1101
GLib.source_remove(self.disable_initiator_tag)
1102
self.disable_initiator_tag = GLib.timeout_add(
1103
int((self.expires - now).total_seconds() * 1000),
1106
def checker_callback(self, source, condition, connection,
631
gobject.source_remove(self.disable_initiator_tag)
632
self.disable_initiator_tag = gobject.timeout_add(
633
int(self.timeout.total_seconds() * 1000), self.disable)
634
# Also start a new checker *right now*.
637
def checker_callback(self, pid, condition, command):
1108
638
"""The checker has completed, so take appropriate actions."""
1109
# Read return code from connection (see call_pipe)
1110
returncode = connection.recv()
1112
if self.checker is not None:
1114
639
self.checker_callback_tag = None
1115
640
self.checker = None
1118
self.last_checker_status = returncode
1119
self.last_checker_signal = None
641
if os.WIFEXITED(condition):
642
self.last_checker_status = os.WEXITSTATUS(condition)
1120
643
if self.last_checker_status == 0:
1121
log.info("Checker for %(name)s succeeded", vars(self))
644
logger.info("Checker for %(name)s succeeded",
1122
646
self.checked_ok()
1124
log.info("Checker for %(name)s failed", vars(self))
648
logger.info("Checker for %(name)s failed", vars(self))
1126
650
self.last_checker_status = -1
1127
self.last_checker_signal = -returncode
1128
log.warning("Checker for %(name)s crashed?", vars(self))
651
logger.warning("Checker for %(name)s crashed?",
1131
654
def checked_ok(self):
1132
655
"""Assert that the client has been seen, alive and well."""
1133
656
self.last_checked_ok = datetime.datetime.utcnow()
1134
657
self.last_checker_status = 0
1135
self.last_checker_signal = None
1136
658
self.bump_timeout()
1138
660
def bump_timeout(self, timeout=None):
1139
661
"""Bump up the timeout for this client."""
1140
662
if timeout is None:
1141
663
timeout = self.timeout
1142
664
if self.disable_initiator_tag is not None:
1143
GLib.source_remove(self.disable_initiator_tag)
665
gobject.source_remove(self.disable_initiator_tag)
1144
666
self.disable_initiator_tag = None
1145
667
if getattr(self, "enabled", False):
1146
self.disable_initiator_tag = GLib.timeout_add(
668
self.disable_initiator_tag = gobject.timeout_add(
1147
669
int(timeout.total_seconds() * 1000), self.disable)
1148
670
self.expires = datetime.datetime.utcnow() + timeout
1150
672
def need_approval(self):
1151
673
self.last_approval_request = datetime.datetime.utcnow()
1153
def start_checker(self, start_was_randomized=False):
675
def start_checker(self):
1154
676
"""Start a new checker subprocess if one is not running.
1156
678
If a checker already exists, leave it running and do
1158
680
# The reason for not killing a running checker is that if we
1163
685
# checkers alone, the checker would have to take more time
1164
686
# than 'timeout' for the client to be disabled, which is as it
1167
if self.checker is not None and not self.checker.is_alive():
1168
log.warning("Checker was not alive; joining")
689
# If a checker exists, make sure it is not a zombie
691
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
692
except AttributeError:
694
except OSError as error:
695
if error.errno != errno.ECHILD:
699
logger.warning("Checker was a zombie")
700
gobject.source_remove(self.checker_callback_tag)
701
self.checker_callback(pid, status,
702
self.current_checker_command)
1171
703
# Start a new checker if needed
1172
704
if self.checker is None:
1173
705
# Escape attributes for the shell
1174
706
escaped_attrs = {
1175
attr: shlex.quote(str(getattr(self, attr)))
1176
for attr in self.runtime_expansions}
707
attr: re.escape(str(getattr(self, attr)))
708
for attr in self.runtime_expansions }
1178
710
command = self.checker_command % escaped_attrs
1179
711
except TypeError as error:
1180
log.error('Could not format string "%s"',
1181
self.checker_command, exc_info=error)
712
logger.error('Could not format string "%s"',
713
self.checker_command,
1182
715
return True # Try again later
1183
716
self.current_checker_command = command
1184
log.info("Starting checker %r for %s", command, self.name)
1185
# We don't need to redirect stdout and stderr, since
1186
# in normal mode, that is already done by daemon(),
1187
# and in debug mode we don't want to. (Stdin is
1188
# always replaced by /dev/null.)
1189
# The exception is when not debugging but nevertheless
1190
# running in the foreground; use the previously
1192
popen_args = {"close_fds": True,
1195
if (not self.server_settings["debug"]
1196
and self.server_settings["foreground"]):
1197
popen_args.update({"stdout": wnull,
1199
pipe = multiprocessing.Pipe(duplex=False)
1200
self.checker = multiprocessing.Process(
1202
args=(pipe[1], subprocess.call, command),
1204
self.checker.start()
1205
self.checker_callback_tag = GLib.io_add_watch(
1206
GLib.IOChannel.unix_new(pipe[0].fileno()),
1207
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1208
self.checker_callback, pipe[0], command)
1209
if start_was_randomized:
1210
# We were started after a random delay; Schedule a new
1211
# checker to be started an 'interval' from now, and every
1212
# interval from then on.
1213
now = datetime.datetime.utcnow()
1214
self.checker_initiator_tag = GLib.timeout_add(
1215
int(self.interval.total_seconds() * 1000),
1217
self.expires = max(self.expires, now + self.interval)
1218
# Don't start a new checker again after same random delay
1220
# Re-run this periodically if run by GLib.timeout_add
718
logger.info("Starting checker %r for %s", command,
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
741
self.checker_callback_tag = gobject.child_watch_add(
742
self.checker.pid, self.checker_callback, data=command)
743
# The checker may have completed before the gobject
744
# watch was added. Check for this.
746
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
747
except OSError as error:
748
if error.errno == errno.ECHILD:
749
# This should never happen
750
logger.error("Child process vanished",
755
gobject.source_remove(self.checker_callback_tag)
756
self.checker_callback(pid, status, command)
757
# Re-run this periodically if run by gobject.timeout_add
1223
760
def stop_checker(self):
1224
761
"""Force the checker process, if any, to stop."""
1225
762
if self.checker_callback_tag:
1226
GLib.source_remove(self.checker_callback_tag)
763
gobject.source_remove(self.checker_callback_tag)
1227
764
self.checker_callback_tag = None
1228
765
if getattr(self, "checker", None) is None:
1230
log.debug("Stopping checker for %(name)s", vars(self))
1231
self.checker.terminate()
767
logger.debug("Stopping checker for %(name)s", vars(self))
769
self.checker.terminate()
771
#if self.checker.poll() is None:
772
# self.checker.kill()
773
except OSError as error:
774
if error.errno != errno.ESRCH: # No such process
1232
776
self.checker = None
1352
895
for cls in self.__class__.__mro__
1353
896
for name, athing in
1354
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1356
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1358
path_keyword="object_path",
1359
connection_keyword="connection")
1360
def Introspect(self, object_path, connection):
1361
"""Overloading of standard D-Bus method.
1363
Inserts annotation tags on methods and signals.
1365
xmlstring = dbus.service.Object.Introspect(self, object_path,
1368
document = xml.dom.minidom.parseString(xmlstring)
1370
for if_tag in document.getElementsByTagName("interface"):
1371
# Add annotation tags
1372
for typ in ("method", "signal"):
1373
for tag in if_tag.getElementsByTagName(typ):
1375
for name, prop in (self.
1376
_get_all_dbus_things(typ)):
1377
if (name == tag.getAttribute("name")
1378
and prop._dbus_interface
1379
== if_tag.getAttribute("name")):
1380
annots.update(getattr(
1381
prop, "_dbus_annotations", {}))
1382
for name, value in annots.items():
1383
ann_tag = document.createElement(
1385
ann_tag.setAttribute("name", name)
1386
ann_tag.setAttribute("value", value)
1387
tag.appendChild(ann_tag)
1388
# Add interface annotation tags
1389
for annotation, value in dict(
1390
itertools.chain.from_iterable(
1391
annotations().items()
1392
for name, annotations
1393
in self._get_all_dbus_things("interface")
1394
if name == if_tag.getAttribute("name")
1396
ann_tag = document.createElement("annotation")
1397
ann_tag.setAttribute("name", annotation)
1398
ann_tag.setAttribute("value", value)
1399
if_tag.appendChild(ann_tag)
1400
# Fix argument name for the Introspect method itself
1401
if (if_tag.getAttribute("name")
1402
== dbus.INTROSPECTABLE_IFACE):
1403
for cn in if_tag.getElementsByTagName("method"):
1404
if cn.getAttribute("name") == "Introspect":
1405
for arg in cn.getElementsByTagName("arg"):
1406
if (arg.getAttribute("direction")
1408
arg.setAttribute("name",
1410
xmlstring = document.toxml("utf-8")
1412
except (AttributeError, xml.dom.DOMException,
1413
xml.parsers.expat.ExpatError) as error:
1414
log.error("Failed to override Introspection method",
1419
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1420
"""A D-Bus object with properties.
1422
Classes inheriting from this can use the dbus_service_property
1423
decorator to expose methods as D-Bus properties. It exposes the
1424
standard Get(), Set(), and GetAll() methods on the D-Bus.
1427
899
def _get_dbus_property(self, interface_name, property_name):
1428
900
"""Returns a bound method if one exists which is a D-Bus
1429
901
property with the specified name and interface.
1578
1054
document.unlink()
1579
1055
except (AttributeError, xml.dom.DOMException,
1580
1056
xml.parsers.expat.ExpatError) as error:
1581
log.error("Failed to override Introspection method",
1587
dbus.OBJECT_MANAGER_IFACE
1588
except AttributeError:
1589
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1592
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1593
"""A D-Bus object with an ObjectManager.
1595
Classes inheriting from this exposes the standard
1596
GetManagedObjects call and the InterfacesAdded and
1597
InterfacesRemoved signals on the standard
1598
"org.freedesktop.DBus.ObjectManager" interface.
1600
Note: No signals are sent automatically; they must be sent
1603
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1604
out_signature="a{oa{sa{sv}}}")
1605
def GetManagedObjects(self):
1606
"""This function must be overridden"""
1607
raise NotImplementedError()
1609
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1610
signature="oa{sa{sv}}")
1611
def InterfacesAdded(self, object_path, interfaces_and_properties):
1614
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1615
def InterfacesRemoved(self, object_path, interfaces):
1618
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1620
path_keyword="object_path",
1621
connection_keyword="connection")
1622
def Introspect(self, object_path, connection):
1623
"""Overloading of standard D-Bus method.
1625
Override return argument name of GetManagedObjects to be
1626
"objpath_interfaces_and_properties"
1628
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1632
document = xml.dom.minidom.parseString(xmlstring)
1634
for if_tag in document.getElementsByTagName("interface"):
1635
# Fix argument name for the GetManagedObjects method
1636
if (if_tag.getAttribute("name")
1637
== dbus.OBJECT_MANAGER_IFACE):
1638
for cn in if_tag.getElementsByTagName("method"):
1639
if (cn.getAttribute("name")
1640
== "GetManagedObjects"):
1641
for arg in cn.getElementsByTagName("arg"):
1642
if (arg.getAttribute("direction")
1646
"objpath_interfaces"
1648
xmlstring = document.toxml("utf-8")
1650
except (AttributeError, xml.dom.DOMException,
1651
xml.parsers.expat.ExpatError) as error:
1652
log.error("Failed to override Introspection method",
1057
logger.error("Failed to override Introspection method",
1654
1059
return xmlstring
1657
1062
def datetime_to_dbus(dt, variant_level=0):
1658
1063
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1660
return dbus.String("", variant_level=variant_level)
1065
return dbus.String("", variant_level = variant_level)
1661
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
2264
1649
self.start_checker()
2266
1651
self.stop_checker()
2268
1653
# ObjectPath - property
2270
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2271
"org.freedesktop.DBus.Deprecated": "true"})
2272
1654
@dbus_service_property(_interface, signature="o", access="read")
2273
1655
def ObjectPath_dbus_property(self):
2274
return self.dbus_object_path # is already a dbus.ObjectPath
1656
return self.dbus_object_path # is already a dbus.ObjectPath
2276
1658
# Secret = property
2278
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2280
1659
@dbus_service_property(_interface,
2281
1660
signature="ay",
2282
1661
access="write",
2283
1662
byte_arrays=True)
2284
1663
def Secret_dbus_property(self, value):
2285
1664
self.secret = bytes(value)
2291
def __init__(self, child_pipe, key_id, fpr, address):
1669
class ProxyClient(object):
1670
def __init__(self, child_pipe, fpr, address):
2292
1671
self._pipe = child_pipe
2293
self._pipe.send(("init", key_id, fpr, address))
1672
self._pipe.send(('init', fpr, address))
2294
1673
if not self._pipe.recv():
2295
raise KeyError(key_id or fpr)
2297
1676
def __getattribute__(self, name):
2299
1678
return super(ProxyClient, self).__getattribute__(name)
2300
self._pipe.send(("getattr", name))
1679
self._pipe.send(('getattr', name))
2301
1680
data = self._pipe.recv()
2302
if data[0] == "data":
1681
if data[0] == 'data':
2304
if data[0] == "function":
1683
if data[0] == 'function':
2306
1685
def func(*args, **kwargs):
2307
self._pipe.send(("funcall", name, args, kwargs))
1686
self._pipe.send(('funcall', name, args, kwargs))
2308
1687
return self._pipe.recv()[1]
2312
1691
def __setattr__(self, name, value):
2314
1693
return super(ProxyClient, self).__setattr__(name, value)
2315
self._pipe.send(("setattr", name, value))
1694
self._pipe.send(('setattr', name, value))
2318
1697
class ClientHandler(socketserver.BaseRequestHandler, object):
2319
1698
"""A class to handle client connections.
2321
1700
Instantiated once for each connection to handle it.
2322
1701
Note: This will run in its own forked process."""
2324
1703
def handle(self):
2325
1704
with contextlib.closing(self.server.child_pipe) as child_pipe:
2326
log.info("TCP connection from: %s",
2327
str(self.client_address))
2328
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2330
session = gnutls.ClientSession(self.request)
2332
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2333
# "+AES-256-CBC", "+SHA1",
2334
# "+COMP-NULL", "+CTYPE-OPENPGP",
1705
logger.info("TCP connection from: %s",
1706
str(self.client_address))
1707
logger.debug("Pipe FD: %d",
1708
self.server.child_pipe.fileno())
1710
session = gnutls.connection.ClientSession(
1711
self.request, gnutls.connection .X509Credentials())
1713
# Note: gnutls.connection.X509Credentials is really a
1714
# generic GnuTLS certificate credentials object so long as
1715
# no X.509 keys are added to it. Therefore, we can use it
1716
# here despite using OpenPGP certificates.
1718
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1719
# "+AES-256-CBC", "+SHA1",
1720
# "+COMP-NULL", "+CTYPE-OPENPGP",
2336
1722
# Use a fallback default, since this MUST be set.
2337
1723
priority = self.server.gnutls_priority
2338
1724
if priority is None:
2339
1725
priority = "NORMAL"
2340
gnutls.priority_set_direct(session,
2341
priority.encode("utf-8"), None)
1726
gnutls.library.functions.gnutls_priority_set_direct(
1727
session._c_object, priority, None)
2343
1729
# Start communication using the Mandos protocol
2344
1730
# Get protocol number
2345
1731
line = self.request.makefile().readline()
2346
log.debug("Protocol version: %r", line)
1732
logger.debug("Protocol version: %r", line)
2348
1734
if int(line.strip().split()[0]) > 1:
2349
1735
raise RuntimeError(line)
2350
1736
except (ValueError, IndexError, RuntimeError) as error:
2351
log.error("Unknown protocol version: %s", error)
1737
logger.error("Unknown protocol version: %s", error)
2354
1740
# Start GnuTLS connection
2356
1742
session.handshake()
2357
except gnutls.Error as error:
2358
log.warning("Handshake failed: %s", error)
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("Handshake failed: %s", error)
2359
1745
# Do not run session.bye() here: the session is not
2360
1746
# established. Just abandon the request.
2362
log.debug("Handshake succeeded")
1748
logger.debug("Handshake succeeded")
2364
1750
approval_required = False
2366
if gnutls.has_rawpk:
2369
key_id = self.key_id(
2370
self.peer_certificate(session))
2371
except (TypeError, gnutls.Error) as error:
2372
log.warning("Bad certificate: %s", error)
2374
log.debug("Key ID: %s",
2375
key_id.decode("utf-8",
2381
fpr = self.fingerprint(
2382
self.peer_certificate(session))
2383
except (TypeError, gnutls.Error) as error:
2384
log.warning("Bad certificate: %s", error)
2386
log.debug("Fingerprint: %s", fpr)
2389
client = ProxyClient(child_pipe, key_id, fpr,
1753
fpr = self.fingerprint(
1754
self.peer_certificate(session))
1756
gnutls.errors.GNUTLSError) as error:
1757
logger.warning("Bad certificate: %s", error)
1759
logger.debug("Fingerprint: %s", fpr)
1762
client = ProxyClient(child_pipe, fpr,
2390
1763
self.client_address)
2391
1764
except KeyError:
2394
1767
if client.approval_delay:
2395
1768
delay = client.approval_delay
2396
1769
client.approvals_pending += 1
2397
1770
approval_required = True
2400
1773
if not client.enabled:
2401
log.info("Client %s is disabled", client.name)
1774
logger.info("Client %s is disabled",
2402
1776
if self.server.use_dbus:
2403
1777
# Emit D-Bus signal
2404
1778
client.Rejected("Disabled")
2407
1781
if client.approved or not client.approval_delay:
2408
# We are approved or approval is disabled
1782
#We are approved or approval is disabled
2410
1784
elif client.approved is None:
2411
log.info("Client %s needs approval",
1785
logger.info("Client %s needs approval",
2413
1787
if self.server.use_dbus:
2414
1788
# Emit D-Bus signal
2415
1789
client.NeedApproval(
2416
1790
client.approval_delay.total_seconds()
2417
1791
* 1000, client.approved_by_default)
2419
log.warning("Client %s was not approved",
1793
logger.warning("Client %s was not approved",
2421
1795
if self.server.use_dbus:
2422
1796
# Emit D-Bus signal
2423
1797
client.Rejected("Denied")
2426
# wait until timeout or approved
1800
#wait until timeout or approved
2427
1801
time = datetime.datetime.now()
2428
1802
client.changedstate.acquire()
2429
1803
client.changedstate.wait(delay.total_seconds())
2444
1818
delay -= time2 - time
2447
session.send(client.secret)
2448
except gnutls.Error as error:
2449
log.warning("gnutls send failed", exc_info=error)
2452
log.info("Sending secret to %s", client.name)
1821
while sent_size < len(client.secret):
1823
sent = session.send(client.secret[sent_size:])
1824
except gnutls.errors.GNUTLSError as error:
1825
logger.warning("gnutls send failed",
1828
logger.debug("Sent: %d, remaining: %d", sent,
1829
len(client.secret) - (sent_size
1833
logger.info("Sending secret to %s", client.name)
2453
1834
# bump the timeout using extended_timeout
2454
1835
client.bump_timeout(client.extended_timeout)
2455
1836
if self.server.use_dbus:
2456
1837
# Emit D-Bus signal
2457
1838
client.GotSecret()
2460
1841
if approval_required:
2461
1842
client.approvals_pending -= 1
2464
except gnutls.Error as error:
2465
log.warning("GnuTLS bye failed", exc_info=error)
1845
except gnutls.errors.GNUTLSError as error:
1846
logger.warning("GnuTLS bye failed",
2468
1850
def peer_certificate(session):
2469
"Return the peer's certificate as a bytestring"
2471
cert_type = gnutls.certificate_type_get2(
2472
session, gnutls.CTYPE_PEERS)
2473
except AttributeError:
2474
cert_type = gnutls.certificate_type_get(session)
2475
if gnutls.has_rawpk:
2476
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2478
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2479
# If not a valid certificate type...
2480
if cert_type not in valid_cert_types:
2481
log.info("Cert type %r not in %r", cert_type,
2483
# ...return invalid data
1851
"Return the peer's OpenPGP certificate as a bytestring"
1852
# If not an OpenPGP certificate...
1853
if (gnutls.library.functions.gnutls_certificate_type_get(
1855
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1856
# ...do the normal thing
1857
return session.peer_certificate
2485
1858
list_size = ctypes.c_uint(1)
2486
cert_list = (gnutls.certificate_get_peers
2487
(session, ctypes.byref(list_size)))
1859
cert_list = (gnutls.library.functions
1860
.gnutls_certificate_get_peers
1861
(session._c_object, ctypes.byref(list_size)))
2488
1862
if not bool(cert_list) and list_size.value != 0:
2489
raise gnutls.Error("error getting peer certificate")
1863
raise gnutls.errors.GNUTLSError("error getting peer"
2490
1865
if list_size.value == 0:
2492
1867
cert = cert_list[0]
2493
1868
return ctypes.string_at(cert.data, cert.size)
2496
def key_id(certificate):
2497
"Convert a certificate bytestring to a hexdigit key ID"
2498
# New GnuTLS "datum" with the public key
2499
datum = gnutls.datum_t(
2500
ctypes.cast(ctypes.c_char_p(certificate),
2501
ctypes.POINTER(ctypes.c_ubyte)),
2502
ctypes.c_uint(len(certificate)))
2503
# XXX all these need to be created in the gnutls "module"
2504
# New empty GnuTLS certificate
2505
pubkey = gnutls.pubkey_t()
2506
gnutls.pubkey_init(ctypes.byref(pubkey))
2507
# Import the raw public key into the certificate
2508
gnutls.pubkey_import(pubkey,
2509
ctypes.byref(datum),
2510
gnutls.X509_FMT_DER)
2511
# New buffer for the key ID
2512
buf = ctypes.create_string_buffer(32)
2513
buf_len = ctypes.c_size_t(len(buf))
2514
# Get the key ID from the raw public key into the buffer
2515
gnutls.pubkey_get_key_id(
2517
gnutls.KEYID_USE_SHA256,
2518
ctypes.cast(ctypes.byref(buf),
2519
ctypes.POINTER(ctypes.c_ubyte)),
2520
ctypes.byref(buf_len))
2521
# Deinit the certificate
2522
gnutls.pubkey_deinit(pubkey)
2524
# Convert the buffer to a Python bytestring
2525
key_id = ctypes.string_at(buf, buf_len.value)
2526
# Convert the bytestring to hexadecimal notation
2527
hex_key_id = binascii.hexlify(key_id).upper()
2531
1871
def fingerprint(openpgp):
2532
1872
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2533
1873
# New GnuTLS "datum" with the OpenPGP public key
2534
datum = gnutls.datum_t(
1874
datum = gnutls.library.types.gnutls_datum_t(
2535
1875
ctypes.cast(ctypes.c_char_p(openpgp),
2536
1876
ctypes.POINTER(ctypes.c_ubyte)),
2537
1877
ctypes.c_uint(len(openpgp)))
2538
1878
# New empty GnuTLS certificate
2539
crt = gnutls.openpgp_crt_t()
2540
gnutls.openpgp_crt_init(ctypes.byref(crt))
1879
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1880
gnutls.library.functions.gnutls_openpgp_crt_init(
2541
1882
# Import the OpenPGP public key into the certificate
2542
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2543
gnutls.OPENPGP_FMT_RAW)
1883
gnutls.library.functions.gnutls_openpgp_crt_import(
1884
crt, ctypes.byref(datum),
1885
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2544
1886
# Verify the self signature in the key
2545
1887
crtverify = ctypes.c_uint()
2546
gnutls.openpgp_crt_verify_self(crt, 0,
2547
ctypes.byref(crtverify))
1888
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1889
crt, 0, ctypes.byref(crtverify))
2548
1890
if crtverify.value != 0:
2549
gnutls.openpgp_crt_deinit(crt)
2550
raise gnutls.CertificateSecurityError(code
1891
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1892
raise gnutls.errors.CertificateSecurityError(
2552
1894
# New buffer for the fingerprint
2553
1895
buf = ctypes.create_string_buffer(20)
2554
1896
buf_len = ctypes.c_size_t()
2555
1897
# Get the fingerprint from the certificate into the buffer
2556
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2557
ctypes.byref(buf_len))
1898
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1899
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2558
1900
# Deinit the certificate
2559
gnutls.openpgp_crt_deinit(crt)
1901
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2560
1902
# Convert the buffer to a Python bytestring
2561
1903
fpr = ctypes.string_at(buf, buf_len.value)
2562
1904
# Convert the bytestring to hexadecimal notation
2651
1992
# socket_wrapper(), if socketfd was set.
2652
1993
socketserver.TCPServer.__init__(self, server_address,
2653
1994
RequestHandlerClass)
2655
1996
def server_bind(self):
2656
1997
"""This overrides the normal server_bind() function
2657
1998
to bind to an interface if one was specified, and also NOT to
2658
1999
bind to an address or port if they were not specified."""
2659
global SO_BINDTODEVICE
2660
2000
if self.interface is not None:
2661
2001
if SO_BINDTODEVICE is None:
2662
# Fall back to a hard-coded value which seems to be
2664
log.warning("SO_BINDTODEVICE not found, trying 25")
2665
SO_BINDTODEVICE = 25
2667
self.socket.setsockopt(
2668
socket.SOL_SOCKET, SO_BINDTODEVICE,
2669
(self.interface + "\0").encode("utf-8"))
2670
except socket.error as error:
2671
if error.errno == errno.EPERM:
2672
log.error("No permission to bind to interface %s",
2674
elif error.errno == errno.ENOPROTOOPT:
2675
log.error("SO_BINDTODEVICE not available; cannot"
2676
" bind to interface %s", self.interface)
2677
elif error.errno == errno.ENODEV:
2678
log.error("Interface %s does not exist, cannot"
2679
" bind", self.interface)
2002
logger.error("SO_BINDTODEVICE does not exist;"
2003
" cannot bind to interface %s",
2007
self.socket.setsockopt(
2008
socket.SOL_SOCKET, SO_BINDTODEVICE,
2009
(self.interface + "\0").encode("utf-8"))
2010
except socket.error as error:
2011
if error.errno == errno.EPERM:
2012
logger.error("No permission to bind to"
2013
" interface %s", self.interface)
2014
elif error.errno == errno.ENOPROTOOPT:
2015
logger.error("SO_BINDTODEVICE not available;"
2016
" cannot bind to interface %s",
2018
elif error.errno == errno.ENODEV:
2019
logger.error("Interface %s does not exist,"
2020
" cannot bind", self.interface)
2682
2023
# Only bind(2) the socket if we really need to.
2683
2024
if self.server_address[0] or self.server_address[1]:
2684
if self.server_address[1]:
2685
self.allow_reuse_address = True
2686
2025
if not self.server_address[0]:
2687
2026
if self.address_family == socket.AF_INET6:
2688
any_address = "::" # in6addr_any
2027
any_address = "::" # in6addr_any
2690
any_address = "0.0.0.0" # INADDR_ANY
2029
any_address = "0.0.0.0" # INADDR_ANY
2691
2030
self.server_address = (any_address,
2692
2031
self.server_address[1])
2693
2032
elif not self.server_address[1]:
2727
2066
self.gnutls_priority = gnutls_priority
2728
2067
IPv6_TCPServer.__init__(self, server_address,
2729
2068
RequestHandlerClass,
2730
interface=interface,
2069
interface = interface,
2070
use_ipv6 = use_ipv6,
2071
socketfd = socketfd)
2734
2073
def server_activate(self):
2735
2074
if self.enabled:
2736
2075
return socketserver.TCPServer.server_activate(self)
2738
2077
def enable(self):
2739
2078
self.enabled = True
2741
2080
def add_pipe(self, parent_pipe, proc):
2742
2081
# Call "handle_ipc" for both data and EOF events
2744
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2745
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2082
gobject.io_add_watch(
2083
parent_pipe.fileno(),
2084
gobject.IO_IN | gobject.IO_HUP,
2746
2085
functools.partial(self.handle_ipc,
2747
parent_pipe=parent_pipe,
2086
parent_pipe = parent_pipe,
2750
2089
def handle_ipc(self, source, condition,
2751
2090
parent_pipe=None,
2753
2092
client_object=None):
2754
2093
# error, or the other end of multiprocessing.Pipe has closed
2755
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2094
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2756
2095
# Wait for other process to exit
2760
2099
# Read a request from the child
2761
2100
request = parent_pipe.recv()
2762
2101
command = request[0]
2764
if command == "init":
2765
key_id = request[1].decode("ascii")
2766
fpr = request[2].decode("ascii")
2767
address = request[3]
2769
for c in self.clients.values():
2770
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2771
"27AE41E4649B934CA495991B7852B855"):
2773
if key_id and c.key_id == key_id:
2776
if fpr and c.fingerprint == fpr:
2103
if command == 'init':
2105
address = request[2]
2107
for c in self.clients.itervalues():
2108
if c.fingerprint == fpr:
2780
log.info("Client not found for key ID: %s, address:"
2781
" %s", key_id or fpr, address)
2112
logger.info("Client not found for fingerprint: %s, ad"
2113
"dress: %s", fpr, address)
2782
2114
if self.use_dbus:
2783
2115
# Emit D-Bus signal
2784
mandos_dbus_service.ClientNotFound(key_id or fpr,
2116
mandos_dbus_service.ClientNotFound(fpr,
2786
2118
parent_pipe.send(False)
2790
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2791
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2121
gobject.io_add_watch(
2122
parent_pipe.fileno(),
2123
gobject.IO_IN | gobject.IO_HUP,
2792
2124
functools.partial(self.handle_ipc,
2793
parent_pipe=parent_pipe,
2795
client_object=client))
2125
parent_pipe = parent_pipe,
2127
client_object = client))
2796
2128
parent_pipe.send(True)
2797
2129
# remove the old hook in favor of the new above hook on
2800
if command == "funcall":
2132
if command == 'funcall':
2801
2133
funcname = request[1]
2802
2134
args = request[2]
2803
2135
kwargs = request[3]
2805
parent_pipe.send(("data", getattr(client_object,
2137
parent_pipe.send(('data', getattr(client_object,
2806
2138
funcname)(*args,
2809
if command == "getattr":
2141
if command == 'getattr':
2810
2142
attrname = request[1]
2811
if isinstance(client_object.__getattribute__(attrname),
2812
collections.abc.Callable):
2813
parent_pipe.send(("function", ))
2143
if callable(client_object.__getattribute__(attrname)):
2144
parent_pipe.send(('function', ))
2815
2146
parent_pipe.send((
2816
"data", client_object.__getattribute__(attrname)))
2818
if command == "setattr":
2147
'data', client_object.__getattribute__(attrname)))
2149
if command == 'setattr':
2819
2150
attrname = request[1]
2820
2151
value = request[2]
2821
2152
setattr(client_object, attrname, value)
2826
2157
def rfc3339_duration_to_delta(duration):
2827
2158
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2829
>>> timedelta = datetime.timedelta
2830
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2832
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2834
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2836
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2838
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2840
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2842
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2160
>>> rfc3339_duration_to_delta("P7D")
2161
datetime.timedelta(7)
2162
>>> rfc3339_duration_to_delta("PT60S")
2163
datetime.timedelta(0, 60)
2164
>>> rfc3339_duration_to_delta("PT60M")
2165
datetime.timedelta(0, 3600)
2166
>>> rfc3339_duration_to_delta("PT24H")
2167
datetime.timedelta(1)
2168
>>> rfc3339_duration_to_delta("P1W")
2169
datetime.timedelta(7)
2170
>>> rfc3339_duration_to_delta("PT5M30S")
2171
datetime.timedelta(0, 330)
2172
>>> rfc3339_duration_to_delta("P1DT3M20S")
2173
datetime.timedelta(1, 200)
2847
2176
# Parsing an RFC 3339 duration with regular expressions is not
2848
2177
# possible - there would have to be multiple places for the same
2849
2178
# values, like seconds. The current code, while more esoteric, is
2850
2179
# cleaner without depending on a parsing library. If Python had a
2851
2180
# built-in library for parsing we would use it, but we'd like to
2852
2181
# avoid excessive use of external libraries.
2854
2183
# New type for defining tokens, syntax, and semantics all-in-one
2184
Token = collections.namedtuple("Token",
2185
("regexp", # To match token; if
2186
# "value" is not None,
2187
# must have a "group"
2189
"value", # datetime.timedelta or
2191
"followers")) # Tokens valid after
2855
2193
Token = collections.namedtuple("Token", (
2856
2194
"regexp", # To match token; if "value" is not None, must have
2857
2195
# a "group" containing digits
3247
2575
old_bus_name = dbus.service.BusName(
3248
2576
"se.bsnet.fukt.Mandos", bus,
3249
2577
do_not_queue=True)
3250
except dbus.exceptions.DBusException as e:
3251
log.error("Disabling D-Bus:", exc_info=e)
2578
except dbus.exceptions.NameExistsException as e:
2579
logger.error("Disabling D-Bus:", exc_info=e)
3252
2580
use_dbus = False
3253
2581
server_settings["use_dbus"] = False
3254
2582
tcp_server.use_dbus = False
3256
2584
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3257
2585
service = AvahiServiceToSyslog(
3258
name=server_settings["servicename"],
3259
servicetype="_mandos._tcp",
2586
name = server_settings["servicename"],
2587
servicetype = "_mandos._tcp",
2588
protocol = protocol,
3262
2590
if server_settings["interface"]:
3263
2591
service.interface = if_nametoindex(
3264
2592
server_settings["interface"].encode("utf-8"))
3266
2594
global multiprocessing_manager
3267
2595
multiprocessing_manager = multiprocessing.Manager()
3269
2597
client_class = Client
3271
client_class = functools.partial(ClientDBus, bus=bus)
2599
client_class = functools.partial(ClientDBus, bus = bus)
3273
2601
client_settings = Client.config_parser(client_config)
3274
2602
old_client_settings = {}
3275
2603
clients_data = {}
3277
2605
# This is used to redirect stdout and stderr for checker processes
3279
wnull = open(os.devnull, "w") # A writable /dev/null
2607
wnull = open(os.devnull, "w") # A writable /dev/null
3280
2608
# Only used if server is running in foreground but not in debug
3282
2610
if debug or not foreground:
3285
2613
# Get client data and settings from last running state.
3286
2614
if server_settings["restore"]:
3288
2616
with open(stored_state_path, "rb") as stored_state:
3289
if sys.version_info.major == 2:
3290
clients_data, old_client_settings = pickle.load(
3293
bytes_clients_data, bytes_old_client_settings = (
3294
pickle.load(stored_state, encoding="bytes"))
3295
# Fix bytes to strings
3298
clients_data = {(key.decode("utf-8")
3299
if isinstance(key, bytes)
3302
bytes_clients_data.items()}
3303
del bytes_clients_data
3304
for key in clients_data:
3305
value = {(k.decode("utf-8")
3306
if isinstance(k, bytes) else k): v
3308
clients_data[key].items()}
3309
clients_data[key] = value
3311
value["client_structure"] = [
3313
if isinstance(s, bytes)
3315
value["client_structure"]]
3316
# .name, .host, and .checker_command
3317
for k in ("name", "host", "checker_command"):
3318
if isinstance(value[k], bytes):
3319
value[k] = value[k].decode("utf-8")
3320
if "key_id" not in value:
3321
value["key_id"] = ""
3322
elif "fingerprint" not in value:
3323
value["fingerprint"] = ""
3324
# old_client_settings
3326
old_client_settings = {
3327
(key.decode("utf-8")
3328
if isinstance(key, bytes)
3331
bytes_old_client_settings.items()}
3332
del bytes_old_client_settings
3333
# .host and .checker_command
3334
for value in old_client_settings.values():
3335
for attribute in ("host", "checker_command"):
3336
if isinstance(value[attribute], bytes):
3337
value[attribute] = (value[attribute]
2617
clients_data, old_client_settings = pickle.load(
3339
2619
os.remove(stored_state_path)
3340
2620
except IOError as e:
3341
2621
if e.errno == errno.ENOENT:
3342
log.warning("Could not load persistent state:"
3343
" %s", os.strerror(e.errno))
2622
logger.warning("Could not load persistent state:"
2623
" {}".format(os.strerror(e.errno)))
3345
log.critical("Could not load persistent state:",
2625
logger.critical("Could not load persistent state:",
3348
2628
except EOFError as e:
3349
log.warning("Could not load persistent state: EOFError:",
2629
logger.warning("Could not load persistent state: "
3352
2633
with PGPEngine() as pgp:
3353
2634
for client_name, client in clients_data.items():
3354
2635
# Skip removed clients
3355
2636
if client_name not in client_settings:
3358
2639
# Decide which value to use after restoring saved state.
3359
2640
# We have three different values: Old config file,
3360
2641
# new config file, and saved state.
3414
2699
for client_name in (set(client_settings)
3415
2700
- set(old_client_settings)):
3416
2701
clients_data[client_name] = client_settings[client_name]
3418
2703
# Create all client objects
3419
2704
for client_name, client in clients_data.items():
3420
2705
tcp_server.clients[client_name] = client_class(
3423
server_settings=server_settings)
2708
server_settings = server_settings)
3425
2710
if not tcp_server.clients:
3426
log.warning("No clients defined")
2711
logger.warning("No clients defined")
3428
2713
if not foreground:
3429
2714
if pidfile is not None:
3433
print(pid, file=pidfile)
2718
pidfile.write("{}\n".format(pid).encode("utf-8"))
3434
2719
except IOError:
3435
log.error("Could not write to file %r with PID %d",
2720
logger.error("Could not write to file %r with PID %d",
3438
2723
del pidfilename
3440
for termsig in (signal.SIGHUP, signal.SIGTERM):
3441
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3442
lambda: main_loop.quit() and False)
2725
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2726
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3446
2730
@alternate_dbus_interfaces(
3447
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3448
class MandosDBusService(DBusObjectWithObjectManager):
2731
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2732
class MandosDBusService(DBusObjectWithProperties):
3449
2733
"""A D-Bus proxy object"""
3451
2735
def __init__(self):
3452
2736
dbus.service.Object.__init__(self, bus, "/")
3454
2738
_interface = "se.recompile.Mandos"
2740
@dbus_interface_annotations(_interface)
2743
"org.freedesktop.DBus.Property.EmitsChangedSignal":
3456
2746
@dbus.service.signal(_interface, signature="o")
3457
2747
def ClientAdded(self, objpath):
3461
2751
@dbus.service.signal(_interface, signature="ss")
3462
def ClientNotFound(self, key_id, address):
2752
def ClientNotFound(self, fingerprint, address):
3466
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3468
2756
@dbus.service.signal(_interface, signature="os")
3469
2757
def ClientRemoved(self, objpath, name):
3473
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3475
2761
@dbus.service.method(_interface, out_signature="ao")
3476
2762
def GetAllClients(self):
3478
2764
return dbus.Array(c.dbus_object_path for c in
3479
tcp_server.clients.values())
3481
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2765
tcp_server.clients.itervalues())
3483
2767
@dbus.service.method(_interface,
3484
2768
out_signature="a{oa{sv}}")
3485
2769
def GetAllClientsWithProperties(self):
3487
2771
return dbus.Dictionary(
3488
{c.dbus_object_path: c.GetAll(
3489
"se.recompile.Mandos.Client")
3490
for c in tcp_server.clients.values()},
2772
{ c.dbus_object_path: c.GetAll("")
2773
for c in tcp_server.clients.itervalues() },
3491
2774
signature="oa{sv}")
3493
2776
@dbus.service.method(_interface, in_signature="o")
3494
2777
def RemoveClient(self, object_path):
3496
for c in tcp_server.clients.values():
2779
for c in tcp_server.clients.itervalues():
3497
2780
if c.dbus_object_path == object_path:
3498
2781
del tcp_server.clients[c.name]
3499
2782
c.remove_from_connection()
3500
# Don't signal the disabling
2783
# Don't signal anything except ClientRemoved
3501
2784
c.disable(quiet=True)
3502
# Emit D-Bus signal for removal
3503
self.client_removed_signal(c)
2786
self.ClientRemoved(object_path, c.name)
3505
2788
raise KeyError(object_path)
3509
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3510
out_signature="a{oa{sa{sv}}}")
3511
def GetManagedObjects(self):
3513
return dbus.Dictionary(
3514
{client.dbus_object_path:
3516
{interface: client.GetAll(interface)
3518
client._get_all_interface_names()})
3519
for client in tcp_server.clients.values()})
3521
def client_added_signal(self, client):
3522
"""Send the new standard signal and the old signal"""
3524
# New standard signal
3525
self.InterfacesAdded(
3526
client.dbus_object_path,
3528
{interface: client.GetAll(interface)
3530
client._get_all_interface_names()}))
3532
self.ClientAdded(client.dbus_object_path)
3534
def client_removed_signal(self, client):
3535
"""Send the new standard signal and the old signal"""
3537
# New standard signal
3538
self.InterfacesRemoved(
3539
client.dbus_object_path,
3540
client._get_all_interface_names())
3542
self.ClientRemoved(client.dbus_object_path,
3545
2792
mandos_dbus_service = MandosDBusService()
3547
# Save modules to variables to exempt the modules from being
3548
# unloaded before the function registered with atexit() is run.
3549
mp = multiprocessing
3553
2795
"Cleanup function; run on exit"
3555
2797
service.cleanup()
3557
mp.active_children()
2799
multiprocessing.active_children()
3559
2801
if not (tcp_server.clients or client_settings):
3562
2804
# Store client before exiting. Secrets are encrypted with key
3563
2805
# based on what config file has. If config file is
3564
2806
# removed/edited, old secret will thus be unrecovable.
3566
2808
with PGPEngine() as pgp:
3567
for client in tcp_server.clients.values():
2809
for client in tcp_server.clients.itervalues():
3568
2810
key = client_settings[client.name]["secret"]
3569
2811
client.encrypted_secret = pgp.encrypt(client.secret,
3571
2813
client_dict = {}
3573
2815
# A list of attributes that can not be pickled
3575
exclude = {"bus", "changedstate", "secret",
3576
"checker", "server_settings"}
2817
exclude = { "bus", "changedstate", "secret",
2818
"checker", "server_settings" }
3577
2819
for name, typ in inspect.getmembers(dbus.service
3579
2821
exclude.add(name)
3581
2823
client_dict["encrypted_secret"] = (client
3582
2824
.encrypted_secret)
3583
2825
for attr in client.client_structure:
3584
2826
if attr not in exclude:
3585
2827
client_dict[attr] = getattr(client, attr)
3587
2829
clients[client.name] = client_dict
3588
2830
del client_settings[client.name]["secret"]
3591
2833
with tempfile.NamedTemporaryFile(
3593
2835
suffix=".pickle",
3595
2837
dir=os.path.dirname(stored_state_path),
3596
2838
delete=False) as stored_state:
3597
pickle.dump((clients, client_settings), stored_state,
2839
pickle.dump((clients, client_settings), stored_state)
3599
2840
tempname = stored_state.name
3600
2841
os.rename(tempname, stored_state_path)
3601
2842
except (IOError, OSError) as e:
3605
2846
except NameError:
3607
2848
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3608
log.warning("Could not save persistent state: %s",
3609
os.strerror(e.errno))
2849
logger.warning("Could not save persistent state: {}"
2850
.format(os.strerror(e.errno)))
3611
log.warning("Could not save persistent state:",
2852
logger.warning("Could not save persistent state:",
3615
2856
# Delete all clients, and settings from config
3616
2857
while tcp_server.clients:
3617
2858
name, client = tcp_server.clients.popitem()
3619
2860
client.remove_from_connection()
3620
# Don't signal the disabling
2861
# Don't signal anything except ClientRemoved
3621
2862
client.disable(quiet=True)
3622
# Emit D-Bus signal for removal
3624
mandos_dbus_service.client_removed_signal(client)
2865
mandos_dbus_service.ClientRemoved(
2866
client.dbus_object_path, client.name)
3625
2867
client_settings.clear()
3627
2869
atexit.register(cleanup)
3629
for client in tcp_server.clients.values():
2871
for client in tcp_server.clients.itervalues():
3631
# Emit D-Bus signal for adding
3632
mandos_dbus_service.client_added_signal(client)
2874
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3633
2875
# Need to initiate checking of clients
3634
2876
if client.enabled:
3635
client.init_checker(randomize_start=True)
2877
client.init_checker()
3637
2879
tcp_server.enable()
3638
2880
tcp_server.server_activate()
3640
2882
# Find out what port we got
3642
2884
service.port = tcp_server.socket.getsockname()[1]
3644
log.info("Now listening on address %r, port %d, flowinfo %d,"
3645
" scope_id %d", *tcp_server.socket.getsockname())
2886
logger.info("Now listening on address %r, port %d,"
2887
" flowinfo %d, scope_id %d",
2888
*tcp_server.socket.getsockname())
3647
log.info("Now listening on address %r, port %d",
3648
*tcp_server.socket.getsockname())
3650
# service.interface = tcp_server.socket.getsockname()[3]
2890
logger.info("Now listening on address %r, port %d",
2891
*tcp_server.socket.getsockname())
2893
#service.interface = tcp_server.socket.getsockname()[3]
3654
2897
# From the Avahi example code
3656
2899
service.activate()
3657
2900
except dbus.exceptions.DBusException as error:
3658
log.critical("D-Bus Exception", exc_info=error)
2901
logger.critical("D-Bus Exception", exc_info=error)
3661
2904
# End of Avahi example code
3664
GLib.IOChannel.unix_new(tcp_server.fileno()),
3665
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3666
lambda *args, **kwargs: (tcp_server.handle_request
3667
(*args[2:], **kwargs) or True))
3669
log.debug("Starting main loop")
2906
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2907
lambda *args, **kwargs:
2908
(tcp_server.handle_request
2909
(*args[2:], **kwargs) or True))
2911
logger.debug("Starting main loop")
3670
2912
main_loop.run()
3671
2913
except AvahiError as error:
3672
log.critical("Avahi Error", exc_info=error)
2914
logger.critical("Avahi Error", exc_info=error)
3675
2917
except KeyboardInterrupt:
3677
2919
print("", file=sys.stderr)
3678
log.debug("Server received KeyboardInterrupt")
3679
log.debug("Server exiting")
2920
logger.debug("Server received KeyboardInterrupt")
2921
logger.debug("Server exiting")
3680
2922
# Must run before the D-Bus bus name gets deregistered
3684
def parse_test_args():
3685
# type: () -> argparse.Namespace
3686
parser = argparse.ArgumentParser(add_help=False)
3687
parser.add_argument("--check", action="store_true")
3688
parser.add_argument("--prefix", )
3689
args, unknown_args = parser.parse_known_args()
3691
# Remove test options from sys.argv
3692
sys.argv[1:] = unknown_args
3695
# Add all tests from doctest strings
3696
def load_tests(loader, tests, none):
3698
tests.addTests(doctest.DocTestSuite())
3701
if __name__ == "__main__":
3702
options = parse_test_args()
3705
extra_test_prefix = options.prefix
3706
if extra_test_prefix is not None:
3707
if not (unittest.main(argv=[""], exit=False)
3708
.result.wasSuccessful()):
3710
class ExtraTestLoader(unittest.TestLoader):
3711
testMethodPrefix = extra_test_prefix
3712
# Call using ./scriptname --test [--verbose]
3713
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3715
unittest.main(argv=[""])
3723
# (lambda (&optional extra)
3724
# (if (not (funcall run-tests-in-test-buffer default-directory
3726
# (funcall show-test-buffer-in-test-window)
3727
# (funcall remove-test-window)
3728
# (if extra (message "Extra tests run successfully!"))))
3729
# run-tests-in-test-buffer:
3730
# (lambda (dir &optional extra)
3731
# (with-current-buffer (get-buffer-create "*Test*")
3732
# (setq buffer-read-only nil
3733
# default-directory dir)
3735
# (compilation-mode))
3736
# (let ((process-result
3737
# (let ((inhibit-read-only t))
3738
# (process-file-shell-command
3739
# (funcall get-command-line extra) nil "*Test*"))))
3740
# (and (numberp process-result)
3741
# (= process-result 0))))
3743
# (lambda (&optional extra)
3744
# (let ((quoted-script
3745
# (shell-quote-argument (funcall get-script-name))))
3747
# (concat "%s --check" (if extra " --prefix=atest" ""))
3751
# (if (fboundp 'file-local-name)
3752
# (file-local-name (buffer-file-name))
3753
# (or (file-remote-p (buffer-file-name) 'localname)
3754
# (buffer-file-name))))
3755
# remove-test-window:
3757
# (let ((test-window (get-buffer-window "*Test*")))
3758
# (if test-window (delete-window test-window))))
3759
# show-test-buffer-in-test-window:
3761
# (when (not (get-buffer-window-list "*Test*"))
3762
# (setq next-error-last-buffer (get-buffer "*Test*"))
3763
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3764
# (display-buffer-overriding-action
3765
# `((display-buffer-in-side-window) (side . ,side)
3766
# (window-height . fit-window-to-buffer)
3767
# (window-width . fit-window-to-buffer))))
3768
# (display-buffer "*Test*"))))
3771
# (let* ((run-extra-tests (lambda () (interactive)
3772
# (funcall run-tests t)))
3773
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3774
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3775
# (setq minor-mode-overriding-map-alist
3776
# (cons `(run-tests . ,outer-keymap)
3777
# minor-mode-overriding-map-alist)))
3778
# (add-hook 'after-save-hook run-tests 90 t))
2926
if __name__ == '__main__':