523
423
class AvahiServiceToSyslog(AvahiService):
524
424
def rename(self, *args, **kwargs):
525
425
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
426
ret = AvahiService.rename(self, *args, **kwargs)
528
427
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
428
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
429
.format(self.name)))
534
432
# 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)
433
class GnuTLS(object):
434
"""This isn't so much a class as it is a module-like namespace.
435
It is instantiated once, and simulates having a GnuTLS module."""
437
_library = ctypes.cdll.LoadLibrary(
438
ctypes.util.find_library("gnutls"))
439
_need_version = "3.3.0"
441
# Need to use class name "GnuTLS" here, since this method is
442
# called before the assignment to the "gnutls" global variable
444
if GnuTLS.check_version(self._need_version) is None:
445
raise GnuTLS.Error("Needs GnuTLS {} or later"
446
.format(self._need_version))
544
448
# Unless otherwise indicated, the constants and types below are
545
449
# all from the gnutls/gnutls.h C header file.
555
456
CRD_CERTIFICATE = 1
556
457
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
458
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
461
class session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
463
session_t = ctypes.POINTER(session_int)
569
464
class certificate_credentials_st(ctypes.Structure):
571
466
certificate_credentials_t = ctypes.POINTER(
572
467
certificate_credentials_st)
573
468
certificate_type_t = ctypes.c_int
575
469
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):
470
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
471
('size', ctypes.c_uint)]
472
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
474
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
475
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
476
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
477
credentials_type_t = ctypes.c_int #
585
478
transport_ptr_t = ctypes.c_void_p
586
479
close_request_t = ctypes.c_int
589
482
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
483
# We need to use the class name "GnuTLS" here, since this
484
# exception might be raised from within GnuTLS.__init__,
485
# which is called before the assignment to the "gnutls"
486
# global variable happens.
487
def __init__(self, message = None, code = None, args=()):
591
488
# Default usage is by a message string, but if a return
592
489
# code is passed, convert it to a string with
593
490
# gnutls.strerror()
595
491
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__(
492
message = GnuTLS.strerror(code)
493
return super(GnuTLS.Error, self).__init__(
601
496
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):
500
class Credentials(object):
631
501
def __init__(self):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
502
self._c_object = gnutls.certificate_credentials_t()
503
gnutls.certificate_allocate_credentials(
504
ctypes.byref(self._c_object))
634
505
self.type = gnutls.CRD_CERTIFICATE
636
507
def __del__(self):
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)
508
gnutls.certificate_free_credentials(self._c_object)
510
class ClientSession(object):
511
def __init__(self, socket, credentials = None):
512
self._c_object = gnutls.session_t()
513
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
514
gnutls.set_default_priority(self._c_object)
515
gnutls.transport_set_ptr(self._c_object, socket.fileno())
516
gnutls.handshake_set_private_extensions(self._c_object,
652
518
self.socket = socket
653
519
if credentials is None:
654
520
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
521
gnutls.credentials_set(self._c_object, credentials.type,
522
ctypes.cast(credentials._c_object,
657
524
self.credentials = credentials
659
526
def __del__(self):
527
gnutls.deinit(self._c_object)
662
529
def handshake(self):
663
return gnutls.handshake(self)
530
return gnutls.handshake(self._c_object)
665
532
def send(self, data):
666
533
data = bytes(data)
669
data_len -= gnutls.record_send(self, data[-data_len:],
536
return gnutls.record_send(self._c_object, data, len(data))
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
539
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
541
# Error handling function
676
542
def _error_code(result):
677
543
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
544
for the 'restype' attribute on ctypes functions"""
681
547
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)
548
raise gnutls.CertificateSecurityError(code = result)
549
raise gnutls.Error(code = result)
695
551
# Unless otherwise indicated, the function declarations below are
696
552
# all from the gnutls/gnutls.h C header file.
699
555
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
556
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
701
557
ctypes.POINTER(ctypes.c_char_p)]
702
558
priority_set_direct.restype = _error_code
704
560
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
561
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
706
562
init.restype = _error_code
708
564
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
565
set_default_priority.argtypes = [session_t]
710
566
set_default_priority.restype = _error_code
712
568
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
569
record_send.argtypes = [session_t, ctypes.c_void_p,
715
571
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
573
certificate_allocate_credentials = (
719
574
_library.gnutls_certificate_allocate_credentials)
720
575
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
576
ctypes.POINTER(certificate_credentials_t)]
722
577
certificate_allocate_credentials.restype = _error_code
724
579
certificate_free_credentials = (
725
580
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
581
certificate_free_credentials.argtypes = [certificate_credentials_t]
727
582
certificate_free_credentials.restype = None
729
584
handshake_set_private_extensions = (
730
585
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
586
handshake_set_private_extensions.argtypes = [session_t,
733
588
handshake_set_private_extensions.restype = None
735
590
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
591
credentials_set.argtypes = [session_t, credentials_type_t,
738
593
credentials_set.restype = _error_code
740
595
strerror = _library.gnutls_strerror
741
596
strerror.argtypes = [ctypes.c_int]
742
597
strerror.restype = ctypes.c_char_p
744
599
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
600
certificate_type_get.argtypes = [session_t]
746
601
certificate_type_get.restype = _error_code
748
603
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
604
certificate_get_peers.argtypes = [session_t,
750
605
ctypes.POINTER(ctypes.c_uint)]
751
606
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
608
global_set_log_level = _library.gnutls_global_set_log_level
754
609
global_set_log_level.argtypes = [ctypes.c_int]
755
610
global_set_log_level.restype = None
757
612
global_set_log_function = _library.gnutls_global_set_log_function
758
613
global_set_log_function.argtypes = [log_func]
759
614
global_set_log_function.restype = None
761
616
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
617
deinit.argtypes = [session_t]
763
618
deinit.restype = None
765
620
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
621
handshake.argtypes = [session_t]
622
handshake.restype = _error_code
770
624
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
625
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
772
626
transport_set_ptr.restype = None
774
628
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
629
bye.argtypes = [session_t, close_request_t]
630
bye.restype = _error_code
779
632
check_version = _library.gnutls_check_version
780
633
check_version.argtypes = [ctypes.c_char_p]
781
634
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
636
# All the function declarations below are from gnutls/openpgp.h
638
openpgp_crt_init = _library.gnutls_openpgp_crt_init
639
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
640
openpgp_crt_init.restype = _error_code
642
openpgp_crt_import = _library.gnutls_openpgp_crt_import
643
openpgp_crt_import.argtypes = [openpgp_crt_t,
644
ctypes.POINTER(datum_t),
646
openpgp_crt_import.restype = _error_code
648
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
649
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
650
ctypes.POINTER(ctypes.c_uint)]
651
openpgp_crt_verify_self.restype = _error_code
653
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
654
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
655
openpgp_crt_deinit.restype = None
657
openpgp_crt_get_fingerprint = (
658
_library.gnutls_openpgp_crt_get_fingerprint)
659
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
663
openpgp_crt_get_fingerprint.restype = _error_code
665
# Remove non-public function
667
# Create the global "gnutls" object, simulating a module
863
670
def call_pipe(connection, # : multiprocessing.Connection
864
671
func, *args, **kwargs):
865
672
"""This function is meant to be called by multiprocessing.Process
867
674
This function runs func(*args, **kwargs), and writes the resulting
868
675
return value on the provided multiprocessing.Connection.
870
677
connection.send(func(*args, **kwargs))
871
678
connection.close()
680
class Client(object):
875
681
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
684
approved: bool(); 'None' if not yet approved/disapproved
879
685
approval_delay: datetime.timedelta(); Time to wait for approval
880
686
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
687
checker: subprocess.Popen(); a running checker process used
688
to see if the client lives.
689
'None' if no process is running.
690
checker_callback_tag: a gobject event source tag, or None
885
691
checker_command: string; External command which is run to check
886
692
if client lives. %() expansions are done at
887
693
runtime with vars(self) as dict, so that for
888
694
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
695
checker_initiator_tag: a gobject event source tag, or None
890
696
created: datetime.datetime(); (UTC) object creation
891
697
client_structure: Object describing what attributes a client has
892
698
and is used for storing the client at exit
893
699
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
700
disable_initiator_tag: a gobject event source tag, or None
896
702
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
703
uniquely identify the client
900
704
host: string; available for use by the checker command
901
705
interval: datetime.timedelta(); How often to start a new checker
902
706
last_approval_request: datetime.datetime(); (UTC) or None
1026
825
self.changedstate = multiprocessing_manager.Condition(
1027
826
multiprocessing_manager.Lock())
1028
827
self.client_structure = [attr
1029
for attr in self.__dict__.keys()
828
for attr in self.__dict__.iterkeys()
1030
829
if not attr.startswith("_")]
1031
830
self.client_structure.append("client_structure")
1033
832
for name, t in inspect.getmembers(
1034
833
type(self), lambda obj: isinstance(obj, property)):
1035
834
if not name.startswith("_"):
1036
835
self.client_structure.append(name)
1038
837
# Send notice to process children that client state has changed
1039
838
def send_changedstate(self):
1040
839
with self.changedstate:
1041
840
self.changedstate.notify_all()
1043
842
def enable(self):
1044
843
"""Start this client's checker and timeout hooks"""
1045
844
if getattr(self, "enabled", False):
1046
845
# Already enabled
847
self.expires = datetime.datetime.utcnow() + self.timeout
1048
848
self.enabled = True
1049
849
self.last_enabled = datetime.datetime.utcnow()
1050
850
self.init_checker()
1051
851
self.send_changedstate()
1053
853
def disable(self, quiet=True):
1054
854
"""Disable this client."""
1055
855
if not getattr(self, "enabled", False):
1058
log.info("Disabling client %s", self.name)
858
logger.info("Disabling client %s", self.name)
1059
859
if getattr(self, "disable_initiator_tag", None) is not None:
1060
GLib.source_remove(self.disable_initiator_tag)
860
gobject.source_remove(self.disable_initiator_tag)
1061
861
self.disable_initiator_tag = None
1062
862
self.expires = None
1063
863
if getattr(self, "checker_initiator_tag", None) is not None:
1064
GLib.source_remove(self.checker_initiator_tag)
864
gobject.source_remove(self.checker_initiator_tag)
1065
865
self.checker_initiator_tag = None
1066
866
self.stop_checker()
1067
867
self.enabled = False
1069
869
self.send_changedstate()
1070
# Do not run this again if called by a GLib.timeout_add
870
# Do not run this again if called by a gobject.timeout_add
1073
873
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
876
def init_checker(self):
877
# Schedule a new checker to be started an 'interval' from now,
878
# and every interval from then on.
1081
879
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
880
gobject.source_remove(self.checker_initiator_tag)
881
self.checker_initiator_tag = gobject.timeout_add(
882
int(self.interval.total_seconds() * 1000),
884
# Schedule a disable() when 'timeout' has passed
1100
885
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),
886
gobject.source_remove(self.disable_initiator_tag)
887
self.disable_initiator_tag = gobject.timeout_add(
888
int(self.timeout.total_seconds() * 1000), self.disable)
889
# Also start a new checker *right now*.
1106
892
def checker_callback(self, source, condition, connection,
1108
894
"""The checker has completed, so take appropriate actions."""
895
self.checker_callback_tag = None
1109
897
# Read return code from connection (see call_pipe)
1110
898
returncode = connection.recv()
1111
899
connection.close()
1112
if self.checker is not None:
1114
self.checker_callback_tag = None
1117
901
if returncode >= 0:
1118
902
self.last_checker_status = returncode
1119
903
self.last_checker_signal = None
1120
904
if self.last_checker_status == 0:
1121
log.info("Checker for %(name)s succeeded", vars(self))
905
logger.info("Checker for %(name)s succeeded",
1122
907
self.checked_ok()
1124
log.info("Checker for %(name)s failed", vars(self))
909
logger.info("Checker for %(name)s failed", vars(self))
1126
911
self.last_checker_status = -1
1127
912
self.last_checker_signal = -returncode
1128
log.warning("Checker for %(name)s crashed?", vars(self))
913
logger.warning("Checker for %(name)s crashed?",
1131
917
def checked_ok(self):
1132
918
"""Assert that the client has been seen, alive and well."""
1133
919
self.last_checked_ok = datetime.datetime.utcnow()
1134
920
self.last_checker_status = 0
1135
921
self.last_checker_signal = None
1136
922
self.bump_timeout()
1138
924
def bump_timeout(self, timeout=None):
1139
925
"""Bump up the timeout for this client."""
1140
926
if timeout is None:
1141
927
timeout = self.timeout
1142
928
if self.disable_initiator_tag is not None:
1143
GLib.source_remove(self.disable_initiator_tag)
929
gobject.source_remove(self.disable_initiator_tag)
1144
930
self.disable_initiator_tag = None
1145
931
if getattr(self, "enabled", False):
1146
self.disable_initiator_tag = GLib.timeout_add(
932
self.disable_initiator_tag = gobject.timeout_add(
1147
933
int(timeout.total_seconds() * 1000), self.disable)
1148
934
self.expires = datetime.datetime.utcnow() + timeout
1150
936
def need_approval(self):
1151
937
self.last_approval_request = datetime.datetime.utcnow()
1153
def start_checker(self, start_was_randomized=False):
939
def start_checker(self):
1154
940
"""Start a new checker subprocess if one is not running.
1156
942
If a checker already exists, leave it running and do
1158
944
# The reason for not killing a running checker is that if we
2283
2067
byte_arrays=True)
2284
2068
def Secret_dbus_property(self, value):
2285
2069
self.secret = bytes(value)
2291
def __init__(self, child_pipe, key_id, fpr, address):
2074
class ProxyClient(object):
2075
def __init__(self, child_pipe, fpr, address):
2292
2076
self._pipe = child_pipe
2293
self._pipe.send(("init", key_id, fpr, address))
2077
self._pipe.send(('init', fpr, address))
2294
2078
if not self._pipe.recv():
2295
raise KeyError(key_id or fpr)
2297
2081
def __getattribute__(self, name):
2299
2083
return super(ProxyClient, self).__getattribute__(name)
2300
self._pipe.send(("getattr", name))
2084
self._pipe.send(('getattr', name))
2301
2085
data = self._pipe.recv()
2302
if data[0] == "data":
2086
if data[0] == 'data':
2304
if data[0] == "function":
2088
if data[0] == 'function':
2306
2090
def func(*args, **kwargs):
2307
self._pipe.send(("funcall", name, args, kwargs))
2091
self._pipe.send(('funcall', name, args, kwargs))
2308
2092
return self._pipe.recv()[1]
2312
2096
def __setattr__(self, name, value):
2314
2098
return super(ProxyClient, self).__setattr__(name, value)
2315
self._pipe.send(("setattr", name, value))
2099
self._pipe.send(('setattr', name, value))
2318
2102
class ClientHandler(socketserver.BaseRequestHandler, object):
2319
2103
"""A class to handle client connections.
2321
2105
Instantiated once for each connection to handle it.
2322
2106
Note: This will run in its own forked process."""
2324
2108
def handle(self):
2325
2109
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())
2110
logger.info("TCP connection from: %s",
2111
str(self.client_address))
2112
logger.debug("Pipe FD: %d",
2113
self.server.child_pipe.fileno())
2330
2115
session = gnutls.ClientSession(self.request)
2332
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2333
# "+AES-256-CBC", "+SHA1",
2334
# "+COMP-NULL", "+CTYPE-OPENPGP",
2117
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2118
# "+AES-256-CBC", "+SHA1",
2119
# "+COMP-NULL", "+CTYPE-OPENPGP",
2336
2121
# Use a fallback default, since this MUST be set.
2337
2122
priority = self.server.gnutls_priority
2338
2123
if priority is None:
2339
2124
priority = "NORMAL"
2340
gnutls.priority_set_direct(session,
2341
priority.encode("utf-8"), None)
2125
gnutls.priority_set_direct(session._c_object, priority,
2343
2128
# Start communication using the Mandos protocol
2344
2129
# Get protocol number
2345
2130
line = self.request.makefile().readline()
2346
log.debug("Protocol version: %r", line)
2131
logger.debug("Protocol version: %r", line)
2348
2133
if int(line.strip().split()[0]) > 1:
2349
2134
raise RuntimeError(line)
2350
2135
except (ValueError, IndexError, RuntimeError) as error:
2351
log.error("Unknown protocol version: %s", error)
2136
logger.error("Unknown protocol version: %s", error)
2354
2139
# Start GnuTLS connection
2356
2141
session.handshake()
2357
2142
except gnutls.Error as error:
2358
log.warning("Handshake failed: %s", error)
2143
logger.warning("Handshake failed: %s", error)
2359
2144
# Do not run session.bye() here: the session is not
2360
2145
# established. Just abandon the request.
2362
log.debug("Handshake succeeded")
2147
logger.debug("Handshake succeeded")
2364
2149
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,
2152
fpr = self.fingerprint(
2153
self.peer_certificate(session))
2154
except (TypeError, gnutls.Error) as error:
2155
logger.warning("Bad certificate: %s", error)
2157
logger.debug("Fingerprint: %s", fpr)
2160
client = ProxyClient(child_pipe, fpr,
2390
2161
self.client_address)
2391
2162
except KeyError:
2394
2165
if client.approval_delay:
2395
2166
delay = client.approval_delay
2396
2167
client.approvals_pending += 1
2397
2168
approval_required = True
2400
2171
if not client.enabled:
2401
log.info("Client %s is disabled", client.name)
2172
logger.info("Client %s is disabled",
2402
2174
if self.server.use_dbus:
2403
2175
# Emit D-Bus signal
2404
2176
client.Rejected("Disabled")
2407
2179
if client.approved or not client.approval_delay:
2408
# We are approved or approval is disabled
2180
#We are approved or approval is disabled
2410
2182
elif client.approved is None:
2411
log.info("Client %s needs approval",
2183
logger.info("Client %s needs approval",
2413
2185
if self.server.use_dbus:
2414
2186
# Emit D-Bus signal
2415
2187
client.NeedApproval(
2416
2188
client.approval_delay.total_seconds()
2417
2189
* 1000, client.approved_by_default)
2419
log.warning("Client %s was not approved",
2191
logger.warning("Client %s was not approved",
2421
2193
if self.server.use_dbus:
2422
2194
# Emit D-Bus signal
2423
2195
client.Rejected("Denied")
2426
# wait until timeout or approved
2198
#wait until timeout or approved
2427
2199
time = datetime.datetime.now()
2428
2200
client.changedstate.acquire()
2429
2201
client.changedstate.wait(delay.total_seconds())
2444
2216
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)
2219
while sent_size < len(client.secret):
2221
sent = session.send(client.secret[sent_size:])
2222
except gnutls.Error as error:
2223
logger.warning("gnutls send failed",
2226
logger.debug("Sent: %d, remaining: %d", sent,
2227
len(client.secret) - (sent_size
2231
logger.info("Sending secret to %s", client.name)
2453
2232
# bump the timeout using extended_timeout
2454
2233
client.bump_timeout(client.extended_timeout)
2455
2234
if self.server.use_dbus:
2456
2235
# Emit D-Bus signal
2457
2236
client.GotSecret()
2460
2239
if approval_required:
2461
2240
client.approvals_pending -= 1
2464
2243
except gnutls.Error as error:
2465
log.warning("GnuTLS bye failed", exc_info=error)
2244
logger.warning("GnuTLS bye failed",
2468
2248
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,
2249
"Return the peer's OpenPGP certificate as a bytestring"
2250
# If not an OpenPGP certificate...
2251
if (gnutls.certificate_type_get(session._c_object)
2252
!= gnutls.CRT_OPENPGP):
2483
2253
# ...return invalid data
2485
2255
list_size = ctypes.c_uint(1)
2486
2256
cert_list = (gnutls.certificate_get_peers
2487
(session, ctypes.byref(list_size)))
2257
(session._c_object, ctypes.byref(list_size)))
2488
2258
if not bool(cert_list) and list_size.value != 0:
2489
2259
raise gnutls.Error("error getting peer certificate")
2490
2260
if list_size.value == 0:
2492
2262
cert = cert_list[0]
2493
2263
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
2266
def fingerprint(openpgp):
2532
2267
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2727
2458
self.gnutls_priority = gnutls_priority
2728
2459
IPv6_TCPServer.__init__(self, server_address,
2729
2460
RequestHandlerClass,
2730
interface=interface,
2461
interface = interface,
2462
use_ipv6 = use_ipv6,
2463
socketfd = socketfd)
2734
2465
def server_activate(self):
2735
2466
if self.enabled:
2736
2467
return socketserver.TCPServer.server_activate(self)
2738
2469
def enable(self):
2739
2470
self.enabled = True
2741
2472
def add_pipe(self, parent_pipe, proc):
2742
2473
# 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,
2474
gobject.io_add_watch(
2475
parent_pipe.fileno(),
2476
gobject.IO_IN | gobject.IO_HUP,
2746
2477
functools.partial(self.handle_ipc,
2747
parent_pipe=parent_pipe,
2478
parent_pipe = parent_pipe,
2750
2481
def handle_ipc(self, source, condition,
2751
2482
parent_pipe=None,
2753
2484
client_object=None):
2754
2485
# error, or the other end of multiprocessing.Pipe has closed
2755
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2486
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2756
2487
# Wait for other process to exit
2760
2491
# Read a request from the child
2761
2492
request = parent_pipe.recv()
2762
2493
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:
2495
if command == 'init':
2497
address = request[2]
2499
for c in self.clients.itervalues():
2500
if c.fingerprint == fpr:
2780
log.info("Client not found for key ID: %s, address:"
2781
" %s", key_id or fpr, address)
2504
logger.info("Client not found for fingerprint: %s, ad"
2505
"dress: %s", fpr, address)
2782
2506
if self.use_dbus:
2783
2507
# Emit D-Bus signal
2784
mandos_dbus_service.ClientNotFound(key_id or fpr,
2508
mandos_dbus_service.ClientNotFound(fpr,
2786
2510
parent_pipe.send(False)
2790
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2791
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2513
gobject.io_add_watch(
2514
parent_pipe.fileno(),
2515
gobject.IO_IN | gobject.IO_HUP,
2792
2516
functools.partial(self.handle_ipc,
2793
parent_pipe=parent_pipe,
2795
client_object=client))
2517
parent_pipe = parent_pipe,
2519
client_object = client))
2796
2520
parent_pipe.send(True)
2797
2521
# remove the old hook in favor of the new above hook on
2800
if command == "funcall":
2524
if command == 'funcall':
2801
2525
funcname = request[1]
2802
2526
args = request[2]
2803
2527
kwargs = request[3]
2805
parent_pipe.send(("data", getattr(client_object,
2529
parent_pipe.send(('data', getattr(client_object,
2806
2530
funcname)(*args,
2809
if command == "getattr":
2533
if command == 'getattr':
2810
2534
attrname = request[1]
2811
2535
if isinstance(client_object.__getattribute__(attrname),
2812
collections.abc.Callable):
2813
parent_pipe.send(("function", ))
2536
collections.Callable):
2537
parent_pipe.send(('function', ))
2815
2539
parent_pipe.send((
2816
"data", client_object.__getattribute__(attrname)))
2818
if command == "setattr":
2540
'data', client_object.__getattribute__(attrname)))
2542
if command == 'setattr':
2819
2543
attrname = request[1]
2820
2544
value = request[2]
2821
2545
setattr(client_object, attrname, value)
2826
2550
def rfc3339_duration_to_delta(duration):
2827
2551
"""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)
2553
>>> rfc3339_duration_to_delta("P7D")
2554
datetime.timedelta(7)
2555
>>> rfc3339_duration_to_delta("PT60S")
2556
datetime.timedelta(0, 60)
2557
>>> rfc3339_duration_to_delta("PT60M")
2558
datetime.timedelta(0, 3600)
2559
>>> rfc3339_duration_to_delta("PT24H")
2560
datetime.timedelta(1)
2561
>>> rfc3339_duration_to_delta("P1W")
2562
datetime.timedelta(7)
2563
>>> rfc3339_duration_to_delta("PT5M30S")
2564
datetime.timedelta(0, 330)
2565
>>> rfc3339_duration_to_delta("P1DT3M20S")
2566
datetime.timedelta(1, 200)
2847
2569
# Parsing an RFC 3339 duration with regular expressions is not
2848
2570
# possible - there would have to be multiple places for the same
2849
2571
# values, like seconds. The current code, while more esoteric, is
2850
2572
# cleaner without depending on a parsing library. If Python had a
2851
2573
# built-in library for parsing we would use it, but we'd like to
2852
2574
# avoid excessive use of external libraries.
2854
2576
# New type for defining tokens, syntax, and semantics all-in-one
2855
2577
Token = collections.namedtuple("Token", (
2856
2578
"regexp", # To match token; if "value" is not None, must have
3248
2960
"se.bsnet.fukt.Mandos", bus,
3249
2961
do_not_queue=True)
3250
2962
except dbus.exceptions.DBusException as e:
3251
log.error("Disabling D-Bus:", exc_info=e)
2963
logger.error("Disabling D-Bus:", exc_info=e)
3252
2964
use_dbus = False
3253
2965
server_settings["use_dbus"] = False
3254
2966
tcp_server.use_dbus = False
3256
2968
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3257
2969
service = AvahiServiceToSyslog(
3258
name=server_settings["servicename"],
3259
servicetype="_mandos._tcp",
2970
name = server_settings["servicename"],
2971
servicetype = "_mandos._tcp",
2972
protocol = protocol,
3262
2974
if server_settings["interface"]:
3263
2975
service.interface = if_nametoindex(
3264
2976
server_settings["interface"].encode("utf-8"))
3266
2978
global multiprocessing_manager
3267
2979
multiprocessing_manager = multiprocessing.Manager()
3269
2981
client_class = Client
3271
client_class = functools.partial(ClientDBus, bus=bus)
2983
client_class = functools.partial(ClientDBus, bus = bus)
3273
2985
client_settings = Client.config_parser(client_config)
3274
2986
old_client_settings = {}
3275
2987
clients_data = {}
3277
2989
# This is used to redirect stdout and stderr for checker processes
3279
wnull = open(os.devnull, "w") # A writable /dev/null
2991
wnull = open(os.devnull, "w") # A writable /dev/null
3280
2992
# Only used if server is running in foreground but not in debug
3282
2994
if debug or not foreground:
3285
2997
# Get client data and settings from last running state.
3286
2998
if server_settings["restore"]:
3288
3000
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]
3001
clients_data, old_client_settings = pickle.load(
3339
3003
os.remove(stored_state_path)
3340
3004
except IOError as e:
3341
3005
if e.errno == errno.ENOENT:
3342
log.warning("Could not load persistent state:"
3343
" %s", os.strerror(e.errno))
3006
logger.warning("Could not load persistent state:"
3007
" {}".format(os.strerror(e.errno)))
3345
log.critical("Could not load persistent state:",
3009
logger.critical("Could not load persistent state:",
3348
3012
except EOFError as e:
3349
log.warning("Could not load persistent state: EOFError:",
3013
logger.warning("Could not load persistent state: "
3352
3017
with PGPEngine() as pgp:
3353
3018
for client_name, client in clients_data.items():
3354
3019
# Skip removed clients
3355
3020
if client_name not in client_settings:
3358
3023
# Decide which value to use after restoring saved state.
3359
3024
# We have three different values: Old config file,
3360
3025
# new config file, and saved state.
3624
3286
mandos_dbus_service.client_removed_signal(client)
3625
3287
client_settings.clear()
3627
3289
atexit.register(cleanup)
3629
for client in tcp_server.clients.values():
3291
for client in tcp_server.clients.itervalues():
3631
3293
# Emit D-Bus signal for adding
3632
3294
mandos_dbus_service.client_added_signal(client)
3633
3295
# Need to initiate checking of clients
3634
3296
if client.enabled:
3635
client.init_checker(randomize_start=True)
3297
client.init_checker()
3637
3299
tcp_server.enable()
3638
3300
tcp_server.server_activate()
3640
3302
# Find out what port we got
3642
3304
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())
3306
logger.info("Now listening on address %r, port %d,"
3307
" flowinfo %d, scope_id %d",
3308
*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]
3310
logger.info("Now listening on address %r, port %d",
3311
*tcp_server.socket.getsockname())
3313
#service.interface = tcp_server.socket.getsockname()[3]
3654
3317
# From the Avahi example code
3656
3319
service.activate()
3657
3320
except dbus.exceptions.DBusException as error:
3658
log.critical("D-Bus Exception", exc_info=error)
3321
logger.critical("D-Bus Exception", exc_info=error)
3661
3324
# 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")
3326
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3327
lambda *args, **kwargs:
3328
(tcp_server.handle_request
3329
(*args[2:], **kwargs) or True))
3331
logger.debug("Starting main loop")
3670
3332
main_loop.run()
3671
3333
except AvahiError as error:
3672
log.critical("Avahi Error", exc_info=error)
3334
logger.critical("Avahi Error", exc_info=error)
3675
3337
except KeyboardInterrupt:
3677
3339
print("", file=sys.stderr)
3678
log.debug("Server received KeyboardInterrupt")
3679
log.debug("Server exiting")
3340
logger.debug("Server received KeyboardInterrupt")
3341
logger.debug("Server exiting")
3680
3342
# 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))
3346
if __name__ == '__main__':