278
196
.replace(b"\n", b"\\n")
279
197
.replace(b"\0", b"\\x00"))
282
200
def encrypt(self, data, password):
283
201
passphrase = self.password_encode(password)
284
202
with tempfile.NamedTemporaryFile(
285
203
dir=self.tempdir) as passfile:
286
204
passfile.write(passphrase)
288
proc = subprocess.Popen([self.gpg, "--symmetric",
206
proc = subprocess.Popen(['gpg', '--symmetric',
291
209
+ self.gnupgargs,
292
stdin=subprocess.PIPE,
293
stdout=subprocess.PIPE,
294
stderr=subprocess.PIPE)
295
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)
296
214
if proc.returncode != 0:
297
215
raise PGPError(err)
298
216
return ciphertext
300
218
def decrypt(self, data, password):
301
219
passphrase = self.password_encode(password)
302
220
with tempfile.NamedTemporaryFile(
303
dir=self.tempdir) as passfile:
221
dir = self.tempdir) as passfile:
304
222
passfile.write(passphrase)
306
proc = subprocess.Popen([self.gpg, "--decrypt",
224
proc = subprocess.Popen(['gpg', '--decrypt',
309
227
+ self.gnupgargs,
310
stdin=subprocess.PIPE,
311
stdout=subprocess.PIPE,
312
stderr=subprocess.PIPE)
313
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)
314
232
if proc.returncode != 0:
315
233
raise PGPError(err)
316
234
return decrypted_plaintext
319
# Pretend that we have an Avahi module
321
"""This isn't so much a class as it is a module-like namespace."""
322
IF_UNSPEC = -1 # avahi-common/address.h
323
PROTO_UNSPEC = -1 # avahi-common/address.h
324
PROTO_INET = 0 # avahi-common/address.h
325
PROTO_INET6 = 1 # avahi-common/address.h
326
DBUS_NAME = "org.freedesktop.Avahi"
327
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
328
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
329
DBUS_PATH_SERVER = "/"
332
def string_array_to_txt_array(t):
333
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
334
for s in t), signature="ay")
335
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
336
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
337
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
338
SERVER_INVALID = 0 # avahi-common/defs.h
339
SERVER_REGISTERING = 1 # avahi-common/defs.h
340
SERVER_RUNNING = 2 # avahi-common/defs.h
341
SERVER_COLLISION = 3 # avahi-common/defs.h
342
SERVER_FAILURE = 4 # avahi-common/defs.h
345
237
class AvahiError(Exception):
346
238
def __init__(self, value, *args, **kwargs):
347
239
self.value = value
536
429
class AvahiServiceToSyslog(AvahiService):
537
430
def rename(self, *args, **kwargs):
538
431
"""Add the new name to the syslog messages"""
539
ret = super(AvahiServiceToSyslog, self).rename(*args,
432
ret = AvahiService.rename(self, *args, **kwargs)
541
433
syslogger.setFormatter(logging.Formatter(
542
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
543
435
.format(self.name)))
547
# 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)
557
# Unless otherwise indicated, the constants and types below are
558
# all from the gnutls/gnutls.h C header file.
569
E_NO_CERTIFICATE_FOUND = -49
574
KEYID_USE_SHA256 = 1 # gnutls/x509.h
575
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
578
class _session_int(ctypes.Structure):
580
session_t = ctypes.POINTER(_session_int)
582
class certificate_credentials_st(ctypes.Structure):
584
certificate_credentials_t = ctypes.POINTER(
585
certificate_credentials_st)
586
certificate_type_t = ctypes.c_int
588
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):
594
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
595
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
596
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
597
credentials_type_t = ctypes.c_int
598
transport_ptr_t = ctypes.c_void_p
599
close_request_t = ctypes.c_int
602
class Error(Exception):
603
def __init__(self, message=None, code=None, args=()):
604
# Default usage is by a message string, but if a return
605
# code is passed, convert it to a string with
608
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__(
614
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):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
647
self.type = gnutls.CRD_CERTIFICATE
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)
666
if credentials is None:
667
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
670
self.credentials = credentials
676
return gnutls.handshake(self)
678
def send(self, data):
682
data_len -= gnutls.record_send(self, data[-data_len:],
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
688
# Error handling functions
689
def _error_code(result):
690
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
694
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):
700
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
703
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
return _error_code(result)
705
result = func(*arguments)
708
# Unless otherwise indicated, the function declarations below are
709
# all from the gnutls/gnutls.h C header file.
712
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
714
ctypes.POINTER(ctypes.c_char_p)]
715
priority_set_direct.restype = _error_code
717
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
719
init.restype = _error_code
721
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
723
set_default_priority.restype = _error_code
725
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
728
record_send.restype = ctypes.c_ssize_t
729
record_send.errcheck = _retry_on_error
731
certificate_allocate_credentials = (
732
_library.gnutls_certificate_allocate_credentials)
733
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
735
certificate_allocate_credentials.restype = _error_code
737
certificate_free_credentials = (
738
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
740
certificate_free_credentials.restype = None
742
handshake_set_private_extensions = (
743
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
746
handshake_set_private_extensions.restype = None
748
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
751
credentials_set.restype = _error_code
753
strerror = _library.gnutls_strerror
754
strerror.argtypes = [ctypes.c_int]
755
strerror.restype = ctypes.c_char_p
757
certificate_type_get = _library.gnutls_certificate_type_get
758
certificate_type_get.argtypes = [ClientSession]
759
certificate_type_get.restype = _error_code
761
certificate_get_peers = _library.gnutls_certificate_get_peers
762
certificate_get_peers.argtypes = [ClientSession,
763
ctypes.POINTER(ctypes.c_uint)]
764
certificate_get_peers.restype = ctypes.POINTER(datum_t)
766
global_set_log_level = _library.gnutls_global_set_log_level
767
global_set_log_level.argtypes = [ctypes.c_int]
768
global_set_log_level.restype = None
770
global_set_log_function = _library.gnutls_global_set_log_function
771
global_set_log_function.argtypes = [log_func]
772
global_set_log_function.restype = None
774
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
776
deinit.restype = None
778
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
781
handshake.errcheck = _retry_on_error
783
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
785
transport_set_ptr.restype = None
787
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
790
bye.errcheck = _retry_on_error
792
check_version = _library.gnutls_check_version
793
check_version.argtypes = [ctypes.c_char_p]
794
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
872
# Remove non-public functions
873
del _error_code, _retry_on_error
876
438
def call_pipe(connection, # : multiprocessing.Connection
877
439
func, *args, **kwargs):
878
440
"""This function is meant to be called by multiprocessing.Process
880
442
This function runs func(*args, **kwargs), and writes the resulting
881
443
return value on the provided multiprocessing.Connection.
883
445
connection.send(func(*args, **kwargs))
884
446
connection.close()
448
class Client(object):
888
449
"""A representation of a client host served by this server.
891
approved: bool(); None if not yet approved/disapproved
452
approved: bool(); 'None' if not yet approved/disapproved
892
453
approval_delay: datetime.timedelta(); Time to wait for approval
893
454
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
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
898
459
checker_command: string; External command which is run to check
899
460
if client lives. %() expansions are done at
900
461
runtime with vars(self) as dict, so that for
901
462
instance %(name)s can be used in the command.
902
checker_initiator_tag: a GLib event source tag, or None
463
checker_initiator_tag: a gobject event source tag, or None
903
464
created: datetime.datetime(); (UTC) object creation
904
465
client_structure: Object describing what attributes a client has
905
466
and is used for storing the client at exit
906
467
current_checker_command: string; current running checker_command
907
disable_initiator_tag: a GLib event source tag, or None
468
disable_initiator_tag: a gobject event source tag, or None
909
470
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
471
uniquely identify the client
913
472
host: string; available for use by the checker command
914
473
interval: datetime.timedelta(); How often to start a new checker
915
474
last_approval_request: datetime.datetime(); (UTC) or None
1045
593
self.changedstate = multiprocessing_manager.Condition(
1046
594
multiprocessing_manager.Lock())
1047
595
self.client_structure = [attr
1048
for attr in self.__dict__.keys()
596
for attr in self.__dict__.iterkeys()
1049
597
if not attr.startswith("_")]
1050
598
self.client_structure.append("client_structure")
1052
600
for name, t in inspect.getmembers(
1053
601
type(self), lambda obj: isinstance(obj, property)):
1054
602
if not name.startswith("_"):
1055
603
self.client_structure.append(name)
1057
605
# Send notice to process children that client state has changed
1058
606
def send_changedstate(self):
1059
607
with self.changedstate:
1060
608
self.changedstate.notify_all()
1062
610
def enable(self):
1063
611
"""Start this client's checker and timeout hooks"""
1064
612
if getattr(self, "enabled", False):
1065
613
# Already enabled
615
self.expires = datetime.datetime.utcnow() + self.timeout
1067
616
self.enabled = True
1068
617
self.last_enabled = datetime.datetime.utcnow()
1069
618
self.init_checker()
1070
619
self.send_changedstate()
1072
621
def disable(self, quiet=True):
1073
622
"""Disable this client."""
1074
623
if not getattr(self, "enabled", False):
1077
log.info("Disabling client %s", self.name)
626
logger.info("Disabling client %s", self.name)
1078
627
if getattr(self, "disable_initiator_tag", None) is not None:
1079
GLib.source_remove(self.disable_initiator_tag)
628
gobject.source_remove(self.disable_initiator_tag)
1080
629
self.disable_initiator_tag = None
1081
630
self.expires = None
1082
631
if getattr(self, "checker_initiator_tag", None) is not None:
1083
GLib.source_remove(self.checker_initiator_tag)
632
gobject.source_remove(self.checker_initiator_tag)
1084
633
self.checker_initiator_tag = None
1085
634
self.stop_checker()
1086
635
self.enabled = False
1088
637
self.send_changedstate()
1089
# 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
1092
641
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
644
def init_checker(self):
645
# Schedule a new checker to be started an 'interval' from now,
646
# and every interval from then on.
1100
647
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
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
1119
653
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),
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*.
1125
660
def checker_callback(self, source, condition, connection,
1127
662
"""The checker has completed, so take appropriate actions."""
663
self.checker_callback_tag = None
1128
665
# Read return code from connection (see call_pipe)
1129
666
returncode = connection.recv()
1130
667
connection.close()
1131
if self.checker is not None:
1133
self.checker_callback_tag = None
1136
669
if returncode >= 0:
1137
670
self.last_checker_status = returncode
1138
671
self.last_checker_signal = None
1139
672
if self.last_checker_status == 0:
1140
log.info("Checker for %(name)s succeeded", vars(self))
673
logger.info("Checker for %(name)s succeeded",
1141
675
self.checked_ok()
1143
log.info("Checker for %(name)s failed", vars(self))
677
logger.info("Checker for %(name)s failed", vars(self))
1145
679
self.last_checker_status = -1
1146
680
self.last_checker_signal = -returncode
1147
log.warning("Checker for %(name)s crashed?", vars(self))
681
logger.warning("Checker for %(name)s crashed?",
1150
685
def checked_ok(self):
1151
686
"""Assert that the client has been seen, alive and well."""
1152
687
self.last_checked_ok = datetime.datetime.utcnow()
1153
688
self.last_checker_status = 0
1154
689
self.last_checker_signal = None
1155
690
self.bump_timeout()
1157
692
def bump_timeout(self, timeout=None):
1158
693
"""Bump up the timeout for this client."""
1159
694
if timeout is None:
1160
695
timeout = self.timeout
1161
696
if self.disable_initiator_tag is not None:
1162
GLib.source_remove(self.disable_initiator_tag)
697
gobject.source_remove(self.disable_initiator_tag)
1163
698
self.disable_initiator_tag = None
1164
699
if getattr(self, "enabled", False):
1165
self.disable_initiator_tag = GLib.timeout_add(
700
self.disable_initiator_tag = gobject.timeout_add(
1166
701
int(timeout.total_seconds() * 1000), self.disable)
1167
702
self.expires = datetime.datetime.utcnow() + timeout
1169
704
def need_approval(self):
1170
705
self.last_approval_request = datetime.datetime.utcnow()
1172
def start_checker(self, start_was_randomized=False):
707
def start_checker(self):
1173
708
"""Start a new checker subprocess if one is not running.
1175
710
If a checker already exists, leave it running and do
1177
712
# The reason for not killing a running checker is that if we
1597
1123
document.unlink()
1598
1124
except (AttributeError, xml.dom.DOMException,
1599
1125
xml.parsers.expat.ExpatError) as error:
1600
log.error("Failed to override Introspection method",
1126
logger.error("Failed to override Introspection method",
1602
1128
return xmlstring
1606
1131
dbus.OBJECT_MANAGER_IFACE
1607
1132
except AttributeError:
1608
1133
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1611
1135
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1612
1136
"""A D-Bus object with an ObjectManager.
1614
1138
Classes inheriting from this exposes the standard
1615
1139
GetManagedObjects call and the InterfacesAdded and
1616
1140
InterfacesRemoved signals on the standard
1617
1141
"org.freedesktop.DBus.ObjectManager" interface.
1619
1143
Note: No signals are sent automatically; they must be sent
1622
1146
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1623
out_signature="a{oa{sa{sv}}}")
1147
out_signature = "a{oa{sa{sv}}}")
1624
1148
def GetManagedObjects(self):
1625
1149
"""This function must be overridden"""
1626
1150
raise NotImplementedError()
1628
1152
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1629
signature="oa{sa{sv}}")
1153
signature = "oa{sa{sv}}")
1630
1154
def InterfacesAdded(self, object_path, interfaces_and_properties):
1633
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1157
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1634
1159
def InterfacesRemoved(self, object_path, interfaces):
1637
1162
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1639
path_keyword="object_path",
1640
connection_keyword="connection")
1163
out_signature = "s",
1164
path_keyword = 'object_path',
1165
connection_keyword = 'connection')
1641
1166
def Introspect(self, object_path, connection):
1642
1167
"""Overloading of standard D-Bus method.
1644
1169
Override return argument name of GetManagedObjects to be
1645
1170
"objpath_interfaces_and_properties"
1647
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1172
xmlstring = DBusObjectWithAnnotations(self, object_path,
1651
1175
document = xml.dom.minidom.parseString(xmlstring)
1653
1177
for if_tag in document.getElementsByTagName("interface"):
1654
1178
# Fix argument name for the GetManagedObjects method
1655
1179
if (if_tag.getAttribute("name")
1656
== dbus.OBJECT_MANAGER_IFACE):
1180
== dbus.OBJECT_MANAGER_IFACE):
1657
1181
for cn in if_tag.getElementsByTagName("method"):
1658
1182
if (cn.getAttribute("name")
1659
1183
== "GetManagedObjects"):
2302
1830
byte_arrays=True)
2303
1831
def Secret_dbus_property(self, value):
2304
1832
self.secret = bytes(value)
2310
def __init__(self, child_pipe, key_id, fpr, address):
1837
class ProxyClient(object):
1838
def __init__(self, child_pipe, fpr, address):
2311
1839
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
1840
self._pipe.send(('init', fpr, address))
2313
1841
if not self._pipe.recv():
2314
raise KeyError(key_id or fpr)
2316
1844
def __getattribute__(self, name):
2318
1846
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
1847
self._pipe.send(('getattr', name))
2320
1848
data = self._pipe.recv()
2321
if data[0] == "data":
1849
if data[0] == 'data':
2323
if data[0] == "function":
1851
if data[0] == 'function':
2325
1853
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
1854
self._pipe.send(('funcall', name, args, kwargs))
2327
1855
return self._pipe.recv()[1]
2331
1859
def __setattr__(self, name, value):
2333
1861
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
1862
self._pipe.send(('setattr', name, value))
2337
1865
class ClientHandler(socketserver.BaseRequestHandler, object):
2338
1866
"""A class to handle client connections.
2340
1868
Instantiated once for each connection to handle it.
2341
1869
Note: This will run in its own forked process."""
2343
1871
def handle(self):
2344
1872
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())
2349
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2352
# "+AES-256-CBC", "+SHA1",
2353
# "+COMP-NULL", "+CTYPE-OPENPGP",
1873
logger.info("TCP connection from: %s",
1874
str(self.client_address))
1875
logger.debug("Pipe FD: %d",
1876
self.server.child_pipe.fileno())
1878
session = gnutls.connection.ClientSession(
1879
self.request, gnutls.connection .X509Credentials())
1881
# Note: gnutls.connection.X509Credentials is really a
1882
# generic GnuTLS certificate credentials object so long as
1883
# no X.509 keys are added to it. Therefore, we can use it
1884
# here despite using OpenPGP certificates.
1886
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1887
# "+AES-256-CBC", "+SHA1",
1888
# "+COMP-NULL", "+CTYPE-OPENPGP",
2355
1890
# Use a fallback default, since this MUST be set.
2356
1891
priority = self.server.gnutls_priority
2357
1892
if priority is None:
2358
1893
priority = "NORMAL"
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
1894
gnutls.library.functions.gnutls_priority_set_direct(
1895
session._c_object, priority, None)
2362
1897
# Start communication using the Mandos protocol
2363
1898
# Get protocol number
2364
1899
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
1900
logger.debug("Protocol version: %r", line)
2367
1902
if int(line.strip().split()[0]) > 1:
2368
1903
raise RuntimeError(line)
2369
1904
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
1905
logger.error("Unknown protocol version: %s", error)
2373
1908
# Start GnuTLS connection
2375
1910
session.handshake()
2376
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
1911
except gnutls.errors.GNUTLSError as error:
1912
logger.warning("Handshake failed: %s", error)
2378
1913
# Do not run session.bye() here: the session is not
2379
1914
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
1916
logger.debug("Handshake succeeded")
2383
1918
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,
1921
fpr = self.fingerprint(
1922
self.peer_certificate(session))
1924
gnutls.errors.GNUTLSError) as error:
1925
logger.warning("Bad certificate: %s", error)
1927
logger.debug("Fingerprint: %s", fpr)
1930
client = ProxyClient(child_pipe, fpr,
2409
1931
self.client_address)
2410
1932
except KeyError:
2413
1935
if client.approval_delay:
2414
1936
delay = client.approval_delay
2415
1937
client.approvals_pending += 1
2416
1938
approval_required = True
2419
1941
if not client.enabled:
2420
log.info("Client %s is disabled", client.name)
1942
logger.info("Client %s is disabled",
2421
1944
if self.server.use_dbus:
2422
1945
# Emit D-Bus signal
2423
1946
client.Rejected("Disabled")
2426
1949
if client.approved or not client.approval_delay:
2427
# We are approved or approval is disabled
1950
#We are approved or approval is disabled
2429
1952
elif client.approved is None:
2430
log.info("Client %s needs approval",
1953
logger.info("Client %s needs approval",
2432
1955
if self.server.use_dbus:
2433
1956
# Emit D-Bus signal
2434
1957
client.NeedApproval(
2435
1958
client.approval_delay.total_seconds()
2436
1959
* 1000, client.approved_by_default)
2438
log.warning("Client %s was not approved",
1961
logger.warning("Client %s was not approved",
2440
1963
if self.server.use_dbus:
2441
1964
# Emit D-Bus signal
2442
1965
client.Rejected("Denied")
2445
# wait until timeout or approved
1968
#wait until timeout or approved
2446
1969
time = datetime.datetime.now()
2447
1970
client.changedstate.acquire()
2448
1971
client.changedstate.wait(delay.total_seconds())
2463
1986
delay -= time2 - time
2466
session.send(client.secret)
2467
except gnutls.Error as error:
2468
log.warning("gnutls send failed", exc_info=error)
2471
log.info("Sending secret to %s", client.name)
1989
while sent_size < len(client.secret):
1991
sent = session.send(client.secret[sent_size:])
1992
except gnutls.errors.GNUTLSError as error:
1993
logger.warning("gnutls send failed",
1996
logger.debug("Sent: %d, remaining: %d", sent,
1997
len(client.secret) - (sent_size
2001
logger.info("Sending secret to %s", client.name)
2472
2002
# bump the timeout using extended_timeout
2473
2003
client.bump_timeout(client.extended_timeout)
2474
2004
if self.server.use_dbus:
2475
2005
# Emit D-Bus signal
2476
2006
client.GotSecret()
2479
2009
if approval_required:
2480
2010
client.approvals_pending -= 1
2483
except gnutls.Error as error:
2484
log.warning("GnuTLS bye failed", exc_info=error)
2013
except gnutls.errors.GNUTLSError as error:
2014
logger.warning("GnuTLS bye failed",
2487
2018
def peer_certificate(session):
2488
"Return the peer's certificate as a bytestring"
2490
cert_type = gnutls.certificate_type_get2(
2491
session, gnutls.CTYPE_PEERS)
2492
except AttributeError:
2493
cert_type = gnutls.certificate_type_get(session)
2494
if gnutls.has_rawpk:
2495
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2497
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2498
# If not a valid certificate type...
2499
if cert_type not in valid_cert_types:
2500
log.info("Cert type %r not in %r", cert_type,
2502
# ...return invalid data
2019
"Return the peer's OpenPGP certificate as a bytestring"
2020
# If not an OpenPGP certificate...
2021
if (gnutls.library.functions.gnutls_certificate_type_get(
2023
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
2024
# ...do the normal thing
2025
return session.peer_certificate
2504
2026
list_size = ctypes.c_uint(1)
2505
cert_list = (gnutls.certificate_get_peers
2506
(session, ctypes.byref(list_size)))
2027
cert_list = (gnutls.library.functions
2028
.gnutls_certificate_get_peers
2029
(session._c_object, ctypes.byref(list_size)))
2507
2030
if not bool(cert_list) and list_size.value != 0:
2508
raise gnutls.Error("error getting peer certificate")
2031
raise gnutls.errors.GNUTLSError("error getting peer"
2509
2033
if list_size.value == 0:
2511
2035
cert = cert_list[0]
2512
2036
return ctypes.string_at(cert.data, cert.size)
2515
def key_id(certificate):
2516
"Convert a certificate bytestring to a hexdigit key ID"
2517
# New GnuTLS "datum" with the public key
2518
datum = gnutls.datum_t(
2519
ctypes.cast(ctypes.c_char_p(certificate),
2520
ctypes.POINTER(ctypes.c_ubyte)),
2521
ctypes.c_uint(len(certificate)))
2522
# XXX all these need to be created in the gnutls "module"
2523
# New empty GnuTLS certificate
2524
pubkey = gnutls.pubkey_t()
2525
gnutls.pubkey_init(ctypes.byref(pubkey))
2526
# Import the raw public key into the certificate
2527
gnutls.pubkey_import(pubkey,
2528
ctypes.byref(datum),
2529
gnutls.X509_FMT_DER)
2530
# New buffer for the key ID
2531
buf = ctypes.create_string_buffer(32)
2532
buf_len = ctypes.c_size_t(len(buf))
2533
# Get the key ID from the raw public key into the buffer
2534
gnutls.pubkey_get_key_id(
2536
gnutls.KEYID_USE_SHA256,
2537
ctypes.cast(ctypes.byref(buf),
2538
ctypes.POINTER(ctypes.c_ubyte)),
2539
ctypes.byref(buf_len))
2540
# Deinit the certificate
2541
gnutls.pubkey_deinit(pubkey)
2543
# Convert the buffer to a Python bytestring
2544
key_id = ctypes.string_at(buf, buf_len.value)
2545
# Convert the bytestring to hexadecimal notation
2546
hex_key_id = binascii.hexlify(key_id).upper()
2550
2039
def fingerprint(openpgp):
2551
2040
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2552
2041
# New GnuTLS "datum" with the OpenPGP public key
2553
datum = gnutls.datum_t(
2042
datum = gnutls.library.types.gnutls_datum_t(
2554
2043
ctypes.cast(ctypes.c_char_p(openpgp),
2555
2044
ctypes.POINTER(ctypes.c_ubyte)),
2556
2045
ctypes.c_uint(len(openpgp)))
2557
2046
# New empty GnuTLS certificate
2558
crt = gnutls.openpgp_crt_t()
2559
gnutls.openpgp_crt_init(ctypes.byref(crt))
2047
crt = gnutls.library.types.gnutls_openpgp_crt_t()
2048
gnutls.library.functions.gnutls_openpgp_crt_init(
2560
2050
# Import the OpenPGP public key into the certificate
2561
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2562
gnutls.OPENPGP_FMT_RAW)
2051
gnutls.library.functions.gnutls_openpgp_crt_import(
2052
crt, ctypes.byref(datum),
2053
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2563
2054
# Verify the self signature in the key
2564
2055
crtverify = ctypes.c_uint()
2565
gnutls.openpgp_crt_verify_self(crt, 0,
2566
ctypes.byref(crtverify))
2056
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2057
crt, 0, ctypes.byref(crtverify))
2567
2058
if crtverify.value != 0:
2568
gnutls.openpgp_crt_deinit(crt)
2569
raise gnutls.CertificateSecurityError(code
2059
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2060
raise gnutls.errors.CertificateSecurityError(
2571
2062
# New buffer for the fingerprint
2572
2063
buf = ctypes.create_string_buffer(20)
2573
2064
buf_len = ctypes.c_size_t()
2574
2065
# Get the fingerprint from the certificate into the buffer
2575
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2576
ctypes.byref(buf_len))
2066
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2067
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2577
2068
# Deinit the certificate
2578
gnutls.openpgp_crt_deinit(crt)
2069
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2579
2070
# Convert the buffer to a Python bytestring
2580
2071
fpr = ctypes.string_at(buf, buf_len.value)
2581
2072
# Convert the bytestring to hexadecimal notation
2670
2160
# socket_wrapper(), if socketfd was set.
2671
2161
socketserver.TCPServer.__init__(self, server_address,
2672
2162
RequestHandlerClass)
2674
2164
def server_bind(self):
2675
2165
"""This overrides the normal server_bind() function
2676
2166
to bind to an interface if one was specified, and also NOT to
2677
2167
bind to an address or port if they were not specified."""
2678
global SO_BINDTODEVICE
2679
2168
if self.interface is not None:
2680
2169
if SO_BINDTODEVICE is None:
2681
# Fall back to a hard-coded value which seems to be
2683
log.warning("SO_BINDTODEVICE not found, trying 25")
2684
SO_BINDTODEVICE = 25
2686
self.socket.setsockopt(
2687
socket.SOL_SOCKET, SO_BINDTODEVICE,
2688
(self.interface + "\0").encode("utf-8"))
2689
except socket.error as error:
2690
if error.errno == errno.EPERM:
2691
log.error("No permission to bind to interface %s",
2693
elif error.errno == errno.ENOPROTOOPT:
2694
log.error("SO_BINDTODEVICE not available; cannot"
2695
" bind to interface %s", self.interface)
2696
elif error.errno == errno.ENODEV:
2697
log.error("Interface %s does not exist, cannot"
2698
" bind", self.interface)
2170
logger.error("SO_BINDTODEVICE does not exist;"
2171
" cannot bind to interface %s",
2175
self.socket.setsockopt(
2176
socket.SOL_SOCKET, SO_BINDTODEVICE,
2177
(self.interface + "\0").encode("utf-8"))
2178
except socket.error as error:
2179
if error.errno == errno.EPERM:
2180
logger.error("No permission to bind to"
2181
" interface %s", self.interface)
2182
elif error.errno == errno.ENOPROTOOPT:
2183
logger.error("SO_BINDTODEVICE not available;"
2184
" cannot bind to interface %s",
2186
elif error.errno == errno.ENODEV:
2187
logger.error("Interface %s does not exist,"
2188
" cannot bind", self.interface)
2701
2191
# Only bind(2) the socket if we really need to.
2702
2192
if self.server_address[0] or self.server_address[1]:
2703
if self.server_address[1]:
2704
self.allow_reuse_address = True
2705
2193
if not self.server_address[0]:
2706
2194
if self.address_family == socket.AF_INET6:
2707
any_address = "::" # in6addr_any
2195
any_address = "::" # in6addr_any
2709
any_address = "0.0.0.0" # INADDR_ANY
2197
any_address = "0.0.0.0" # INADDR_ANY
2710
2198
self.server_address = (any_address,
2711
2199
self.server_address[1])
2712
2200
elif not self.server_address[1]:
2746
2234
self.gnutls_priority = gnutls_priority
2747
2235
IPv6_TCPServer.__init__(self, server_address,
2748
2236
RequestHandlerClass,
2749
interface=interface,
2237
interface = interface,
2238
use_ipv6 = use_ipv6,
2239
socketfd = socketfd)
2753
2241
def server_activate(self):
2754
2242
if self.enabled:
2755
2243
return socketserver.TCPServer.server_activate(self)
2757
2245
def enable(self):
2758
2246
self.enabled = True
2760
2248
def add_pipe(self, parent_pipe, proc):
2761
2249
# 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,
2250
gobject.io_add_watch(
2251
parent_pipe.fileno(),
2252
gobject.IO_IN | gobject.IO_HUP,
2765
2253
functools.partial(self.handle_ipc,
2766
parent_pipe=parent_pipe,
2254
parent_pipe = parent_pipe,
2769
2257
def handle_ipc(self, source, condition,
2770
2258
parent_pipe=None,
2772
2260
client_object=None):
2773
2261
# error, or the other end of multiprocessing.Pipe has closed
2774
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2262
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2775
2263
# Wait for other process to exit
2779
2267
# Read a request from the child
2780
2268
request = parent_pipe.recv()
2781
2269
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:
2271
if command == 'init':
2273
address = request[2]
2275
for c in self.clients.itervalues():
2276
if c.fingerprint == fpr:
2799
log.info("Client not found for key ID: %s, address:"
2800
" %s", key_id or fpr, address)
2280
logger.info("Client not found for fingerprint: %s, ad"
2281
"dress: %s", fpr, address)
2801
2282
if self.use_dbus:
2802
2283
# Emit D-Bus signal
2803
mandos_dbus_service.ClientNotFound(key_id or fpr,
2284
mandos_dbus_service.ClientNotFound(fpr,
2805
2286
parent_pipe.send(False)
2809
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2810
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2289
gobject.io_add_watch(
2290
parent_pipe.fileno(),
2291
gobject.IO_IN | gobject.IO_HUP,
2811
2292
functools.partial(self.handle_ipc,
2812
parent_pipe=parent_pipe,
2814
client_object=client))
2293
parent_pipe = parent_pipe,
2295
client_object = client))
2815
2296
parent_pipe.send(True)
2816
2297
# remove the old hook in favor of the new above hook on
2819
if command == "funcall":
2300
if command == 'funcall':
2820
2301
funcname = request[1]
2821
2302
args = request[2]
2822
2303
kwargs = request[3]
2824
parent_pipe.send(("data", getattr(client_object,
2305
parent_pipe.send(('data', getattr(client_object,
2825
2306
funcname)(*args,
2828
if command == "getattr":
2309
if command == 'getattr':
2829
2310
attrname = request[1]
2830
2311
if isinstance(client_object.__getattribute__(attrname),
2831
collections.abc.Callable):
2832
parent_pipe.send(("function", ))
2312
collections.Callable):
2313
parent_pipe.send(('function', ))
2834
2315
parent_pipe.send((
2835
"data", client_object.__getattribute__(attrname)))
2837
if command == "setattr":
2316
'data', client_object.__getattribute__(attrname)))
2318
if command == 'setattr':
2838
2319
attrname = request[1]
2839
2320
value = request[2]
2840
2321
setattr(client_object, attrname, value)
2845
2326
def rfc3339_duration_to_delta(duration):
2846
2327
"""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)
2329
>>> rfc3339_duration_to_delta("P7D")
2330
datetime.timedelta(7)
2331
>>> rfc3339_duration_to_delta("PT60S")
2332
datetime.timedelta(0, 60)
2333
>>> rfc3339_duration_to_delta("PT60M")
2334
datetime.timedelta(0, 3600)
2335
>>> rfc3339_duration_to_delta("PT24H")
2336
datetime.timedelta(1)
2337
>>> rfc3339_duration_to_delta("P1W")
2338
datetime.timedelta(7)
2339
>>> rfc3339_duration_to_delta("PT5M30S")
2340
datetime.timedelta(0, 330)
2341
>>> rfc3339_duration_to_delta("P1DT3M20S")
2342
datetime.timedelta(1, 200)
2866
2345
# Parsing an RFC 3339 duration with regular expressions is not
2867
2346
# possible - there would have to be multiple places for the same
2868
2347
# values, like seconds. The current code, while more esoteric, is
2869
2348
# cleaner without depending on a parsing library. If Python had a
2870
2349
# built-in library for parsing we would use it, but we'd like to
2871
2350
# avoid excessive use of external libraries.
2873
2352
# New type for defining tokens, syntax, and semantics all-in-one
2874
2353
Token = collections.namedtuple("Token", (
2875
2354
"regexp", # To match token; if "value" is not None, must have
3269
2737
"se.bsnet.fukt.Mandos", bus,
3270
2738
do_not_queue=True)
3271
2739
except dbus.exceptions.DBusException as e:
3272
log.error("Disabling D-Bus:", exc_info=e)
2740
logger.error("Disabling D-Bus:", exc_info=e)
3273
2741
use_dbus = False
3274
2742
server_settings["use_dbus"] = False
3275
2743
tcp_server.use_dbus = False
3277
2745
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3278
2746
service = AvahiServiceToSyslog(
3279
name=server_settings["servicename"],
3280
servicetype="_mandos._tcp",
2747
name = server_settings["servicename"],
2748
servicetype = "_mandos._tcp",
2749
protocol = protocol,
3283
2751
if server_settings["interface"]:
3284
2752
service.interface = if_nametoindex(
3285
2753
server_settings["interface"].encode("utf-8"))
3287
2755
global multiprocessing_manager
3288
2756
multiprocessing_manager = multiprocessing.Manager()
3290
2758
client_class = Client
3292
client_class = functools.partial(ClientDBus, bus=bus)
2760
client_class = functools.partial(ClientDBus, bus = bus)
3294
2762
client_settings = Client.config_parser(client_config)
3295
2763
old_client_settings = {}
3296
2764
clients_data = {}
3298
2766
# This is used to redirect stdout and stderr for checker processes
3300
wnull = open(os.devnull, "w") # A writable /dev/null
2768
wnull = open(os.devnull, "w") # A writable /dev/null
3301
2769
# Only used if server is running in foreground but not in debug
3303
2771
if debug or not foreground:
3306
2774
# Get client data and settings from last running state.
3307
2775
if server_settings["restore"]:
3309
2777
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]
2778
clients_data, old_client_settings = pickle.load(
3360
2780
os.remove(stored_state_path)
3361
2781
except IOError as e:
3362
2782
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
2783
logger.warning("Could not load persistent state:"
2784
" {}".format(os.strerror(e.errno)))
3366
log.critical("Could not load persistent state:",
2786
logger.critical("Could not load persistent state:",
3369
2789
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
2790
logger.warning("Could not load persistent state: "
3373
2794
with PGPEngine() as pgp:
3374
2795
for client_name, client in clients_data.items():
3375
2796
# Skip removed clients
3376
2797
if client_name not in client_settings:
3379
2800
# Decide which value to use after restoring saved state.
3380
2801
# We have three different values: Old config file,
3381
2802
# new config file, and saved state.
3641
3059
# Don't signal the disabling
3642
3060
client.disable(quiet=True)
3643
3061
# Emit D-Bus signal for removal
3645
mandos_dbus_service.client_removed_signal(client)
3062
mandos_dbus_service.client_removed_signal(client)
3646
3063
client_settings.clear()
3648
3065
atexit.register(cleanup)
3650
for client in tcp_server.clients.values():
3067
for client in tcp_server.clients.itervalues():
3652
3069
# Emit D-Bus signal for adding
3653
3070
mandos_dbus_service.client_added_signal(client)
3654
3071
# Need to initiate checking of clients
3655
3072
if client.enabled:
3656
client.init_checker(randomize_start=True)
3073
client.init_checker()
3658
3075
tcp_server.enable()
3659
3076
tcp_server.server_activate()
3661
3078
# Find out what port we got
3663
3080
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())
3082
logger.info("Now listening on address %r, port %d,"
3083
" flowinfo %d, scope_id %d",
3084
*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]
3086
logger.info("Now listening on address %r, port %d",
3087
*tcp_server.socket.getsockname())
3089
#service.interface = tcp_server.socket.getsockname()[3]
3675
3093
# From the Avahi example code
3677
3095
service.activate()
3678
3096
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3097
logger.critical("D-Bus Exception", exc_info=error)
3682
3100
# 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")
3102
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3103
lambda *args, **kwargs:
3104
(tcp_server.handle_request
3105
(*args[2:], **kwargs) or True))
3107
logger.debug("Starting main loop")
3691
3108
main_loop.run()
3692
3109
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
3110
logger.critical("Avahi Error", exc_info=error)
3696
3113
except KeyboardInterrupt:
3698
3115
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
3116
logger.debug("Server received KeyboardInterrupt")
3117
logger.debug("Server exiting")
3701
3118
# 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))
3122
if __name__ == '__main__':