219
265
.replace(b"\n", b"\\n")
220
266
.replace(b"\0", b"\\x00"))
223
269
def encrypt(self, data, password):
224
270
passphrase = self.password_encode(password)
225
271
with tempfile.NamedTemporaryFile(
226
272
dir=self.tempdir) as passfile:
227
273
passfile.write(passphrase)
229
proc = subprocess.Popen([self.gpg, '--symmetric',
275
proc = subprocess.Popen([self.gpg, "--symmetric",
232
278
+ self.gnupgargs,
233
stdin = subprocess.PIPE,
234
stdout = subprocess.PIPE,
235
stderr = subprocess.PIPE)
236
ciphertext, err = proc.communicate(input = data)
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
237
283
if proc.returncode != 0:
238
284
raise PGPError(err)
239
285
return ciphertext
241
287
def decrypt(self, data, password):
242
288
passphrase = self.password_encode(password)
243
289
with tempfile.NamedTemporaryFile(
244
dir = self.tempdir) as passfile:
290
dir=self.tempdir) as passfile:
245
291
passfile.write(passphrase)
247
proc = subprocess.Popen([self.gpg, '--decrypt',
293
proc = subprocess.Popen([self.gpg, "--decrypt",
250
296
+ self.gnupgargs,
251
stdin = subprocess.PIPE,
252
stdout = subprocess.PIPE,
253
stderr = subprocess.PIPE)
254
decrypted_plaintext, err = proc.communicate(input = data)
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
255
301
if proc.returncode != 0:
256
302
raise PGPError(err)
257
303
return decrypted_plaintext
259
306
# Pretend that we have an Avahi module
261
"""This isn't so much a class as it is a module-like namespace.
262
It is instantiated once, and simulates having an Avahi module."""
263
IF_UNSPEC = -1 # avahi-common/address.h
264
PROTO_UNSPEC = -1 # avahi-common/address.h
265
PROTO_INET = 0 # avahi-common/address.h
266
PROTO_INET6 = 1 # avahi-common/address.h
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
267
313
DBUS_NAME = "org.freedesktop.Avahi"
268
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
269
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
270
316
DBUS_PATH_SERVER = "/"
271
def string_array_to_txt_array(self, t):
319
def string_array_to_txt_array(t):
272
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
273
321
for s in t), signature="ay")
274
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
275
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
276
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
277
SERVER_INVALID = 0 # avahi-common/defs.h
278
SERVER_REGISTERING = 1 # avahi-common/defs.h
279
SERVER_RUNNING = 2 # avahi-common/defs.h
280
SERVER_COLLISION = 3 # avahi-common/defs.h
281
SERVER_FAILURE = 4 # avahi-common/defs.h
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
284
332
class AvahiError(Exception):
285
333
def __init__(self, value, *args, **kwargs):
476
523
class AvahiServiceToSyslog(AvahiService):
477
524
def rename(self, *args, **kwargs):
478
525
"""Add the new name to the syslog messages"""
479
ret = AvahiService.rename(self, *args, **kwargs)
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
480
528
syslogger.setFormatter(logging.Formatter(
481
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
482
530
.format(self.name)))
485
534
# Pretend that we have a GnuTLS module
486
class GnuTLS(object):
487
"""This isn't so much a class as it is a module-like namespace.
488
It is instantiated once, and simulates having a GnuTLS module."""
490
_library = ctypes.cdll.LoadLibrary(
491
ctypes.util.find_library("gnutls"))
492
_need_version = b"3.3.0"
494
# Need to use class name "GnuTLS" here, since this method is
495
# called before the assignment to the "gnutls" global variable
497
if GnuTLS.check_version(self._need_version) is None:
498
raise GnuTLS.Error("Needs GnuTLS {} or later"
499
.format(self._need_version))
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)
501
544
# Unless otherwise indicated, the constants and types below are
502
545
# all from the gnutls/gnutls.h C header file.
506
549
E_INTERRUPTED = -52
511
555
CRD_CERTIFICATE = 1
512
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
513
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
516
class session_int(ctypes.Structure):
565
class _session_int(ctypes.Structure):
518
session_t = ctypes.POINTER(session_int)
567
session_t = ctypes.POINTER(_session_int)
519
569
class certificate_credentials_st(ctypes.Structure):
521
571
certificate_credentials_t = ctypes.POINTER(
522
572
certificate_credentials_st)
523
573
certificate_type_t = ctypes.c_int
524
575
class datum_t(ctypes.Structure):
525
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
526
('size', ctypes.c_uint)]
527
class openpgp_crt_int(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
529
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
530
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
531
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
532
584
credentials_type_t = ctypes.c_int
533
585
transport_ptr_t = ctypes.c_void_p
534
586
close_request_t = ctypes.c_int
537
589
class Error(Exception):
538
# We need to use the class name "GnuTLS" here, since this
539
# exception might be raised from within GnuTLS.__init__,
540
# which is called before the assignment to the "gnutls"
541
# global variable has happened.
542
def __init__(self, message = None, code = None, args=()):
590
def __init__(self, message=None, code=None, args=()):
543
591
# Default usage is by a message string, but if a return
544
592
# code is passed, convert it to a string with
545
593
# gnutls.strerror()
547
595
if message is None and code is not None:
548
message = GnuTLS.strerror(code)
549
return super(GnuTLS.Error, self).__init__(
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
552
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_
556
class Credentials(object):
630
class Credentials(With_from_param):
557
631
def __init__(self):
558
self._c_object = gnutls.certificate_credentials_t()
559
gnutls.certificate_allocate_credentials(
560
ctypes.byref(self._c_object))
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
561
634
self.type = gnutls.CRD_CERTIFICATE
563
636
def __del__(self):
564
gnutls.certificate_free_credentials(self._c_object)
566
class ClientSession(object):
567
def __init__(self, socket, credentials = None):
568
self._c_object = gnutls.session_t()
569
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
570
gnutls.set_default_priority(self._c_object)
571
gnutls.transport_set_ptr(self._c_object, socket.fileno())
572
gnutls.handshake_set_private_extensions(self._c_object,
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)
574
652
self.socket = socket
575
653
if credentials is None:
576
654
credentials = gnutls.Credentials()
577
gnutls.credentials_set(self._c_object, credentials.type,
578
ctypes.cast(credentials._c_object,
655
gnutls.credentials_set(self, credentials.type,
580
657
self.credentials = credentials
582
659
def __del__(self):
583
gnutls.deinit(self._c_object)
585
662
def handshake(self):
586
return gnutls.handshake(self._c_object)
663
return gnutls.handshake(self)
588
665
def send(self, data):
589
666
data = bytes(data)
590
667
data_len = len(data)
591
668
while data_len > 0:
592
data_len -= gnutls.record_send(self._c_object,
669
data_len -= gnutls.record_send(self, data[-data_len:],
597
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
599
675
# Error handling functions
600
676
def _error_code(result):
601
677
"""A function to raise exceptions on errors, suitable
602
for the 'restype' attribute on ctypes functions"""
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
605
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
606
raise gnutls.CertificateSecurityError(code = result)
607
raise gnutls.Error(code = result)
609
def _retry_on_error(result, func, arguments):
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):
610
687
"""A function to retry on some errors, suitable
611
for the 'errcheck' attribute on ctypes functions"""
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
613
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
614
691
return _error_code(result)
615
692
result = func(*arguments)
618
695
# Unless otherwise indicated, the function declarations below are
619
696
# all from the gnutls/gnutls.h C header file.
622
699
priority_set_direct = _library.gnutls_priority_set_direct
623
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
624
701
ctypes.POINTER(ctypes.c_char_p)]
625
702
priority_set_direct.restype = _error_code
627
704
init = _library.gnutls_init
628
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
629
706
init.restype = _error_code
631
708
set_default_priority = _library.gnutls_set_default_priority
632
set_default_priority.argtypes = [session_t]
709
set_default_priority.argtypes = [ClientSession]
633
710
set_default_priority.restype = _error_code
635
712
record_send = _library.gnutls_record_send
636
record_send.argtypes = [session_t, ctypes.c_void_p,
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
638
715
record_send.restype = ctypes.c_ssize_t
639
716
record_send.errcheck = _retry_on_error
641
718
certificate_allocate_credentials = (
642
719
_library.gnutls_certificate_allocate_credentials)
643
720
certificate_allocate_credentials.argtypes = [
644
ctypes.POINTER(certificate_credentials_t)]
721
PointerTo(Credentials)]
645
722
certificate_allocate_credentials.restype = _error_code
647
724
certificate_free_credentials = (
648
725
_library.gnutls_certificate_free_credentials)
649
certificate_free_credentials.argtypes = [certificate_credentials_t]
726
certificate_free_credentials.argtypes = [Credentials]
650
727
certificate_free_credentials.restype = None
652
729
handshake_set_private_extensions = (
653
730
_library.gnutls_handshake_set_private_extensions)
654
handshake_set_private_extensions.argtypes = [session_t,
731
handshake_set_private_extensions.argtypes = [ClientSession,
656
733
handshake_set_private_extensions.restype = None
658
735
credentials_set = _library.gnutls_credentials_set
659
credentials_set.argtypes = [session_t, credentials_type_t,
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
661
738
credentials_set.restype = _error_code
663
740
strerror = _library.gnutls_strerror
664
741
strerror.argtypes = [ctypes.c_int]
665
742
strerror.restype = ctypes.c_char_p
667
744
certificate_type_get = _library.gnutls_certificate_type_get
668
certificate_type_get.argtypes = [session_t]
745
certificate_type_get.argtypes = [ClientSession]
669
746
certificate_type_get.restype = _error_code
671
748
certificate_get_peers = _library.gnutls_certificate_get_peers
672
certificate_get_peers.argtypes = [session_t,
749
certificate_get_peers.argtypes = [ClientSession,
673
750
ctypes.POINTER(ctypes.c_uint)]
674
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
676
753
global_set_log_level = _library.gnutls_global_set_log_level
677
754
global_set_log_level.argtypes = [ctypes.c_int]
678
755
global_set_log_level.restype = None
680
757
global_set_log_function = _library.gnutls_global_set_log_function
681
758
global_set_log_function.argtypes = [log_func]
682
759
global_set_log_function.restype = None
684
761
deinit = _library.gnutls_deinit
685
deinit.argtypes = [session_t]
762
deinit.argtypes = [ClientSession]
686
763
deinit.restype = None
688
765
handshake = _library.gnutls_handshake
689
handshake.argtypes = [session_t]
690
handshake.restype = _error_code
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
691
768
handshake.errcheck = _retry_on_error
693
770
transport_set_ptr = _library.gnutls_transport_set_ptr
694
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
695
772
transport_set_ptr.restype = None
697
774
bye = _library.gnutls_bye
698
bye.argtypes = [session_t, close_request_t]
699
bye.restype = _error_code
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
700
777
bye.errcheck = _retry_on_error
702
779
check_version = _library.gnutls_check_version
703
780
check_version.argtypes = [ctypes.c_char_p]
704
781
check_version.restype = ctypes.c_char_p
706
# All the function declarations below are from gnutls/openpgp.h
708
openpgp_crt_init = _library.gnutls_openpgp_crt_init
709
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
710
openpgp_crt_init.restype = _error_code
712
openpgp_crt_import = _library.gnutls_openpgp_crt_import
713
openpgp_crt_import.argtypes = [openpgp_crt_t,
714
ctypes.POINTER(datum_t),
716
openpgp_crt_import.restype = _error_code
718
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
719
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
720
ctypes.POINTER(ctypes.c_uint)]
721
openpgp_crt_verify_self.restype = _error_code
723
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
724
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
725
openpgp_crt_deinit.restype = None
727
openpgp_crt_get_fingerprint = (
728
_library.gnutls_openpgp_crt_get_fingerprint)
729
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
733
openpgp_crt_get_fingerprint.restype = _error_code
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
735
859
# Remove non-public functions
736
860
del _error_code, _retry_on_error
737
# Create the global "gnutls" object, simulating a module
740
863
def call_pipe(connection, # : multiprocessing.Connection
741
864
func, *args, **kwargs):
742
865
"""This function is meant to be called by multiprocessing.Process
744
867
This function runs func(*args, **kwargs), and writes the resulting
745
868
return value on the provided multiprocessing.Connection.
747
870
connection.send(func(*args, **kwargs))
748
871
connection.close()
750
class Client(object):
751
875
"""A representation of a client host served by this server.
754
approved: bool(); 'None' if not yet approved/disapproved
878
approved: bool(); None if not yet approved/disapproved
755
879
approval_delay: datetime.timedelta(); Time to wait for approval
756
880
approval_duration: datetime.timedelta(); Duration of one approval
757
checker: subprocess.Popen(); a running checker process used
758
to see if the client lives.
759
'None' if no process is running.
760
checker_callback_tag: a GObject event source tag, or None
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
761
885
checker_command: string; External command which is run to check
762
886
if client lives. %() expansions are done at
763
887
runtime with vars(self) as dict, so that for
764
888
instance %(name)s can be used in the command.
765
checker_initiator_tag: a GObject event source tag, or None
889
checker_initiator_tag: a GLib event source tag, or None
766
890
created: datetime.datetime(); (UTC) object creation
767
891
client_structure: Object describing what attributes a client has
768
892
and is used for storing the client at exit
769
893
current_checker_command: string; current running checker_command
770
disable_initiator_tag: a GObject event source tag, or None
894
disable_initiator_tag: a GLib event source tag, or None
772
896
fingerprint: string (40 or 32 hexadecimal digits); used to
773
uniquely identify the client
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
774
900
host: string; available for use by the checker command
775
901
interval: datetime.timedelta(); How often to start a new checker
776
902
last_approval_request: datetime.datetime(); (UTC) or None
921
1050
self.last_enabled = datetime.datetime.utcnow()
922
1051
self.init_checker()
923
1052
self.send_changedstate()
925
1054
def disable(self, quiet=True):
926
1055
"""Disable this client."""
927
1056
if not getattr(self, "enabled", False):
930
logger.info("Disabling client %s", self.name)
1059
log.info("Disabling client %s", self.name)
931
1060
if getattr(self, "disable_initiator_tag", None) is not None:
932
GObject.source_remove(self.disable_initiator_tag)
1061
GLib.source_remove(self.disable_initiator_tag)
933
1062
self.disable_initiator_tag = None
934
1063
self.expires = None
935
1064
if getattr(self, "checker_initiator_tag", None) is not None:
936
GObject.source_remove(self.checker_initiator_tag)
1065
GLib.source_remove(self.checker_initiator_tag)
937
1066
self.checker_initiator_tag = None
938
1067
self.stop_checker()
939
1068
self.enabled = False
941
1070
self.send_changedstate()
942
# Do not run this again if called by a GObject.timeout_add
1071
# Do not run this again if called by a GLib.timeout_add
945
1074
def __del__(self):
948
1077
def init_checker(self):
949
1078
# Schedule a new checker to be started an 'interval' from now,
950
1079
# and every interval from then on.
951
1080
if self.checker_initiator_tag is not None:
952
GObject.source_remove(self.checker_initiator_tag)
953
self.checker_initiator_tag = GObject.timeout_add(
954
int(self.interval.total_seconds() * 1000),
1081
GLib.source_remove(self.checker_initiator_tag)
1082
self.checker_initiator_tag = GLib.timeout_add(
1083
random.randrange(int(self.interval.total_seconds() * 1000
955
1085
self.start_checker)
956
1086
# Schedule a disable() when 'timeout' has passed
957
1087
if self.disable_initiator_tag is not None:
958
GObject.source_remove(self.disable_initiator_tag)
959
self.disable_initiator_tag = GObject.timeout_add(
1088
GLib.source_remove(self.disable_initiator_tag)
1089
self.disable_initiator_tag = GLib.timeout_add(
960
1090
int(self.timeout.total_seconds() * 1000), self.disable)
961
1091
# Also start a new checker *right now*.
962
1092
self.start_checker()
964
1094
def checker_callback(self, source, condition, connection,
966
1096
"""The checker has completed, so take appropriate actions."""
967
self.checker_callback_tag = None
969
1097
# Read return code from connection (see call_pipe)
970
1098
returncode = connection.recv()
971
1099
connection.close()
1100
if self.checker is not None:
1102
self.checker_callback_tag = None
973
1105
if returncode >= 0:
974
1106
self.last_checker_status = returncode
975
1107
self.last_checker_signal = None
976
1108
if self.last_checker_status == 0:
977
logger.info("Checker for %(name)s succeeded",
1109
log.info("Checker for %(name)s succeeded", vars(self))
979
1110
self.checked_ok()
981
logger.info("Checker for %(name)s failed", vars(self))
1112
log.info("Checker for %(name)s failed", vars(self))
983
1114
self.last_checker_status = -1
984
1115
self.last_checker_signal = -returncode
985
logger.warning("Checker for %(name)s crashed?",
1116
log.warning("Checker for %(name)s crashed?", vars(self))
989
1119
def checked_ok(self):
990
1120
"""Assert that the client has been seen, alive and well."""
991
1121
self.last_checked_ok = datetime.datetime.utcnow()
992
1122
self.last_checker_status = 0
993
1123
self.last_checker_signal = None
994
1124
self.bump_timeout()
996
1126
def bump_timeout(self, timeout=None):
997
1127
"""Bump up the timeout for this client."""
998
1128
if timeout is None:
999
1129
timeout = self.timeout
1000
1130
if self.disable_initiator_tag is not None:
1001
GObject.source_remove(self.disable_initiator_tag)
1131
GLib.source_remove(self.disable_initiator_tag)
1002
1132
self.disable_initiator_tag = None
1003
1133
if getattr(self, "enabled", False):
1004
self.disable_initiator_tag = GObject.timeout_add(
1134
self.disable_initiator_tag = GLib.timeout_add(
1005
1135
int(timeout.total_seconds() * 1000), self.disable)
1006
1136
self.expires = datetime.datetime.utcnow() + timeout
1008
1138
def need_approval(self):
1009
1139
self.last_approval_request = datetime.datetime.utcnow()
1011
1141
def start_checker(self):
1012
1142
"""Start a new checker subprocess if one is not running.
1014
1144
If a checker already exists, leave it running and do
1016
1146
# The reason for not killing a running checker is that if we
2120
2260
byte_arrays=True)
2121
2261
def Secret_dbus_property(self, value):
2122
2262
self.secret = bytes(value)
2127
class ProxyClient(object):
2128
def __init__(self, child_pipe, fpr, address):
2268
def __init__(self, child_pipe, key_id, fpr, address):
2129
2269
self._pipe = child_pipe
2130
self._pipe.send(('init', fpr, address))
2270
self._pipe.send(("init", key_id, fpr, address))
2131
2271
if not self._pipe.recv():
2272
raise KeyError(key_id or fpr)
2134
2274
def __getattribute__(self, name):
2136
2276
return super(ProxyClient, self).__getattribute__(name)
2137
self._pipe.send(('getattr', name))
2277
self._pipe.send(("getattr", name))
2138
2278
data = self._pipe.recv()
2139
if data[0] == 'data':
2279
if data[0] == "data":
2141
if data[0] == 'function':
2281
if data[0] == "function":
2143
2283
def func(*args, **kwargs):
2144
self._pipe.send(('funcall', name, args, kwargs))
2284
self._pipe.send(("funcall", name, args, kwargs))
2145
2285
return self._pipe.recv()[1]
2149
2289
def __setattr__(self, name, value):
2151
2291
return super(ProxyClient, self).__setattr__(name, value)
2152
self._pipe.send(('setattr', name, value))
2292
self._pipe.send(("setattr", name, value))
2155
2295
class ClientHandler(socketserver.BaseRequestHandler, object):
2156
2296
"""A class to handle client connections.
2158
2298
Instantiated once for each connection to handle it.
2159
2299
Note: This will run in its own forked process."""
2161
2301
def handle(self):
2162
2302
with contextlib.closing(self.server.child_pipe) as child_pipe:
2163
logger.info("TCP connection from: %s",
2164
str(self.client_address))
2165
logger.debug("Pipe FD: %d",
2166
self.server.child_pipe.fileno())
2303
log.info("TCP connection from: %s",
2304
str(self.client_address))
2305
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2168
2307
session = gnutls.ClientSession(self.request)
2170
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2171
# "+AES-256-CBC", "+SHA1",
2172
# "+COMP-NULL", "+CTYPE-OPENPGP",
2309
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2310
# "+AES-256-CBC", "+SHA1",
2311
# "+COMP-NULL", "+CTYPE-OPENPGP",
2174
2313
# Use a fallback default, since this MUST be set.
2175
2314
priority = self.server.gnutls_priority
2176
2315
if priority is None:
2177
2316
priority = "NORMAL"
2178
gnutls.priority_set_direct(session._c_object, priority,
2317
gnutls.priority_set_direct(session,
2318
priority.encode("utf-8"), None)
2181
2320
# Start communication using the Mandos protocol
2182
2321
# Get protocol number
2183
2322
line = self.request.makefile().readline()
2184
logger.debug("Protocol version: %r", line)
2323
log.debug("Protocol version: %r", line)
2186
2325
if int(line.strip().split()[0]) > 1:
2187
2326
raise RuntimeError(line)
2188
2327
except (ValueError, IndexError, RuntimeError) as error:
2189
logger.error("Unknown protocol version: %s", error)
2328
log.error("Unknown protocol version: %s", error)
2192
2331
# Start GnuTLS connection
2194
2333
session.handshake()
2195
2334
except gnutls.Error as error:
2196
logger.warning("Handshake failed: %s", error)
2335
log.warning("Handshake failed: %s", error)
2197
2336
# Do not run session.bye() here: the session is not
2198
2337
# established. Just abandon the request.
2200
logger.debug("Handshake succeeded")
2339
log.debug("Handshake succeeded")
2202
2341
approval_required = False
2205
fpr = self.fingerprint(
2206
self.peer_certificate(session))
2207
except (TypeError, gnutls.Error) as error:
2208
logger.warning("Bad certificate: %s", error)
2210
logger.debug("Fingerprint: %s", fpr)
2213
client = ProxyClient(child_pipe, fpr,
2343
if gnutls.has_rawpk:
2346
key_id = self.key_id(
2347
self.peer_certificate(session))
2348
except (TypeError, gnutls.Error) as error:
2349
log.warning("Bad certificate: %s", error)
2351
log.debug("Key ID: %s",
2352
key_id.decode("utf-8",
2358
fpr = self.fingerprint(
2359
self.peer_certificate(session))
2360
except (TypeError, gnutls.Error) as error:
2361
log.warning("Bad certificate: %s", error)
2363
log.debug("Fingerprint: %s", fpr)
2366
client = ProxyClient(child_pipe, key_id, fpr,
2214
2367
self.client_address)
2215
2368
except KeyError:
2218
2371
if client.approval_delay:
2219
2372
delay = client.approval_delay
2220
2373
client.approvals_pending += 1
2221
2374
approval_required = True
2224
2377
if not client.enabled:
2225
logger.info("Client %s is disabled",
2378
log.info("Client %s is disabled", client.name)
2227
2379
if self.server.use_dbus:
2228
2380
# Emit D-Bus signal
2229
2381
client.Rejected("Disabled")
2232
2384
if client.approved or not client.approval_delay:
2233
#We are approved or approval is disabled
2385
# We are approved or approval is disabled
2235
2387
elif client.approved is None:
2236
logger.info("Client %s needs approval",
2388
log.info("Client %s needs approval",
2238
2390
if self.server.use_dbus:
2239
2391
# Emit D-Bus signal
2240
2392
client.NeedApproval(
2241
2393
client.approval_delay.total_seconds()
2242
2394
* 1000, client.approved_by_default)
2244
logger.warning("Client %s was not approved",
2396
log.warning("Client %s was not approved",
2246
2398
if self.server.use_dbus:
2247
2399
# Emit D-Bus signal
2248
2400
client.Rejected("Denied")
2251
#wait until timeout or approved
2403
# wait until timeout or approved
2252
2404
time = datetime.datetime.now()
2253
2405
client.changedstate.acquire()
2254
2406
client.changedstate.wait(delay.total_seconds())
2505
2704
self.gnutls_priority = gnutls_priority
2506
2705
IPv6_TCPServer.__init__(self, server_address,
2507
2706
RequestHandlerClass,
2508
interface = interface,
2509
use_ipv6 = use_ipv6,
2510
socketfd = socketfd)
2707
interface=interface,
2512
2711
def server_activate(self):
2513
2712
if self.enabled:
2514
2713
return socketserver.TCPServer.server_activate(self)
2516
2715
def enable(self):
2517
2716
self.enabled = True
2519
2718
def add_pipe(self, parent_pipe, proc):
2520
2719
# Call "handle_ipc" for both data and EOF events
2521
GObject.io_add_watch(
2522
parent_pipe.fileno(),
2523
GObject.IO_IN | GObject.IO_HUP,
2721
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2722
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2524
2723
functools.partial(self.handle_ipc,
2525
parent_pipe = parent_pipe,
2724
parent_pipe=parent_pipe,
2528
2727
def handle_ipc(self, source, condition,
2529
2728
parent_pipe=None,
2531
2730
client_object=None):
2532
2731
# error, or the other end of multiprocessing.Pipe has closed
2533
if condition & (GObject.IO_ERR | GObject.IO_HUP):
2732
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2534
2733
# Wait for other process to exit
2538
2737
# Read a request from the child
2539
2738
request = parent_pipe.recv()
2540
2739
command = request[0]
2542
if command == 'init':
2544
address = request[2]
2741
if command == "init":
2742
key_id = request[1].decode("ascii")
2743
fpr = request[2].decode("ascii")
2744
address = request[3]
2546
2746
for c in self.clients.values():
2547
if c.fingerprint == fpr:
2747
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2748
"27AE41E4649B934CA495991B7852B855"):
2750
if key_id and c.key_id == key_id:
2753
if fpr and c.fingerprint == fpr:
2551
logger.info("Client not found for fingerprint: %s, ad"
2552
"dress: %s", fpr, address)
2757
log.info("Client not found for key ID: %s, address:"
2758
" %s", key_id or fpr, address)
2553
2759
if self.use_dbus:
2554
2760
# Emit D-Bus signal
2555
mandos_dbus_service.ClientNotFound(fpr,
2761
mandos_dbus_service.ClientNotFound(key_id or fpr,
2557
2763
parent_pipe.send(False)
2560
GObject.io_add_watch(
2561
parent_pipe.fileno(),
2562
GObject.IO_IN | GObject.IO_HUP,
2767
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2768
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2563
2769
functools.partial(self.handle_ipc,
2564
parent_pipe = parent_pipe,
2566
client_object = client))
2770
parent_pipe=parent_pipe,
2772
client_object=client))
2567
2773
parent_pipe.send(True)
2568
2774
# remove the old hook in favor of the new above hook on
2571
if command == 'funcall':
2777
if command == "funcall":
2572
2778
funcname = request[1]
2573
2779
args = request[2]
2574
2780
kwargs = request[3]
2576
parent_pipe.send(('data', getattr(client_object,
2782
parent_pipe.send(("data", getattr(client_object,
2577
2783
funcname)(*args,
2580
if command == 'getattr':
2786
if command == "getattr":
2581
2787
attrname = request[1]
2582
2788
if isinstance(client_object.__getattribute__(attrname),
2583
collections.Callable):
2584
parent_pipe.send(('function', ))
2789
collections.abc.Callable):
2790
parent_pipe.send(("function", ))
2586
2792
parent_pipe.send((
2587
'data', client_object.__getattribute__(attrname)))
2589
if command == 'setattr':
2793
"data", client_object.__getattribute__(attrname)))
2795
if command == "setattr":
2590
2796
attrname = request[1]
2591
2797
value = request[2]
2592
2798
setattr(client_object, attrname, value)
2597
2803
def rfc3339_duration_to_delta(duration):
2598
2804
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2600
>>> rfc3339_duration_to_delta("P7D")
2601
datetime.timedelta(7)
2602
>>> rfc3339_duration_to_delta("PT60S")
2603
datetime.timedelta(0, 60)
2604
>>> rfc3339_duration_to_delta("PT60M")
2605
datetime.timedelta(0, 3600)
2606
>>> rfc3339_duration_to_delta("PT24H")
2607
datetime.timedelta(1)
2608
>>> rfc3339_duration_to_delta("P1W")
2609
datetime.timedelta(7)
2610
>>> rfc3339_duration_to_delta("PT5M30S")
2611
datetime.timedelta(0, 330)
2612
>>> rfc3339_duration_to_delta("P1DT3M20S")
2613
datetime.timedelta(1, 200)
2806
>>> timedelta = datetime.timedelta
2807
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2809
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2811
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2813
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2815
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2817
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2819
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2616
2824
# Parsing an RFC 3339 duration with regular expressions is not
2617
2825
# possible - there would have to be multiple places for the same
2618
2826
# values, like seconds. The current code, while more esoteric, is
2619
2827
# cleaner without depending on a parsing library. If Python had a
2620
2828
# built-in library for parsing we would use it, but we'd like to
2621
2829
# avoid excessive use of external libraries.
2623
2831
# New type for defining tokens, syntax, and semantics all-in-one
2624
2832
Token = collections.namedtuple("Token", (
2625
2833
"regexp", # To match token; if "value" is not None, must have
3014
3225
"se.bsnet.fukt.Mandos", bus,
3015
3226
do_not_queue=True)
3016
3227
except dbus.exceptions.DBusException as e:
3017
logger.error("Disabling D-Bus:", exc_info=e)
3228
log.error("Disabling D-Bus:", exc_info=e)
3018
3229
use_dbus = False
3019
3230
server_settings["use_dbus"] = False
3020
3231
tcp_server.use_dbus = False
3022
3233
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3023
3234
service = AvahiServiceToSyslog(
3024
name = server_settings["servicename"],
3025
servicetype = "_mandos._tcp",
3026
protocol = protocol,
3235
name=server_settings["servicename"],
3236
servicetype="_mandos._tcp",
3028
3239
if server_settings["interface"]:
3029
3240
service.interface = if_nametoindex(
3030
3241
server_settings["interface"].encode("utf-8"))
3032
3243
global multiprocessing_manager
3033
3244
multiprocessing_manager = multiprocessing.Manager()
3035
3246
client_class = Client
3037
client_class = functools.partial(ClientDBus, bus = bus)
3248
client_class = functools.partial(ClientDBus, bus=bus)
3039
3250
client_settings = Client.config_parser(client_config)
3040
3251
old_client_settings = {}
3041
3252
clients_data = {}
3043
3254
# This is used to redirect stdout and stderr for checker processes
3045
wnull = open(os.devnull, "w") # A writable /dev/null
3256
wnull = open(os.devnull, "w") # A writable /dev/null
3046
3257
# Only used if server is running in foreground but not in debug
3048
3259
if debug or not foreground:
3051
3262
# Get client data and settings from last running state.
3052
3263
if server_settings["restore"]:
3054
3265
with open(stored_state_path, "rb") as stored_state:
3055
if sys.version_info.major == 2:
3266
if sys.version_info.major == 2:
3056
3267
clients_data, old_client_settings = pickle.load(
3059
3270
bytes_clients_data, bytes_old_client_settings = (
3060
pickle.load(stored_state, encoding = "bytes"))
3061
### Fix bytes to strings
3271
pickle.load(stored_state, encoding="bytes"))
3272
# Fix bytes to strings
3064
clients_data = { (key.decode("utf-8")
3065
if isinstance(key, bytes)
3068
bytes_clients_data.items() }
3275
clients_data = {(key.decode("utf-8")
3276
if isinstance(key, bytes)
3279
bytes_clients_data.items()}
3069
3280
del bytes_clients_data
3070
3281
for key in clients_data:
3071
value = { (k.decode("utf-8")
3072
if isinstance(k, bytes) else k): v
3074
clients_data[key].items() }
3282
value = {(k.decode("utf-8")
3283
if isinstance(k, bytes) else k): v
3285
clients_data[key].items()}
3075
3286
clients_data[key] = value
3076
3287
# .client_structure
3077
3288
value["client_structure"] = [
3078
3289
(s.decode("utf-8")
3079
3290
if isinstance(s, bytes)
3080
3291
else s) for s in
3081
value["client_structure"] ]
3083
for k in ("name", "host"):
3292
value["client_structure"]]
3293
# .name, .host, and .checker_command
3294
for k in ("name", "host", "checker_command"):
3084
3295
if isinstance(value[k], bytes):
3085
3296
value[k] = value[k].decode("utf-8")
3086
## old_client_settings
3297
if "key_id" not in value:
3298
value["key_id"] = ""
3299
elif "fingerprint" not in value:
3300
value["fingerprint"] = ""
3301
# old_client_settings
3088
3303
old_client_settings = {
3089
3304
(key.decode("utf-8")
3090
3305
if isinstance(key, bytes)
3091
3306
else key): value
3092
3307
for key, value in
3093
bytes_old_client_settings.items() }
3308
bytes_old_client_settings.items()}
3094
3309
del bytes_old_client_settings
3310
# .host and .checker_command
3096
3311
for value in old_client_settings.values():
3097
if isinstance(value["host"], bytes):
3098
value["host"] = (value["host"]
3312
for attribute in ("host", "checker_command"):
3313
if isinstance(value[attribute], bytes):
3314
value[attribute] = (value[attribute]
3100
3316
os.remove(stored_state_path)
3101
3317
except IOError as e:
3102
3318
if e.errno == errno.ENOENT:
3103
logger.warning("Could not load persistent state:"
3104
" {}".format(os.strerror(e.errno)))
3319
log.warning("Could not load persistent state:"
3320
" %s", os.strerror(e.errno))
3106
logger.critical("Could not load persistent state:",
3322
log.critical("Could not load persistent state:",
3109
3325
except EOFError as e:
3110
logger.warning("Could not load persistent state: "
3326
log.warning("Could not load persistent state: EOFError:",
3114
3329
with PGPEngine() as pgp:
3115
3330
for client_name, client in clients_data.items():
3116
3331
# Skip removed clients
3117
3332
if client_name not in client_settings:
3120
3335
# Decide which value to use after restoring saved state.
3121
3336
# We have three different values: Old config file,
3122
3337
# new config file, and saved state.
3393
3610
# Need to initiate checking of clients
3394
3611
if client.enabled:
3395
3612
client.init_checker()
3397
3614
tcp_server.enable()
3398
3615
tcp_server.server_activate()
3400
3617
# Find out what port we got
3402
3619
service.port = tcp_server.socket.getsockname()[1]
3404
logger.info("Now listening on address %r, port %d,"
3405
" flowinfo %d, scope_id %d",
3406
*tcp_server.socket.getsockname())
3621
log.info("Now listening on address %r, port %d, flowinfo %d,"
3622
" scope_id %d", *tcp_server.socket.getsockname())
3408
logger.info("Now listening on address %r, port %d",
3409
*tcp_server.socket.getsockname())
3411
#service.interface = tcp_server.socket.getsockname()[3]
3624
log.info("Now listening on address %r, port %d",
3625
*tcp_server.socket.getsockname())
3627
# service.interface = tcp_server.socket.getsockname()[3]
3415
3631
# From the Avahi example code
3417
3633
service.activate()
3418
3634
except dbus.exceptions.DBusException as error:
3419
logger.critical("D-Bus Exception", exc_info=error)
3635
log.critical("D-Bus Exception", exc_info=error)
3422
3638
# End of Avahi example code
3424
GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
3425
lambda *args, **kwargs:
3426
(tcp_server.handle_request
3427
(*args[2:], **kwargs) or True))
3429
logger.debug("Starting main loop")
3641
GLib.IOChannel.unix_new(tcp_server.fileno()),
3642
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3643
lambda *args, **kwargs: (tcp_server.handle_request
3644
(*args[2:], **kwargs) or True))
3646
log.debug("Starting main loop")
3430
3647
main_loop.run()
3431
3648
except AvahiError as error:
3432
logger.critical("Avahi Error", exc_info=error)
3649
log.critical("Avahi Error", exc_info=error)
3435
3652
except KeyboardInterrupt:
3437
3654
print("", file=sys.stderr)
3438
logger.debug("Server received KeyboardInterrupt")
3439
logger.debug("Server exiting")
3655
log.debug("Server received KeyboardInterrupt")
3656
log.debug("Server exiting")
3440
3657
# Must run before the D-Bus bus name gets deregistered
3444
if __name__ == '__main__':
3661
def parse_test_args():
3662
# type: () -> argparse.Namespace
3663
parser = argparse.ArgumentParser(add_help=False)
3664
parser.add_argument("--check", action="store_true")
3665
parser.add_argument("--prefix", )
3666
args, unknown_args = parser.parse_known_args()
3668
# Remove test options from sys.argv
3669
sys.argv[1:] = unknown_args
3672
# Add all tests from doctest strings
3673
def load_tests(loader, tests, none):
3675
tests.addTests(doctest.DocTestSuite())
3678
if __name__ == "__main__":
3679
options = parse_test_args()
3682
extra_test_prefix = options.prefix
3683
if extra_test_prefix is not None:
3684
if not (unittest.main(argv=[""], exit=False)
3685
.result.wasSuccessful()):
3687
class ExtraTestLoader(unittest.TestLoader):
3688
testMethodPrefix = extra_test_prefix
3689
# Call using ./scriptname --test [--verbose]
3690
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3692
unittest.main(argv=[""])
3700
# (lambda (&optional extra)
3701
# (if (not (funcall run-tests-in-test-buffer default-directory
3703
# (funcall show-test-buffer-in-test-window)
3704
# (funcall remove-test-window)
3705
# (if extra (message "Extra tests run successfully!"))))
3706
# run-tests-in-test-buffer:
3707
# (lambda (dir &optional extra)
3708
# (with-current-buffer (get-buffer-create "*Test*")
3709
# (setq buffer-read-only nil
3710
# default-directory dir)
3712
# (compilation-mode))
3713
# (let ((process-result
3714
# (let ((inhibit-read-only t))
3715
# (process-file-shell-command
3716
# (funcall get-command-line extra) nil "*Test*"))))
3717
# (and (numberp process-result)
3718
# (= process-result 0))))
3720
# (lambda (&optional extra)
3721
# (let ((quoted-script
3722
# (shell-quote-argument (funcall get-script-name))))
3724
# (concat "%s --check" (if extra " --prefix=atest" ""))
3728
# (if (fboundp 'file-local-name)
3729
# (file-local-name (buffer-file-name))
3730
# (or (file-remote-p (buffer-file-name) 'localname)
3731
# (buffer-file-name))))
3732
# remove-test-window:
3734
# (let ((test-window (get-buffer-window "*Test*")))
3735
# (if test-window (delete-window test-window))))
3736
# show-test-buffer-in-test-window:
3738
# (when (not (get-buffer-window-list "*Test*"))
3739
# (setq next-error-last-buffer (get-buffer "*Test*"))
3740
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3741
# (display-buffer-overriding-action
3742
# `((display-buffer-in-side-window) (side . ,side)
3743
# (window-height . fit-window-to-buffer)
3744
# (window-width . fit-window-to-buffer))))
3745
# (display-buffer "*Test*"))))
3748
# (let* ((run-extra-tests (lambda () (interactive)
3749
# (funcall run-tests t)))
3750
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3751
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3752
# (setq minor-mode-overriding-map-alist
3753
# (cons `(run-tests . ,outer-keymap)
3754
# minor-mode-overriding-map-alist)))
3755
# (add-hook 'after-save-hook run-tests 90 t))