265
216
.replace(b"\n", b"\\n")
266
217
.replace(b"\0", b"\\x00"))
269
220
def encrypt(self, data, password):
270
221
passphrase = self.password_encode(password)
271
222
with tempfile.NamedTemporaryFile(
272
223
dir=self.tempdir) as passfile:
273
224
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
226
proc = subprocess.Popen([self.gpg, '--symmetric',
278
229
+ self.gnupgargs,
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
230
stdin = subprocess.PIPE,
231
stdout = subprocess.PIPE,
232
stderr = subprocess.PIPE)
233
ciphertext, err = proc.communicate(input = data)
283
234
if proc.returncode != 0:
284
235
raise PGPError(err)
285
236
return ciphertext
287
238
def decrypt(self, data, password):
288
239
passphrase = self.password_encode(password)
289
240
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
241
dir = self.tempdir) as passfile:
291
242
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
244
proc = subprocess.Popen([self.gpg, '--decrypt',
296
247
+ self.gnupgargs,
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
248
stdin = subprocess.PIPE,
249
stdout = subprocess.PIPE,
250
stderr = subprocess.PIPE)
251
decrypted_plaintext, err = proc.communicate(input = data)
301
252
if proc.returncode != 0:
302
253
raise PGPError(err)
303
254
return decrypted_plaintext
306
256
# 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
258
"""This isn't so much a class as it is a module-like namespace.
259
It is instantiated once, and simulates having an Avahi module."""
260
IF_UNSPEC = -1 # avahi-common/address.h
261
PROTO_UNSPEC = -1 # avahi-common/address.h
262
PROTO_INET = 0 # avahi-common/address.h
263
PROTO_INET6 = 1 # avahi-common/address.h
313
264
DBUS_NAME = "org.freedesktop.Avahi"
314
265
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
266
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
267
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
268
def string_array_to_txt_array(self, t):
320
269
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
270
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
271
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
272
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
273
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
274
SERVER_INVALID = 0 # avahi-common/defs.h
275
SERVER_REGISTERING = 1 # avahi-common/defs.h
276
SERVER_RUNNING = 2 # avahi-common/defs.h
277
SERVER_COLLISION = 3 # avahi-common/defs.h
278
SERVER_FAILURE = 4 # avahi-common/defs.h
332
281
class AvahiError(Exception):
333
282
def __init__(self, value, *args, **kwargs):
524
473
class AvahiServiceToSyslog(AvahiService):
525
474
def rename(self, *args, **kwargs):
526
475
"""Add the new name to the syslog messages"""
527
ret = super(AvahiServiceToSyslog, self).rename(*args,
476
ret = AvahiService.rename(self, *args, **kwargs)
529
477
syslogger.setFormatter(logging.Formatter(
530
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
478
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
479
.format(self.name)))
535
482
# Pretend that we have a GnuTLS module
537
"""This isn't so much a class as it is a module-like namespace."""
539
library = ctypes.util.find_library("gnutls")
541
library = ctypes.util.find_library("gnutls-deb0")
542
_library = ctypes.cdll.LoadLibrary(library)
483
class GnuTLS(object):
484
"""This isn't so much a class as it is a module-like namespace.
485
It is instantiated once, and simulates having a GnuTLS module."""
487
_library = ctypes.cdll.LoadLibrary(
488
ctypes.util.find_library("gnutls"))
489
_need_version = b"3.3.0"
491
# Need to use class name "GnuTLS" here, since this method is
492
# called before the assignment to the "gnutls" global variable
494
if GnuTLS.check_version(self._need_version) is None:
495
raise GnuTLS.Error("Needs GnuTLS {} or later"
496
.format(self._need_version))
545
498
# Unless otherwise indicated, the constants and types below are
546
499
# all from the gnutls/gnutls.h C header file.
550
503
E_INTERRUPTED = -52
556
508
CRD_CERTIFICATE = 1
557
509
E_NO_CERTIFICATE_FOUND = -49
562
KEYID_USE_SHA256 = 1 # gnutls/x509.h
563
510
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
566
class _session_int(ctypes.Structure):
513
class session_int(ctypes.Structure):
568
session_t = ctypes.POINTER(_session_int)
515
session_t = ctypes.POINTER(session_int)
570
516
class certificate_credentials_st(ctypes.Structure):
572
518
certificate_credentials_t = ctypes.POINTER(
573
519
certificate_credentials_st)
574
520
certificate_type_t = ctypes.c_int
576
521
class datum_t(ctypes.Structure):
577
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
578
("size", ctypes.c_uint)]
580
class _openpgp_crt_int(ctypes.Structure):
522
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
523
('size', ctypes.c_uint)]
524
class openpgp_crt_int(ctypes.Structure):
582
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
583
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
526
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
527
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
584
528
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
585
529
credentials_type_t = ctypes.c_int
586
530
transport_ptr_t = ctypes.c_void_p
587
531
close_request_t = ctypes.c_int
590
534
class Error(Exception):
591
def __init__(self, message=None, code=None, args=()):
535
# We need to use the class name "GnuTLS" here, since this
536
# exception might be raised from within GnuTLS.__init__,
537
# which is called before the assignment to the "gnutls"
538
# global variable has happened.
539
def __init__(self, message = None, code = None, args=()):
592
540
# Default usage is by a message string, but if a return
593
541
# code is passed, convert it to a string with
594
542
# gnutls.strerror()
596
544
if message is None and code is not None:
597
message = gnutls.strerror(code).decode(
598
"utf-8", errors="replace")
599
return super(gnutls.Error, self).__init__(
545
message = GnuTLS.strerror(code)
546
return super(GnuTLS.Error, self).__init__(
602
549
class CertificateSecurityError(Error):
606
def __init__(self, cls):
609
def from_param(self, obj):
610
if not isinstance(obj, self.cls):
611
raise TypeError("Not of type {}: {!r}"
612
.format(self.cls.__name__, obj))
613
return ctypes.byref(obj.from_param(obj))
615
class CastToVoidPointer:
616
def __init__(self, cls):
619
def from_param(self, obj):
620
if not isinstance(obj, self.cls):
621
raise TypeError("Not of type {}: {!r}"
622
.format(self.cls.__name__, obj))
623
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
625
class With_from_param:
627
def from_param(cls, obj):
628
return obj._as_parameter_
631
class Credentials(With_from_param):
553
class Credentials(object):
632
554
def __init__(self):
633
self._as_parameter_ = gnutls.certificate_credentials_t()
634
gnutls.certificate_allocate_credentials(self)
555
self._c_object = gnutls.certificate_credentials_t()
556
gnutls.certificate_allocate_credentials(
557
ctypes.byref(self._c_object))
635
558
self.type = gnutls.CRD_CERTIFICATE
637
560
def __del__(self):
638
gnutls.certificate_free_credentials(self)
640
class ClientSession(With_from_param):
641
def __init__(self, socket, credentials=None):
642
self._as_parameter_ = gnutls.session_t()
643
gnutls_flags = gnutls.CLIENT
644
if gnutls.check_version(b"3.5.6"):
645
gnutls_flags |= gnutls.NO_TICKETS
647
gnutls_flags |= gnutls.ENABLE_RAWPK
648
gnutls.init(self, gnutls_flags)
650
gnutls.set_default_priority(self)
651
gnutls.transport_set_ptr(self, socket.fileno())
652
gnutls.handshake_set_private_extensions(self, True)
561
gnutls.certificate_free_credentials(self._c_object)
563
class ClientSession(object):
564
def __init__(self, socket, credentials = None):
565
self._c_object = gnutls.session_t()
566
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
567
gnutls.set_default_priority(self._c_object)
568
gnutls.transport_set_ptr(self._c_object, socket.fileno())
569
gnutls.handshake_set_private_extensions(self._c_object,
653
571
self.socket = socket
654
572
if credentials is None:
655
573
credentials = gnutls.Credentials()
656
gnutls.credentials_set(self, credentials.type,
574
gnutls.credentials_set(self._c_object, credentials.type,
575
ctypes.cast(credentials._c_object,
658
577
self.credentials = credentials
660
579
def __del__(self):
580
gnutls.deinit(self._c_object)
663
582
def handshake(self):
664
return gnutls.handshake(self)
583
return gnutls.handshake(self._c_object)
666
585
def send(self, data):
667
586
data = bytes(data)
668
587
data_len = len(data)
669
588
while data_len > 0:
670
data_len -= gnutls.record_send(self, data[-data_len:],
589
data_len -= gnutls.record_send(self._c_object,
674
return gnutls.bye(self, gnutls.SHUT_RDWR)
594
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
676
596
# Error handling functions
677
597
def _error_code(result):
678
598
"""A function to raise exceptions on errors, suitable
679
for the "restype" attribute on ctypes functions"""
680
if result >= gnutls.E_SUCCESS:
599
for the 'restype' attribute on ctypes functions"""
682
602
if result == gnutls.E_NO_CERTIFICATE_FOUND:
683
raise gnutls.CertificateSecurityError(code=result)
684
raise gnutls.Error(code=result)
686
def _retry_on_error(result, func, arguments,
687
_error_code=_error_code):
603
raise gnutls.CertificateSecurityError(code = result)
604
raise gnutls.Error(code = result)
606
def _retry_on_error(result, func, arguments):
688
607
"""A function to retry on some errors, suitable
689
for the "errcheck" attribute on ctypes functions"""
690
while result < gnutls.E_SUCCESS:
608
for the 'errcheck' attribute on ctypes functions"""
691
610
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
692
611
return _error_code(result)
693
612
result = func(*arguments)
696
615
# Unless otherwise indicated, the function declarations below are
697
616
# all from the gnutls/gnutls.h C header file.
700
619
priority_set_direct = _library.gnutls_priority_set_direct
701
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
620
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
702
621
ctypes.POINTER(ctypes.c_char_p)]
703
622
priority_set_direct.restype = _error_code
705
624
init = _library.gnutls_init
706
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
625
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
707
626
init.restype = _error_code
709
628
set_default_priority = _library.gnutls_set_default_priority
710
set_default_priority.argtypes = [ClientSession]
629
set_default_priority.argtypes = [session_t]
711
630
set_default_priority.restype = _error_code
713
632
record_send = _library.gnutls_record_send
714
record_send.argtypes = [ClientSession, ctypes.c_void_p,
633
record_send.argtypes = [session_t, ctypes.c_void_p,
716
635
record_send.restype = ctypes.c_ssize_t
717
636
record_send.errcheck = _retry_on_error
719
638
certificate_allocate_credentials = (
720
639
_library.gnutls_certificate_allocate_credentials)
721
640
certificate_allocate_credentials.argtypes = [
722
PointerTo(Credentials)]
641
ctypes.POINTER(certificate_credentials_t)]
723
642
certificate_allocate_credentials.restype = _error_code
725
644
certificate_free_credentials = (
726
645
_library.gnutls_certificate_free_credentials)
727
certificate_free_credentials.argtypes = [Credentials]
646
certificate_free_credentials.argtypes = [certificate_credentials_t]
728
647
certificate_free_credentials.restype = None
730
649
handshake_set_private_extensions = (
731
650
_library.gnutls_handshake_set_private_extensions)
732
handshake_set_private_extensions.argtypes = [ClientSession,
651
handshake_set_private_extensions.argtypes = [session_t,
734
653
handshake_set_private_extensions.restype = None
736
655
credentials_set = _library.gnutls_credentials_set
737
credentials_set.argtypes = [ClientSession, credentials_type_t,
738
CastToVoidPointer(Credentials)]
656
credentials_set.argtypes = [session_t, credentials_type_t,
739
658
credentials_set.restype = _error_code
741
660
strerror = _library.gnutls_strerror
742
661
strerror.argtypes = [ctypes.c_int]
743
662
strerror.restype = ctypes.c_char_p
745
664
certificate_type_get = _library.gnutls_certificate_type_get
746
certificate_type_get.argtypes = [ClientSession]
665
certificate_type_get.argtypes = [session_t]
747
666
certificate_type_get.restype = _error_code
749
668
certificate_get_peers = _library.gnutls_certificate_get_peers
750
certificate_get_peers.argtypes = [ClientSession,
669
certificate_get_peers.argtypes = [session_t,
751
670
ctypes.POINTER(ctypes.c_uint)]
752
671
certificate_get_peers.restype = ctypes.POINTER(datum_t)
754
673
global_set_log_level = _library.gnutls_global_set_log_level
755
674
global_set_log_level.argtypes = [ctypes.c_int]
756
675
global_set_log_level.restype = None
758
677
global_set_log_function = _library.gnutls_global_set_log_function
759
678
global_set_log_function.argtypes = [log_func]
760
679
global_set_log_function.restype = None
762
681
deinit = _library.gnutls_deinit
763
deinit.argtypes = [ClientSession]
682
deinit.argtypes = [session_t]
764
683
deinit.restype = None
766
685
handshake = _library.gnutls_handshake
767
handshake.argtypes = [ClientSession]
768
handshake.restype = ctypes.c_int
686
handshake.argtypes = [session_t]
687
handshake.restype = _error_code
769
688
handshake.errcheck = _retry_on_error
771
690
transport_set_ptr = _library.gnutls_transport_set_ptr
772
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
691
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
773
692
transport_set_ptr.restype = None
775
694
bye = _library.gnutls_bye
776
bye.argtypes = [ClientSession, close_request_t]
777
bye.restype = ctypes.c_int
695
bye.argtypes = [session_t, close_request_t]
696
bye.restype = _error_code
778
697
bye.errcheck = _retry_on_error
780
699
check_version = _library.gnutls_check_version
781
700
check_version.argtypes = [ctypes.c_char_p]
782
701
check_version.restype = ctypes.c_char_p
784
_need_version = b"3.3.0"
785
if check_version(_need_version) is None:
786
raise self.Error("Needs GnuTLS {} or later"
787
.format(_need_version))
789
_tls_rawpk_version = b"3.6.6"
790
has_rawpk = bool(check_version(_tls_rawpk_version))
794
class pubkey_st(ctypes.Structure):
796
pubkey_t = ctypes.POINTER(pubkey_st)
798
x509_crt_fmt_t = ctypes.c_int
800
# All the function declarations below are from
802
pubkey_init = _library.gnutls_pubkey_init
803
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
804
pubkey_init.restype = _error_code
806
pubkey_import = _library.gnutls_pubkey_import
807
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
809
pubkey_import.restype = _error_code
811
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
812
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
813
ctypes.POINTER(ctypes.c_ubyte),
814
ctypes.POINTER(ctypes.c_size_t)]
815
pubkey_get_key_id.restype = _error_code
817
pubkey_deinit = _library.gnutls_pubkey_deinit
818
pubkey_deinit.argtypes = [pubkey_t]
819
pubkey_deinit.restype = None
821
# All the function declarations below are from
824
openpgp_crt_init = _library.gnutls_openpgp_crt_init
825
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
826
openpgp_crt_init.restype = _error_code
828
openpgp_crt_import = _library.gnutls_openpgp_crt_import
829
openpgp_crt_import.argtypes = [openpgp_crt_t,
830
ctypes.POINTER(datum_t),
832
openpgp_crt_import.restype = _error_code
834
openpgp_crt_verify_self = \
835
_library.gnutls_openpgp_crt_verify_self
836
openpgp_crt_verify_self.argtypes = [
839
ctypes.POINTER(ctypes.c_uint),
841
openpgp_crt_verify_self.restype = _error_code
843
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
844
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
845
openpgp_crt_deinit.restype = None
847
openpgp_crt_get_fingerprint = (
848
_library.gnutls_openpgp_crt_get_fingerprint)
849
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
853
openpgp_crt_get_fingerprint.restype = _error_code
855
if check_version(b"3.6.4"):
856
certificate_type_get2 = _library.gnutls_certificate_type_get2
857
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
858
certificate_type_get2.restype = _error_code
703
# All the function declarations below are from gnutls/openpgp.h
705
openpgp_crt_init = _library.gnutls_openpgp_crt_init
706
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
707
openpgp_crt_init.restype = _error_code
709
openpgp_crt_import = _library.gnutls_openpgp_crt_import
710
openpgp_crt_import.argtypes = [openpgp_crt_t,
711
ctypes.POINTER(datum_t),
713
openpgp_crt_import.restype = _error_code
715
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
716
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
717
ctypes.POINTER(ctypes.c_uint)]
718
openpgp_crt_verify_self.restype = _error_code
720
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
721
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
722
openpgp_crt_deinit.restype = None
724
openpgp_crt_get_fingerprint = (
725
_library.gnutls_openpgp_crt_get_fingerprint)
726
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
730
openpgp_crt_get_fingerprint.restype = _error_code
860
732
# Remove non-public functions
861
733
del _error_code, _retry_on_error
734
# Create the global "gnutls" object, simulating a module
864
737
def call_pipe(connection, # : multiprocessing.Connection
865
738
func, *args, **kwargs):
866
739
"""This function is meant to be called by multiprocessing.Process
868
741
This function runs func(*args, **kwargs), and writes the resulting
869
742
return value on the provided multiprocessing.Connection.
871
744
connection.send(func(*args, **kwargs))
872
745
connection.close()
747
class Client(object):
876
748
"""A representation of a client host served by this server.
879
approved: bool(); None if not yet approved/disapproved
751
approved: bool(); 'None' if not yet approved/disapproved
880
752
approval_delay: datetime.timedelta(); Time to wait for approval
881
753
approval_duration: datetime.timedelta(); Duration of one approval
882
checker: multiprocessing.Process(); a running checker process used
883
to see if the client lives. None if no process is
754
checker: subprocess.Popen(); a running checker process used
755
to see if the client lives.
756
'None' if no process is running.
885
757
checker_callback_tag: a GLib event source tag, or None
886
758
checker_command: string; External command which is run to check
887
759
if client lives. %() expansions are done at
2265
2117
byte_arrays=True)
2266
2118
def Secret_dbus_property(self, value):
2267
2119
self.secret = bytes(value)
2273
def __init__(self, child_pipe, key_id, fpr, address):
2124
class ProxyClient(object):
2125
def __init__(self, child_pipe, fpr, address):
2274
2126
self._pipe = child_pipe
2275
self._pipe.send(("init", key_id, fpr, address))
2127
self._pipe.send(('init', fpr, address))
2276
2128
if not self._pipe.recv():
2277
raise KeyError(key_id or fpr)
2279
2131
def __getattribute__(self, name):
2281
2133
return super(ProxyClient, self).__getattribute__(name)
2282
self._pipe.send(("getattr", name))
2134
self._pipe.send(('getattr', name))
2283
2135
data = self._pipe.recv()
2284
if data[0] == "data":
2136
if data[0] == 'data':
2286
if data[0] == "function":
2138
if data[0] == 'function':
2288
2140
def func(*args, **kwargs):
2289
self._pipe.send(("funcall", name, args, kwargs))
2141
self._pipe.send(('funcall', name, args, kwargs))
2290
2142
return self._pipe.recv()[1]
2294
2146
def __setattr__(self, name, value):
2296
2148
return super(ProxyClient, self).__setattr__(name, value)
2297
self._pipe.send(("setattr", name, value))
2149
self._pipe.send(('setattr', name, value))
2300
2152
class ClientHandler(socketserver.BaseRequestHandler, object):
2301
2153
"""A class to handle client connections.
2303
2155
Instantiated once for each connection to handle it.
2304
2156
Note: This will run in its own forked process."""
2306
2158
def handle(self):
2307
2159
with contextlib.closing(self.server.child_pipe) as child_pipe:
2308
2160
logger.info("TCP connection from: %s",
2309
2161
str(self.client_address))
2310
2162
logger.debug("Pipe FD: %d",
2311
2163
self.server.child_pipe.fileno())
2313
2165
session = gnutls.ClientSession(self.request)
2315
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2316
# "+AES-256-CBC", "+SHA1",
2317
# "+COMP-NULL", "+CTYPE-OPENPGP",
2167
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2168
# "+AES-256-CBC", "+SHA1",
2169
# "+COMP-NULL", "+CTYPE-OPENPGP",
2319
2171
# Use a fallback default, since this MUST be set.
2320
2172
priority = self.server.gnutls_priority
2321
2173
if priority is None:
2322
2174
priority = "NORMAL"
2323
gnutls.priority_set_direct(session,
2324
priority.encode("utf-8"), None)
2175
gnutls.priority_set_direct(session._c_object, priority,
2326
2178
# Start communication using the Mandos protocol
2327
2179
# Get protocol number
2328
2180
line = self.request.makefile().readline()
2714
2502
self.gnutls_priority = gnutls_priority
2715
2503
IPv6_TCPServer.__init__(self, server_address,
2716
2504
RequestHandlerClass,
2717
interface=interface,
2505
interface = interface,
2506
use_ipv6 = use_ipv6,
2507
socketfd = socketfd)
2721
2509
def server_activate(self):
2722
2510
if self.enabled:
2723
2511
return socketserver.TCPServer.server_activate(self)
2725
2513
def enable(self):
2726
2514
self.enabled = True
2728
2516
def add_pipe(self, parent_pipe, proc):
2729
2517
# Call "handle_ipc" for both data and EOF events
2730
2518
GLib.io_add_watch(
2731
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2732
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2519
parent_pipe.fileno(),
2520
GLib.IO_IN | GLib.IO_HUP,
2733
2521
functools.partial(self.handle_ipc,
2734
parent_pipe=parent_pipe,
2522
parent_pipe = parent_pipe,
2737
2525
def handle_ipc(self, source, condition,
2738
2526
parent_pipe=None,
2740
2528
client_object=None):
2741
2529
# error, or the other end of multiprocessing.Pipe has closed
2742
2530
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2743
2531
# Wait for other process to exit
2747
2535
# Read a request from the child
2748
2536
request = parent_pipe.recv()
2749
2537
command = request[0]
2751
if command == "init":
2752
key_id = request[1].decode("ascii")
2753
fpr = request[2].decode("ascii")
2754
address = request[3]
2539
if command == 'init':
2541
address = request[2]
2756
2543
for c in self.clients.values():
2757
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2758
"27AE41E4649B934CA495991B7852B855"):
2760
if key_id and c.key_id == key_id:
2763
if fpr and c.fingerprint == fpr:
2544
if c.fingerprint == fpr:
2767
logger.info("Client not found for key ID: %s, address"
2768
": %s", key_id or fpr, address)
2548
logger.info("Client not found for fingerprint: %s, ad"
2549
"dress: %s", fpr, address)
2769
2550
if self.use_dbus:
2770
2551
# Emit D-Bus signal
2771
mandos_dbus_service.ClientNotFound(key_id or fpr,
2552
mandos_dbus_service.ClientNotFound(fpr,
2773
2554
parent_pipe.send(False)
2776
2557
GLib.io_add_watch(
2777
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2778
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2558
parent_pipe.fileno(),
2559
GLib.IO_IN | GLib.IO_HUP,
2779
2560
functools.partial(self.handle_ipc,
2780
parent_pipe=parent_pipe,
2782
client_object=client))
2561
parent_pipe = parent_pipe,
2563
client_object = client))
2783
2564
parent_pipe.send(True)
2784
2565
# remove the old hook in favor of the new above hook on
2787
if command == "funcall":
2568
if command == 'funcall':
2788
2569
funcname = request[1]
2789
2570
args = request[2]
2790
2571
kwargs = request[3]
2792
parent_pipe.send(("data", getattr(client_object,
2573
parent_pipe.send(('data', getattr(client_object,
2793
2574
funcname)(*args,
2796
if command == "getattr":
2577
if command == 'getattr':
2797
2578
attrname = request[1]
2798
2579
if isinstance(client_object.__getattribute__(attrname),
2799
collections.abc.Callable):
2800
parent_pipe.send(("function", ))
2580
collections.Callable):
2581
parent_pipe.send(('function', ))
2802
2583
parent_pipe.send((
2803
"data", client_object.__getattribute__(attrname)))
2805
if command == "setattr":
2584
'data', client_object.__getattribute__(attrname)))
2586
if command == 'setattr':
2806
2587
attrname = request[1]
2807
2588
value = request[2]
2808
2589
setattr(client_object, attrname, value)
2813
2594
def rfc3339_duration_to_delta(duration):
2814
2595
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2816
>>> timedelta = datetime.timedelta
2817
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2819
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2821
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2823
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2825
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2827
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2829
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2597
>>> rfc3339_duration_to_delta("P7D")
2598
datetime.timedelta(7)
2599
>>> rfc3339_duration_to_delta("PT60S")
2600
datetime.timedelta(0, 60)
2601
>>> rfc3339_duration_to_delta("PT60M")
2602
datetime.timedelta(0, 3600)
2603
>>> rfc3339_duration_to_delta("PT24H")
2604
datetime.timedelta(1)
2605
>>> rfc3339_duration_to_delta("P1W")
2606
datetime.timedelta(7)
2607
>>> rfc3339_duration_to_delta("PT5M30S")
2608
datetime.timedelta(0, 330)
2609
>>> rfc3339_duration_to_delta("P1DT3M20S")
2610
datetime.timedelta(1, 200)
2834
2613
# Parsing an RFC 3339 duration with regular expressions is not
2835
2614
# possible - there would have to be multiple places for the same
2836
2615
# values, like seconds. The current code, while more esoteric, is
2837
2616
# cleaner without depending on a parsing library. If Python had a
2838
2617
# built-in library for parsing we would use it, but we'd like to
2839
2618
# avoid excessive use of external libraries.
2841
2620
# New type for defining tokens, syntax, and semantics all-in-one
2842
2621
Token = collections.namedtuple("Token", (
2843
2622
"regexp", # To match token; if "value" is not None, must have
3246
3019
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3247
3020
service = AvahiServiceToSyslog(
3248
name=server_settings["servicename"],
3249
servicetype="_mandos._tcp",
3021
name = server_settings["servicename"],
3022
servicetype = "_mandos._tcp",
3023
protocol = protocol,
3252
3025
if server_settings["interface"]:
3253
3026
service.interface = if_nametoindex(
3254
3027
server_settings["interface"].encode("utf-8"))
3256
3029
global multiprocessing_manager
3257
3030
multiprocessing_manager = multiprocessing.Manager()
3259
3032
client_class = Client
3261
client_class = functools.partial(ClientDBus, bus=bus)
3034
client_class = functools.partial(ClientDBus, bus = bus)
3263
3036
client_settings = Client.config_parser(client_config)
3264
3037
old_client_settings = {}
3265
3038
clients_data = {}
3267
3040
# This is used to redirect stdout and stderr for checker processes
3269
wnull = open(os.devnull, "w") # A writable /dev/null
3042
wnull = open(os.devnull, "w") # A writable /dev/null
3270
3043
# Only used if server is running in foreground but not in debug
3272
3045
if debug or not foreground:
3275
3048
# Get client data and settings from last running state.
3276
3049
if server_settings["restore"]:
3278
3051
with open(stored_state_path, "rb") as stored_state:
3279
if sys.version_info.major == 2:
3052
if sys.version_info.major == 2:
3280
3053
clients_data, old_client_settings = pickle.load(
3283
3056
bytes_clients_data, bytes_old_client_settings = (
3284
pickle.load(stored_state, encoding="bytes"))
3285
# Fix bytes to strings
3057
pickle.load(stored_state, encoding = "bytes"))
3058
### Fix bytes to strings
3288
clients_data = {(key.decode("utf-8")
3289
if isinstance(key, bytes)
3292
bytes_clients_data.items()}
3061
clients_data = { (key.decode("utf-8")
3062
if isinstance(key, bytes)
3065
bytes_clients_data.items() }
3293
3066
del bytes_clients_data
3294
3067
for key in clients_data:
3295
value = {(k.decode("utf-8")
3296
if isinstance(k, bytes) else k): v
3298
clients_data[key].items()}
3068
value = { (k.decode("utf-8")
3069
if isinstance(k, bytes) else k): v
3071
clients_data[key].items() }
3299
3072
clients_data[key] = value
3300
3073
# .client_structure
3301
3074
value["client_structure"] = [
3302
3075
(s.decode("utf-8")
3303
3076
if isinstance(s, bytes)
3304
3077
else s) for s in
3305
value["client_structure"]]
3306
# .name, .host, and .checker_command
3307
for k in ("name", "host", "checker_command"):
3078
value["client_structure"] ]
3080
for k in ("name", "host"):
3308
3081
if isinstance(value[k], bytes):
3309
3082
value[k] = value[k].decode("utf-8")
3310
if "key_id" not in value:
3311
value["key_id"] = ""
3312
elif "fingerprint" not in value:
3313
value["fingerprint"] = ""
3314
# old_client_settings
3083
## old_client_settings
3316
3085
old_client_settings = {
3317
3086
(key.decode("utf-8")
3318
3087
if isinstance(key, bytes)
3319
3088
else key): value
3320
3089
for key, value in
3321
bytes_old_client_settings.items()}
3090
bytes_old_client_settings.items() }
3322
3091
del bytes_old_client_settings
3323
# .host and .checker_command
3324
3093
for value in old_client_settings.values():
3325
for attribute in ("host", "checker_command"):
3326
if isinstance(value[attribute], bytes):
3327
value[attribute] = (value[attribute]
3094
if isinstance(value["host"], bytes):
3095
value["host"] = (value["host"]
3329
3097
os.remove(stored_state_path)
3330
3098
except IOError as e:
3331
3099
if e.errno == errno.ENOENT: