265
195
.replace(b"\n", b"\\n")
266
196
.replace(b"\0", b"\\x00"))
269
199
def encrypt(self, data, password):
270
200
passphrase = self.password_encode(password)
271
201
with tempfile.NamedTemporaryFile(
272
202
dir=self.tempdir) as passfile:
273
203
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
205
proc = subprocess.Popen(['gpg', '--symmetric',
278
208
+ self.gnupgargs,
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
209
stdin = subprocess.PIPE,
210
stdout = subprocess.PIPE,
211
stderr = subprocess.PIPE)
212
ciphertext, err = proc.communicate(input = data)
283
213
if proc.returncode != 0:
284
214
raise PGPError(err)
285
215
return ciphertext
287
217
def decrypt(self, data, password):
288
218
passphrase = self.password_encode(password)
289
219
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
220
dir = self.tempdir) as passfile:
291
221
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
223
proc = subprocess.Popen(['gpg', '--decrypt',
296
226
+ self.gnupgargs,
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
227
stdin = subprocess.PIPE,
228
stdout = subprocess.PIPE,
229
stderr = subprocess.PIPE)
230
decrypted_plaintext, err = proc.communicate(input = data)
301
231
if proc.returncode != 0:
302
232
raise PGPError(err)
303
233
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
236
class AvahiError(Exception):
333
237
def __init__(self, value, *args, **kwargs):
334
238
self.value = value
523
417
class AvahiServiceToSyslog(AvahiService):
524
418
def rename(self, *args, **kwargs):
525
419
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
420
ret = AvahiService.rename(self, *args, **kwargs)
528
421
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
422
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
423
.format(self.name)))
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
608
def from_param(self, obj):
609
if not isinstance(obj, self.cls):
610
raise TypeError("Not of type {}: {!r}"
611
.format(self.cls.__name__, obj))
612
return ctypes.byref(obj.from_param(obj))
614
class CastToVoidPointer:
615
def __init__(self, cls):
618
def from_param(self, obj):
619
if not isinstance(obj, self.cls):
620
raise TypeError("Not of type {}: {!r}"
621
.format(self.cls.__name__, obj))
622
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
630
class Credentials(With_from_param):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
634
self.type = gnutls.CRD_CERTIFICATE
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
640
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
642
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
644
gnutls_flags |= gnutls.NO_TICKETS
646
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
653
if credentials is None:
654
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
657
self.credentials = credentials
663
return gnutls.handshake(self)
665
def send(self, data):
669
data_len -= gnutls.record_send(self, data[-data_len:],
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
676
def _error_code(result):
677
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
raise gnutls.CertificateSecurityError(code=result)
683
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
687
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
return _error_code(result)
692
result = func(*arguments)
695
# Unless otherwise indicated, the function declarations below are
696
# all from the gnutls/gnutls.h C header file.
699
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
ctypes.POINTER(ctypes.c_char_p)]
702
priority_set_direct.restype = _error_code
704
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
init.restype = _error_code
708
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
710
set_default_priority.restype = _error_code
712
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
715
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
certificate_allocate_credentials = (
719
_library.gnutls_certificate_allocate_credentials)
720
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
722
certificate_allocate_credentials.restype = _error_code
724
certificate_free_credentials = (
725
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
727
certificate_free_credentials.restype = None
729
handshake_set_private_extensions = (
730
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
733
handshake_set_private_extensions.restype = None
735
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
738
credentials_set.restype = _error_code
740
strerror = _library.gnutls_strerror
741
strerror.argtypes = [ctypes.c_int]
742
strerror.restype = ctypes.c_char_p
744
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
746
certificate_type_get.restype = _error_code
748
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
750
ctypes.POINTER(ctypes.c_uint)]
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
global_set_log_level = _library.gnutls_global_set_log_level
754
global_set_log_level.argtypes = [ctypes.c_int]
755
global_set_log_level.restype = None
757
global_set_log_function = _library.gnutls_global_set_log_function
758
global_set_log_function.argtypes = [log_func]
759
global_set_log_function.restype = None
761
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
763
deinit.restype = None
765
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
770
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
transport_set_ptr.restype = None
774
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
779
check_version = _library.gnutls_check_version
780
check_version.argtypes = [ctypes.c_char_p]
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
789
has_rawpk = bool(check_version(_tls_rawpk_version))
793
class pubkey_st(ctypes.Structure):
795
pubkey_t = ctypes.POINTER(pubkey_st)
797
x509_crt_fmt_t = ctypes.c_int
799
# All the function declarations below are from
801
pubkey_init = _library.gnutls_pubkey_init
802
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
pubkey_init.restype = _error_code
805
pubkey_import = _library.gnutls_pubkey_import
806
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
808
pubkey_import.restype = _error_code
810
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
ctypes.POINTER(ctypes.c_ubyte),
813
ctypes.POINTER(ctypes.c_size_t)]
814
pubkey_get_key_id.restype = _error_code
816
pubkey_deinit = _library.gnutls_pubkey_deinit
817
pubkey_deinit.argtypes = [pubkey_t]
818
pubkey_deinit.restype = None
820
# All the function declarations below are from
823
openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
openpgp_crt_init.restype = _error_code
827
openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
openpgp_crt_import.argtypes = [openpgp_crt_t,
829
ctypes.POINTER(datum_t),
831
openpgp_crt_import.restype = _error_code
833
openpgp_crt_verify_self = \
834
_library.gnutls_openpgp_crt_verify_self
835
openpgp_crt_verify_self.argtypes = [
838
ctypes.POINTER(ctypes.c_uint),
840
openpgp_crt_verify_self.restype = _error_code
842
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
openpgp_crt_deinit.restype = None
846
openpgp_crt_get_fingerprint = (
847
_library.gnutls_openpgp_crt_get_fingerprint)
848
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
852
openpgp_crt_get_fingerprint.restype = _error_code
854
if check_version(b"3.6.4"):
855
certificate_type_get2 = _library.gnutls_certificate_type_get2
856
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
certificate_type_get2.restype = _error_code
859
# Remove non-public functions
860
del _error_code, _retry_on_error
863
426
def call_pipe(connection, # : multiprocessing.Connection
864
427
func, *args, **kwargs):
865
428
"""This function is meant to be called by multiprocessing.Process
867
430
This function runs func(*args, **kwargs), and writes the resulting
868
431
return value on the provided multiprocessing.Connection.
870
433
connection.send(func(*args, **kwargs))
871
434
connection.close()
436
class Client(object):
875
437
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
440
approved: bool(); 'None' if not yet approved/disapproved
879
441
approval_delay: datetime.timedelta(); Time to wait for approval
880
442
approval_duration: datetime.timedelta(); Duration of one approval
881
checker: multiprocessing.Process(); a running checker process used
882
to see if the client lives. None if no process is
884
checker_callback_tag: a GLib event source tag, or None
443
checker: subprocess.Popen(); a running checker process used
444
to see if the client lives.
445
'None' if no process is running.
446
checker_callback_tag: a gobject event source tag, or None
885
447
checker_command: string; External command which is run to check
886
448
if client lives. %() expansions are done at
887
449
runtime with vars(self) as dict, so that for
888
450
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
451
checker_initiator_tag: a gobject event source tag, or None
890
452
created: datetime.datetime(); (UTC) object creation
891
453
client_structure: Object describing what attributes a client has
892
454
and is used for storing the client at exit
893
455
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
456
disable_initiator_tag: a gobject event source tag, or None
896
458
fingerprint: string (40 or 32 hexadecimal digits); used to
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
459
uniquely identify the client
900
460
host: string; available for use by the checker command
901
461
interval: datetime.timedelta(); How often to start a new checker
902
462
last_approval_request: datetime.datetime(); (UTC) or None
1026
581
self.changedstate = multiprocessing_manager.Condition(
1027
582
multiprocessing_manager.Lock())
1028
583
self.client_structure = [attr
1029
for attr in self.__dict__.keys()
584
for attr in self.__dict__.iterkeys()
1030
585
if not attr.startswith("_")]
1031
586
self.client_structure.append("client_structure")
1033
588
for name, t in inspect.getmembers(
1034
589
type(self), lambda obj: isinstance(obj, property)):
1035
590
if not name.startswith("_"):
1036
591
self.client_structure.append(name)
1038
593
# Send notice to process children that client state has changed
1039
594
def send_changedstate(self):
1040
595
with self.changedstate:
1041
596
self.changedstate.notify_all()
1043
598
def enable(self):
1044
599
"""Start this client's checker and timeout hooks"""
1045
600
if getattr(self, "enabled", False):
1046
601
# Already enabled
603
self.expires = datetime.datetime.utcnow() + self.timeout
1048
604
self.enabled = True
1049
605
self.last_enabled = datetime.datetime.utcnow()
1050
606
self.init_checker()
1051
607
self.send_changedstate()
1053
609
def disable(self, quiet=True):
1054
610
"""Disable this client."""
1055
611
if not getattr(self, "enabled", False):
1058
log.info("Disabling client %s", self.name)
614
logger.info("Disabling client %s", self.name)
1059
615
if getattr(self, "disable_initiator_tag", None) is not None:
1060
GLib.source_remove(self.disable_initiator_tag)
616
gobject.source_remove(self.disable_initiator_tag)
1061
617
self.disable_initiator_tag = None
1062
618
self.expires = None
1063
619
if getattr(self, "checker_initiator_tag", None) is not None:
1064
GLib.source_remove(self.checker_initiator_tag)
620
gobject.source_remove(self.checker_initiator_tag)
1065
621
self.checker_initiator_tag = None
1066
622
self.stop_checker()
1067
623
self.enabled = False
1069
625
self.send_changedstate()
1070
# Do not run this again if called by a GLib.timeout_add
626
# Do not run this again if called by a gobject.timeout_add
1073
629
def __del__(self):
1076
def init_checker(self, randomize_start=False):
1077
# Schedule a new checker to be started a randomly selected
1078
# time (a fraction of 'interval') from now. This spreads out
1079
# the startup of checkers over time when the server is
632
def init_checker(self):
633
# Schedule a new checker to be started an 'interval' from now,
634
# and every interval from then on.
1081
635
if self.checker_initiator_tag is not None:
1082
GLib.source_remove(self.checker_initiator_tag)
1083
interval_milliseconds = int(self.interval.total_seconds()
1086
delay_milliseconds = random.randrange(
1087
interval_milliseconds + 1)
1089
delay_milliseconds = interval_milliseconds
1090
self.checker_initiator_tag = GLib.timeout_add(
1091
delay_milliseconds, self.start_checker, randomize_start)
1092
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1093
# A checker might take up to an 'interval' of time, so we can
1094
# expire at the soonest one interval after a checker was
1095
# started. Since the initial checker is delayed, the expire
1096
# time might have to be extended.
1097
now = datetime.datetime.utcnow()
1098
self.expires = now + delay + self.interval
1099
# Schedule a disable() at expire time
636
gobject.source_remove(self.checker_initiator_tag)
637
self.checker_initiator_tag = gobject.timeout_add(
638
int(self.interval.total_seconds() * 1000),
640
# Schedule a disable() when 'timeout' has passed
1100
641
if self.disable_initiator_tag is not None:
1101
GLib.source_remove(self.disable_initiator_tag)
1102
self.disable_initiator_tag = GLib.timeout_add(
1103
int((self.expires - now).total_seconds() * 1000),
1106
def checker_callback(self, source, condition, connection,
642
gobject.source_remove(self.disable_initiator_tag)
643
self.disable_initiator_tag = gobject.timeout_add(
644
int(self.timeout.total_seconds() * 1000), self.disable)
645
# Also start a new checker *right now*.
648
def checker_callback(self, source, condition,
649
(connection, command)):
1108
650
"""The checker has completed, so take appropriate actions."""
651
self.checker_callback_tag = None
1109
653
# Read return code from connection (see call_pipe)
1110
654
returncode = connection.recv()
1111
655
connection.close()
1112
if self.checker is not None:
1114
self.checker_callback_tag = None
1117
657
if returncode >= 0:
1118
658
self.last_checker_status = returncode
1119
659
self.last_checker_signal = None
1120
660
if self.last_checker_status == 0:
1121
log.info("Checker for %(name)s succeeded", vars(self))
661
logger.info("Checker for %(name)s succeeded",
1122
663
self.checked_ok()
1124
log.info("Checker for %(name)s failed", vars(self))
665
logger.info("Checker for %(name)s failed", vars(self))
1126
667
self.last_checker_status = -1
1127
668
self.last_checker_signal = -returncode
1128
log.warning("Checker for %(name)s crashed?", vars(self))
669
logger.warning("Checker for %(name)s crashed?",
1131
673
def checked_ok(self):
1132
674
"""Assert that the client has been seen, alive and well."""
1133
675
self.last_checked_ok = datetime.datetime.utcnow()
1134
676
self.last_checker_status = 0
1135
677
self.last_checker_signal = None
1136
678
self.bump_timeout()
1138
680
def bump_timeout(self, timeout=None):
1139
681
"""Bump up the timeout for this client."""
1140
682
if timeout is None:
1141
683
timeout = self.timeout
1142
684
if self.disable_initiator_tag is not None:
1143
GLib.source_remove(self.disable_initiator_tag)
685
gobject.source_remove(self.disable_initiator_tag)
1144
686
self.disable_initiator_tag = None
1145
687
if getattr(self, "enabled", False):
1146
self.disable_initiator_tag = GLib.timeout_add(
688
self.disable_initiator_tag = gobject.timeout_add(
1147
689
int(timeout.total_seconds() * 1000), self.disable)
1148
690
self.expires = datetime.datetime.utcnow() + timeout
1150
692
def need_approval(self):
1151
693
self.last_approval_request = datetime.datetime.utcnow()
1153
def start_checker(self, start_was_randomized=False):
695
def start_checker(self):
1154
696
"""Start a new checker subprocess if one is not running.
1156
698
If a checker already exists, leave it running and do
1158
700
# The reason for not killing a running checker is that if we
1352
883
for cls in self.__class__.__mro__
1353
884
for name, athing in
1354
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1356
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1358
path_keyword="object_path",
1359
connection_keyword="connection")
1360
def Introspect(self, object_path, connection):
1361
"""Overloading of standard D-Bus method.
1363
Inserts annotation tags on methods and signals.
1365
xmlstring = dbus.service.Object.Introspect(self, object_path,
1368
document = xml.dom.minidom.parseString(xmlstring)
1370
for if_tag in document.getElementsByTagName("interface"):
1371
# Add annotation tags
1372
for typ in ("method", "signal"):
1373
for tag in if_tag.getElementsByTagName(typ):
1375
for name, prop in (self.
1376
_get_all_dbus_things(typ)):
1377
if (name == tag.getAttribute("name")
1378
and prop._dbus_interface
1379
== if_tag.getAttribute("name")):
1380
annots.update(getattr(
1381
prop, "_dbus_annotations", {}))
1382
for name, value in annots.items():
1383
ann_tag = document.createElement(
1385
ann_tag.setAttribute("name", name)
1386
ann_tag.setAttribute("value", value)
1387
tag.appendChild(ann_tag)
1388
# Add interface annotation tags
1389
for annotation, value in dict(
1390
itertools.chain.from_iterable(
1391
annotations().items()
1392
for name, annotations
1393
in self._get_all_dbus_things("interface")
1394
if name == if_tag.getAttribute("name")
1396
ann_tag = document.createElement("annotation")
1397
ann_tag.setAttribute("name", annotation)
1398
ann_tag.setAttribute("value", value)
1399
if_tag.appendChild(ann_tag)
1400
# Fix argument name for the Introspect method itself
1401
if (if_tag.getAttribute("name")
1402
== dbus.INTROSPECTABLE_IFACE):
1403
for cn in if_tag.getElementsByTagName("method"):
1404
if cn.getAttribute("name") == "Introspect":
1405
for arg in cn.getElementsByTagName("arg"):
1406
if (arg.getAttribute("direction")
1408
arg.setAttribute("name",
1410
xmlstring = document.toxml("utf-8")
1412
except (AttributeError, xml.dom.DOMException,
1413
xml.parsers.expat.ExpatError) as error:
1414
log.error("Failed to override Introspection method",
1419
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1420
"""A D-Bus object with properties.
1422
Classes inheriting from this can use the dbus_service_property
1423
decorator to expose methods as D-Bus properties. It exposes the
1424
standard Get(), Set(), and GetAll() methods on the D-Bus.
1427
887
def _get_dbus_property(self, interface_name, property_name):
1428
888
"""Returns a bound method if one exists which is a D-Bus
1429
889
property with the specified name and interface.
1578
1042
document.unlink()
1579
1043
except (AttributeError, xml.dom.DOMException,
1580
1044
xml.parsers.expat.ExpatError) as error:
1581
log.error("Failed to override Introspection method",
1587
dbus.OBJECT_MANAGER_IFACE
1588
except AttributeError:
1589
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1592
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1593
"""A D-Bus object with an ObjectManager.
1595
Classes inheriting from this exposes the standard
1596
GetManagedObjects call and the InterfacesAdded and
1597
InterfacesRemoved signals on the standard
1598
"org.freedesktop.DBus.ObjectManager" interface.
1600
Note: No signals are sent automatically; they must be sent
1603
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1604
out_signature="a{oa{sa{sv}}}")
1605
def GetManagedObjects(self):
1606
"""This function must be overridden"""
1607
raise NotImplementedError()
1609
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1610
signature="oa{sa{sv}}")
1611
def InterfacesAdded(self, object_path, interfaces_and_properties):
1614
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1615
def InterfacesRemoved(self, object_path, interfaces):
1618
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1620
path_keyword="object_path",
1621
connection_keyword="connection")
1622
def Introspect(self, object_path, connection):
1623
"""Overloading of standard D-Bus method.
1625
Override return argument name of GetManagedObjects to be
1626
"objpath_interfaces_and_properties"
1628
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1632
document = xml.dom.minidom.parseString(xmlstring)
1634
for if_tag in document.getElementsByTagName("interface"):
1635
# Fix argument name for the GetManagedObjects method
1636
if (if_tag.getAttribute("name")
1637
== dbus.OBJECT_MANAGER_IFACE):
1638
for cn in if_tag.getElementsByTagName("method"):
1639
if (cn.getAttribute("name")
1640
== "GetManagedObjects"):
1641
for arg in cn.getElementsByTagName("arg"):
1642
if (arg.getAttribute("direction")
1646
"objpath_interfaces"
1648
xmlstring = document.toxml("utf-8")
1650
except (AttributeError, xml.dom.DOMException,
1651
xml.parsers.expat.ExpatError) as error:
1652
log.error("Failed to override Introspection method",
1045
logger.error("Failed to override Introspection method",
1654
1047
return xmlstring
1657
1050
def datetime_to_dbus(dt, variant_level=0):
1658
1051
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1660
return dbus.String("", variant_level=variant_level)
1053
return dbus.String("", variant_level = variant_level)
1661
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
2264
1637
self.start_checker()
2266
1639
self.stop_checker()
2268
1641
# ObjectPath - property
2270
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2271
"org.freedesktop.DBus.Deprecated": "true"})
2272
1642
@dbus_service_property(_interface, signature="o", access="read")
2273
1643
def ObjectPath_dbus_property(self):
2274
return self.dbus_object_path # is already a dbus.ObjectPath
1644
return self.dbus_object_path # is already a dbus.ObjectPath
2276
1646
# Secret = property
2278
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2280
1647
@dbus_service_property(_interface,
2281
1648
signature="ay",
2282
1649
access="write",
2283
1650
byte_arrays=True)
2284
1651
def Secret_dbus_property(self, value):
2285
1652
self.secret = bytes(value)
2291
def __init__(self, child_pipe, key_id, fpr, address):
1657
class ProxyClient(object):
1658
def __init__(self, child_pipe, fpr, address):
2292
1659
self._pipe = child_pipe
2293
self._pipe.send(("init", key_id, fpr, address))
1660
self._pipe.send(('init', fpr, address))
2294
1661
if not self._pipe.recv():
2295
raise KeyError(key_id or fpr)
2297
1664
def __getattribute__(self, name):
2299
1666
return super(ProxyClient, self).__getattribute__(name)
2300
self._pipe.send(("getattr", name))
1667
self._pipe.send(('getattr', name))
2301
1668
data = self._pipe.recv()
2302
if data[0] == "data":
1669
if data[0] == 'data':
2304
if data[0] == "function":
1671
if data[0] == 'function':
2306
1673
def func(*args, **kwargs):
2307
self._pipe.send(("funcall", name, args, kwargs))
1674
self._pipe.send(('funcall', name, args, kwargs))
2308
1675
return self._pipe.recv()[1]
2312
1679
def __setattr__(self, name, value):
2314
1681
return super(ProxyClient, self).__setattr__(name, value)
2315
self._pipe.send(("setattr", name, value))
1682
self._pipe.send(('setattr', name, value))
2318
1685
class ClientHandler(socketserver.BaseRequestHandler, object):
2319
1686
"""A class to handle client connections.
2321
1688
Instantiated once for each connection to handle it.
2322
1689
Note: This will run in its own forked process."""
2324
1691
def handle(self):
2325
1692
with contextlib.closing(self.server.child_pipe) as child_pipe:
2326
log.info("TCP connection from: %s",
2327
str(self.client_address))
2328
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2330
session = gnutls.ClientSession(self.request)
2332
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2333
# "+AES-256-CBC", "+SHA1",
2334
# "+COMP-NULL", "+CTYPE-OPENPGP",
1693
logger.info("TCP connection from: %s",
1694
str(self.client_address))
1695
logger.debug("Pipe FD: %d",
1696
self.server.child_pipe.fileno())
1698
session = gnutls.connection.ClientSession(
1699
self.request, gnutls.connection .X509Credentials())
1701
# Note: gnutls.connection.X509Credentials is really a
1702
# generic GnuTLS certificate credentials object so long as
1703
# no X.509 keys are added to it. Therefore, we can use it
1704
# here despite using OpenPGP certificates.
1706
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1707
# "+AES-256-CBC", "+SHA1",
1708
# "+COMP-NULL", "+CTYPE-OPENPGP",
2336
1710
# Use a fallback default, since this MUST be set.
2337
1711
priority = self.server.gnutls_priority
2338
1712
if priority is None:
2339
1713
priority = "NORMAL"
2340
gnutls.priority_set_direct(session,
2341
priority.encode("utf-8"), None)
1714
gnutls.library.functions.gnutls_priority_set_direct(
1715
session._c_object, priority, None)
2343
1717
# Start communication using the Mandos protocol
2344
1718
# Get protocol number
2345
1719
line = self.request.makefile().readline()
2346
log.debug("Protocol version: %r", line)
1720
logger.debug("Protocol version: %r", line)
2348
1722
if int(line.strip().split()[0]) > 1:
2349
1723
raise RuntimeError(line)
2350
1724
except (ValueError, IndexError, RuntimeError) as error:
2351
log.error("Unknown protocol version: %s", error)
1725
logger.error("Unknown protocol version: %s", error)
2354
1728
# Start GnuTLS connection
2356
1730
session.handshake()
2357
except gnutls.Error as error:
2358
log.warning("Handshake failed: %s", error)
1731
except gnutls.errors.GNUTLSError as error:
1732
logger.warning("Handshake failed: %s", error)
2359
1733
# Do not run session.bye() here: the session is not
2360
1734
# established. Just abandon the request.
2362
log.debug("Handshake succeeded")
1736
logger.debug("Handshake succeeded")
2364
1738
approval_required = False
2366
if gnutls.has_rawpk:
2369
key_id = self.key_id(
2370
self.peer_certificate(session))
2371
except (TypeError, gnutls.Error) as error:
2372
log.warning("Bad certificate: %s", error)
2374
log.debug("Key ID: %s",
2375
key_id.decode("utf-8",
2381
fpr = self.fingerprint(
2382
self.peer_certificate(session))
2383
except (TypeError, gnutls.Error) as error:
2384
log.warning("Bad certificate: %s", error)
2386
log.debug("Fingerprint: %s", fpr)
2389
client = ProxyClient(child_pipe, key_id, fpr,
1741
fpr = self.fingerprint(
1742
self.peer_certificate(session))
1744
gnutls.errors.GNUTLSError) as error:
1745
logger.warning("Bad certificate: %s", error)
1747
logger.debug("Fingerprint: %s", fpr)
1750
client = ProxyClient(child_pipe, fpr,
2390
1751
self.client_address)
2391
1752
except KeyError:
2394
1755
if client.approval_delay:
2395
1756
delay = client.approval_delay
2396
1757
client.approvals_pending += 1
2397
1758
approval_required = True
2400
1761
if not client.enabled:
2401
log.info("Client %s is disabled", client.name)
1762
logger.info("Client %s is disabled",
2402
1764
if self.server.use_dbus:
2403
1765
# Emit D-Bus signal
2404
1766
client.Rejected("Disabled")
2407
1769
if client.approved or not client.approval_delay:
2408
# We are approved or approval is disabled
1770
#We are approved or approval is disabled
2410
1772
elif client.approved is None:
2411
log.info("Client %s needs approval",
1773
logger.info("Client %s needs approval",
2413
1775
if self.server.use_dbus:
2414
1776
# Emit D-Bus signal
2415
1777
client.NeedApproval(
2416
1778
client.approval_delay.total_seconds()
2417
1779
* 1000, client.approved_by_default)
2419
log.warning("Client %s was not approved",
1781
logger.warning("Client %s was not approved",
2421
1783
if self.server.use_dbus:
2422
1784
# Emit D-Bus signal
2423
1785
client.Rejected("Denied")
2426
# wait until timeout or approved
1788
#wait until timeout or approved
2427
1789
time = datetime.datetime.now()
2428
1790
client.changedstate.acquire()
2429
1791
client.changedstate.wait(delay.total_seconds())
2444
1806
delay -= time2 - time
2447
session.send(client.secret)
2448
except gnutls.Error as error:
2449
log.warning("gnutls send failed", exc_info=error)
2452
log.info("Sending secret to %s", client.name)
1809
while sent_size < len(client.secret):
1811
sent = session.send(client.secret[sent_size:])
1812
except gnutls.errors.GNUTLSError as error:
1813
logger.warning("gnutls send failed",
1816
logger.debug("Sent: %d, remaining: %d", sent,
1817
len(client.secret) - (sent_size
1821
logger.info("Sending secret to %s", client.name)
2453
1822
# bump the timeout using extended_timeout
2454
1823
client.bump_timeout(client.extended_timeout)
2455
1824
if self.server.use_dbus:
2456
1825
# Emit D-Bus signal
2457
1826
client.GotSecret()
2460
1829
if approval_required:
2461
1830
client.approvals_pending -= 1
2464
except gnutls.Error as error:
2465
log.warning("GnuTLS bye failed", exc_info=error)
1833
except gnutls.errors.GNUTLSError as error:
1834
logger.warning("GnuTLS bye failed",
2468
1838
def peer_certificate(session):
2469
"Return the peer's certificate as a bytestring"
2471
cert_type = gnutls.certificate_type_get2(
2472
session, gnutls.CTYPE_PEERS)
2473
except AttributeError:
2474
cert_type = gnutls.certificate_type_get(session)
2475
if gnutls.has_rawpk:
2476
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2478
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2479
# If not a valid certificate type...
2480
if cert_type not in valid_cert_types:
2481
log.info("Cert type %r not in %r", cert_type,
2483
# ...return invalid data
1839
"Return the peer's OpenPGP certificate as a bytestring"
1840
# If not an OpenPGP certificate...
1841
if (gnutls.library.functions.gnutls_certificate_type_get(
1843
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1844
# ...do the normal thing
1845
return session.peer_certificate
2485
1846
list_size = ctypes.c_uint(1)
2486
cert_list = (gnutls.certificate_get_peers
2487
(session, ctypes.byref(list_size)))
1847
cert_list = (gnutls.library.functions
1848
.gnutls_certificate_get_peers
1849
(session._c_object, ctypes.byref(list_size)))
2488
1850
if not bool(cert_list) and list_size.value != 0:
2489
raise gnutls.Error("error getting peer certificate")
1851
raise gnutls.errors.GNUTLSError("error getting peer"
2490
1853
if list_size.value == 0:
2492
1855
cert = cert_list[0]
2493
1856
return ctypes.string_at(cert.data, cert.size)
2496
def key_id(certificate):
2497
"Convert a certificate bytestring to a hexdigit key ID"
2498
# New GnuTLS "datum" with the public key
2499
datum = gnutls.datum_t(
2500
ctypes.cast(ctypes.c_char_p(certificate),
2501
ctypes.POINTER(ctypes.c_ubyte)),
2502
ctypes.c_uint(len(certificate)))
2503
# XXX all these need to be created in the gnutls "module"
2504
# New empty GnuTLS certificate
2505
pubkey = gnutls.pubkey_t()
2506
gnutls.pubkey_init(ctypes.byref(pubkey))
2507
# Import the raw public key into the certificate
2508
gnutls.pubkey_import(pubkey,
2509
ctypes.byref(datum),
2510
gnutls.X509_FMT_DER)
2511
# New buffer for the key ID
2512
buf = ctypes.create_string_buffer(32)
2513
buf_len = ctypes.c_size_t(len(buf))
2514
# Get the key ID from the raw public key into the buffer
2515
gnutls.pubkey_get_key_id(
2517
gnutls.KEYID_USE_SHA256,
2518
ctypes.cast(ctypes.byref(buf),
2519
ctypes.POINTER(ctypes.c_ubyte)),
2520
ctypes.byref(buf_len))
2521
# Deinit the certificate
2522
gnutls.pubkey_deinit(pubkey)
2524
# Convert the buffer to a Python bytestring
2525
key_id = ctypes.string_at(buf, buf_len.value)
2526
# Convert the bytestring to hexadecimal notation
2527
hex_key_id = binascii.hexlify(key_id).upper()
2531
1859
def fingerprint(openpgp):
2532
1860
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2533
1861
# New GnuTLS "datum" with the OpenPGP public key
2534
datum = gnutls.datum_t(
1862
datum = gnutls.library.types.gnutls_datum_t(
2535
1863
ctypes.cast(ctypes.c_char_p(openpgp),
2536
1864
ctypes.POINTER(ctypes.c_ubyte)),
2537
1865
ctypes.c_uint(len(openpgp)))
2538
1866
# New empty GnuTLS certificate
2539
crt = gnutls.openpgp_crt_t()
2540
gnutls.openpgp_crt_init(ctypes.byref(crt))
1867
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
2541
1870
# Import the OpenPGP public key into the certificate
2542
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2543
gnutls.OPENPGP_FMT_RAW)
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2544
1874
# Verify the self signature in the key
2545
1875
crtverify = ctypes.c_uint()
2546
gnutls.openpgp_crt_verify_self(crt, 0,
2547
ctypes.byref(crtverify))
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
2548
1878
if crtverify.value != 0:
2549
gnutls.openpgp_crt_deinit(crt)
2550
raise gnutls.CertificateSecurityError(code
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
raise gnutls.errors.CertificateSecurityError(
2552
1882
# New buffer for the fingerprint
2553
1883
buf = ctypes.create_string_buffer(20)
2554
1884
buf_len = ctypes.c_size_t()
2555
1885
# Get the fingerprint from the certificate into the buffer
2556
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2557
ctypes.byref(buf_len))
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2558
1888
# Deinit the certificate
2559
gnutls.openpgp_crt_deinit(crt)
1889
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2560
1890
# Convert the buffer to a Python bytestring
2561
1891
fpr = ctypes.string_at(buf, buf_len.value)
2562
1892
# Convert the bytestring to hexadecimal notation
2651
1980
# socket_wrapper(), if socketfd was set.
2652
1981
socketserver.TCPServer.__init__(self, server_address,
2653
1982
RequestHandlerClass)
2655
1984
def server_bind(self):
2656
1985
"""This overrides the normal server_bind() function
2657
1986
to bind to an interface if one was specified, and also NOT to
2658
1987
bind to an address or port if they were not specified."""
2659
global SO_BINDTODEVICE
2660
1988
if self.interface is not None:
2661
1989
if SO_BINDTODEVICE is None:
2662
# Fall back to a hard-coded value which seems to be
2664
log.warning("SO_BINDTODEVICE not found, trying 25")
2665
SO_BINDTODEVICE = 25
2667
self.socket.setsockopt(
2668
socket.SOL_SOCKET, SO_BINDTODEVICE,
2669
(self.interface + "\0").encode("utf-8"))
2670
except socket.error as error:
2671
if error.errno == errno.EPERM:
2672
log.error("No permission to bind to interface %s",
2674
elif error.errno == errno.ENOPROTOOPT:
2675
log.error("SO_BINDTODEVICE not available; cannot"
2676
" bind to interface %s", self.interface)
2677
elif error.errno == errno.ENODEV:
2678
log.error("Interface %s does not exist, cannot"
2679
" bind", self.interface)
1990
logger.error("SO_BINDTODEVICE does not exist;"
1991
" cannot bind to interface %s",
1995
self.socket.setsockopt(
1996
socket.SOL_SOCKET, SO_BINDTODEVICE,
1997
(self.interface + "\0").encode("utf-8"))
1998
except socket.error as error:
1999
if error.errno == errno.EPERM:
2000
logger.error("No permission to bind to"
2001
" interface %s", self.interface)
2002
elif error.errno == errno.ENOPROTOOPT:
2003
logger.error("SO_BINDTODEVICE not available;"
2004
" cannot bind to interface %s",
2006
elif error.errno == errno.ENODEV:
2007
logger.error("Interface %s does not exist,"
2008
" cannot bind", self.interface)
2682
2011
# Only bind(2) the socket if we really need to.
2683
2012
if self.server_address[0] or self.server_address[1]:
2684
if self.server_address[1]:
2685
self.allow_reuse_address = True
2686
2013
if not self.server_address[0]:
2687
2014
if self.address_family == socket.AF_INET6:
2688
any_address = "::" # in6addr_any
2015
any_address = "::" # in6addr_any
2690
any_address = "0.0.0.0" # INADDR_ANY
2017
any_address = "0.0.0.0" # INADDR_ANY
2691
2018
self.server_address = (any_address,
2692
2019
self.server_address[1])
2693
2020
elif not self.server_address[1]:
2727
2054
self.gnutls_priority = gnutls_priority
2728
2055
IPv6_TCPServer.__init__(self, server_address,
2729
2056
RequestHandlerClass,
2730
interface=interface,
2057
interface = interface,
2058
use_ipv6 = use_ipv6,
2059
socketfd = socketfd)
2734
2061
def server_activate(self):
2735
2062
if self.enabled:
2736
2063
return socketserver.TCPServer.server_activate(self)
2738
2065
def enable(self):
2739
2066
self.enabled = True
2741
2068
def add_pipe(self, parent_pipe, proc):
2742
2069
# Call "handle_ipc" for both data and EOF events
2744
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2745
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2070
gobject.io_add_watch(
2071
parent_pipe.fileno(),
2072
gobject.IO_IN | gobject.IO_HUP,
2746
2073
functools.partial(self.handle_ipc,
2747
parent_pipe=parent_pipe,
2074
parent_pipe = parent_pipe,
2750
2077
def handle_ipc(self, source, condition,
2751
2078
parent_pipe=None,
2753
2080
client_object=None):
2754
2081
# error, or the other end of multiprocessing.Pipe has closed
2755
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2082
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2756
2083
# Wait for other process to exit
2760
2087
# Read a request from the child
2761
2088
request = parent_pipe.recv()
2762
2089
command = request[0]
2764
if command == "init":
2765
key_id = request[1].decode("ascii")
2766
fpr = request[2].decode("ascii")
2767
address = request[3]
2769
for c in self.clients.values():
2770
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2771
"27AE41E4649B934CA495991B7852B855"):
2773
if key_id and c.key_id == key_id:
2776
if fpr and c.fingerprint == fpr:
2091
if command == 'init':
2093
address = request[2]
2095
for c in self.clients.itervalues():
2096
if c.fingerprint == fpr:
2780
log.info("Client not found for key ID: %s, address:"
2781
" %s", key_id or fpr, address)
2100
logger.info("Client not found for fingerprint: %s, ad"
2101
"dress: %s", fpr, address)
2782
2102
if self.use_dbus:
2783
2103
# Emit D-Bus signal
2784
mandos_dbus_service.ClientNotFound(key_id or fpr,
2104
mandos_dbus_service.ClientNotFound(fpr,
2786
2106
parent_pipe.send(False)
2790
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2791
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2109
gobject.io_add_watch(
2110
parent_pipe.fileno(),
2111
gobject.IO_IN | gobject.IO_HUP,
2792
2112
functools.partial(self.handle_ipc,
2793
parent_pipe=parent_pipe,
2795
client_object=client))
2113
parent_pipe = parent_pipe,
2115
client_object = client))
2796
2116
parent_pipe.send(True)
2797
2117
# remove the old hook in favor of the new above hook on
2800
if command == "funcall":
2120
if command == 'funcall':
2801
2121
funcname = request[1]
2802
2122
args = request[2]
2803
2123
kwargs = request[3]
2805
parent_pipe.send(("data", getattr(client_object,
2125
parent_pipe.send(('data', getattr(client_object,
2806
2126
funcname)(*args,
2809
if command == "getattr":
2129
if command == 'getattr':
2810
2130
attrname = request[1]
2811
if isinstance(client_object.__getattribute__(attrname),
2812
collections.abc.Callable):
2813
parent_pipe.send(("function", ))
2131
if callable(client_object.__getattribute__(attrname)):
2132
parent_pipe.send(('function', ))
2815
2134
parent_pipe.send((
2816
"data", client_object.__getattribute__(attrname)))
2818
if command == "setattr":
2135
'data', client_object.__getattribute__(attrname)))
2137
if command == 'setattr':
2819
2138
attrname = request[1]
2820
2139
value = request[2]
2821
2140
setattr(client_object, attrname, value)
2826
2145
def rfc3339_duration_to_delta(duration):
2827
2146
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2829
>>> timedelta = datetime.timedelta
2830
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2832
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2834
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2836
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2838
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2840
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2842
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2148
>>> rfc3339_duration_to_delta("P7D")
2149
datetime.timedelta(7)
2150
>>> rfc3339_duration_to_delta("PT60S")
2151
datetime.timedelta(0, 60)
2152
>>> rfc3339_duration_to_delta("PT60M")
2153
datetime.timedelta(0, 3600)
2154
>>> rfc3339_duration_to_delta("PT24H")
2155
datetime.timedelta(1)
2156
>>> rfc3339_duration_to_delta("P1W")
2157
datetime.timedelta(7)
2158
>>> rfc3339_duration_to_delta("PT5M30S")
2159
datetime.timedelta(0, 330)
2160
>>> rfc3339_duration_to_delta("P1DT3M20S")
2161
datetime.timedelta(1, 200)
2847
2164
# Parsing an RFC 3339 duration with regular expressions is not
2848
2165
# possible - there would have to be multiple places for the same
2849
2166
# values, like seconds. The current code, while more esoteric, is
2850
2167
# cleaner without depending on a parsing library. If Python had a
2851
2168
# built-in library for parsing we would use it, but we'd like to
2852
2169
# avoid excessive use of external libraries.
2854
2171
# New type for defining tokens, syntax, and semantics all-in-one
2172
Token = collections.namedtuple("Token",
2173
("regexp", # To match token; if
2174
# "value" is not None,
2175
# must have a "group"
2177
"value", # datetime.timedelta or
2179
"followers")) # Tokens valid after
2855
2181
Token = collections.namedtuple("Token", (
2856
2182
"regexp", # To match token; if "value" is not None, must have
2857
2183
# a "group" containing digits
3247
2563
old_bus_name = dbus.service.BusName(
3248
2564
"se.bsnet.fukt.Mandos", bus,
3249
2565
do_not_queue=True)
3250
except dbus.exceptions.DBusException as e:
3251
log.error("Disabling D-Bus:", exc_info=e)
2566
except dbus.exceptions.NameExistsException as e:
2567
logger.error("Disabling D-Bus:", exc_info=e)
3252
2568
use_dbus = False
3253
2569
server_settings["use_dbus"] = False
3254
2570
tcp_server.use_dbus = False
3256
2572
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3257
2573
service = AvahiServiceToSyslog(
3258
name=server_settings["servicename"],
3259
servicetype="_mandos._tcp",
2574
name = server_settings["servicename"],
2575
servicetype = "_mandos._tcp",
2576
protocol = protocol,
3262
2578
if server_settings["interface"]:
3263
2579
service.interface = if_nametoindex(
3264
2580
server_settings["interface"].encode("utf-8"))
3266
2582
global multiprocessing_manager
3267
2583
multiprocessing_manager = multiprocessing.Manager()
3269
2585
client_class = Client
3271
client_class = functools.partial(ClientDBus, bus=bus)
2587
client_class = functools.partial(ClientDBus, bus = bus)
3273
2589
client_settings = Client.config_parser(client_config)
3274
2590
old_client_settings = {}
3275
2591
clients_data = {}
3277
2593
# This is used to redirect stdout and stderr for checker processes
3279
wnull = open(os.devnull, "w") # A writable /dev/null
2595
wnull = open(os.devnull, "w") # A writable /dev/null
3280
2596
# Only used if server is running in foreground but not in debug
3282
2598
if debug or not foreground:
3285
2601
# Get client data and settings from last running state.
3286
2602
if server_settings["restore"]:
3288
2604
with open(stored_state_path, "rb") as stored_state:
3289
if sys.version_info.major == 2:
3290
clients_data, old_client_settings = pickle.load(
3293
bytes_clients_data, bytes_old_client_settings = (
3294
pickle.load(stored_state, encoding="bytes"))
3295
# Fix bytes to strings
3298
clients_data = {(key.decode("utf-8")
3299
if isinstance(key, bytes)
3302
bytes_clients_data.items()}
3303
del bytes_clients_data
3304
for key in clients_data:
3305
value = {(k.decode("utf-8")
3306
if isinstance(k, bytes) else k): v
3308
clients_data[key].items()}
3309
clients_data[key] = value
3311
value["client_structure"] = [
3313
if isinstance(s, bytes)
3315
value["client_structure"]]
3316
# .name, .host, and .checker_command
3317
for k in ("name", "host", "checker_command"):
3318
if isinstance(value[k], bytes):
3319
value[k] = value[k].decode("utf-8")
3320
if "key_id" not in value:
3321
value["key_id"] = ""
3322
elif "fingerprint" not in value:
3323
value["fingerprint"] = ""
3324
# old_client_settings
3326
old_client_settings = {
3327
(key.decode("utf-8")
3328
if isinstance(key, bytes)
3331
bytes_old_client_settings.items()}
3332
del bytes_old_client_settings
3333
# .host and .checker_command
3334
for value in old_client_settings.values():
3335
for attribute in ("host", "checker_command"):
3336
if isinstance(value[attribute], bytes):
3337
value[attribute] = (value[attribute]
2605
clients_data, old_client_settings = pickle.load(
3339
2607
os.remove(stored_state_path)
3340
2608
except IOError as e:
3341
2609
if e.errno == errno.ENOENT:
3342
log.warning("Could not load persistent state:"
3343
" %s", os.strerror(e.errno))
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
3345
log.critical("Could not load persistent state:",
2613
logger.critical("Could not load persistent state:",
3348
2616
except EOFError as e:
3349
log.warning("Could not load persistent state: EOFError:",
2617
logger.warning("Could not load persistent state: "
3352
2621
with PGPEngine() as pgp:
3353
2622
for client_name, client in clients_data.items():
3354
2623
# Skip removed clients
3355
2624
if client_name not in client_settings:
3358
2627
# Decide which value to use after restoring saved state.
3359
2628
# We have three different values: Old config file,
3360
2629
# new config file, and saved state.
3414
2687
for client_name in (set(client_settings)
3415
2688
- set(old_client_settings)):
3416
2689
clients_data[client_name] = client_settings[client_name]
3418
2691
# Create all client objects
3419
2692
for client_name, client in clients_data.items():
3420
2693
tcp_server.clients[client_name] = client_class(
3423
server_settings=server_settings)
2696
server_settings = server_settings)
3425
2698
if not tcp_server.clients:
3426
log.warning("No clients defined")
2699
logger.warning("No clients defined")
3428
2701
if not foreground:
3429
2702
if pidfile is not None:
3433
print(pid, file=pidfile)
2706
pidfile.write("{}\n".format(pid).encode("utf-8"))
3434
2707
except IOError:
3435
log.error("Could not write to file %r with PID %d",
2708
logger.error("Could not write to file %r with PID %d",
3438
2711
del pidfilename
3440
for termsig in (signal.SIGHUP, signal.SIGTERM):
3441
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3442
lambda: main_loop.quit() and False)
2713
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2714
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3446
2718
@alternate_dbus_interfaces(
3447
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3448
class MandosDBusService(DBusObjectWithObjectManager):
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2720
class MandosDBusService(DBusObjectWithProperties):
3449
2721
"""A D-Bus proxy object"""
3451
2723
def __init__(self):
3452
2724
dbus.service.Object.__init__(self, bus, "/")
3454
2726
_interface = "se.recompile.Mandos"
2728
@dbus_interface_annotations(_interface)
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
3456
2734
@dbus.service.signal(_interface, signature="o")
3457
2735
def ClientAdded(self, objpath):
3461
2739
@dbus.service.signal(_interface, signature="ss")
3462
def ClientNotFound(self, key_id, address):
2740
def ClientNotFound(self, fingerprint, address):
3466
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3468
2744
@dbus.service.signal(_interface, signature="os")
3469
2745
def ClientRemoved(self, objpath, name):
3473
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3475
2749
@dbus.service.method(_interface, out_signature="ao")
3476
2750
def GetAllClients(self):
3478
2752
return dbus.Array(c.dbus_object_path for c in
3479
tcp_server.clients.values())
3481
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2753
tcp_server.clients.itervalues())
3483
2755
@dbus.service.method(_interface,
3484
2756
out_signature="a{oa{sv}}")
3485
2757
def GetAllClientsWithProperties(self):
3487
2759
return dbus.Dictionary(
3488
{c.dbus_object_path: c.GetAll(
3489
"se.recompile.Mandos.Client")
3490
for c in tcp_server.clients.values()},
2760
{ c.dbus_object_path: c.GetAll("")
2761
for c in tcp_server.clients.itervalues() },
3491
2762
signature="oa{sv}")
3493
2764
@dbus.service.method(_interface, in_signature="o")
3494
2765
def RemoveClient(self, object_path):
3496
for c in tcp_server.clients.values():
2767
for c in tcp_server.clients.itervalues():
3497
2768
if c.dbus_object_path == object_path:
3498
2769
del tcp_server.clients[c.name]
3499
2770
c.remove_from_connection()
3500
# Don't signal the disabling
2771
# Don't signal anything except ClientRemoved
3501
2772
c.disable(quiet=True)
3502
# Emit D-Bus signal for removal
3503
self.client_removed_signal(c)
2774
self.ClientRemoved(object_path, c.name)
3505
2776
raise KeyError(object_path)
3509
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3510
out_signature="a{oa{sa{sv}}}")
3511
def GetManagedObjects(self):
3513
return dbus.Dictionary(
3514
{client.dbus_object_path:
3516
{interface: client.GetAll(interface)
3518
client._get_all_interface_names()})
3519
for client in tcp_server.clients.values()})
3521
def client_added_signal(self, client):
3522
"""Send the new standard signal and the old signal"""
3524
# New standard signal
3525
self.InterfacesAdded(
3526
client.dbus_object_path,
3528
{interface: client.GetAll(interface)
3530
client._get_all_interface_names()}))
3532
self.ClientAdded(client.dbus_object_path)
3534
def client_removed_signal(self, client):
3535
"""Send the new standard signal and the old signal"""
3537
# New standard signal
3538
self.InterfacesRemoved(
3539
client.dbus_object_path,
3540
client._get_all_interface_names())
3542
self.ClientRemoved(client.dbus_object_path,
3545
2780
mandos_dbus_service = MandosDBusService()
3547
# Save modules to variables to exempt the modules from being
3548
# unloaded before the function registered with atexit() is run.
3549
mp = multiprocessing
3553
2783
"Cleanup function; run on exit"
3555
2785
service.cleanup()
3557
mp.active_children()
2787
multiprocessing.active_children()
3559
2789
if not (tcp_server.clients or client_settings):
3562
2792
# Store client before exiting. Secrets are encrypted with key
3563
2793
# based on what config file has. If config file is
3564
2794
# removed/edited, old secret will thus be unrecovable.
3566
2796
with PGPEngine() as pgp:
3567
for client in tcp_server.clients.values():
2797
for client in tcp_server.clients.itervalues():
3568
2798
key = client_settings[client.name]["secret"]
3569
2799
client.encrypted_secret = pgp.encrypt(client.secret,
3571
2801
client_dict = {}
3573
2803
# A list of attributes that can not be pickled
3575
exclude = {"bus", "changedstate", "secret",
3576
"checker", "server_settings"}
2805
exclude = { "bus", "changedstate", "secret",
2806
"checker", "server_settings" }
3577
2807
for name, typ in inspect.getmembers(dbus.service
3579
2809
exclude.add(name)
3581
2811
client_dict["encrypted_secret"] = (client
3582
2812
.encrypted_secret)
3583
2813
for attr in client.client_structure:
3584
2814
if attr not in exclude:
3585
2815
client_dict[attr] = getattr(client, attr)
3587
2817
clients[client.name] = client_dict
3588
2818
del client_settings[client.name]["secret"]
3591
2821
with tempfile.NamedTemporaryFile(
3593
2823
suffix=".pickle",
3595
2825
dir=os.path.dirname(stored_state_path),
3596
2826
delete=False) as stored_state:
3597
pickle.dump((clients, client_settings), stored_state,
2827
pickle.dump((clients, client_settings), stored_state)
3599
2828
tempname = stored_state.name
3600
2829
os.rename(tempname, stored_state_path)
3601
2830
except (IOError, OSError) as e:
3605
2834
except NameError:
3607
2836
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3608
log.warning("Could not save persistent state: %s",
3609
os.strerror(e.errno))
2837
logger.warning("Could not save persistent state: {}"
2838
.format(os.strerror(e.errno)))
3611
log.warning("Could not save persistent state:",
2840
logger.warning("Could not save persistent state:",
3615
2844
# Delete all clients, and settings from config
3616
2845
while tcp_server.clients:
3617
2846
name, client = tcp_server.clients.popitem()
3619
2848
client.remove_from_connection()
3620
# Don't signal the disabling
2849
# Don't signal anything except ClientRemoved
3621
2850
client.disable(quiet=True)
3622
# Emit D-Bus signal for removal
3624
mandos_dbus_service.client_removed_signal(client)
2853
mandos_dbus_service.ClientRemoved(
2854
client.dbus_object_path, client.name)
3625
2855
client_settings.clear()
3627
2857
atexit.register(cleanup)
3629
for client in tcp_server.clients.values():
2859
for client in tcp_server.clients.itervalues():
3631
# Emit D-Bus signal for adding
3632
mandos_dbus_service.client_added_signal(client)
2862
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3633
2863
# Need to initiate checking of clients
3634
2864
if client.enabled:
3635
client.init_checker(randomize_start=True)
2865
client.init_checker()
3637
2867
tcp_server.enable()
3638
2868
tcp_server.server_activate()
3640
2870
# Find out what port we got
3642
2872
service.port = tcp_server.socket.getsockname()[1]
3644
log.info("Now listening on address %r, port %d, flowinfo %d,"
3645
" scope_id %d", *tcp_server.socket.getsockname())
2874
logger.info("Now listening on address %r, port %d,"
2875
" flowinfo %d, scope_id %d",
2876
*tcp_server.socket.getsockname())
3647
log.info("Now listening on address %r, port %d",
3648
*tcp_server.socket.getsockname())
3650
# service.interface = tcp_server.socket.getsockname()[3]
2878
logger.info("Now listening on address %r, port %d",
2879
*tcp_server.socket.getsockname())
2881
#service.interface = tcp_server.socket.getsockname()[3]
3654
2885
# From the Avahi example code
3656
2887
service.activate()
3657
2888
except dbus.exceptions.DBusException as error:
3658
log.critical("D-Bus Exception", exc_info=error)
2889
logger.critical("D-Bus Exception", exc_info=error)
3661
2892
# End of Avahi example code
3664
GLib.IOChannel.unix_new(tcp_server.fileno()),
3665
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3666
lambda *args, **kwargs: (tcp_server.handle_request
3667
(*args[2:], **kwargs) or True))
3669
log.debug("Starting main loop")
2894
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2895
lambda *args, **kwargs:
2896
(tcp_server.handle_request
2897
(*args[2:], **kwargs) or True))
2899
logger.debug("Starting main loop")
3670
2900
main_loop.run()
3671
2901
except AvahiError as error:
3672
log.critical("Avahi Error", exc_info=error)
2902
logger.critical("Avahi Error", exc_info=error)
3675
2905
except KeyboardInterrupt:
3677
2907
print("", file=sys.stderr)
3678
log.debug("Server received KeyboardInterrupt")
3679
log.debug("Server exiting")
2908
logger.debug("Server received KeyboardInterrupt")
2909
logger.debug("Server exiting")
3680
2910
# Must run before the D-Bus bus name gets deregistered
3684
def parse_test_args():
3685
# type: () -> argparse.Namespace
3686
parser = argparse.ArgumentParser(add_help=False)
3687
parser.add_argument("--check", action="store_true")
3688
parser.add_argument("--prefix", )
3689
args, unknown_args = parser.parse_known_args()
3691
# Remove test options from sys.argv
3692
sys.argv[1:] = unknown_args
3695
# Add all tests from doctest strings
3696
def load_tests(loader, tests, none):
3698
tests.addTests(doctest.DocTestSuite())
3701
if __name__ == "__main__":
3702
options = parse_test_args()
3705
extra_test_prefix = options.prefix
3706
if extra_test_prefix is not None:
3707
if not (unittest.main(argv=[""], exit=False)
3708
.result.wasSuccessful()):
3710
class ExtraTestLoader(unittest.TestLoader):
3711
testMethodPrefix = extra_test_prefix
3712
# Call using ./scriptname --test [--verbose]
3713
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3715
unittest.main(argv=[""])
3723
# (lambda (&optional extra)
3724
# (if (not (funcall run-tests-in-test-buffer default-directory
3726
# (funcall show-test-buffer-in-test-window)
3727
# (funcall remove-test-window)
3728
# (if extra (message "Extra tests run successfully!"))))
3729
# run-tests-in-test-buffer:
3730
# (lambda (dir &optional extra)
3731
# (with-current-buffer (get-buffer-create "*Test*")
3732
# (setq buffer-read-only nil
3733
# default-directory dir)
3735
# (compilation-mode))
3736
# (let ((process-result
3737
# (let ((inhibit-read-only t))
3738
# (process-file-shell-command
3739
# (funcall get-command-line extra) nil "*Test*"))))
3740
# (and (numberp process-result)
3741
# (= process-result 0))))
3743
# (lambda (&optional extra)
3744
# (let ((quoted-script
3745
# (shell-quote-argument (funcall get-script-name))))
3747
# (concat "%s --check" (if extra " --prefix=atest" ""))
3751
# (if (fboundp 'file-local-name)
3752
# (file-local-name (buffer-file-name))
3753
# (or (file-remote-p (buffer-file-name) 'localname)
3754
# (buffer-file-name))))
3755
# remove-test-window:
3757
# (let ((test-window (get-buffer-window "*Test*")))
3758
# (if test-window (delete-window test-window))))
3759
# show-test-buffer-in-test-window:
3761
# (when (not (get-buffer-window-list "*Test*"))
3762
# (setq next-error-last-buffer (get-buffer "*Test*"))
3763
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3764
# (display-buffer-overriding-action
3765
# `((display-buffer-in-side-window) (side . ,side)
3766
# (window-height . fit-window-to-buffer)
3767
# (window-width . fit-window-to-buffer))))
3768
# (display-buffer "*Test*"))))
3771
# (let* ((run-extra-tests (lambda () (interactive)
3772
# (funcall run-tests t)))
3773
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3774
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3775
# (setq minor-mode-overriding-map-alist
3776
# (cons `(run-tests . ,outer-keymap)
3777
# minor-mode-overriding-map-alist)))
3778
# (add-hook 'after-save-hook run-tests 90 t))
2914
if __name__ == '__main__':