196
265
.replace(b"\n", b"\\n")
197
266
.replace(b"\0", b"\\x00"))
200
269
def encrypt(self, data, password):
201
270
passphrase = self.password_encode(password)
202
271
with tempfile.NamedTemporaryFile(
203
272
dir=self.tempdir) as passfile:
204
273
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
275
proc = subprocess.Popen([self.gpg, "--symmetric",
209
278
+ self.gnupgargs,
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
214
283
if proc.returncode != 0:
215
284
raise PGPError(err)
216
285
return ciphertext
218
287
def decrypt(self, data, password):
219
288
passphrase = self.password_encode(password)
220
289
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
290
dir=self.tempdir) as passfile:
222
291
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
293
proc = subprocess.Popen([self.gpg, "--decrypt",
227
296
+ self.gnupgargs,
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
232
301
if proc.returncode != 0:
233
302
raise PGPError(err)
234
303
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
237
332
class AvahiError(Exception):
238
333
def __init__(self, value, *args, **kwargs):
239
334
self.value = value
429
523
class AvahiServiceToSyslog(AvahiService):
430
524
def rename(self, *args, **kwargs):
431
525
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
433
528
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
435
530
.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
438
863
def call_pipe(connection, # : multiprocessing.Connection
439
864
func, *args, **kwargs):
440
865
"""This function is meant to be called by multiprocessing.Process
442
867
This function runs func(*args, **kwargs), and writes the resulting
443
868
return value on the provided multiprocessing.Connection.
445
870
connection.send(func(*args, **kwargs))
446
871
connection.close()
448
class Client(object):
449
875
"""A representation of a client host served by this server.
452
approved: bool(); 'None' if not yet approved/disapproved
878
approved: bool(); None if not yet approved/disapproved
453
879
approval_delay: datetime.timedelta(); Time to wait for approval
454
880
approval_duration: datetime.timedelta(); Duration of one approval
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
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
459
885
checker_command: string; External command which is run to check
460
886
if client lives. %() expansions are done at
461
887
runtime with vars(self) as dict, so that for
462
888
instance %(name)s can be used in the command.
463
checker_initiator_tag: a gobject event source tag, or None
889
checker_initiator_tag: a GLib event source tag, or None
464
890
created: datetime.datetime(); (UTC) object creation
465
891
client_structure: Object describing what attributes a client has
466
892
and is used for storing the client at exit
467
893
current_checker_command: string; current running checker_command
468
disable_initiator_tag: a gobject event source tag, or None
894
disable_initiator_tag: a GLib event source tag, or None
470
896
fingerprint: string (40 or 32 hexadecimal digits); used to
471
uniquely identify the client
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
472
900
host: string; available for use by the checker command
473
901
interval: datetime.timedelta(); How often to start a new checker
474
902
last_approval_request: datetime.datetime(); (UTC) or None
593
1032
self.changedstate = multiprocessing_manager.Condition(
594
1033
multiprocessing_manager.Lock())
595
1034
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
1035
for attr in self.__dict__.keys()
597
1036
if not attr.startswith("_")]
598
1037
self.client_structure.append("client_structure")
600
1039
for name, t in inspect.getmembers(
601
1040
type(self), lambda obj: isinstance(obj, property)):
602
1041
if not name.startswith("_"):
603
1042
self.client_structure.append(name)
605
1044
# Send notice to process children that client state has changed
606
1045
def send_changedstate(self):
607
1046
with self.changedstate:
608
1047
self.changedstate.notify_all()
610
1049
def enable(self):
611
1050
"""Start this client's checker and timeout hooks"""
612
1051
if getattr(self, "enabled", False):
613
1052
# Already enabled
615
self.expires = datetime.datetime.utcnow() + self.timeout
616
1054
self.enabled = True
617
1055
self.last_enabled = datetime.datetime.utcnow()
618
1056
self.init_checker()
619
1057
self.send_changedstate()
621
1059
def disable(self, quiet=True):
622
1060
"""Disable this client."""
623
1061
if not getattr(self, "enabled", False):
626
logger.info("Disabling client %s", self.name)
1064
log.info("Disabling client %s", self.name)
627
1065
if getattr(self, "disable_initiator_tag", None) is not None:
628
gobject.source_remove(self.disable_initiator_tag)
1066
GLib.source_remove(self.disable_initiator_tag)
629
1067
self.disable_initiator_tag = None
630
1068
self.expires = None
631
1069
if getattr(self, "checker_initiator_tag", None) is not None:
632
gobject.source_remove(self.checker_initiator_tag)
1070
GLib.source_remove(self.checker_initiator_tag)
633
1071
self.checker_initiator_tag = None
634
1072
self.stop_checker()
635
1073
self.enabled = False
637
1075
self.send_changedstate()
638
# Do not run this again if called by a gobject.timeout_add
1076
# Do not run this again if called by a GLib.timeout_add
641
1079
def __del__(self):
644
def init_checker(self):
645
# Schedule a new checker to be started an 'interval' from now,
646
# and every interval from then on.
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
647
1087
if self.checker_initiator_tag is not None:
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
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
653
1106
if self.disable_initiator_tag is not None:
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*.
1107
GLib.source_remove(self.disable_initiator_tag)
1108
self.disable_initiator_tag = GLib.timeout_add(
1109
int((self.expires - now).total_seconds() * 1000),
660
1112
def checker_callback(self, source, condition, connection,
662
1114
"""The checker has completed, so take appropriate actions."""
663
self.checker_callback_tag = None
665
1115
# Read return code from connection (see call_pipe)
666
1116
returncode = connection.recv()
667
1117
connection.close()
1118
if self.checker is not None:
1120
self.checker_callback_tag = None
669
1123
if returncode >= 0:
670
1124
self.last_checker_status = returncode
671
1125
self.last_checker_signal = None
672
1126
if self.last_checker_status == 0:
673
logger.info("Checker for %(name)s succeeded",
1127
log.info("Checker for %(name)s succeeded", vars(self))
675
1128
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
1130
log.info("Checker for %(name)s failed", vars(self))
679
1132
self.last_checker_status = -1
680
1133
self.last_checker_signal = -returncode
681
logger.warning("Checker for %(name)s crashed?",
1134
log.warning("Checker for %(name)s crashed?", vars(self))
685
1137
def checked_ok(self):
686
1138
"""Assert that the client has been seen, alive and well."""
687
1139
self.last_checked_ok = datetime.datetime.utcnow()
688
1140
self.last_checker_status = 0
689
1141
self.last_checker_signal = None
690
1142
self.bump_timeout()
692
1144
def bump_timeout(self, timeout=None):
693
1145
"""Bump up the timeout for this client."""
694
1146
if timeout is None:
695
1147
timeout = self.timeout
696
1148
if self.disable_initiator_tag is not None:
697
gobject.source_remove(self.disable_initiator_tag)
1149
GLib.source_remove(self.disable_initiator_tag)
698
1150
self.disable_initiator_tag = None
699
1151
if getattr(self, "enabled", False):
700
self.disable_initiator_tag = gobject.timeout_add(
1152
self.disable_initiator_tag = GLib.timeout_add(
701
1153
int(timeout.total_seconds() * 1000), self.disable)
702
1154
self.expires = datetime.datetime.utcnow() + timeout
704
1156
def need_approval(self):
705
1157
self.last_approval_request = datetime.datetime.utcnow()
707
def start_checker(self):
1159
def start_checker(self, start_was_randomized=False):
708
1160
"""Start a new checker subprocess if one is not running.
710
1162
If a checker already exists, leave it running and do
712
1164
# The reason for not killing a running checker is that if we
895
1358
for cls in self.__class__.__mro__
896
1359
for name, athing in
897
1360
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1362
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1364
path_keyword="object_path",
1365
connection_keyword="connection")
1366
def Introspect(self, object_path, connection):
1367
"""Overloading of standard D-Bus method.
1369
Inserts annotation tags on methods and signals.
1371
xmlstring = dbus.service.Object.Introspect(self, object_path,
1374
document = xml.dom.minidom.parseString(xmlstring)
1376
for if_tag in document.getElementsByTagName("interface"):
1377
# Add annotation tags
1378
for typ in ("method", "signal"):
1379
for tag in if_tag.getElementsByTagName(typ):
1381
for name, prop in (self.
1382
_get_all_dbus_things(typ)):
1383
if (name == tag.getAttribute("name")
1384
and prop._dbus_interface
1385
== if_tag.getAttribute("name")):
1386
annots.update(getattr(
1387
prop, "_dbus_annotations", {}))
1388
for name, value in annots.items():
1389
ann_tag = document.createElement(
1391
ann_tag.setAttribute("name", name)
1392
ann_tag.setAttribute("value", value)
1393
tag.appendChild(ann_tag)
1394
# Add interface annotation tags
1395
for annotation, value in dict(
1396
itertools.chain.from_iterable(
1397
annotations().items()
1398
for name, annotations
1399
in self._get_all_dbus_things("interface")
1400
if name == if_tag.getAttribute("name")
1402
ann_tag = document.createElement("annotation")
1403
ann_tag.setAttribute("name", annotation)
1404
ann_tag.setAttribute("value", value)
1405
if_tag.appendChild(ann_tag)
1406
# Fix argument name for the Introspect method itself
1407
if (if_tag.getAttribute("name")
1408
== dbus.INTROSPECTABLE_IFACE):
1409
for cn in if_tag.getElementsByTagName("method"):
1410
if cn.getAttribute("name") == "Introspect":
1411
for arg in cn.getElementsByTagName("arg"):
1412
if (arg.getAttribute("direction")
1414
arg.setAttribute("name",
1416
xmlstring = document.toxml("utf-8")
1418
except (AttributeError, xml.dom.DOMException,
1419
xml.parsers.expat.ExpatError) as error:
1420
log.error("Failed to override Introspection method",
1425
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1426
"""A D-Bus object with properties.
1428
Classes inheriting from this can use the dbus_service_property
1429
decorator to expose methods as D-Bus properties. It exposes the
1430
standard Get(), Set(), and GetAll() methods on the D-Bus.
899
1433
def _get_dbus_property(self, interface_name, property_name):
900
1434
"""Returns a bound method if one exists which is a D-Bus
901
1435
property with the specified name and interface.
1054
1584
document.unlink()
1055
1585
except (AttributeError, xml.dom.DOMException,
1056
1586
xml.parsers.expat.ExpatError) as error:
1057
logger.error("Failed to override Introspection method",
1587
log.error("Failed to override Introspection method",
1593
dbus.OBJECT_MANAGER_IFACE
1594
except AttributeError:
1595
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1598
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1599
"""A D-Bus object with an ObjectManager.
1601
Classes inheriting from this exposes the standard
1602
GetManagedObjects call and the InterfacesAdded and
1603
InterfacesRemoved signals on the standard
1604
"org.freedesktop.DBus.ObjectManager" interface.
1606
Note: No signals are sent automatically; they must be sent
1609
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1610
out_signature="a{oa{sa{sv}}}")
1611
def GetManagedObjects(self):
1612
"""This function must be overridden"""
1613
raise NotImplementedError()
1615
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1616
signature="oa{sa{sv}}")
1617
def InterfacesAdded(self, object_path, interfaces_and_properties):
1620
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1621
def InterfacesRemoved(self, object_path, interfaces):
1624
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1626
path_keyword="object_path",
1627
connection_keyword="connection")
1628
def Introspect(self, object_path, connection):
1629
"""Overloading of standard D-Bus method.
1631
Override return argument name of GetManagedObjects to be
1632
"objpath_interfaces_and_properties"
1634
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1638
document = xml.dom.minidom.parseString(xmlstring)
1640
for if_tag in document.getElementsByTagName("interface"):
1641
# Fix argument name for the GetManagedObjects method
1642
if (if_tag.getAttribute("name")
1643
== dbus.OBJECT_MANAGER_IFACE):
1644
for cn in if_tag.getElementsByTagName("method"):
1645
if (cn.getAttribute("name")
1646
== "GetManagedObjects"):
1647
for arg in cn.getElementsByTagName("arg"):
1648
if (arg.getAttribute("direction")
1652
"objpath_interfaces"
1654
xmlstring = document.toxml("utf-8")
1656
except (AttributeError, xml.dom.DOMException,
1657
xml.parsers.expat.ExpatError) as error:
1658
log.error("Failed to override Introspection method",
1059
1660
return xmlstring
1062
1663
def datetime_to_dbus(dt, variant_level=0):
1063
1664
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1065
return dbus.String("", variant_level = variant_level)
1666
return dbus.String("", variant_level=variant_level)
1066
1667
return dbus.String(dt.isoformat(), variant_level=variant_level)
1661
2270
self.start_checker()
1663
2272
self.stop_checker()
1665
2274
# ObjectPath - property
2276
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2277
"org.freedesktop.DBus.Deprecated": "true"})
1666
2278
@dbus_service_property(_interface, signature="o", access="read")
1667
2279
def ObjectPath_dbus_property(self):
1668
return self.dbus_object_path # is already a dbus.ObjectPath
2280
return self.dbus_object_path # is already a dbus.ObjectPath
1670
2282
# Secret = property
2284
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
1671
2286
@dbus_service_property(_interface,
1672
2287
signature="ay",
1673
2288
access="write",
1674
2289
byte_arrays=True)
1675
2290
def Secret_dbus_property(self, value):
1676
2291
self.secret = bytes(value)
1681
class ProxyClient(object):
1682
def __init__(self, child_pipe, fpr, address):
2297
def __init__(self, child_pipe, key_id, fpr, address):
1683
2298
self._pipe = child_pipe
1684
self._pipe.send(('init', fpr, address))
2299
self._pipe.send(("init", key_id, fpr, address))
1685
2300
if not self._pipe.recv():
2301
raise KeyError(key_id or fpr)
1688
2303
def __getattribute__(self, name):
1690
2305
return super(ProxyClient, self).__getattribute__(name)
1691
self._pipe.send(('getattr', name))
2306
self._pipe.send(("getattr", name))
1692
2307
data = self._pipe.recv()
1693
if data[0] == 'data':
2308
if data[0] == "data":
1695
if data[0] == 'function':
2310
if data[0] == "function":
1697
2312
def func(*args, **kwargs):
1698
self._pipe.send(('funcall', name, args, kwargs))
2313
self._pipe.send(("funcall", name, args, kwargs))
1699
2314
return self._pipe.recv()[1]
1703
2318
def __setattr__(self, name, value):
1705
2320
return super(ProxyClient, self).__setattr__(name, value)
1706
self._pipe.send(('setattr', name, value))
2321
self._pipe.send(("setattr", name, value))
1709
2324
class ClientHandler(socketserver.BaseRequestHandler, object):
1710
2325
"""A class to handle client connections.
1712
2327
Instantiated once for each connection to handle it.
1713
2328
Note: This will run in its own forked process."""
1715
2330
def handle(self):
1716
2331
with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
logger.info("TCP connection from: %s",
1718
str(self.client_address))
1719
logger.debug("Pipe FD: %d",
1720
self.server.child_pipe.fileno())
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1725
# Note: gnutls.connection.X509Credentials is really a
1726
# generic GnuTLS certificate credentials object so long as
1727
# no X.509 keys are added to it. Therefore, we can use it
1728
# here despite using OpenPGP certificates.
1730
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1731
# "+AES-256-CBC", "+SHA1",
1732
# "+COMP-NULL", "+CTYPE-OPENPGP",
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",
1734
2342
# Use a fallback default, since this MUST be set.
1735
2343
priority = self.server.gnutls_priority
1736
2344
if priority is None:
1737
2345
priority = "NORMAL"
1738
gnutls.library.functions.gnutls_priority_set_direct(
1739
session._c_object, priority, None)
2346
gnutls.priority_set_direct(session,
2347
priority.encode("utf-8"), None)
1741
2349
# Start communication using the Mandos protocol
1742
2350
# Get protocol number
1743
2351
line = self.request.makefile().readline()
1744
logger.debug("Protocol version: %r", line)
2352
log.debug("Protocol version: %r", line)
1746
2354
if int(line.strip().split()[0]) > 1:
1747
2355
raise RuntimeError(line)
1748
2356
except (ValueError, IndexError, RuntimeError) as error:
1749
logger.error("Unknown protocol version: %s", error)
2357
log.error("Unknown protocol version: %s", error)
1752
2360
# Start GnuTLS connection
1754
2362
session.handshake()
1755
except gnutls.errors.GNUTLSError as error:
1756
logger.warning("Handshake failed: %s", error)
2363
except gnutls.Error as error:
2364
log.warning("Handshake failed: %s", error)
1757
2365
# Do not run session.bye() here: the session is not
1758
2366
# established. Just abandon the request.
1760
logger.debug("Handshake succeeded")
2368
log.debug("Handshake succeeded")
1762
2370
approval_required = False
1765
fpr = self.fingerprint(
1766
self.peer_certificate(session))
1768
gnutls.errors.GNUTLSError) as error:
1769
logger.warning("Bad certificate: %s", error)
1771
logger.debug("Fingerprint: %s", fpr)
1774
client = ProxyClient(child_pipe, fpr,
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,
1775
2396
self.client_address)
1776
2397
except KeyError:
1779
2400
if client.approval_delay:
1780
2401
delay = client.approval_delay
1781
2402
client.approvals_pending += 1
1782
2403
approval_required = True
1785
2406
if not client.enabled:
1786
logger.info("Client %s is disabled",
2407
log.info("Client %s is disabled", client.name)
1788
2408
if self.server.use_dbus:
1789
2409
# Emit D-Bus signal
1790
2410
client.Rejected("Disabled")
1793
2413
if client.approved or not client.approval_delay:
1794
#We are approved or approval is disabled
2414
# We are approved or approval is disabled
1796
2416
elif client.approved is None:
1797
logger.info("Client %s needs approval",
2417
log.info("Client %s needs approval",
1799
2419
if self.server.use_dbus:
1800
2420
# Emit D-Bus signal
1801
2421
client.NeedApproval(
1802
2422
client.approval_delay.total_seconds()
1803
2423
* 1000, client.approved_by_default)
1805
logger.warning("Client %s was not approved",
2425
log.warning("Client %s was not approved",
1807
2427
if self.server.use_dbus:
1808
2428
# Emit D-Bus signal
1809
2429
client.Rejected("Denied")
1812
#wait until timeout or approved
2432
# wait until timeout or approved
1813
2433
time = datetime.datetime.now()
1814
2434
client.changedstate.acquire()
1815
2435
client.changedstate.wait(delay.total_seconds())
1830
2450
delay -= time2 - time
1833
while sent_size < len(client.secret):
1835
sent = session.send(client.secret[sent_size:])
1836
except gnutls.errors.GNUTLSError as error:
1837
logger.warning("gnutls send failed",
1840
logger.debug("Sent: %d, remaining: %d", sent,
1841
len(client.secret) - (sent_size
1845
logger.info("Sending secret to %s", client.name)
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)
1846
2459
# bump the timeout using extended_timeout
1847
2460
client.bump_timeout(client.extended_timeout)
1848
2461
if self.server.use_dbus:
1849
2462
# Emit D-Bus signal
1850
2463
client.GotSecret()
1853
2466
if approval_required:
1854
2467
client.approvals_pending -= 1
1857
except gnutls.errors.GNUTLSError as error:
1858
logger.warning("GnuTLS bye failed",
2470
except gnutls.Error as error:
2471
log.warning("GnuTLS bye failed", exc_info=error)
1862
2474
def peer_certificate(session):
1863
"Return the peer's OpenPGP certificate as a bytestring"
1864
# If not an OpenPGP certificate...
1865
if (gnutls.library.functions.gnutls_certificate_type_get(
1867
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1868
# ...do the normal thing
1869
return session.peer_certificate
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
1870
2491
list_size = ctypes.c_uint(1)
1871
cert_list = (gnutls.library.functions
1872
.gnutls_certificate_get_peers
1873
(session._c_object, ctypes.byref(list_size)))
2492
cert_list = (gnutls.certificate_get_peers
2493
(session, ctypes.byref(list_size)))
1874
2494
if not bool(cert_list) and list_size.value != 0:
1875
raise gnutls.errors.GNUTLSError("error getting peer"
2495
raise gnutls.Error("error getting peer certificate")
1877
2496
if list_size.value == 0:
1879
2498
cert = cert_list[0]
1880
2499
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()
1883
2537
def fingerprint(openpgp):
1884
2538
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
2539
# New GnuTLS "datum" with the OpenPGP public key
1886
datum = gnutls.library.types.gnutls_datum_t(
2540
datum = gnutls.datum_t(
1887
2541
ctypes.cast(ctypes.c_char_p(openpgp),
1888
2542
ctypes.POINTER(ctypes.c_ubyte)),
1889
2543
ctypes.c_uint(len(openpgp)))
1890
2544
# New empty GnuTLS certificate
1891
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
2545
crt = gnutls.openpgp_crt_t()
2546
gnutls.openpgp_crt_init(ctypes.byref(crt))
1894
2547
# Import the OpenPGP public key into the certificate
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2548
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2549
gnutls.OPENPGP_FMT_RAW)
1898
2550
# Verify the self signature in the key
1899
2551
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
2552
gnutls.openpgp_crt_verify_self(crt, 0,
2553
ctypes.byref(crtverify))
1902
2554
if crtverify.value != 0:
1903
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
2555
gnutls.openpgp_crt_deinit(crt)
2556
raise gnutls.CertificateSecurityError(code
1906
2558
# New buffer for the fingerprint
1907
2559
buf = ctypes.create_string_buffer(20)
1908
2560
buf_len = ctypes.c_size_t()
1909
2561
# Get the fingerprint from the certificate into the buffer
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2562
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2563
ctypes.byref(buf_len))
1912
2564
# Deinit the certificate
1913
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2565
gnutls.openpgp_crt_deinit(crt)
1914
2566
# Convert the buffer to a Python bytestring
1915
2567
fpr = ctypes.string_at(buf, buf_len.value)
1916
2568
# Convert the bytestring to hexadecimal notation
2004
2657
# socket_wrapper(), if socketfd was set.
2005
2658
socketserver.TCPServer.__init__(self, server_address,
2006
2659
RequestHandlerClass)
2008
2661
def server_bind(self):
2009
2662
"""This overrides the normal server_bind() function
2010
2663
to bind to an interface if one was specified, and also NOT to
2011
2664
bind to an address or port if they were not specified."""
2665
global SO_BINDTODEVICE
2012
2666
if self.interface is not None:
2013
2667
if SO_BINDTODEVICE is None:
2014
logger.error("SO_BINDTODEVICE does not exist;"
2015
" cannot bind to interface %s",
2019
self.socket.setsockopt(
2020
socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
(self.interface + "\0").encode("utf-8"))
2022
except socket.error as error:
2023
if error.errno == errno.EPERM:
2024
logger.error("No permission to bind to"
2025
" interface %s", self.interface)
2026
elif error.errno == errno.ENOPROTOOPT:
2027
logger.error("SO_BINDTODEVICE not available;"
2028
" cannot bind to interface %s",
2030
elif error.errno == errno.ENODEV:
2031
logger.error("Interface %s does not exist,"
2032
" cannot bind", self.interface)
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)
2035
2688
# Only bind(2) the socket if we really need to.
2036
2689
if self.server_address[0] or self.server_address[1]:
2690
if self.server_address[1]:
2691
self.allow_reuse_address = True
2037
2692
if not self.server_address[0]:
2038
2693
if self.address_family == socket.AF_INET6:
2039
any_address = "::" # in6addr_any
2694
any_address = "::" # in6addr_any
2041
any_address = "0.0.0.0" # INADDR_ANY
2696
any_address = "0.0.0.0" # INADDR_ANY
2042
2697
self.server_address = (any_address,
2043
2698
self.server_address[1])
2044
2699
elif not self.server_address[1]:
2078
2733
self.gnutls_priority = gnutls_priority
2079
2734
IPv6_TCPServer.__init__(self, server_address,
2080
2735
RequestHandlerClass,
2081
interface = interface,
2082
use_ipv6 = use_ipv6,
2083
socketfd = socketfd)
2736
interface=interface,
2085
2740
def server_activate(self):
2086
2741
if self.enabled:
2087
2742
return socketserver.TCPServer.server_activate(self)
2089
2744
def enable(self):
2090
2745
self.enabled = True
2092
2747
def add_pipe(self, parent_pipe, proc):
2093
2748
# Call "handle_ipc" for both data and EOF events
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2750
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2751
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2097
2752
functools.partial(self.handle_ipc,
2098
parent_pipe = parent_pipe,
2753
parent_pipe=parent_pipe,
2101
2756
def handle_ipc(self, source, condition,
2102
2757
parent_pipe=None,
2104
2759
client_object=None):
2105
2760
# error, or the other end of multiprocessing.Pipe has closed
2106
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2761
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2107
2762
# Wait for other process to exit
2111
2766
# Read a request from the child
2112
2767
request = parent_pipe.recv()
2113
2768
command = request[0]
2115
if command == 'init':
2117
address = request[2]
2119
for c in self.clients.itervalues():
2120
if c.fingerprint == fpr:
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:
2124
logger.info("Client not found for fingerprint: %s, ad"
2125
"dress: %s", fpr, address)
2786
log.info("Client not found for key ID: %s, address:"
2787
" %s", key_id or fpr, address)
2126
2788
if self.use_dbus:
2127
2789
# Emit D-Bus signal
2128
mandos_dbus_service.ClientNotFound(fpr,
2790
mandos_dbus_service.ClientNotFound(key_id or fpr,
2130
2792
parent_pipe.send(False)
2133
gobject.io_add_watch(
2134
parent_pipe.fileno(),
2135
gobject.IO_IN | gobject.IO_HUP,
2796
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2797
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2136
2798
functools.partial(self.handle_ipc,
2137
parent_pipe = parent_pipe,
2139
client_object = client))
2799
parent_pipe=parent_pipe,
2801
client_object=client))
2140
2802
parent_pipe.send(True)
2141
2803
# remove the old hook in favor of the new above hook on
2144
if command == 'funcall':
2806
if command == "funcall":
2145
2807
funcname = request[1]
2146
2808
args = request[2]
2147
2809
kwargs = request[3]
2149
parent_pipe.send(('data', getattr(client_object,
2811
parent_pipe.send(("data", getattr(client_object,
2150
2812
funcname)(*args,
2153
if command == 'getattr':
2815
if command == "getattr":
2154
2816
attrname = request[1]
2155
2817
if isinstance(client_object.__getattribute__(attrname),
2156
collections.Callable):
2157
parent_pipe.send(('function', ))
2818
collections.abc.Callable):
2819
parent_pipe.send(("function", ))
2159
2821
parent_pipe.send((
2160
'data', client_object.__getattribute__(attrname)))
2162
if command == 'setattr':
2822
"data", client_object.__getattribute__(attrname)))
2824
if command == "setattr":
2163
2825
attrname = request[1]
2164
2826
value = request[2]
2165
2827
setattr(client_object, attrname, value)
2170
2832
def rfc3339_duration_to_delta(duration):
2171
2833
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2173
>>> rfc3339_duration_to_delta("P7D")
2174
datetime.timedelta(7)
2175
>>> rfc3339_duration_to_delta("PT60S")
2176
datetime.timedelta(0, 60)
2177
>>> rfc3339_duration_to_delta("PT60M")
2178
datetime.timedelta(0, 3600)
2179
>>> rfc3339_duration_to_delta("PT24H")
2180
datetime.timedelta(1)
2181
>>> rfc3339_duration_to_delta("P1W")
2182
datetime.timedelta(7)
2183
>>> rfc3339_duration_to_delta("PT5M30S")
2184
datetime.timedelta(0, 330)
2185
>>> rfc3339_duration_to_delta("P1DT3M20S")
2186
datetime.timedelta(1, 200)
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)
2189
2853
# Parsing an RFC 3339 duration with regular expressions is not
2190
2854
# possible - there would have to be multiple places for the same
2191
2855
# values, like seconds. The current code, while more esoteric, is
2192
2856
# cleaner without depending on a parsing library. If Python had a
2193
2857
# built-in library for parsing we would use it, but we'd like to
2194
2858
# avoid excessive use of external libraries.
2196
2860
# New type for defining tokens, syntax, and semantics all-in-one
2197
2861
Token = collections.namedtuple("Token", (
2198
2862
"regexp", # To match token; if "value" is not None, must have
2581
3255
"se.bsnet.fukt.Mandos", bus,
2582
3256
do_not_queue=True)
2583
3257
except dbus.exceptions.DBusException as e:
2584
logger.error("Disabling D-Bus:", exc_info=e)
3258
log.error("Disabling D-Bus:", exc_info=e)
2585
3259
use_dbus = False
2586
3260
server_settings["use_dbus"] = False
2587
3261
tcp_server.use_dbus = False
2589
3263
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
3264
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
3265
name=server_settings["servicename"],
3266
servicetype="_mandos._tcp",
2595
3269
if server_settings["interface"]:
2596
3270
service.interface = if_nametoindex(
2597
3271
server_settings["interface"].encode("utf-8"))
2599
3273
global multiprocessing_manager
2600
3274
multiprocessing_manager = multiprocessing.Manager()
2602
3276
client_class = Client
2604
client_class = functools.partial(ClientDBus, bus = bus)
3278
client_class = functools.partial(ClientDBus, bus=bus)
2606
3280
client_settings = Client.config_parser(client_config)
2607
3281
old_client_settings = {}
2608
3282
clients_data = {}
2610
3284
# This is used to redirect stdout and stderr for checker processes
2612
wnull = open(os.devnull, "w") # A writable /dev/null
3286
wnull = open(os.devnull, "w") # A writable /dev/null
2613
3287
# Only used if server is running in foreground but not in debug
2615
3289
if debug or not foreground:
2618
3292
# Get client data and settings from last running state.
2619
3293
if server_settings["restore"]:
2621
3295
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
3296
if sys.version_info.major == 2:
3297
clients_data, old_client_settings = pickle.load(
3300
bytes_clients_data, bytes_old_client_settings = (
3301
pickle.load(stored_state, encoding="bytes"))
3302
# Fix bytes to strings
3305
clients_data = {(key.decode("utf-8")
3306
if isinstance(key, bytes)
3309
bytes_clients_data.items()}
3310
del bytes_clients_data
3311
for key in clients_data:
3312
value = {(k.decode("utf-8")
3313
if isinstance(k, bytes) else k): v
3315
clients_data[key].items()}
3316
clients_data[key] = value
3318
value["client_structure"] = [
3320
if isinstance(s, bytes)
3322
value["client_structure"]]
3323
# .name, .host, and .checker_command
3324
for k in ("name", "host", "checker_command"):
3325
if isinstance(value[k], bytes):
3326
value[k] = value[k].decode("utf-8")
3327
if "key_id" not in value:
3328
value["key_id"] = ""
3329
elif "fingerprint" not in value:
3330
value["fingerprint"] = ""
3331
# old_client_settings
3333
old_client_settings = {
3334
(key.decode("utf-8")
3335
if isinstance(key, bytes)
3338
bytes_old_client_settings.items()}
3339
del bytes_old_client_settings
3340
# .host and .checker_command
3341
for value in old_client_settings.values():
3342
for attribute in ("host", "checker_command"):
3343
if isinstance(value[attribute], bytes):
3344
value[attribute] = (value[attribute]
2624
3346
os.remove(stored_state_path)
2625
3347
except IOError as e:
2626
3348
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
3349
log.warning("Could not load persistent state:"
3350
" %s", os.strerror(e.errno))
2630
logger.critical("Could not load persistent state:",
3352
log.critical("Could not load persistent state:",
2633
3355
except EOFError as e:
2634
logger.warning("Could not load persistent state: "
3356
log.warning("Could not load persistent state: EOFError:",
2638
3359
with PGPEngine() as pgp:
2639
3360
for client_name, client in clients_data.items():
2640
3361
# Skip removed clients
2641
3362
if client_name not in client_settings:
2644
3365
# Decide which value to use after restoring saved state.
2645
3366
# We have three different values: Old config file,
2646
3367
# new config file, and saved state.
2723
3440
print(pid, file=pidfile)
2724
3441
except IOError:
2725
logger.error("Could not write to file %r with PID %d",
3442
log.error("Could not write to file %r with PID %d",
2728
3445
del pidfilename
2730
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2731
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3447
for termsig in (signal.SIGHUP, signal.SIGTERM):
3448
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3449
lambda: main_loop.quit() and False)
2735
3453
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2737
class MandosDBusService(DBusObjectWithProperties):
3454
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3455
class MandosDBusService(DBusObjectWithObjectManager):
2738
3456
"""A D-Bus proxy object"""
2740
3458
def __init__(self):
2741
3459
dbus.service.Object.__init__(self, bus, "/")
2743
3461
_interface = "se.recompile.Mandos"
2745
@dbus_interface_annotations(_interface)
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2751
3463
@dbus.service.signal(_interface, signature="o")
2752
3464
def ClientAdded(self, objpath):
2756
3468
@dbus.service.signal(_interface, signature="ss")
2757
def ClientNotFound(self, fingerprint, address):
3469
def ClientNotFound(self, key_id, address):
3473
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2761
3475
@dbus.service.signal(_interface, signature="os")
2762
3476
def ClientRemoved(self, objpath, name):
3480
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2766
3482
@dbus.service.method(_interface, out_signature="ao")
2767
3483
def GetAllClients(self):
2769
3485
return dbus.Array(c.dbus_object_path for c in
2770
tcp_server.clients.itervalues())
3486
tcp_server.clients.values())
3488
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2772
3490
@dbus.service.method(_interface,
2773
3491
out_signature="a{oa{sv}}")
2774
3492
def GetAllClientsWithProperties(self):
2776
3494
return dbus.Dictionary(
2777
{ c.dbus_object_path: c.GetAll("")
2778
for c in tcp_server.clients.itervalues() },
3495
{c.dbus_object_path: c.GetAll(
3496
"se.recompile.Mandos.Client")
3497
for c in tcp_server.clients.values()},
2779
3498
signature="oa{sv}")
2781
3500
@dbus.service.method(_interface, in_signature="o")
2782
3501
def RemoveClient(self, object_path):
2784
for c in tcp_server.clients.itervalues():
3503
for c in tcp_server.clients.values():
2785
3504
if c.dbus_object_path == object_path:
2786
3505
del tcp_server.clients[c.name]
2787
3506
c.remove_from_connection()
2788
# Don't signal anything except ClientRemoved
3507
# Don't signal the disabling
2789
3508
c.disable(quiet=True)
2791
self.ClientRemoved(object_path, c.name)
3509
# Emit D-Bus signal for removal
3510
self.client_removed_signal(c)
2793
3512
raise KeyError(object_path)
3516
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3517
out_signature="a{oa{sa{sv}}}")
3518
def GetManagedObjects(self):
3520
return dbus.Dictionary(
3521
{client.dbus_object_path:
3523
{interface: client.GetAll(interface)
3525
client._get_all_interface_names()})
3526
for client in tcp_server.clients.values()})
3528
def client_added_signal(self, client):
3529
"""Send the new standard signal and the old signal"""
3531
# New standard signal
3532
self.InterfacesAdded(
3533
client.dbus_object_path,
3535
{interface: client.GetAll(interface)
3537
client._get_all_interface_names()}))
3539
self.ClientAdded(client.dbus_object_path)
3541
def client_removed_signal(self, client):
3542
"""Send the new standard signal and the old signal"""
3544
# New standard signal
3545
self.InterfacesRemoved(
3546
client.dbus_object_path,
3547
client._get_all_interface_names())
3549
self.ClientRemoved(client.dbus_object_path,
2797
3552
mandos_dbus_service = MandosDBusService()
3554
# Save modules to variables to exempt the modules from being
3555
# unloaded before the function registered with atexit() is run.
3556
mp = multiprocessing
2800
3560
"Cleanup function; run on exit"
2802
3562
service.cleanup()
2804
multiprocessing.active_children()
3564
mp.active_children()
2806
3566
if not (tcp_server.clients or client_settings):
2809
3569
# Store client before exiting. Secrets are encrypted with key
2810
3570
# based on what config file has. If config file is
2811
3571
# removed/edited, old secret will thus be unrecovable.
2813
3573
with PGPEngine() as pgp:
2814
for client in tcp_server.clients.itervalues():
3574
for client in tcp_server.clients.values():
2815
3575
key = client_settings[client.name]["secret"]
2816
3576
client.encrypted_secret = pgp.encrypt(client.secret,
2818
3578
client_dict = {}
2820
3580
# A list of attributes that can not be pickled
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
3582
exclude = {"bus", "changedstate", "secret",
3583
"checker", "server_settings"}
2824
3584
for name, typ in inspect.getmembers(dbus.service
2826
3586
exclude.add(name)
2828
3588
client_dict["encrypted_secret"] = (client
2829
3589
.encrypted_secret)
2830
3590
for attr in client.client_structure:
2831
3591
if attr not in exclude:
2832
3592
client_dict[attr] = getattr(client, attr)
2834
3594
clients[client.name] = client_dict
2835
3595
del client_settings[client.name]["secret"]
2838
3598
with tempfile.NamedTemporaryFile(
2840
3600
suffix=".pickle",
2842
3602
dir=os.path.dirname(stored_state_path),
2843
3603
delete=False) as stored_state:
2844
pickle.dump((clients, client_settings), stored_state)
3604
pickle.dump((clients, client_settings), stored_state,
2845
3606
tempname = stored_state.name
2846
3607
os.rename(tempname, stored_state_path)
2847
3608
except (IOError, OSError) as e:
2851
3612
except NameError:
2853
3614
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2854
logger.warning("Could not save persistent state: {}"
2855
.format(os.strerror(e.errno)))
3615
log.warning("Could not save persistent state: %s",
3616
os.strerror(e.errno))
2857
logger.warning("Could not save persistent state:",
3618
log.warning("Could not save persistent state:",
2861
3622
# Delete all clients, and settings from config
2862
3623
while tcp_server.clients:
2863
3624
name, client = tcp_server.clients.popitem()
2865
3626
client.remove_from_connection()
2866
# Don't signal anything except ClientRemoved
3627
# Don't signal the disabling
2867
3628
client.disable(quiet=True)
3629
# Emit D-Bus signal for removal
2870
mandos_dbus_service.ClientRemoved(
2871
client.dbus_object_path, client.name)
3631
mandos_dbus_service.client_removed_signal(client)
2872
3632
client_settings.clear()
2874
3634
atexit.register(cleanup)
2876
for client in tcp_server.clients.itervalues():
3636
for client in tcp_server.clients.values():
2879
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3638
# Emit D-Bus signal for adding
3639
mandos_dbus_service.client_added_signal(client)
2880
3640
# Need to initiate checking of clients
2881
3641
if client.enabled:
2882
client.init_checker()
3642
client.init_checker(randomize_start=True)
2884
3644
tcp_server.enable()
2885
3645
tcp_server.server_activate()
2887
3647
# Find out what port we got
2889
3649
service.port = tcp_server.socket.getsockname()[1]
2891
logger.info("Now listening on address %r, port %d,"
2892
" flowinfo %d, scope_id %d",
2893
*tcp_server.socket.getsockname())
3651
log.info("Now listening on address %r, port %d, flowinfo %d,"
3652
" scope_id %d", *tcp_server.socket.getsockname())
2895
logger.info("Now listening on address %r, port %d",
2896
*tcp_server.socket.getsockname())
2898
#service.interface = tcp_server.socket.getsockname()[3]
3654
log.info("Now listening on address %r, port %d",
3655
*tcp_server.socket.getsockname())
3657
# service.interface = tcp_server.socket.getsockname()[3]
2902
3661
# From the Avahi example code
2904
3663
service.activate()
2905
3664
except dbus.exceptions.DBusException as error:
2906
logger.critical("D-Bus Exception", exc_info=error)
3665
log.critical("D-Bus Exception", exc_info=error)
2909
3668
# End of Avahi example code
2911
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
lambda *args, **kwargs:
2913
(tcp_server.handle_request
2914
(*args[2:], **kwargs) or True))
2916
logger.debug("Starting main loop")
3671
GLib.IOChannel.unix_new(tcp_server.fileno()),
3672
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3673
lambda *args, **kwargs: (tcp_server.handle_request
3674
(*args[2:], **kwargs) or True))
3676
log.debug("Starting main loop")
2917
3677
main_loop.run()
2918
3678
except AvahiError as error:
2919
logger.critical("Avahi Error", exc_info=error)
3679
log.critical("Avahi Error", exc_info=error)
2922
3682
except KeyboardInterrupt:
2924
3684
print("", file=sys.stderr)
2925
logger.debug("Server received KeyboardInterrupt")
2926
logger.debug("Server exiting")
3685
log.debug("Server received KeyboardInterrupt")
3686
log.debug("Server exiting")
2927
3687
# Must run before the D-Bus bus name gets deregistered
2931
if __name__ == '__main__':
3691
def parse_test_args():
3692
# type: () -> argparse.Namespace
3693
parser = argparse.ArgumentParser(add_help=False)
3694
parser.add_argument("--check", action="store_true")
3695
parser.add_argument("--prefix", )
3696
args, unknown_args = parser.parse_known_args()
3698
# Remove test options from sys.argv
3699
sys.argv[1:] = unknown_args
3702
# Add all tests from doctest strings
3703
def load_tests(loader, tests, none):
3705
tests.addTests(doctest.DocTestSuite())
3708
if __name__ == "__main__":
3709
options = parse_test_args()
3712
extra_test_prefix = options.prefix
3713
if extra_test_prefix is not None:
3714
if not (unittest.main(argv=[""], exit=False)
3715
.result.wasSuccessful()):
3717
class ExtraTestLoader(unittest.TestLoader):
3718
testMethodPrefix = extra_test_prefix
3719
# Call using ./scriptname --test [--verbose]
3720
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3722
unittest.main(argv=[""])
3730
# (lambda (&optional extra)
3731
# (if (not (funcall run-tests-in-test-buffer default-directory
3733
# (funcall show-test-buffer-in-test-window)
3734
# (funcall remove-test-window)
3735
# (if extra (message "Extra tests run successfully!"))))
3736
# run-tests-in-test-buffer:
3737
# (lambda (dir &optional extra)
3738
# (with-current-buffer (get-buffer-create "*Test*")
3739
# (setq buffer-read-only nil
3740
# default-directory dir)
3742
# (compilation-mode))
3743
# (let ((process-result
3744
# (let ((inhibit-read-only t))
3745
# (process-file-shell-command
3746
# (funcall get-command-line extra) nil "*Test*"))))
3747
# (and (numberp process-result)
3748
# (= process-result 0))))
3750
# (lambda (&optional extra)
3751
# (let ((quoted-script
3752
# (shell-quote-argument (funcall get-script-name))))
3754
# (concat "%s --check" (if extra " --prefix=atest" ""))
3758
# (if (fboundp 'file-local-name)
3759
# (file-local-name (buffer-file-name))
3760
# (or (file-remote-p (buffer-file-name) 'localname)
3761
# (buffer-file-name))))
3762
# remove-test-window:
3764
# (let ((test-window (get-buffer-window "*Test*")))
3765
# (if test-window (delete-window test-window))))
3766
# show-test-buffer-in-test-window:
3768
# (when (not (get-buffer-window-list "*Test*"))
3769
# (setq next-error-last-buffer (get-buffer "*Test*"))
3770
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3771
# (display-buffer-overriding-action
3772
# `((display-buffer-in-side-window) (side . ,side)
3773
# (window-height . fit-window-to-buffer)
3774
# (window-width . fit-window-to-buffer))))
3775
# (display-buffer "*Test*"))))
3778
# (let* ((run-extra-tests (lambda () (interactive)
3779
# (funcall run-tests t)))
3780
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3781
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3782
# (setq minor-mode-overriding-map-alist
3783
# (cons `(run-tests . ,outer-keymap)
3784
# minor-mode-overriding-map-alist)))
3785
# (add-hook 'after-save-hook run-tests 90 t))