265
196
.replace(b"\n", b"\\n")
266
197
.replace(b"\0", b"\\x00"))
269
200
def encrypt(self, data, password):
270
201
passphrase = self.password_encode(password)
271
202
with tempfile.NamedTemporaryFile(
272
203
dir=self.tempdir) as passfile:
273
204
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
206
proc = subprocess.Popen(['gpg', '--symmetric',
278
209
+ self.gnupgargs,
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
283
214
if proc.returncode != 0:
284
215
raise PGPError(err)
285
216
return ciphertext
287
218
def decrypt(self, data, password):
288
219
passphrase = self.password_encode(password)
289
220
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
221
dir = self.tempdir) as passfile:
291
222
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
224
proc = subprocess.Popen(['gpg', '--decrypt',
296
227
+ self.gnupgargs,
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
301
232
if proc.returncode != 0:
302
233
raise PGPError(err)
303
234
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
237
class AvahiError(Exception):
333
238
def __init__(self, value, *args, **kwargs):
334
239
self.value = value
523
429
class AvahiServiceToSyslog(AvahiService):
524
430
def rename(self, *args, **kwargs):
525
431
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
432
ret = AvahiService.rename(self, *args, **kwargs)
528
433
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
435
.format(self.name)))
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
608
def from_param(self, obj):
609
if not isinstance(obj, self.cls):
610
raise TypeError("Not of type {}: {!r}"
611
.format(self.cls.__name__, obj))
612
return ctypes.byref(obj.from_param(obj))
614
class CastToVoidPointer:
615
def __init__(self, cls):
618
def from_param(self, obj):
619
if not isinstance(obj, self.cls):
620
raise TypeError("Not of type {}: {!r}"
621
.format(self.cls.__name__, obj))
622
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
630
class Credentials(With_from_param):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
634
self.type = gnutls.CRD_CERTIFICATE
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
640
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
642
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
644
gnutls_flags |= gnutls.NO_TICKETS
646
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
653
if credentials is None:
654
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
657
self.credentials = credentials
663
return gnutls.handshake(self)
665
def send(self, data):
669
data_len -= gnutls.record_send(self, data[-data_len:],
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
676
def _error_code(result):
677
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
raise gnutls.CertificateSecurityError(code=result)
683
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
687
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
return _error_code(result)
692
result = func(*arguments)
695
# Unless otherwise indicated, the function declarations below are
696
# all from the gnutls/gnutls.h C header file.
699
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
ctypes.POINTER(ctypes.c_char_p)]
702
priority_set_direct.restype = _error_code
704
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
init.restype = _error_code
708
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
710
set_default_priority.restype = _error_code
712
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
715
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
certificate_allocate_credentials = (
719
_library.gnutls_certificate_allocate_credentials)
720
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
722
certificate_allocate_credentials.restype = _error_code
724
certificate_free_credentials = (
725
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
727
certificate_free_credentials.restype = None
729
handshake_set_private_extensions = (
730
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
733
handshake_set_private_extensions.restype = None
735
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
738
credentials_set.restype = _error_code
740
strerror = _library.gnutls_strerror
741
strerror.argtypes = [ctypes.c_int]
742
strerror.restype = ctypes.c_char_p
744
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
746
certificate_type_get.restype = _error_code
748
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
750
ctypes.POINTER(ctypes.c_uint)]
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
global_set_log_level = _library.gnutls_global_set_log_level
754
global_set_log_level.argtypes = [ctypes.c_int]
755
global_set_log_level.restype = None
757
global_set_log_function = _library.gnutls_global_set_log_function
758
global_set_log_function.argtypes = [log_func]
759
global_set_log_function.restype = None
761
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
763
deinit.restype = None
765
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
770
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
transport_set_ptr.restype = None
774
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
779
check_version = _library.gnutls_check_version
780
check_version.argtypes = [ctypes.c_char_p]
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
789
has_rawpk = bool(check_version(_tls_rawpk_version))
793
class pubkey_st(ctypes.Structure):
795
pubkey_t = ctypes.POINTER(pubkey_st)
797
x509_crt_fmt_t = ctypes.c_int
799
# All the function declarations below are from
801
pubkey_init = _library.gnutls_pubkey_init
802
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
pubkey_init.restype = _error_code
805
pubkey_import = _library.gnutls_pubkey_import
806
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
808
pubkey_import.restype = _error_code
810
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
ctypes.POINTER(ctypes.c_ubyte),
813
ctypes.POINTER(ctypes.c_size_t)]
814
pubkey_get_key_id.restype = _error_code
816
pubkey_deinit = _library.gnutls_pubkey_deinit
817
pubkey_deinit.argtypes = [pubkey_t]
818
pubkey_deinit.restype = None
820
# All the function declarations below are from
823
openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
openpgp_crt_init.restype = _error_code
827
openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
openpgp_crt_import.argtypes = [openpgp_crt_t,
829
ctypes.POINTER(datum_t),
831
openpgp_crt_import.restype = _error_code
833
openpgp_crt_verify_self = \
834
_library.gnutls_openpgp_crt_verify_self
835
openpgp_crt_verify_self.argtypes = [
838
ctypes.POINTER(ctypes.c_uint),
840
openpgp_crt_verify_self.restype = _error_code
842
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
openpgp_crt_deinit.restype = None
846
openpgp_crt_get_fingerprint = (
847
_library.gnutls_openpgp_crt_get_fingerprint)
848
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
852
openpgp_crt_get_fingerprint.restype = _error_code
854
if check_version(b"3.6.4"):
855
certificate_type_get2 = _library.gnutls_certificate_type_get2
856
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
certificate_type_get2.restype = _error_code
859
# Remove non-public functions
860
del _error_code, _retry_on_error
863
438
def call_pipe(connection, # : multiprocessing.Connection
864
439
func, *args, **kwargs):
865
440
"""This function is meant to be called by multiprocessing.Process
867
442
This function runs func(*args, **kwargs), and writes the resulting
868
443
return value on the provided multiprocessing.Connection.
870
445
connection.send(func(*args, **kwargs))
871
446
connection.close()
448
class Client(object):
875
449
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
452
approved: bool(); 'None' if not yet approved/disapproved
879
453
approval_delay: datetime.timedelta(); Time to wait for approval
880
454
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
455
checker: subprocess.Popen(); a running checker process used
456
to see if the client lives.
457
'None' if no process is running.
458
checker_callback_tag: a gobject event source tag, or None
885
459
checker_command: string; External command which is run to check
886
460
if client lives. %() expansions are done at
887
461
runtime with vars(self) as dict, so that for
888
462
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
463
checker_initiator_tag: a gobject event source tag, or None
890
464
created: datetime.datetime(); (UTC) object creation
891
465
client_structure: Object describing what attributes a client has
892
466
and is used for storing the client at exit
893
467
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
468
disable_initiator_tag: a gobject event source tag, or None
896
470
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
471
uniquely identify the client
900
472
host: string; available for use by the checker command
901
473
interval: datetime.timedelta(); How often to start a new checker
902
474
last_approval_request: datetime.datetime(); (UTC) or None
1032
593
self.changedstate = multiprocessing_manager.Condition(
1033
594
multiprocessing_manager.Lock())
1034
595
self.client_structure = [attr
1035
for attr in self.__dict__.keys()
596
for attr in self.__dict__.iterkeys()
1036
597
if not attr.startswith("_")]
1037
598
self.client_structure.append("client_structure")
1039
600
for name, t in inspect.getmembers(
1040
601
type(self), lambda obj: isinstance(obj, property)):
1041
602
if not name.startswith("_"):
1042
603
self.client_structure.append(name)
1044
605
# Send notice to process children that client state has changed
1045
606
def send_changedstate(self):
1046
607
with self.changedstate:
1047
608
self.changedstate.notify_all()
1049
610
def enable(self):
1050
611
"""Start this client's checker and timeout hooks"""
1051
612
if getattr(self, "enabled", False):
1052
613
# Already enabled
615
self.expires = datetime.datetime.utcnow() + self.timeout
1054
616
self.enabled = True
1055
617
self.last_enabled = datetime.datetime.utcnow()
1056
618
self.init_checker()
1057
619
self.send_changedstate()
1059
621
def disable(self, quiet=True):
1060
622
"""Disable this client."""
1061
623
if not getattr(self, "enabled", False):
1064
log.info("Disabling client %s", self.name)
626
logger.info("Disabling client %s", self.name)
1065
627
if getattr(self, "disable_initiator_tag", None) is not None:
1066
GLib.source_remove(self.disable_initiator_tag)
628
gobject.source_remove(self.disable_initiator_tag)
1067
629
self.disable_initiator_tag = None
1068
630
self.expires = None
1069
631
if getattr(self, "checker_initiator_tag", None) is not None:
1070
GLib.source_remove(self.checker_initiator_tag)
632
gobject.source_remove(self.checker_initiator_tag)
1071
633
self.checker_initiator_tag = None
1072
634
self.stop_checker()
1073
635
self.enabled = False
1075
637
self.send_changedstate()
1076
# Do not run this again if called by a GLib.timeout_add
638
# Do not run this again if called by a gobject.timeout_add
1079
641
def __del__(self):
1082
def init_checker(self, randomize_start=False):
1083
# Schedule a new checker to be started a randomly selected
1084
# time (a fraction of 'interval') from now. This spreads out
1085
# the startup of checkers over time when the server is
644
def init_checker(self):
645
# Schedule a new checker to be started an 'interval' from now,
646
# and every interval from then on.
1087
647
if self.checker_initiator_tag is not None:
1088
GLib.source_remove(self.checker_initiator_tag)
1089
interval_milliseconds = int(self.interval.total_seconds()
1092
delay_milliseconds = random.randrange(
1093
interval_milliseconds + 1)
1095
delay_milliseconds = interval_milliseconds
1096
self.checker_initiator_tag = GLib.timeout_add(
1097
delay_milliseconds, self.start_checker, randomize_start)
1098
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1099
# A checker might take up to an 'interval' of time, so we can
1100
# expire at the soonest one interval after a checker was
1101
# started. Since the initial checker is delayed, the expire
1102
# time might have to be extended.
1103
now = datetime.datetime.utcnow()
1104
self.expires = now + delay + self.interval
1105
# Schedule a disable() at expire time
648
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
652
# Schedule a disable() when 'timeout' has passed
1106
653
if self.disable_initiator_tag is not None:
1107
GLib.source_remove(self.disable_initiator_tag)
1108
self.disable_initiator_tag = GLib.timeout_add(
1109
int((self.expires - now).total_seconds() * 1000),
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
657
# Also start a new checker *right now*.
1112
660
def checker_callback(self, source, condition, connection,
1114
662
"""The checker has completed, so take appropriate actions."""
663
self.checker_callback_tag = None
1115
665
# Read return code from connection (see call_pipe)
1116
666
returncode = connection.recv()
1117
667
connection.close()
1118
if self.checker is not None:
1120
self.checker_callback_tag = None
1123
669
if returncode >= 0:
1124
670
self.last_checker_status = returncode
1125
671
self.last_checker_signal = None
1126
672
if self.last_checker_status == 0:
1127
log.info("Checker for %(name)s succeeded", vars(self))
673
logger.info("Checker for %(name)s succeeded",
1128
675
self.checked_ok()
1130
log.info("Checker for %(name)s failed", vars(self))
677
logger.info("Checker for %(name)s failed", vars(self))
1132
679
self.last_checker_status = -1
1133
680
self.last_checker_signal = -returncode
1134
log.warning("Checker for %(name)s crashed?", vars(self))
681
logger.warning("Checker for %(name)s crashed?",
1137
685
def checked_ok(self):
1138
686
"""Assert that the client has been seen, alive and well."""
1139
687
self.last_checked_ok = datetime.datetime.utcnow()
1140
688
self.last_checker_status = 0
1141
689
self.last_checker_signal = None
1142
690
self.bump_timeout()
1144
692
def bump_timeout(self, timeout=None):
1145
693
"""Bump up the timeout for this client."""
1146
694
if timeout is None:
1147
695
timeout = self.timeout
1148
696
if self.disable_initiator_tag is not None:
1149
GLib.source_remove(self.disable_initiator_tag)
697
gobject.source_remove(self.disable_initiator_tag)
1150
698
self.disable_initiator_tag = None
1151
699
if getattr(self, "enabled", False):
1152
self.disable_initiator_tag = GLib.timeout_add(
700
self.disable_initiator_tag = gobject.timeout_add(
1153
701
int(timeout.total_seconds() * 1000), self.disable)
1154
702
self.expires = datetime.datetime.utcnow() + timeout
1156
704
def need_approval(self):
1157
705
self.last_approval_request = datetime.datetime.utcnow()
1159
def start_checker(self, start_was_randomized=False):
707
def start_checker(self):
1160
708
"""Start a new checker subprocess if one is not running.
1162
710
If a checker already exists, leave it running and do
1164
712
# The reason for not killing a running checker is that if we
2289
1835
byte_arrays=True)
2290
1836
def Secret_dbus_property(self, value):
2291
1837
self.secret = bytes(value)
2297
def __init__(self, child_pipe, key_id, fpr, address):
1842
class ProxyClient(object):
1843
def __init__(self, child_pipe, fpr, address):
2298
1844
self._pipe = child_pipe
2299
self._pipe.send(("init", key_id, fpr, address))
1845
self._pipe.send(('init', fpr, address))
2300
1846
if not self._pipe.recv():
2301
raise KeyError(key_id or fpr)
2303
1849
def __getattribute__(self, name):
2305
1851
return super(ProxyClient, self).__getattribute__(name)
2306
self._pipe.send(("getattr", name))
1852
self._pipe.send(('getattr', name))
2307
1853
data = self._pipe.recv()
2308
if data[0] == "data":
1854
if data[0] == 'data':
2310
if data[0] == "function":
1856
if data[0] == 'function':
2312
1858
def func(*args, **kwargs):
2313
self._pipe.send(("funcall", name, args, kwargs))
1859
self._pipe.send(('funcall', name, args, kwargs))
2314
1860
return self._pipe.recv()[1]
2318
1864
def __setattr__(self, name, value):
2320
1866
return super(ProxyClient, self).__setattr__(name, value)
2321
self._pipe.send(("setattr", name, value))
1867
self._pipe.send(('setattr', name, value))
2324
1870
class ClientHandler(socketserver.BaseRequestHandler, object):
2325
1871
"""A class to handle client connections.
2327
1873
Instantiated once for each connection to handle it.
2328
1874
Note: This will run in its own forked process."""
2330
1876
def handle(self):
2331
1877
with contextlib.closing(self.server.child_pipe) as child_pipe:
2332
log.info("TCP connection from: %s",
2333
str(self.client_address))
2334
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2336
session = gnutls.ClientSession(self.request)
2338
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2339
# "+AES-256-CBC", "+SHA1",
2340
# "+COMP-NULL", "+CTYPE-OPENPGP",
1878
logger.info("TCP connection from: %s",
1879
str(self.client_address))
1880
logger.debug("Pipe FD: %d",
1881
self.server.child_pipe.fileno())
1883
session = gnutls.connection.ClientSession(
1884
self.request, gnutls.connection .X509Credentials())
1886
# Note: gnutls.connection.X509Credentials is really a
1887
# generic GnuTLS certificate credentials object so long as
1888
# no X.509 keys are added to it. Therefore, we can use it
1889
# here despite using OpenPGP certificates.
1891
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1892
# "+AES-256-CBC", "+SHA1",
1893
# "+COMP-NULL", "+CTYPE-OPENPGP",
2342
1895
# Use a fallback default, since this MUST be set.
2343
1896
priority = self.server.gnutls_priority
2344
1897
if priority is None:
2345
1898
priority = "NORMAL"
2346
gnutls.priority_set_direct(session,
2347
priority.encode("utf-8"), None)
1899
gnutls.library.functions.gnutls_priority_set_direct(
1900
session._c_object, priority, None)
2349
1902
# Start communication using the Mandos protocol
2350
1903
# Get protocol number
2351
1904
line = self.request.makefile().readline()
2352
log.debug("Protocol version: %r", line)
1905
logger.debug("Protocol version: %r", line)
2354
1907
if int(line.strip().split()[0]) > 1:
2355
1908
raise RuntimeError(line)
2356
1909
except (ValueError, IndexError, RuntimeError) as error:
2357
log.error("Unknown protocol version: %s", error)
1910
logger.error("Unknown protocol version: %s", error)
2360
1913
# Start GnuTLS connection
2362
1915
session.handshake()
2363
except gnutls.Error as error:
2364
log.warning("Handshake failed: %s", error)
1916
except gnutls.errors.GNUTLSError as error:
1917
logger.warning("Handshake failed: %s", error)
2365
1918
# Do not run session.bye() here: the session is not
2366
1919
# established. Just abandon the request.
2368
log.debug("Handshake succeeded")
1921
logger.debug("Handshake succeeded")
2370
1923
approval_required = False
2372
if gnutls.has_rawpk:
2375
key_id = self.key_id(
2376
self.peer_certificate(session))
2377
except (TypeError, gnutls.Error) as error:
2378
log.warning("Bad certificate: %s", error)
2380
log.debug("Key ID: %s",
2381
key_id.decode("utf-8",
2387
fpr = self.fingerprint(
2388
self.peer_certificate(session))
2389
except (TypeError, gnutls.Error) as error:
2390
log.warning("Bad certificate: %s", error)
2392
log.debug("Fingerprint: %s", fpr)
2395
client = ProxyClient(child_pipe, key_id, fpr,
1926
fpr = self.fingerprint(
1927
self.peer_certificate(session))
1929
gnutls.errors.GNUTLSError) as error:
1930
logger.warning("Bad certificate: %s", error)
1932
logger.debug("Fingerprint: %s", fpr)
1935
client = ProxyClient(child_pipe, fpr,
2396
1936
self.client_address)
2397
1937
except KeyError:
2400
1940
if client.approval_delay:
2401
1941
delay = client.approval_delay
2402
1942
client.approvals_pending += 1
2403
1943
approval_required = True
2406
1946
if not client.enabled:
2407
log.info("Client %s is disabled", client.name)
1947
logger.info("Client %s is disabled",
2408
1949
if self.server.use_dbus:
2409
1950
# Emit D-Bus signal
2410
1951
client.Rejected("Disabled")
2413
1954
if client.approved or not client.approval_delay:
2414
# We are approved or approval is disabled
1955
#We are approved or approval is disabled
2416
1957
elif client.approved is None:
2417
log.info("Client %s needs approval",
1958
logger.info("Client %s needs approval",
2419
1960
if self.server.use_dbus:
2420
1961
# Emit D-Bus signal
2421
1962
client.NeedApproval(
2422
1963
client.approval_delay.total_seconds()
2423
1964
* 1000, client.approved_by_default)
2425
log.warning("Client %s was not approved",
1966
logger.warning("Client %s was not approved",
2427
1968
if self.server.use_dbus:
2428
1969
# Emit D-Bus signal
2429
1970
client.Rejected("Denied")
2432
# wait until timeout or approved
1973
#wait until timeout or approved
2433
1974
time = datetime.datetime.now()
2434
1975
client.changedstate.acquire()
2435
1976
client.changedstate.wait(delay.total_seconds())
2450
1991
delay -= time2 - time
2453
session.send(client.secret)
2454
except gnutls.Error as error:
2455
log.warning("gnutls send failed", exc_info=error)
2458
log.info("Sending secret to %s", client.name)
1994
while sent_size < len(client.secret):
1996
sent = session.send(client.secret[sent_size:])
1997
except gnutls.errors.GNUTLSError as error:
1998
logger.warning("gnutls send failed",
2001
logger.debug("Sent: %d, remaining: %d", sent,
2002
len(client.secret) - (sent_size
2006
logger.info("Sending secret to %s", client.name)
2459
2007
# bump the timeout using extended_timeout
2460
2008
client.bump_timeout(client.extended_timeout)
2461
2009
if self.server.use_dbus:
2462
2010
# Emit D-Bus signal
2463
2011
client.GotSecret()
2466
2014
if approval_required:
2467
2015
client.approvals_pending -= 1
2470
except gnutls.Error as error:
2471
log.warning("GnuTLS bye failed", exc_info=error)
2018
except gnutls.errors.GNUTLSError as error:
2019
logger.warning("GnuTLS bye failed",
2474
2023
def peer_certificate(session):
2475
"Return the peer's certificate as a bytestring"
2477
cert_type = gnutls.certificate_type_get2(
2478
session, gnutls.CTYPE_PEERS)
2479
except AttributeError:
2480
cert_type = gnutls.certificate_type_get(session)
2481
if gnutls.has_rawpk:
2482
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2484
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2485
# If not a valid certificate type...
2486
if cert_type not in valid_cert_types:
2487
log.info("Cert type %r not in %r", cert_type,
2489
# ...return invalid data
2024
"Return the peer's OpenPGP certificate as a bytestring"
2025
# If not an OpenPGP certificate...
2026
if (gnutls.library.functions.gnutls_certificate_type_get(
2028
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
2029
# ...do the normal thing
2030
return session.peer_certificate
2491
2031
list_size = ctypes.c_uint(1)
2492
cert_list = (gnutls.certificate_get_peers
2493
(session, ctypes.byref(list_size)))
2032
cert_list = (gnutls.library.functions
2033
.gnutls_certificate_get_peers
2034
(session._c_object, ctypes.byref(list_size)))
2494
2035
if not bool(cert_list) and list_size.value != 0:
2495
raise gnutls.Error("error getting peer certificate")
2036
raise gnutls.errors.GNUTLSError("error getting peer"
2496
2038
if list_size.value == 0:
2498
2040
cert = cert_list[0]
2499
2041
return ctypes.string_at(cert.data, cert.size)
2502
def key_id(certificate):
2503
"Convert a certificate bytestring to a hexdigit key ID"
2504
# New GnuTLS "datum" with the public key
2505
datum = gnutls.datum_t(
2506
ctypes.cast(ctypes.c_char_p(certificate),
2507
ctypes.POINTER(ctypes.c_ubyte)),
2508
ctypes.c_uint(len(certificate)))
2509
# XXX all these need to be created in the gnutls "module"
2510
# New empty GnuTLS certificate
2511
pubkey = gnutls.pubkey_t()
2512
gnutls.pubkey_init(ctypes.byref(pubkey))
2513
# Import the raw public key into the certificate
2514
gnutls.pubkey_import(pubkey,
2515
ctypes.byref(datum),
2516
gnutls.X509_FMT_DER)
2517
# New buffer for the key ID
2518
buf = ctypes.create_string_buffer(32)
2519
buf_len = ctypes.c_size_t(len(buf))
2520
# Get the key ID from the raw public key into the buffer
2521
gnutls.pubkey_get_key_id(
2523
gnutls.KEYID_USE_SHA256,
2524
ctypes.cast(ctypes.byref(buf),
2525
ctypes.POINTER(ctypes.c_ubyte)),
2526
ctypes.byref(buf_len))
2527
# Deinit the certificate
2528
gnutls.pubkey_deinit(pubkey)
2530
# Convert the buffer to a Python bytestring
2531
key_id = ctypes.string_at(buf, buf_len.value)
2532
# Convert the bytestring to hexadecimal notation
2533
hex_key_id = binascii.hexlify(key_id).upper()
2537
2044
def fingerprint(openpgp):
2538
2045
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2539
2046
# New GnuTLS "datum" with the OpenPGP public key
2540
datum = gnutls.datum_t(
2047
datum = gnutls.library.types.gnutls_datum_t(
2541
2048
ctypes.cast(ctypes.c_char_p(openpgp),
2542
2049
ctypes.POINTER(ctypes.c_ubyte)),
2543
2050
ctypes.c_uint(len(openpgp)))
2544
2051
# New empty GnuTLS certificate
2545
crt = gnutls.openpgp_crt_t()
2546
gnutls.openpgp_crt_init(ctypes.byref(crt))
2052
crt = gnutls.library.types.gnutls_openpgp_crt_t()
2053
gnutls.library.functions.gnutls_openpgp_crt_init(
2547
2055
# Import the OpenPGP public key into the certificate
2548
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2549
gnutls.OPENPGP_FMT_RAW)
2056
gnutls.library.functions.gnutls_openpgp_crt_import(
2057
crt, ctypes.byref(datum),
2058
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2550
2059
# Verify the self signature in the key
2551
2060
crtverify = ctypes.c_uint()
2552
gnutls.openpgp_crt_verify_self(crt, 0,
2553
ctypes.byref(crtverify))
2061
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
crt, 0, ctypes.byref(crtverify))
2554
2063
if crtverify.value != 0:
2555
gnutls.openpgp_crt_deinit(crt)
2556
raise gnutls.CertificateSecurityError(code
2064
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2065
raise gnutls.errors.CertificateSecurityError(
2558
2067
# New buffer for the fingerprint
2559
2068
buf = ctypes.create_string_buffer(20)
2560
2069
buf_len = ctypes.c_size_t()
2561
2070
# Get the fingerprint from the certificate into the buffer
2562
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2563
ctypes.byref(buf_len))
2071
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2564
2073
# Deinit the certificate
2565
gnutls.openpgp_crt_deinit(crt)
2074
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2566
2075
# Convert the buffer to a Python bytestring
2567
2076
fpr = ctypes.string_at(buf, buf_len.value)
2568
2077
# Convert the bytestring to hexadecimal notation
2657
2165
# socket_wrapper(), if socketfd was set.
2658
2166
socketserver.TCPServer.__init__(self, server_address,
2659
2167
RequestHandlerClass)
2661
2169
def server_bind(self):
2662
2170
"""This overrides the normal server_bind() function
2663
2171
to bind to an interface if one was specified, and also NOT to
2664
2172
bind to an address or port if they were not specified."""
2665
global SO_BINDTODEVICE
2666
2173
if self.interface is not None:
2667
2174
if SO_BINDTODEVICE is None:
2668
# Fall back to a hard-coded value which seems to be
2670
log.warning("SO_BINDTODEVICE not found, trying 25")
2671
SO_BINDTODEVICE = 25
2673
self.socket.setsockopt(
2674
socket.SOL_SOCKET, SO_BINDTODEVICE,
2675
(self.interface + "\0").encode("utf-8"))
2676
except socket.error as error:
2677
if error.errno == errno.EPERM:
2678
log.error("No permission to bind to interface %s",
2680
elif error.errno == errno.ENOPROTOOPT:
2681
log.error("SO_BINDTODEVICE not available; cannot"
2682
" bind to interface %s", self.interface)
2683
elif error.errno == errno.ENODEV:
2684
log.error("Interface %s does not exist, cannot"
2685
" bind", self.interface)
2175
logger.error("SO_BINDTODEVICE does not exist;"
2176
" cannot bind to interface %s",
2180
self.socket.setsockopt(
2181
socket.SOL_SOCKET, SO_BINDTODEVICE,
2182
(self.interface + "\0").encode("utf-8"))
2183
except socket.error as error:
2184
if error.errno == errno.EPERM:
2185
logger.error("No permission to bind to"
2186
" interface %s", self.interface)
2187
elif error.errno == errno.ENOPROTOOPT:
2188
logger.error("SO_BINDTODEVICE not available;"
2189
" cannot bind to interface %s",
2191
elif error.errno == errno.ENODEV:
2192
logger.error("Interface %s does not exist,"
2193
" cannot bind", self.interface)
2688
2196
# Only bind(2) the socket if we really need to.
2689
2197
if self.server_address[0] or self.server_address[1]:
2690
if self.server_address[1]:
2691
self.allow_reuse_address = True
2692
2198
if not self.server_address[0]:
2693
2199
if self.address_family == socket.AF_INET6:
2694
any_address = "::" # in6addr_any
2200
any_address = "::" # in6addr_any
2696
any_address = "0.0.0.0" # INADDR_ANY
2202
any_address = "0.0.0.0" # INADDR_ANY
2697
2203
self.server_address = (any_address,
2698
2204
self.server_address[1])
2699
2205
elif not self.server_address[1]:
2733
2239
self.gnutls_priority = gnutls_priority
2734
2240
IPv6_TCPServer.__init__(self, server_address,
2735
2241
RequestHandlerClass,
2736
interface=interface,
2242
interface = interface,
2243
use_ipv6 = use_ipv6,
2244
socketfd = socketfd)
2740
2246
def server_activate(self):
2741
2247
if self.enabled:
2742
2248
return socketserver.TCPServer.server_activate(self)
2744
2250
def enable(self):
2745
2251
self.enabled = True
2747
2253
def add_pipe(self, parent_pipe, proc):
2748
2254
# Call "handle_ipc" for both data and EOF events
2750
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2751
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2255
gobject.io_add_watch(
2256
parent_pipe.fileno(),
2257
gobject.IO_IN | gobject.IO_HUP,
2752
2258
functools.partial(self.handle_ipc,
2753
parent_pipe=parent_pipe,
2259
parent_pipe = parent_pipe,
2756
2262
def handle_ipc(self, source, condition,
2757
2263
parent_pipe=None,
2759
2265
client_object=None):
2760
2266
# error, or the other end of multiprocessing.Pipe has closed
2761
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2267
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2762
2268
# Wait for other process to exit
2766
2272
# Read a request from the child
2767
2273
request = parent_pipe.recv()
2768
2274
command = request[0]
2770
if command == "init":
2771
key_id = request[1].decode("ascii")
2772
fpr = request[2].decode("ascii")
2773
address = request[3]
2775
for c in self.clients.values():
2776
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2777
"27AE41E4649B934CA495991B7852B855"):
2779
if key_id and c.key_id == key_id:
2782
if fpr and c.fingerprint == fpr:
2276
if command == 'init':
2278
address = request[2]
2280
for c in self.clients.itervalues():
2281
if c.fingerprint == fpr:
2786
log.info("Client not found for key ID: %s, address:"
2787
" %s", key_id or fpr, address)
2285
logger.info("Client not found for fingerprint: %s, ad"
2286
"dress: %s", fpr, address)
2788
2287
if self.use_dbus:
2789
2288
# Emit D-Bus signal
2790
mandos_dbus_service.ClientNotFound(key_id or fpr,
2289
mandos_dbus_service.ClientNotFound(fpr,
2792
2291
parent_pipe.send(False)
2796
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2797
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2294
gobject.io_add_watch(
2295
parent_pipe.fileno(),
2296
gobject.IO_IN | gobject.IO_HUP,
2798
2297
functools.partial(self.handle_ipc,
2799
parent_pipe=parent_pipe,
2801
client_object=client))
2298
parent_pipe = parent_pipe,
2300
client_object = client))
2802
2301
parent_pipe.send(True)
2803
2302
# remove the old hook in favor of the new above hook on
2806
if command == "funcall":
2305
if command == 'funcall':
2807
2306
funcname = request[1]
2808
2307
args = request[2]
2809
2308
kwargs = request[3]
2811
parent_pipe.send(("data", getattr(client_object,
2310
parent_pipe.send(('data', getattr(client_object,
2812
2311
funcname)(*args,
2815
if command == "getattr":
2314
if command == 'getattr':
2816
2315
attrname = request[1]
2817
2316
if isinstance(client_object.__getattribute__(attrname),
2818
collections.abc.Callable):
2819
parent_pipe.send(("function", ))
2317
collections.Callable):
2318
parent_pipe.send(('function', ))
2821
2320
parent_pipe.send((
2822
"data", client_object.__getattribute__(attrname)))
2824
if command == "setattr":
2321
'data', client_object.__getattribute__(attrname)))
2323
if command == 'setattr':
2825
2324
attrname = request[1]
2826
2325
value = request[2]
2827
2326
setattr(client_object, attrname, value)
2832
2331
def rfc3339_duration_to_delta(duration):
2833
2332
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2835
>>> timedelta = datetime.timedelta
2836
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2838
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2840
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2842
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2844
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2846
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2848
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2334
>>> rfc3339_duration_to_delta("P7D")
2335
datetime.timedelta(7)
2336
>>> rfc3339_duration_to_delta("PT60S")
2337
datetime.timedelta(0, 60)
2338
>>> rfc3339_duration_to_delta("PT60M")
2339
datetime.timedelta(0, 3600)
2340
>>> rfc3339_duration_to_delta("PT24H")
2341
datetime.timedelta(1)
2342
>>> rfc3339_duration_to_delta("P1W")
2343
datetime.timedelta(7)
2344
>>> rfc3339_duration_to_delta("PT5M30S")
2345
datetime.timedelta(0, 330)
2346
>>> rfc3339_duration_to_delta("P1DT3M20S")
2347
datetime.timedelta(1, 200)
2853
2350
# Parsing an RFC 3339 duration with regular expressions is not
2854
2351
# possible - there would have to be multiple places for the same
2855
2352
# values, like seconds. The current code, while more esoteric, is
2856
2353
# cleaner without depending on a parsing library. If Python had a
2857
2354
# built-in library for parsing we would use it, but we'd like to
2858
2355
# avoid excessive use of external libraries.
2860
2357
# New type for defining tokens, syntax, and semantics all-in-one
2861
2358
Token = collections.namedtuple("Token", (
2862
2359
"regexp", # To match token; if "value" is not None, must have
3254
2742
"se.bsnet.fukt.Mandos", bus,
3255
2743
do_not_queue=True)
3256
2744
except dbus.exceptions.DBusException as e:
3257
log.error("Disabling D-Bus:", exc_info=e)
2745
logger.error("Disabling D-Bus:", exc_info=e)
3258
2746
use_dbus = False
3259
2747
server_settings["use_dbus"] = False
3260
2748
tcp_server.use_dbus = False
3262
2750
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3263
2751
service = AvahiServiceToSyslog(
3264
name=server_settings["servicename"],
3265
servicetype="_mandos._tcp",
2752
name = server_settings["servicename"],
2753
servicetype = "_mandos._tcp",
2754
protocol = protocol,
3268
2756
if server_settings["interface"]:
3269
2757
service.interface = if_nametoindex(
3270
2758
server_settings["interface"].encode("utf-8"))
3272
2760
global multiprocessing_manager
3273
2761
multiprocessing_manager = multiprocessing.Manager()
3275
2763
client_class = Client
3277
client_class = functools.partial(ClientDBus, bus=bus)
2765
client_class = functools.partial(ClientDBus, bus = bus)
3279
2767
client_settings = Client.config_parser(client_config)
3280
2768
old_client_settings = {}
3281
2769
clients_data = {}
3283
2771
# This is used to redirect stdout and stderr for checker processes
3285
wnull = open(os.devnull, "w") # A writable /dev/null
2773
wnull = open(os.devnull, "w") # A writable /dev/null
3286
2774
# Only used if server is running in foreground but not in debug
3288
2776
if debug or not foreground:
3291
2779
# Get client data and settings from last running state.
3292
2780
if server_settings["restore"]:
3294
2782
with open(stored_state_path, "rb") as stored_state:
3295
if sys.version_info.major == 2:
3296
clients_data, old_client_settings = pickle.load(
3299
bytes_clients_data, bytes_old_client_settings = (
3300
pickle.load(stored_state, encoding="bytes"))
3301
# Fix bytes to strings
3304
clients_data = {(key.decode("utf-8")
3305
if isinstance(key, bytes)
3308
bytes_clients_data.items()}
3309
del bytes_clients_data
3310
for key in clients_data:
3311
value = {(k.decode("utf-8")
3312
if isinstance(k, bytes) else k): v
3314
clients_data[key].items()}
3315
clients_data[key] = value
3317
value["client_structure"] = [
3319
if isinstance(s, bytes)
3321
value["client_structure"]]
3322
# .name, .host, and .checker_command
3323
for k in ("name", "host", "checker_command"):
3324
if isinstance(value[k], bytes):
3325
value[k] = value[k].decode("utf-8")
3326
if "key_id" not in value:
3327
value["key_id"] = ""
3328
elif "fingerprint" not in value:
3329
value["fingerprint"] = ""
3330
# old_client_settings
3332
old_client_settings = {
3333
(key.decode("utf-8")
3334
if isinstance(key, bytes)
3337
bytes_old_client_settings.items()}
3338
del bytes_old_client_settings
3339
# .host and .checker_command
3340
for value in old_client_settings.values():
3341
for attribute in ("host", "checker_command"):
3342
if isinstance(value[attribute], bytes):
3343
value[attribute] = (value[attribute]
2783
clients_data, old_client_settings = pickle.load(
3345
2785
os.remove(stored_state_path)
3346
2786
except IOError as e:
3347
2787
if e.errno == errno.ENOENT:
3348
log.warning("Could not load persistent state:"
3349
" %s", os.strerror(e.errno))
2788
logger.warning("Could not load persistent state:"
2789
" {}".format(os.strerror(e.errno)))
3351
log.critical("Could not load persistent state:",
2791
logger.critical("Could not load persistent state:",
3354
2794
except EOFError as e:
3355
log.warning("Could not load persistent state: EOFError:",
2795
logger.warning("Could not load persistent state: "
3358
2799
with PGPEngine() as pgp:
3359
2800
for client_name, client in clients_data.items():
3360
2801
# Skip removed clients
3361
2802
if client_name not in client_settings:
3364
2805
# Decide which value to use after restoring saved state.
3365
2806
# We have three different values: Old config file,
3366
2807
# new config file, and saved state.
3626
3064
# Don't signal the disabling
3627
3065
client.disable(quiet=True)
3628
3066
# Emit D-Bus signal for removal
3630
mandos_dbus_service.client_removed_signal(client)
3067
mandos_dbus_service.client_removed_signal(client)
3631
3068
client_settings.clear()
3633
3070
atexit.register(cleanup)
3635
for client in tcp_server.clients.values():
3072
for client in tcp_server.clients.itervalues():
3637
3074
# Emit D-Bus signal for adding
3638
3075
mandos_dbus_service.client_added_signal(client)
3639
3076
# Need to initiate checking of clients
3640
3077
if client.enabled:
3641
client.init_checker(randomize_start=True)
3078
client.init_checker()
3643
3080
tcp_server.enable()
3644
3081
tcp_server.server_activate()
3646
3083
# Find out what port we got
3648
3085
service.port = tcp_server.socket.getsockname()[1]
3650
log.info("Now listening on address %r, port %d, flowinfo %d,"
3651
" scope_id %d", *tcp_server.socket.getsockname())
3087
logger.info("Now listening on address %r, port %d,"
3088
" flowinfo %d, scope_id %d",
3089
*tcp_server.socket.getsockname())
3653
log.info("Now listening on address %r, port %d",
3654
*tcp_server.socket.getsockname())
3656
# service.interface = tcp_server.socket.getsockname()[3]
3091
logger.info("Now listening on address %r, port %d",
3092
*tcp_server.socket.getsockname())
3094
#service.interface = tcp_server.socket.getsockname()[3]
3660
3098
# From the Avahi example code
3662
3100
service.activate()
3663
3101
except dbus.exceptions.DBusException as error:
3664
log.critical("D-Bus Exception", exc_info=error)
3102
logger.critical("D-Bus Exception", exc_info=error)
3667
3105
# End of Avahi example code
3670
GLib.IOChannel.unix_new(tcp_server.fileno()),
3671
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3672
lambda *args, **kwargs: (tcp_server.handle_request
3673
(*args[2:], **kwargs) or True))
3675
log.debug("Starting main loop")
3107
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3108
lambda *args, **kwargs:
3109
(tcp_server.handle_request
3110
(*args[2:], **kwargs) or True))
3112
logger.debug("Starting main loop")
3676
3113
main_loop.run()
3677
3114
except AvahiError as error:
3678
log.critical("Avahi Error", exc_info=error)
3115
logger.critical("Avahi Error", exc_info=error)
3681
3118
except KeyboardInterrupt:
3683
3120
print("", file=sys.stderr)
3684
log.debug("Server received KeyboardInterrupt")
3685
log.debug("Server exiting")
3121
logger.debug("Server received KeyboardInterrupt")
3122
logger.debug("Server exiting")
3686
3123
# Must run before the D-Bus bus name gets deregistered
3690
def parse_test_args():
3691
# type: () -> argparse.Namespace
3692
parser = argparse.ArgumentParser(add_help=False)
3693
parser.add_argument("--check", action="store_true")
3694
parser.add_argument("--prefix", )
3695
args, unknown_args = parser.parse_known_args()
3697
# Remove test options from sys.argv
3698
sys.argv[1:] = unknown_args
3701
# Add all tests from doctest strings
3702
def load_tests(loader, tests, none):
3704
tests.addTests(doctest.DocTestSuite())
3707
if __name__ == "__main__":
3708
options = parse_test_args()
3711
extra_test_prefix = options.prefix
3712
if extra_test_prefix is not None:
3713
if not (unittest.main(argv=[""], exit=False)
3714
.result.wasSuccessful()):
3716
class ExtraTestLoader(unittest.TestLoader):
3717
testMethodPrefix = extra_test_prefix
3718
# Call using ./scriptname --test [--verbose]
3719
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3721
unittest.main(argv=[""])
3729
# (lambda (&optional extra)
3730
# (if (not (funcall run-tests-in-test-buffer default-directory
3732
# (funcall show-test-buffer-in-test-window)
3733
# (funcall remove-test-window)
3734
# (if extra (message "Extra tests run successfully!"))))
3735
# run-tests-in-test-buffer:
3736
# (lambda (dir &optional extra)
3737
# (with-current-buffer (get-buffer-create "*Test*")
3738
# (setq buffer-read-only nil
3739
# default-directory dir)
3741
# (compilation-mode))
3742
# (let ((process-result
3743
# (let ((inhibit-read-only t))
3744
# (process-file-shell-command
3745
# (funcall get-command-line extra) nil "*Test*"))))
3746
# (and (numberp process-result)
3747
# (= process-result 0))))
3749
# (lambda (&optional extra)
3750
# (let ((quoted-script
3751
# (shell-quote-argument (funcall get-script-name))))
3753
# (concat "%s --check" (if extra " --prefix=atest" ""))
3757
# (if (fboundp 'file-local-name)
3758
# (file-local-name (buffer-file-name))
3759
# (or (file-remote-p (buffer-file-name) 'localname)
3760
# (buffer-file-name))))
3761
# remove-test-window:
3763
# (let ((test-window (get-buffer-window "*Test*")))
3764
# (if test-window (delete-window test-window))))
3765
# show-test-buffer-in-test-window:
3767
# (when (not (get-buffer-window-list "*Test*"))
3768
# (setq next-error-last-buffer (get-buffer "*Test*"))
3769
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3770
# (display-buffer-overriding-action
3771
# `((display-buffer-in-side-window) (side . ,side)
3772
# (window-height . fit-window-to-buffer)
3773
# (window-width . fit-window-to-buffer))))
3774
# (display-buffer "*Test*"))))
3777
# (let* ((run-extra-tests (lambda () (interactive)
3778
# (funcall run-tests t)))
3779
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3780
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3781
# (setq minor-mode-overriding-map-alist
3782
# (cons `(run-tests . ,outer-keymap)
3783
# minor-mode-overriding-map-alist)))
3784
# (add-hook 'after-save-hook run-tests 90 t))
3127
if __name__ == '__main__':