536
434
class AvahiServiceToSyslog(AvahiService):
537
435
def rename(self, *args, **kwargs):
538
436
"""Add the new name to the syslog messages"""
539
ret = super(AvahiServiceToSyslog, self).rename(*args,
437
ret = AvahiService.rename(self, *args, **kwargs)
541
438
syslogger.setFormatter(logging.Formatter(
542
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
439
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
543
440
.format(self.name)))
547
443
# Pretend that we have a GnuTLS module
549
"""This isn't so much a class as it is a module-like namespace."""
551
library = ctypes.util.find_library("gnutls")
553
library = ctypes.util.find_library("gnutls-deb0")
554
_library = ctypes.cdll.LoadLibrary(library)
444
class GnuTLS(object):
445
"""This isn't so much a class as it is a module-like namespace.
446
It is instantiated once, and simulates having a GnuTLS module."""
448
_library = ctypes.cdll.LoadLibrary(
449
ctypes.util.find_library("gnutls"))
450
_need_version = "3.3.0"
452
# Need to use class name "GnuTLS" here, since this method is
453
# called before the assignment to the "gnutls" global variable
455
if GnuTLS.check_version(self._need_version) is None:
456
raise GnuTLS.Error("Needs GnuTLS {} or later"
457
.format(self._need_version))
557
459
# Unless otherwise indicated, the constants and types below are
558
460
# all from the gnutls/gnutls.h C header file.
562
464
E_INTERRUPTED = -52
568
469
CRD_CERTIFICATE = 1
569
470
E_NO_CERTIFICATE_FOUND = -49
574
KEYID_USE_SHA256 = 1 # gnutls/x509.h
575
471
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
578
class _session_int(ctypes.Structure):
474
class session_int(ctypes.Structure):
580
session_t = ctypes.POINTER(_session_int)
476
session_t = ctypes.POINTER(session_int)
582
477
class certificate_credentials_st(ctypes.Structure):
584
479
certificate_credentials_t = ctypes.POINTER(
585
480
certificate_credentials_st)
586
481
certificate_type_t = ctypes.c_int
588
482
class datum_t(ctypes.Structure):
589
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
590
("size", ctypes.c_uint)]
592
class _openpgp_crt_int(ctypes.Structure):
483
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
484
('size', ctypes.c_uint)]
485
class openpgp_crt_int(ctypes.Structure):
594
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
595
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
487
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
488
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
596
489
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
597
credentials_type_t = ctypes.c_int
490
credentials_type_t = ctypes.c_int #
598
491
transport_ptr_t = ctypes.c_void_p
599
492
close_request_t = ctypes.c_int
602
495
class Error(Exception):
603
def __init__(self, message=None, code=None, args=()):
496
# We need to use the class name "GnuTLS" here, since this
497
# exception might be raised from within GnuTLS.__init__,
498
# which is called before the assignment to the "gnutls"
499
# global variable has happened.
500
def __init__(self, message = None, code = None, args=()):
604
501
# Default usage is by a message string, but if a return
605
502
# code is passed, convert it to a string with
606
503
# gnutls.strerror()
608
505
if message is None and code is not None:
609
message = gnutls.strerror(code).decode(
610
"utf-8", errors="replace")
611
return super(gnutls.Error, self).__init__(
506
message = GnuTLS.strerror(code)
507
return super(GnuTLS.Error, self).__init__(
614
510
class CertificateSecurityError(Error):
618
def __init__(self, cls):
621
def from_param(self, obj):
622
if not isinstance(obj, self.cls):
623
raise TypeError("Not of type {}: {!r}"
624
.format(self.cls.__name__, obj))
625
return ctypes.byref(obj.from_param(obj))
627
class CastToVoidPointer:
628
def __init__(self, cls):
631
def from_param(self, obj):
632
if not isinstance(obj, self.cls):
633
raise TypeError("Not of type {}: {!r}"
634
.format(self.cls.__name__, obj))
635
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
637
class With_from_param:
639
def from_param(cls, obj):
640
return obj._as_parameter_
643
class Credentials(With_from_param):
514
class Credentials(object):
644
515
def __init__(self):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
516
self._c_object = gnutls.certificate_credentials_t()
517
gnutls.certificate_allocate_credentials(
518
ctypes.byref(self._c_object))
647
519
self.type = gnutls.CRD_CERTIFICATE
649
521
def __del__(self):
650
gnutls.certificate_free_credentials(self)
652
class ClientSession(With_from_param):
653
def __init__(self, socket, credentials=None):
654
self._as_parameter_ = gnutls.session_t()
655
gnutls_flags = gnutls.CLIENT
656
if gnutls.check_version(b"3.5.6"):
657
gnutls_flags |= gnutls.NO_TICKETS
659
gnutls_flags |= gnutls.ENABLE_RAWPK
660
gnutls.init(self, gnutls_flags)
662
gnutls.set_default_priority(self)
663
gnutls.transport_set_ptr(self, socket.fileno())
664
gnutls.handshake_set_private_extensions(self, True)
522
gnutls.certificate_free_credentials(self._c_object)
524
class ClientSession(object):
525
def __init__(self, socket, credentials = None):
526
self._c_object = gnutls.session_t()
527
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
528
gnutls.set_default_priority(self._c_object)
529
gnutls.transport_set_ptr(self._c_object, socket.fileno())
530
gnutls.handshake_set_private_extensions(self._c_object,
665
532
self.socket = socket
666
533
if credentials is None:
667
534
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
535
gnutls.credentials_set(self._c_object, credentials.type,
536
ctypes.cast(credentials._c_object,
670
538
self.credentials = credentials
672
540
def __del__(self):
541
gnutls.deinit(self._c_object)
675
543
def handshake(self):
676
return gnutls.handshake(self)
544
return gnutls.handshake(self._c_object)
678
546
def send(self, data):
679
547
data = bytes(data)
680
548
data_len = len(data)
681
549
while data_len > 0:
682
data_len -= gnutls.record_send(self, data[-data_len:],
550
data_len -= gnutls.record_send(self._c_object,
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
555
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
688
557
# Error handling functions
689
558
def _error_code(result):
690
559
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
560
for the 'restype' attribute on ctypes functions"""
694
563
if result == gnutls.E_NO_CERTIFICATE_FOUND:
695
raise gnutls.CertificateSecurityError(code=result)
696
raise gnutls.Error(code=result)
698
def _retry_on_error(result, func, arguments,
699
_error_code=_error_code):
564
raise gnutls.CertificateSecurityError(code = result)
565
raise gnutls.Error(code = result)
567
def _retry_on_error(result, func, arguments):
700
568
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
569
for the 'errcheck' attribute on ctypes functions"""
703
571
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
572
return _error_code(result)
705
573
result = func(*arguments)
708
576
# Unless otherwise indicated, the function declarations below are
709
577
# all from the gnutls/gnutls.h C header file.
712
580
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
581
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
714
582
ctypes.POINTER(ctypes.c_char_p)]
715
583
priority_set_direct.restype = _error_code
717
585
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
586
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
719
587
init.restype = _error_code
721
589
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
590
set_default_priority.argtypes = [session_t]
723
591
set_default_priority.restype = _error_code
725
593
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
594
record_send.argtypes = [session_t, ctypes.c_void_p,
728
596
record_send.restype = ctypes.c_ssize_t
729
597
record_send.errcheck = _retry_on_error
731
599
certificate_allocate_credentials = (
732
600
_library.gnutls_certificate_allocate_credentials)
733
601
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
602
ctypes.POINTER(certificate_credentials_t)]
735
603
certificate_allocate_credentials.restype = _error_code
737
605
certificate_free_credentials = (
738
606
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
607
certificate_free_credentials.argtypes = [certificate_credentials_t]
740
608
certificate_free_credentials.restype = None
742
610
handshake_set_private_extensions = (
743
611
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
612
handshake_set_private_extensions.argtypes = [session_t,
746
614
handshake_set_private_extensions.restype = None
748
616
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
617
credentials_set.argtypes = [session_t, credentials_type_t,
751
619
credentials_set.restype = _error_code
753
621
strerror = _library.gnutls_strerror
754
622
strerror.argtypes = [ctypes.c_int]
755
623
strerror.restype = ctypes.c_char_p
757
625
certificate_type_get = _library.gnutls_certificate_type_get
758
certificate_type_get.argtypes = [ClientSession]
626
certificate_type_get.argtypes = [session_t]
759
627
certificate_type_get.restype = _error_code
761
629
certificate_get_peers = _library.gnutls_certificate_get_peers
762
certificate_get_peers.argtypes = [ClientSession,
630
certificate_get_peers.argtypes = [session_t,
763
631
ctypes.POINTER(ctypes.c_uint)]
764
632
certificate_get_peers.restype = ctypes.POINTER(datum_t)
766
634
global_set_log_level = _library.gnutls_global_set_log_level
767
635
global_set_log_level.argtypes = [ctypes.c_int]
768
636
global_set_log_level.restype = None
770
638
global_set_log_function = _library.gnutls_global_set_log_function
771
639
global_set_log_function.argtypes = [log_func]
772
640
global_set_log_function.restype = None
774
642
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
643
deinit.argtypes = [session_t]
776
644
deinit.restype = None
778
646
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
647
handshake.argtypes = [session_t]
648
handshake.restype = _error_code
781
649
handshake.errcheck = _retry_on_error
783
651
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
652
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
785
653
transport_set_ptr.restype = None
787
655
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
656
bye.argtypes = [session_t, close_request_t]
657
bye.restype = _error_code
790
658
bye.errcheck = _retry_on_error
792
660
check_version = _library.gnutls_check_version
793
661
check_version.argtypes = [ctypes.c_char_p]
794
662
check_version.restype = ctypes.c_char_p
796
_need_version = b"3.3.0"
797
if check_version(_need_version) is None:
798
raise self.Error("Needs GnuTLS {} or later"
799
.format(_need_version))
801
_tls_rawpk_version = b"3.6.6"
802
has_rawpk = bool(check_version(_tls_rawpk_version))
806
class pubkey_st(ctypes.Structure):
808
pubkey_t = ctypes.POINTER(pubkey_st)
810
x509_crt_fmt_t = ctypes.c_int
812
# All the function declarations below are from
814
pubkey_init = _library.gnutls_pubkey_init
815
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
816
pubkey_init.restype = _error_code
818
pubkey_import = _library.gnutls_pubkey_import
819
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
821
pubkey_import.restype = _error_code
823
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
824
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
825
ctypes.POINTER(ctypes.c_ubyte),
826
ctypes.POINTER(ctypes.c_size_t)]
827
pubkey_get_key_id.restype = _error_code
829
pubkey_deinit = _library.gnutls_pubkey_deinit
830
pubkey_deinit.argtypes = [pubkey_t]
831
pubkey_deinit.restype = None
833
# All the function declarations below are from
836
openpgp_crt_init = _library.gnutls_openpgp_crt_init
837
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
838
openpgp_crt_init.restype = _error_code
840
openpgp_crt_import = _library.gnutls_openpgp_crt_import
841
openpgp_crt_import.argtypes = [openpgp_crt_t,
842
ctypes.POINTER(datum_t),
844
openpgp_crt_import.restype = _error_code
846
openpgp_crt_verify_self = \
847
_library.gnutls_openpgp_crt_verify_self
848
openpgp_crt_verify_self.argtypes = [
851
ctypes.POINTER(ctypes.c_uint),
853
openpgp_crt_verify_self.restype = _error_code
855
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
856
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
857
openpgp_crt_deinit.restype = None
859
openpgp_crt_get_fingerprint = (
860
_library.gnutls_openpgp_crt_get_fingerprint)
861
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
865
openpgp_crt_get_fingerprint.restype = _error_code
867
if check_version(b"3.6.4"):
868
certificate_type_get2 = _library.gnutls_certificate_type_get2
869
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
870
certificate_type_get2.restype = _error_code
664
# All the function declarations below are from gnutls/openpgp.h
666
openpgp_crt_init = _library.gnutls_openpgp_crt_init
667
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
668
openpgp_crt_init.restype = _error_code
670
openpgp_crt_import = _library.gnutls_openpgp_crt_import
671
openpgp_crt_import.argtypes = [openpgp_crt_t,
672
ctypes.POINTER(datum_t),
674
openpgp_crt_import.restype = _error_code
676
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
677
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
678
ctypes.POINTER(ctypes.c_uint)]
679
openpgp_crt_verify_self.restype = _error_code
681
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
682
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
683
openpgp_crt_deinit.restype = None
685
openpgp_crt_get_fingerprint = (
686
_library.gnutls_openpgp_crt_get_fingerprint)
687
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
691
openpgp_crt_get_fingerprint.restype = _error_code
872
693
# Remove non-public functions
873
694
del _error_code, _retry_on_error
695
# Create the global "gnutls" object, simulating a module
876
698
def call_pipe(connection, # : multiprocessing.Connection
877
699
func, *args, **kwargs):
878
700
"""This function is meant to be called by multiprocessing.Process
880
702
This function runs func(*args, **kwargs), and writes the resulting
881
703
return value on the provided multiprocessing.Connection.
883
705
connection.send(func(*args, **kwargs))
884
706
connection.close()
708
class Client(object):
888
709
"""A representation of a client host served by this server.
891
approved: bool(); None if not yet approved/disapproved
712
approved: bool(); 'None' if not yet approved/disapproved
892
713
approval_delay: datetime.timedelta(); Time to wait for approval
893
714
approval_duration: datetime.timedelta(); Duration of one approval
894
checker: multiprocessing.Process(); a running checker process used
895
to see if the client lives. None if no process is
897
checker_callback_tag: a GLib event source tag, or None
715
checker: subprocess.Popen(); a running checker process used
716
to see if the client lives.
717
'None' if no process is running.
718
checker_callback_tag: a GObject event source tag, or None
898
719
checker_command: string; External command which is run to check
899
720
if client lives. %() expansions are done at
900
721
runtime with vars(self) as dict, so that for
901
722
instance %(name)s can be used in the command.
902
checker_initiator_tag: a GLib event source tag, or None
723
checker_initiator_tag: a GObject event source tag, or None
903
724
created: datetime.datetime(); (UTC) object creation
904
725
client_structure: Object describing what attributes a client has
905
726
and is used for storing the client at exit
906
727
current_checker_command: string; current running checker_command
907
disable_initiator_tag: a GLib event source tag, or None
728
disable_initiator_tag: a GObject event source tag, or None
909
730
fingerprint: string (40 or 32 hexadecimal digits); used to
910
uniquely identify an OpenPGP client
911
key_id: string (64 hexadecimal digits); used to uniquely identify
912
a client using raw public keys
731
uniquely identify the client
913
732
host: string; available for use by the checker command
914
733
interval: datetime.timedelta(); How often to start a new checker
915
734
last_approval_request: datetime.datetime(); (UTC) or None
1045
853
self.changedstate = multiprocessing_manager.Condition(
1046
854
multiprocessing_manager.Lock())
1047
855
self.client_structure = [attr
1048
for attr in self.__dict__.keys()
856
for attr in self.__dict__.iterkeys()
1049
857
if not attr.startswith("_")]
1050
858
self.client_structure.append("client_structure")
1052
860
for name, t in inspect.getmembers(
1053
861
type(self), lambda obj: isinstance(obj, property)):
1054
862
if not name.startswith("_"):
1055
863
self.client_structure.append(name)
1057
865
# Send notice to process children that client state has changed
1058
866
def send_changedstate(self):
1059
867
with self.changedstate:
1060
868
self.changedstate.notify_all()
1062
870
def enable(self):
1063
871
"""Start this client's checker and timeout hooks"""
1064
872
if getattr(self, "enabled", False):
1065
873
# Already enabled
875
self.expires = datetime.datetime.utcnow() + self.timeout
1067
876
self.enabled = True
1068
877
self.last_enabled = datetime.datetime.utcnow()
1069
878
self.init_checker()
1070
879
self.send_changedstate()
1072
881
def disable(self, quiet=True):
1073
882
"""Disable this client."""
1074
883
if not getattr(self, "enabled", False):
1077
log.info("Disabling client %s", self.name)
886
logger.info("Disabling client %s", self.name)
1078
887
if getattr(self, "disable_initiator_tag", None) is not None:
1079
GLib.source_remove(self.disable_initiator_tag)
888
GObject.source_remove(self.disable_initiator_tag)
1080
889
self.disable_initiator_tag = None
1081
890
self.expires = None
1082
891
if getattr(self, "checker_initiator_tag", None) is not None:
1083
GLib.source_remove(self.checker_initiator_tag)
892
GObject.source_remove(self.checker_initiator_tag)
1084
893
self.checker_initiator_tag = None
1085
894
self.stop_checker()
1086
895
self.enabled = False
1088
897
self.send_changedstate()
1089
# Do not run this again if called by a GLib.timeout_add
898
# Do not run this again if called by a GObject.timeout_add
1092
901
def __del__(self):
1095
def init_checker(self, randomize_start=False):
1096
# Schedule a new checker to be started a randomly selected
1097
# time (a fraction of 'interval') from now. This spreads out
1098
# the startup of checkers over time when the server is
904
def init_checker(self):
905
# Schedule a new checker to be started an 'interval' from now,
906
# and every interval from then on.
1100
907
if self.checker_initiator_tag is not None:
1101
GLib.source_remove(self.checker_initiator_tag)
1102
interval_milliseconds = int(self.interval.total_seconds()
1105
delay_milliseconds = random.randrange(
1106
interval_milliseconds + 1)
1108
delay_milliseconds = interval_milliseconds
1109
self.checker_initiator_tag = GLib.timeout_add(
1110
delay_milliseconds, self.start_checker, randomize_start)
1111
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1112
# A checker might take up to an 'interval' of time, so we can
1113
# expire at the soonest one interval after a checker was
1114
# started. Since the initial checker is delayed, the expire
1115
# time might have to be extended.
1116
now = datetime.datetime.utcnow()
1117
self.expires = now + delay + self.interval
1118
# Schedule a disable() at expire time
908
GObject.source_remove(self.checker_initiator_tag)
909
self.checker_initiator_tag = GObject.timeout_add(
910
int(self.interval.total_seconds() * 1000),
912
# Schedule a disable() when 'timeout' has passed
1119
913
if self.disable_initiator_tag is not None:
1120
GLib.source_remove(self.disable_initiator_tag)
1121
self.disable_initiator_tag = GLib.timeout_add(
1122
int((self.expires - now).total_seconds() * 1000),
914
GObject.source_remove(self.disable_initiator_tag)
915
self.disable_initiator_tag = GObject.timeout_add(
916
int(self.timeout.total_seconds() * 1000), self.disable)
917
# Also start a new checker *right now*.
1125
920
def checker_callback(self, source, condition, connection,
1127
922
"""The checker has completed, so take appropriate actions."""
923
self.checker_callback_tag = None
1128
925
# Read return code from connection (see call_pipe)
1129
926
returncode = connection.recv()
1130
927
connection.close()
1131
if self.checker is not None:
1133
self.checker_callback_tag = None
1136
929
if returncode >= 0:
1137
930
self.last_checker_status = returncode
1138
931
self.last_checker_signal = None
1139
932
if self.last_checker_status == 0:
1140
log.info("Checker for %(name)s succeeded", vars(self))
933
logger.info("Checker for %(name)s succeeded",
1141
935
self.checked_ok()
1143
log.info("Checker for %(name)s failed", vars(self))
937
logger.info("Checker for %(name)s failed", vars(self))
1145
939
self.last_checker_status = -1
1146
940
self.last_checker_signal = -returncode
1147
log.warning("Checker for %(name)s crashed?", vars(self))
941
logger.warning("Checker for %(name)s crashed?",
1150
945
def checked_ok(self):
1151
946
"""Assert that the client has been seen, alive and well."""
1152
947
self.last_checked_ok = datetime.datetime.utcnow()
1153
948
self.last_checker_status = 0
1154
949
self.last_checker_signal = None
1155
950
self.bump_timeout()
1157
952
def bump_timeout(self, timeout=None):
1158
953
"""Bump up the timeout for this client."""
1159
954
if timeout is None:
1160
955
timeout = self.timeout
1161
956
if self.disable_initiator_tag is not None:
1162
GLib.source_remove(self.disable_initiator_tag)
957
GObject.source_remove(self.disable_initiator_tag)
1163
958
self.disable_initiator_tag = None
1164
959
if getattr(self, "enabled", False):
1165
self.disable_initiator_tag = GLib.timeout_add(
960
self.disable_initiator_tag = GObject.timeout_add(
1166
961
int(timeout.total_seconds() * 1000), self.disable)
1167
962
self.expires = datetime.datetime.utcnow() + timeout
1169
964
def need_approval(self):
1170
965
self.last_approval_request = datetime.datetime.utcnow()
1172
def start_checker(self, start_was_randomized=False):
967
def start_checker(self):
1173
968
"""Start a new checker subprocess if one is not running.
1175
970
If a checker already exists, leave it running and do
1177
972
# The reason for not killing a running checker is that if we
2302
2095
byte_arrays=True)
2303
2096
def Secret_dbus_property(self, value):
2304
2097
self.secret = bytes(value)
2310
def __init__(self, child_pipe, key_id, fpr, address):
2102
class ProxyClient(object):
2103
def __init__(self, child_pipe, fpr, address):
2311
2104
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
2105
self._pipe.send(('init', fpr, address))
2313
2106
if not self._pipe.recv():
2314
raise KeyError(key_id or fpr)
2316
2109
def __getattribute__(self, name):
2318
2111
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
2112
self._pipe.send(('getattr', name))
2320
2113
data = self._pipe.recv()
2321
if data[0] == "data":
2114
if data[0] == 'data':
2323
if data[0] == "function":
2116
if data[0] == 'function':
2325
2118
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
2119
self._pipe.send(('funcall', name, args, kwargs))
2327
2120
return self._pipe.recv()[1]
2331
2124
def __setattr__(self, name, value):
2333
2126
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
2127
self._pipe.send(('setattr', name, value))
2337
2130
class ClientHandler(socketserver.BaseRequestHandler, object):
2338
2131
"""A class to handle client connections.
2340
2133
Instantiated once for each connection to handle it.
2341
2134
Note: This will run in its own forked process."""
2343
2136
def handle(self):
2344
2137
with contextlib.closing(self.server.child_pipe) as child_pipe:
2345
log.info("TCP connection from: %s",
2346
str(self.client_address))
2347
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2138
logger.info("TCP connection from: %s",
2139
str(self.client_address))
2140
logger.debug("Pipe FD: %d",
2141
self.server.child_pipe.fileno())
2349
2143
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2352
# "+AES-256-CBC", "+SHA1",
2353
# "+COMP-NULL", "+CTYPE-OPENPGP",
2145
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2146
# "+AES-256-CBC", "+SHA1",
2147
# "+COMP-NULL", "+CTYPE-OPENPGP",
2355
2149
# Use a fallback default, since this MUST be set.
2356
2150
priority = self.server.gnutls_priority
2357
2151
if priority is None:
2358
2152
priority = "NORMAL"
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
2153
gnutls.priority_set_direct(session._c_object, priority,
2362
2156
# Start communication using the Mandos protocol
2363
2157
# Get protocol number
2364
2158
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
2159
logger.debug("Protocol version: %r", line)
2367
2161
if int(line.strip().split()[0]) > 1:
2368
2162
raise RuntimeError(line)
2369
2163
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
2164
logger.error("Unknown protocol version: %s", error)
2373
2167
# Start GnuTLS connection
2375
2169
session.handshake()
2376
2170
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
2171
logger.warning("Handshake failed: %s", error)
2378
2172
# Do not run session.bye() here: the session is not
2379
2173
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
2175
logger.debug("Handshake succeeded")
2383
2177
approval_required = False
2385
if gnutls.has_rawpk:
2388
key_id = self.key_id(
2389
self.peer_certificate(session))
2390
except (TypeError, gnutls.Error) as error:
2391
log.warning("Bad certificate: %s", error)
2393
log.debug("Key ID: %s",
2394
key_id.decode("utf-8",
2400
fpr = self.fingerprint(
2401
self.peer_certificate(session))
2402
except (TypeError, gnutls.Error) as error:
2403
log.warning("Bad certificate: %s", error)
2405
log.debug("Fingerprint: %s", fpr)
2408
client = ProxyClient(child_pipe, key_id, fpr,
2180
fpr = self.fingerprint(
2181
self.peer_certificate(session))
2182
except (TypeError, gnutls.Error) as error:
2183
logger.warning("Bad certificate: %s", error)
2185
logger.debug("Fingerprint: %s", fpr)
2188
client = ProxyClient(child_pipe, fpr,
2409
2189
self.client_address)
2410
2190
except KeyError:
2413
2193
if client.approval_delay:
2414
2194
delay = client.approval_delay
2415
2195
client.approvals_pending += 1
2416
2196
approval_required = True
2419
2199
if not client.enabled:
2420
log.info("Client %s is disabled", client.name)
2200
logger.info("Client %s is disabled",
2421
2202
if self.server.use_dbus:
2422
2203
# Emit D-Bus signal
2423
2204
client.Rejected("Disabled")
2426
2207
if client.approved or not client.approval_delay:
2427
# We are approved or approval is disabled
2208
#We are approved or approval is disabled
2429
2210
elif client.approved is None:
2430
log.info("Client %s needs approval",
2211
logger.info("Client %s needs approval",
2432
2213
if self.server.use_dbus:
2433
2214
# Emit D-Bus signal
2434
2215
client.NeedApproval(
2435
2216
client.approval_delay.total_seconds()
2436
2217
* 1000, client.approved_by_default)
2438
log.warning("Client %s was not approved",
2219
logger.warning("Client %s was not approved",
2440
2221
if self.server.use_dbus:
2441
2222
# Emit D-Bus signal
2442
2223
client.Rejected("Denied")
2445
# wait until timeout or approved
2226
#wait until timeout or approved
2446
2227
time = datetime.datetime.now()
2447
2228
client.changedstate.acquire()
2448
2229
client.changedstate.wait(delay.total_seconds())
2746
2480
self.gnutls_priority = gnutls_priority
2747
2481
IPv6_TCPServer.__init__(self, server_address,
2748
2482
RequestHandlerClass,
2749
interface=interface,
2483
interface = interface,
2484
use_ipv6 = use_ipv6,
2485
socketfd = socketfd)
2753
2487
def server_activate(self):
2754
2488
if self.enabled:
2755
2489
return socketserver.TCPServer.server_activate(self)
2757
2491
def enable(self):
2758
2492
self.enabled = True
2760
2494
def add_pipe(self, parent_pipe, proc):
2761
2495
# Call "handle_ipc" for both data and EOF events
2763
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2764
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2496
GObject.io_add_watch(
2497
parent_pipe.fileno(),
2498
GObject.IO_IN | GObject.IO_HUP,
2765
2499
functools.partial(self.handle_ipc,
2766
parent_pipe=parent_pipe,
2500
parent_pipe = parent_pipe,
2769
2503
def handle_ipc(self, source, condition,
2770
2504
parent_pipe=None,
2772
2506
client_object=None):
2773
2507
# error, or the other end of multiprocessing.Pipe has closed
2774
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2508
if condition & (GObject.IO_ERR | GObject.IO_HUP):
2775
2509
# Wait for other process to exit
2779
2513
# Read a request from the child
2780
2514
request = parent_pipe.recv()
2781
2515
command = request[0]
2783
if command == "init":
2784
key_id = request[1].decode("ascii")
2785
fpr = request[2].decode("ascii")
2786
address = request[3]
2788
for c in self.clients.values():
2789
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2790
"27AE41E4649B934CA495991B7852B855"):
2792
if key_id and c.key_id == key_id:
2795
if fpr and c.fingerprint == fpr:
2517
if command == 'init':
2519
address = request[2]
2521
for c in self.clients.itervalues():
2522
if c.fingerprint == fpr:
2799
log.info("Client not found for key ID: %s, address:"
2800
" %s", key_id or fpr, address)
2526
logger.info("Client not found for fingerprint: %s, ad"
2527
"dress: %s", fpr, address)
2801
2528
if self.use_dbus:
2802
2529
# Emit D-Bus signal
2803
mandos_dbus_service.ClientNotFound(key_id or fpr,
2530
mandos_dbus_service.ClientNotFound(fpr,
2805
2532
parent_pipe.send(False)
2809
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2810
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2535
GObject.io_add_watch(
2536
parent_pipe.fileno(),
2537
GObject.IO_IN | GObject.IO_HUP,
2811
2538
functools.partial(self.handle_ipc,
2812
parent_pipe=parent_pipe,
2814
client_object=client))
2539
parent_pipe = parent_pipe,
2541
client_object = client))
2815
2542
parent_pipe.send(True)
2816
2543
# remove the old hook in favor of the new above hook on
2819
if command == "funcall":
2546
if command == 'funcall':
2820
2547
funcname = request[1]
2821
2548
args = request[2]
2822
2549
kwargs = request[3]
2824
parent_pipe.send(("data", getattr(client_object,
2551
parent_pipe.send(('data', getattr(client_object,
2825
2552
funcname)(*args,
2828
if command == "getattr":
2555
if command == 'getattr':
2829
2556
attrname = request[1]
2830
2557
if isinstance(client_object.__getattribute__(attrname),
2831
collections.abc.Callable):
2832
parent_pipe.send(("function", ))
2558
collections.Callable):
2559
parent_pipe.send(('function', ))
2834
2561
parent_pipe.send((
2835
"data", client_object.__getattribute__(attrname)))
2837
if command == "setattr":
2562
'data', client_object.__getattribute__(attrname)))
2564
if command == 'setattr':
2838
2565
attrname = request[1]
2839
2566
value = request[2]
2840
2567
setattr(client_object, attrname, value)
2845
2572
def rfc3339_duration_to_delta(duration):
2846
2573
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2848
>>> timedelta = datetime.timedelta
2849
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2851
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2853
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2855
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2857
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2859
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2861
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2575
>>> rfc3339_duration_to_delta("P7D")
2576
datetime.timedelta(7)
2577
>>> rfc3339_duration_to_delta("PT60S")
2578
datetime.timedelta(0, 60)
2579
>>> rfc3339_duration_to_delta("PT60M")
2580
datetime.timedelta(0, 3600)
2581
>>> rfc3339_duration_to_delta("PT24H")
2582
datetime.timedelta(1)
2583
>>> rfc3339_duration_to_delta("P1W")
2584
datetime.timedelta(7)
2585
>>> rfc3339_duration_to_delta("PT5M30S")
2586
datetime.timedelta(0, 330)
2587
>>> rfc3339_duration_to_delta("P1DT3M20S")
2588
datetime.timedelta(1, 200)
2866
2591
# Parsing an RFC 3339 duration with regular expressions is not
2867
2592
# possible - there would have to be multiple places for the same
2868
2593
# values, like seconds. The current code, while more esoteric, is
2869
2594
# cleaner without depending on a parsing library. If Python had a
2870
2595
# built-in library for parsing we would use it, but we'd like to
2871
2596
# avoid excessive use of external libraries.
2873
2598
# New type for defining tokens, syntax, and semantics all-in-one
2874
2599
Token = collections.namedtuple("Token", (
2875
2600
"regexp", # To match token; if "value" is not None, must have
3269
2984
"se.bsnet.fukt.Mandos", bus,
3270
2985
do_not_queue=True)
3271
2986
except dbus.exceptions.DBusException as e:
3272
log.error("Disabling D-Bus:", exc_info=e)
2987
logger.error("Disabling D-Bus:", exc_info=e)
3273
2988
use_dbus = False
3274
2989
server_settings["use_dbus"] = False
3275
2990
tcp_server.use_dbus = False
3277
2992
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3278
2993
service = AvahiServiceToSyslog(
3279
name=server_settings["servicename"],
3280
servicetype="_mandos._tcp",
2994
name = server_settings["servicename"],
2995
servicetype = "_mandos._tcp",
2996
protocol = protocol,
3283
2998
if server_settings["interface"]:
3284
2999
service.interface = if_nametoindex(
3285
3000
server_settings["interface"].encode("utf-8"))
3287
3002
global multiprocessing_manager
3288
3003
multiprocessing_manager = multiprocessing.Manager()
3290
3005
client_class = Client
3292
client_class = functools.partial(ClientDBus, bus=bus)
3007
client_class = functools.partial(ClientDBus, bus = bus)
3294
3009
client_settings = Client.config_parser(client_config)
3295
3010
old_client_settings = {}
3296
3011
clients_data = {}
3298
3013
# This is used to redirect stdout and stderr for checker processes
3300
wnull = open(os.devnull, "w") # A writable /dev/null
3015
wnull = open(os.devnull, "w") # A writable /dev/null
3301
3016
# Only used if server is running in foreground but not in debug
3303
3018
if debug or not foreground:
3306
3021
# Get client data and settings from last running state.
3307
3022
if server_settings["restore"]:
3309
3024
with open(stored_state_path, "rb") as stored_state:
3310
if sys.version_info.major == 2:
3311
clients_data, old_client_settings = pickle.load(
3314
bytes_clients_data, bytes_old_client_settings = (
3315
pickle.load(stored_state, encoding="bytes"))
3316
# Fix bytes to strings
3319
clients_data = {(key.decode("utf-8")
3320
if isinstance(key, bytes)
3323
bytes_clients_data.items()}
3324
del bytes_clients_data
3325
for key in clients_data:
3326
value = {(k.decode("utf-8")
3327
if isinstance(k, bytes) else k): v
3329
clients_data[key].items()}
3330
clients_data[key] = value
3332
value["client_structure"] = [
3334
if isinstance(s, bytes)
3336
value["client_structure"]]
3337
# .name, .host, and .checker_command
3338
for k in ("name", "host", "checker_command"):
3339
if isinstance(value[k], bytes):
3340
value[k] = value[k].decode("utf-8")
3341
if "key_id" not in value:
3342
value["key_id"] = ""
3343
elif "fingerprint" not in value:
3344
value["fingerprint"] = ""
3345
# old_client_settings
3347
old_client_settings = {
3348
(key.decode("utf-8")
3349
if isinstance(key, bytes)
3352
bytes_old_client_settings.items()}
3353
del bytes_old_client_settings
3354
# .host and .checker_command
3355
for value in old_client_settings.values():
3356
for attribute in ("host", "checker_command"):
3357
if isinstance(value[attribute], bytes):
3358
value[attribute] = (value[attribute]
3025
clients_data, old_client_settings = pickle.load(
3360
3027
os.remove(stored_state_path)
3361
3028
except IOError as e:
3362
3029
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
3030
logger.warning("Could not load persistent state:"
3031
" {}".format(os.strerror(e.errno)))
3366
log.critical("Could not load persistent state:",
3033
logger.critical("Could not load persistent state:",
3369
3036
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
3037
logger.warning("Could not load persistent state: "
3373
3041
with PGPEngine() as pgp:
3374
3042
for client_name, client in clients_data.items():
3375
3043
# Skip removed clients
3376
3044
if client_name not in client_settings:
3379
3047
# Decide which value to use after restoring saved state.
3380
3048
# We have three different values: Old config file,
3381
3049
# new config file, and saved state.
3645
3310
mandos_dbus_service.client_removed_signal(client)
3646
3311
client_settings.clear()
3648
3313
atexit.register(cleanup)
3650
for client in tcp_server.clients.values():
3315
for client in tcp_server.clients.itervalues():
3652
3317
# Emit D-Bus signal for adding
3653
3318
mandos_dbus_service.client_added_signal(client)
3654
3319
# Need to initiate checking of clients
3655
3320
if client.enabled:
3656
client.init_checker(randomize_start=True)
3321
client.init_checker()
3658
3323
tcp_server.enable()
3659
3324
tcp_server.server_activate()
3661
3326
# Find out what port we got
3663
3328
service.port = tcp_server.socket.getsockname()[1]
3665
log.info("Now listening on address %r, port %d, flowinfo %d,"
3666
" scope_id %d", *tcp_server.socket.getsockname())
3330
logger.info("Now listening on address %r, port %d,"
3331
" flowinfo %d, scope_id %d",
3332
*tcp_server.socket.getsockname())
3668
log.info("Now listening on address %r, port %d",
3669
*tcp_server.socket.getsockname())
3671
# service.interface = tcp_server.socket.getsockname()[3]
3334
logger.info("Now listening on address %r, port %d",
3335
*tcp_server.socket.getsockname())
3337
#service.interface = tcp_server.socket.getsockname()[3]
3675
3341
# From the Avahi example code
3677
3343
service.activate()
3678
3344
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3345
logger.critical("D-Bus Exception", exc_info=error)
3682
3348
# End of Avahi example code
3685
GLib.IOChannel.unix_new(tcp_server.fileno()),
3686
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3687
lambda *args, **kwargs: (tcp_server.handle_request
3688
(*args[2:], **kwargs) or True))
3690
log.debug("Starting main loop")
3350
GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
3351
lambda *args, **kwargs:
3352
(tcp_server.handle_request
3353
(*args[2:], **kwargs) or True))
3355
logger.debug("Starting main loop")
3691
3356
main_loop.run()
3692
3357
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
3358
logger.critical("Avahi Error", exc_info=error)
3696
3361
except KeyboardInterrupt:
3698
3363
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
3364
logger.debug("Server received KeyboardInterrupt")
3365
logger.debug("Server exiting")
3701
3366
# Must run before the D-Bus bus name gets deregistered
3705
def parse_test_args():
3706
# type: () -> argparse.Namespace
3707
parser = argparse.ArgumentParser(add_help=False)
3708
parser.add_argument("--check", action="store_true")
3709
parser.add_argument("--prefix", )
3710
args, unknown_args = parser.parse_known_args()
3712
# Remove test options from sys.argv
3713
sys.argv[1:] = unknown_args
3716
# Add all tests from doctest strings
3717
def load_tests(loader, tests, none):
3719
tests.addTests(doctest.DocTestSuite())
3722
if __name__ == "__main__":
3723
options = parse_test_args()
3726
extra_test_prefix = options.prefix
3727
if extra_test_prefix is not None:
3728
if not (unittest.main(argv=[""], exit=False)
3729
.result.wasSuccessful()):
3731
class ExtraTestLoader(unittest.TestLoader):
3732
testMethodPrefix = extra_test_prefix
3733
# Call using ./scriptname --test [--verbose]
3734
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3736
unittest.main(argv=[""])
3744
# (lambda (&optional extra)
3745
# (if (not (funcall run-tests-in-test-buffer default-directory
3747
# (funcall show-test-buffer-in-test-window)
3748
# (funcall remove-test-window)
3749
# (if extra (message "Extra tests run successfully!"))))
3750
# run-tests-in-test-buffer:
3751
# (lambda (dir &optional extra)
3752
# (with-current-buffer (get-buffer-create "*Test*")
3753
# (setq buffer-read-only nil
3754
# default-directory dir)
3756
# (compilation-mode))
3757
# (let ((process-result
3758
# (let ((inhibit-read-only t))
3759
# (process-file-shell-command
3760
# (funcall get-command-line extra) nil "*Test*"))))
3761
# (and (numberp process-result)
3762
# (= process-result 0))))
3764
# (lambda (&optional extra)
3765
# (let ((quoted-script
3766
# (shell-quote-argument (funcall get-script-name))))
3768
# (concat "%s --check" (if extra " --prefix=atest" ""))
3772
# (if (fboundp 'file-local-name)
3773
# (file-local-name (buffer-file-name))
3774
# (or (file-remote-p (buffer-file-name) 'localname)
3775
# (buffer-file-name))))
3776
# remove-test-window:
3778
# (let ((test-window (get-buffer-window "*Test*")))
3779
# (if test-window (delete-window test-window))))
3780
# show-test-buffer-in-test-window:
3782
# (when (not (get-buffer-window-list "*Test*"))
3783
# (setq next-error-last-buffer (get-buffer "*Test*"))
3784
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3785
# (display-buffer-overriding-action
3786
# `((display-buffer-in-side-window) (side . ,side)
3787
# (window-height . fit-window-to-buffer)
3788
# (window-width . fit-window-to-buffer))))
3789
# (display-buffer "*Test*"))))
3792
# (let* ((run-extra-tests (lambda () (interactive)
3793
# (funcall run-tests t)))
3794
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3795
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3796
# (setq minor-mode-overriding-map-alist
3797
# (cons `(run-tests . ,outer-keymap)
3798
# minor-mode-overriding-map-alist)))
3799
# (add-hook 'after-save-hook run-tests 90 t))
3370
if __name__ == '__main__':