265
196
.replace(b"\n", b"\\n")
266
197
.replace(b"\0", b"\\x00"))
269
200
def encrypt(self, data, password):
270
201
passphrase = self.password_encode(password)
271
202
with tempfile.NamedTemporaryFile(
272
203
dir=self.tempdir) as passfile:
273
204
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
206
proc = subprocess.Popen(['gpg', '--symmetric',
278
209
+ self.gnupgargs,
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
283
214
if proc.returncode != 0:
284
215
raise PGPError(err)
285
216
return ciphertext
287
218
def decrypt(self, data, password):
288
219
passphrase = self.password_encode(password)
289
220
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
221
dir = self.tempdir) as passfile:
291
222
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
224
proc = subprocess.Popen(['gpg', '--decrypt',
296
227
+ self.gnupgargs,
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
301
232
if proc.returncode != 0:
302
233
raise PGPError(err)
303
234
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
237
class AvahiError(Exception):
333
238
def __init__(self, value, *args, **kwargs):
334
239
self.value = value
523
429
class AvahiServiceToSyslog(AvahiService):
524
430
def rename(self, *args, **kwargs):
525
431
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
432
ret = AvahiService.rename(self, *args, **kwargs)
528
433
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
435
.format(self.name)))
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
608
def from_param(self, obj):
609
if not isinstance(obj, self.cls):
610
raise TypeError("Not of type {}: {!r}"
611
.format(self.cls.__name__, obj))
612
return ctypes.byref(obj.from_param(obj))
614
class CastToVoidPointer:
615
def __init__(self, cls):
618
def from_param(self, obj):
619
if not isinstance(obj, self.cls):
620
raise TypeError("Not of type {}: {!r}"
621
.format(self.cls.__name__, obj))
622
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
630
class Credentials(With_from_param):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
634
self.type = gnutls.CRD_CERTIFICATE
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
640
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
642
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
644
gnutls_flags |= gnutls.NO_TICKETS
646
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
653
if credentials is None:
654
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
657
self.credentials = credentials
663
return gnutls.handshake(self)
665
def send(self, data):
669
data_len -= gnutls.record_send(self, data[-data_len:],
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
676
def _error_code(result):
677
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
raise gnutls.CertificateSecurityError(code=result)
683
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
687
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
return _error_code(result)
692
result = func(*arguments)
695
# Unless otherwise indicated, the function declarations below are
696
# all from the gnutls/gnutls.h C header file.
699
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
ctypes.POINTER(ctypes.c_char_p)]
702
priority_set_direct.restype = _error_code
704
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
init.restype = _error_code
708
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
710
set_default_priority.restype = _error_code
712
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
715
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
certificate_allocate_credentials = (
719
_library.gnutls_certificate_allocate_credentials)
720
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
722
certificate_allocate_credentials.restype = _error_code
724
certificate_free_credentials = (
725
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
727
certificate_free_credentials.restype = None
729
handshake_set_private_extensions = (
730
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
733
handshake_set_private_extensions.restype = None
735
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
738
credentials_set.restype = _error_code
740
strerror = _library.gnutls_strerror
741
strerror.argtypes = [ctypes.c_int]
742
strerror.restype = ctypes.c_char_p
744
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
746
certificate_type_get.restype = _error_code
748
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
750
ctypes.POINTER(ctypes.c_uint)]
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
global_set_log_level = _library.gnutls_global_set_log_level
754
global_set_log_level.argtypes = [ctypes.c_int]
755
global_set_log_level.restype = None
757
global_set_log_function = _library.gnutls_global_set_log_function
758
global_set_log_function.argtypes = [log_func]
759
global_set_log_function.restype = None
761
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
763
deinit.restype = None
765
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
770
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
transport_set_ptr.restype = None
774
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
779
check_version = _library.gnutls_check_version
780
check_version.argtypes = [ctypes.c_char_p]
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
789
has_rawpk = bool(check_version(_tls_rawpk_version))
793
class pubkey_st(ctypes.Structure):
795
pubkey_t = ctypes.POINTER(pubkey_st)
797
x509_crt_fmt_t = ctypes.c_int
799
# All the function declarations below are from
801
pubkey_init = _library.gnutls_pubkey_init
802
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
pubkey_init.restype = _error_code
805
pubkey_import = _library.gnutls_pubkey_import
806
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
808
pubkey_import.restype = _error_code
810
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
ctypes.POINTER(ctypes.c_ubyte),
813
ctypes.POINTER(ctypes.c_size_t)]
814
pubkey_get_key_id.restype = _error_code
816
pubkey_deinit = _library.gnutls_pubkey_deinit
817
pubkey_deinit.argtypes = [pubkey_t]
818
pubkey_deinit.restype = None
820
# All the function declarations below are from
823
openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
openpgp_crt_init.restype = _error_code
827
openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
openpgp_crt_import.argtypes = [openpgp_crt_t,
829
ctypes.POINTER(datum_t),
831
openpgp_crt_import.restype = _error_code
833
openpgp_crt_verify_self = \
834
_library.gnutls_openpgp_crt_verify_self
835
openpgp_crt_verify_self.argtypes = [
838
ctypes.POINTER(ctypes.c_uint),
840
openpgp_crt_verify_self.restype = _error_code
842
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
openpgp_crt_deinit.restype = None
846
openpgp_crt_get_fingerprint = (
847
_library.gnutls_openpgp_crt_get_fingerprint)
848
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
852
openpgp_crt_get_fingerprint.restype = _error_code
854
if check_version(b"3.6.4"):
855
certificate_type_get2 = _library.gnutls_certificate_type_get2
856
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
certificate_type_get2.restype = _error_code
859
# Remove non-public functions
860
del _error_code, _retry_on_error
863
438
def call_pipe(connection, # : multiprocessing.Connection
864
439
func, *args, **kwargs):
865
440
"""This function is meant to be called by multiprocessing.Process
867
442
This function runs func(*args, **kwargs), and writes the resulting
868
443
return value on the provided multiprocessing.Connection.
870
445
connection.send(func(*args, **kwargs))
871
446
connection.close()
448
class Client(object):
875
449
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
452
approved: bool(); 'None' if not yet approved/disapproved
879
453
approval_delay: datetime.timedelta(); Time to wait for approval
880
454
approval_duration: datetime.timedelta(); Duration of one approval
881
checker: multiprocessing.Process(); a running checker process used
882
to see if the client lives. None if no process is
884
checker_callback_tag: a GLib event source tag, or None
455
checker: subprocess.Popen(); a running checker process used
456
to see if the client lives.
457
'None' if no process is running.
458
checker_callback_tag: a gobject event source tag, or None
885
459
checker_command: string; External command which is run to check
886
460
if client lives. %() expansions are done at
887
461
runtime with vars(self) as dict, so that for
888
462
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
463
checker_initiator_tag: a gobject event source tag, or None
890
464
created: datetime.datetime(); (UTC) object creation
891
465
client_structure: Object describing what attributes a client has
892
466
and is used for storing the client at exit
893
467
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
468
disable_initiator_tag: a gobject event source tag, or None
896
470
fingerprint: string (40 or 32 hexadecimal digits); used to
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
471
uniquely identify the client
900
472
host: string; available for use by the checker command
901
473
interval: datetime.timedelta(); How often to start a new checker
902
474
last_approval_request: datetime.datetime(); (UTC) or None
1050
617
self.last_enabled = datetime.datetime.utcnow()
1051
618
self.init_checker()
1052
619
self.send_changedstate()
1054
621
def disable(self, quiet=True):
1055
622
"""Disable this client."""
1056
623
if not getattr(self, "enabled", False):
1059
log.info("Disabling client %s", self.name)
626
logger.info("Disabling client %s", self.name)
1060
627
if getattr(self, "disable_initiator_tag", None) is not None:
1061
GLib.source_remove(self.disable_initiator_tag)
628
gobject.source_remove(self.disable_initiator_tag)
1062
629
self.disable_initiator_tag = None
1063
630
self.expires = None
1064
631
if getattr(self, "checker_initiator_tag", None) is not None:
1065
GLib.source_remove(self.checker_initiator_tag)
632
gobject.source_remove(self.checker_initiator_tag)
1066
633
self.checker_initiator_tag = None
1067
634
self.stop_checker()
1068
635
self.enabled = False
1070
637
self.send_changedstate()
1071
# Do not run this again if called by a GLib.timeout_add
638
# Do not run this again if called by a gobject.timeout_add
1074
641
def __del__(self):
1077
644
def init_checker(self):
1078
645
# Schedule a new checker to be started an 'interval' from now,
1079
646
# and every interval from then on.
1080
647
if self.checker_initiator_tag is not None:
1081
GLib.source_remove(self.checker_initiator_tag)
1082
self.checker_initiator_tag = GLib.timeout_add(
1083
random.randrange(int(self.interval.total_seconds() * 1000
648
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
1085
651
self.start_checker)
1086
652
# Schedule a disable() when 'timeout' has passed
1087
653
if self.disable_initiator_tag is not None:
1088
GLib.source_remove(self.disable_initiator_tag)
1089
self.disable_initiator_tag = GLib.timeout_add(
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
1090
656
int(self.timeout.total_seconds() * 1000), self.disable)
1091
657
# Also start a new checker *right now*.
1092
658
self.start_checker()
1094
660
def checker_callback(self, source, condition, connection,
1096
662
"""The checker has completed, so take appropriate actions."""
663
self.checker_callback_tag = None
1097
665
# Read return code from connection (see call_pipe)
1098
666
returncode = connection.recv()
1099
667
connection.close()
1100
if self.checker is not None:
1102
self.checker_callback_tag = None
1105
669
if returncode >= 0:
1106
670
self.last_checker_status = returncode
1107
671
self.last_checker_signal = None
1108
672
if self.last_checker_status == 0:
1109
log.info("Checker for %(name)s succeeded", vars(self))
673
logger.info("Checker for %(name)s succeeded",
1110
675
self.checked_ok()
1112
log.info("Checker for %(name)s failed", vars(self))
677
logger.info("Checker for %(name)s failed", vars(self))
1114
679
self.last_checker_status = -1
1115
680
self.last_checker_signal = -returncode
1116
log.warning("Checker for %(name)s crashed?", vars(self))
681
logger.warning("Checker for %(name)s crashed?",
1119
685
def checked_ok(self):
1120
686
"""Assert that the client has been seen, alive and well."""
1121
687
self.last_checked_ok = datetime.datetime.utcnow()
1122
688
self.last_checker_status = 0
1123
689
self.last_checker_signal = None
1124
690
self.bump_timeout()
1126
692
def bump_timeout(self, timeout=None):
1127
693
"""Bump up the timeout for this client."""
1128
694
if timeout is None:
1129
695
timeout = self.timeout
1130
696
if self.disable_initiator_tag is not None:
1131
GLib.source_remove(self.disable_initiator_tag)
697
gobject.source_remove(self.disable_initiator_tag)
1132
698
self.disable_initiator_tag = None
1133
699
if getattr(self, "enabled", False):
1134
self.disable_initiator_tag = GLib.timeout_add(
700
self.disable_initiator_tag = gobject.timeout_add(
1135
701
int(timeout.total_seconds() * 1000), self.disable)
1136
702
self.expires = datetime.datetime.utcnow() + timeout
1138
704
def need_approval(self):
1139
705
self.last_approval_request = datetime.datetime.utcnow()
1141
707
def start_checker(self):
1142
708
"""Start a new checker subprocess if one is not running.
1144
710
If a checker already exists, leave it running and do
1146
712
# The reason for not killing a running checker is that if we
1329
895
for cls in self.__class__.__mro__
1330
896
for name, athing in
1331
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1333
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1335
path_keyword="object_path",
1336
connection_keyword="connection")
1337
def Introspect(self, object_path, connection):
1338
"""Overloading of standard D-Bus method.
1340
Inserts annotation tags on methods and signals.
1342
xmlstring = dbus.service.Object.Introspect(self, object_path,
1345
document = xml.dom.minidom.parseString(xmlstring)
1347
for if_tag in document.getElementsByTagName("interface"):
1348
# Add annotation tags
1349
for typ in ("method", "signal"):
1350
for tag in if_tag.getElementsByTagName(typ):
1352
for name, prop in (self.
1353
_get_all_dbus_things(typ)):
1354
if (name == tag.getAttribute("name")
1355
and prop._dbus_interface
1356
== if_tag.getAttribute("name")):
1357
annots.update(getattr(
1358
prop, "_dbus_annotations", {}))
1359
for name, value in annots.items():
1360
ann_tag = document.createElement(
1362
ann_tag.setAttribute("name", name)
1363
ann_tag.setAttribute("value", value)
1364
tag.appendChild(ann_tag)
1365
# Add interface annotation tags
1366
for annotation, value in dict(
1367
itertools.chain.from_iterable(
1368
annotations().items()
1369
for name, annotations
1370
in self._get_all_dbus_things("interface")
1371
if name == if_tag.getAttribute("name")
1373
ann_tag = document.createElement("annotation")
1374
ann_tag.setAttribute("name", annotation)
1375
ann_tag.setAttribute("value", value)
1376
if_tag.appendChild(ann_tag)
1377
# Fix argument name for the Introspect method itself
1378
if (if_tag.getAttribute("name")
1379
== dbus.INTROSPECTABLE_IFACE):
1380
for cn in if_tag.getElementsByTagName("method"):
1381
if cn.getAttribute("name") == "Introspect":
1382
for arg in cn.getElementsByTagName("arg"):
1383
if (arg.getAttribute("direction")
1385
arg.setAttribute("name",
1387
xmlstring = document.toxml("utf-8")
1389
except (AttributeError, xml.dom.DOMException,
1390
xml.parsers.expat.ExpatError) as error:
1391
log.error("Failed to override Introspection method",
1396
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1397
"""A D-Bus object with properties.
1399
Classes inheriting from this can use the dbus_service_property
1400
decorator to expose methods as D-Bus properties. It exposes the
1401
standard Get(), Set(), and GetAll() methods on the D-Bus.
1404
899
def _get_dbus_property(self, interface_name, property_name):
1405
900
"""Returns a bound method if one exists which is a D-Bus
1406
901
property with the specified name and interface.
1555
1054
document.unlink()
1556
1055
except (AttributeError, xml.dom.DOMException,
1557
1056
xml.parsers.expat.ExpatError) as error:
1558
log.error("Failed to override Introspection method",
1564
dbus.OBJECT_MANAGER_IFACE
1565
except AttributeError:
1566
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1569
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1570
"""A D-Bus object with an ObjectManager.
1572
Classes inheriting from this exposes the standard
1573
GetManagedObjects call and the InterfacesAdded and
1574
InterfacesRemoved signals on the standard
1575
"org.freedesktop.DBus.ObjectManager" interface.
1577
Note: No signals are sent automatically; they must be sent
1580
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1581
out_signature="a{oa{sa{sv}}}")
1582
def GetManagedObjects(self):
1583
"""This function must be overridden"""
1584
raise NotImplementedError()
1586
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1587
signature="oa{sa{sv}}")
1588
def InterfacesAdded(self, object_path, interfaces_and_properties):
1591
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1592
def InterfacesRemoved(self, object_path, interfaces):
1595
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1597
path_keyword="object_path",
1598
connection_keyword="connection")
1599
def Introspect(self, object_path, connection):
1600
"""Overloading of standard D-Bus method.
1602
Override return argument name of GetManagedObjects to be
1603
"objpath_interfaces_and_properties"
1605
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1609
document = xml.dom.minidom.parseString(xmlstring)
1611
for if_tag in document.getElementsByTagName("interface"):
1612
# Fix argument name for the GetManagedObjects method
1613
if (if_tag.getAttribute("name")
1614
== dbus.OBJECT_MANAGER_IFACE):
1615
for cn in if_tag.getElementsByTagName("method"):
1616
if (cn.getAttribute("name")
1617
== "GetManagedObjects"):
1618
for arg in cn.getElementsByTagName("arg"):
1619
if (arg.getAttribute("direction")
1623
"objpath_interfaces"
1625
xmlstring = document.toxml("utf-8")
1627
except (AttributeError, xml.dom.DOMException,
1628
xml.parsers.expat.ExpatError) as error:
1629
log.error("Failed to override Introspection method",
1057
logger.error("Failed to override Introspection method",
1631
1059
return xmlstring
1634
1062
def datetime_to_dbus(dt, variant_level=0):
1635
1063
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1637
return dbus.String("", variant_level=variant_level)
1065
return dbus.String("", variant_level = variant_level)
1638
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
2241
1661
self.start_checker()
2243
1663
self.stop_checker()
2245
1665
# ObjectPath - property
2247
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2248
"org.freedesktop.DBus.Deprecated": "true"})
2249
1666
@dbus_service_property(_interface, signature="o", access="read")
2250
1667
def ObjectPath_dbus_property(self):
2251
return self.dbus_object_path # is already a dbus.ObjectPath
1668
return self.dbus_object_path # is already a dbus.ObjectPath
2253
1670
# Secret = property
2255
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2257
1671
@dbus_service_property(_interface,
2258
1672
signature="ay",
2259
1673
access="write",
2260
1674
byte_arrays=True)
2261
1675
def Secret_dbus_property(self, value):
2262
1676
self.secret = bytes(value)
2268
def __init__(self, child_pipe, key_id, fpr, address):
1681
class ProxyClient(object):
1682
def __init__(self, child_pipe, fpr, address):
2269
1683
self._pipe = child_pipe
2270
self._pipe.send(("init", key_id, fpr, address))
1684
self._pipe.send(('init', fpr, address))
2271
1685
if not self._pipe.recv():
2272
raise KeyError(key_id or fpr)
2274
1688
def __getattribute__(self, name):
2276
1690
return super(ProxyClient, self).__getattribute__(name)
2277
self._pipe.send(("getattr", name))
1691
self._pipe.send(('getattr', name))
2278
1692
data = self._pipe.recv()
2279
if data[0] == "data":
1693
if data[0] == 'data':
2281
if data[0] == "function":
1695
if data[0] == 'function':
2283
1697
def func(*args, **kwargs):
2284
self._pipe.send(("funcall", name, args, kwargs))
1698
self._pipe.send(('funcall', name, args, kwargs))
2285
1699
return self._pipe.recv()[1]
2289
1703
def __setattr__(self, name, value):
2291
1705
return super(ProxyClient, self).__setattr__(name, value)
2292
self._pipe.send(("setattr", name, value))
1706
self._pipe.send(('setattr', name, value))
2295
1709
class ClientHandler(socketserver.BaseRequestHandler, object):
2296
1710
"""A class to handle client connections.
2298
1712
Instantiated once for each connection to handle it.
2299
1713
Note: This will run in its own forked process."""
2301
1715
def handle(self):
2302
1716
with contextlib.closing(self.server.child_pipe) as child_pipe:
2303
log.info("TCP connection from: %s",
2304
str(self.client_address))
2305
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2307
session = gnutls.ClientSession(self.request)
2309
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2310
# "+AES-256-CBC", "+SHA1",
2311
# "+COMP-NULL", "+CTYPE-OPENPGP",
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",
2313
1734
# Use a fallback default, since this MUST be set.
2314
1735
priority = self.server.gnutls_priority
2315
1736
if priority is None:
2316
1737
priority = "NORMAL"
2317
gnutls.priority_set_direct(session,
2318
priority.encode("utf-8"), None)
1738
gnutls.library.functions.gnutls_priority_set_direct(
1739
session._c_object, priority, None)
2320
1741
# Start communication using the Mandos protocol
2321
1742
# Get protocol number
2322
1743
line = self.request.makefile().readline()
2323
log.debug("Protocol version: %r", line)
1744
logger.debug("Protocol version: %r", line)
2325
1746
if int(line.strip().split()[0]) > 1:
2326
1747
raise RuntimeError(line)
2327
1748
except (ValueError, IndexError, RuntimeError) as error:
2328
log.error("Unknown protocol version: %s", error)
1749
logger.error("Unknown protocol version: %s", error)
2331
1752
# Start GnuTLS connection
2333
1754
session.handshake()
2334
except gnutls.Error as error:
2335
log.warning("Handshake failed: %s", error)
1755
except gnutls.errors.GNUTLSError as error:
1756
logger.warning("Handshake failed: %s", error)
2336
1757
# Do not run session.bye() here: the session is not
2337
1758
# established. Just abandon the request.
2339
log.debug("Handshake succeeded")
1760
logger.debug("Handshake succeeded")
2341
1762
approval_required = False
2343
if gnutls.has_rawpk:
2346
key_id = self.key_id(
2347
self.peer_certificate(session))
2348
except (TypeError, gnutls.Error) as error:
2349
log.warning("Bad certificate: %s", error)
2351
log.debug("Key ID: %s",
2352
key_id.decode("utf-8",
2358
fpr = self.fingerprint(
2359
self.peer_certificate(session))
2360
except (TypeError, gnutls.Error) as error:
2361
log.warning("Bad certificate: %s", error)
2363
log.debug("Fingerprint: %s", fpr)
2366
client = ProxyClient(child_pipe, key_id, fpr,
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,
2367
1775
self.client_address)
2368
1776
except KeyError:
2371
1779
if client.approval_delay:
2372
1780
delay = client.approval_delay
2373
1781
client.approvals_pending += 1
2374
1782
approval_required = True
2377
1785
if not client.enabled:
2378
log.info("Client %s is disabled", client.name)
1786
logger.info("Client %s is disabled",
2379
1788
if self.server.use_dbus:
2380
1789
# Emit D-Bus signal
2381
1790
client.Rejected("Disabled")
2384
1793
if client.approved or not client.approval_delay:
2385
# We are approved or approval is disabled
1794
#We are approved or approval is disabled
2387
1796
elif client.approved is None:
2388
log.info("Client %s needs approval",
1797
logger.info("Client %s needs approval",
2390
1799
if self.server.use_dbus:
2391
1800
# Emit D-Bus signal
2392
1801
client.NeedApproval(
2393
1802
client.approval_delay.total_seconds()
2394
1803
* 1000, client.approved_by_default)
2396
log.warning("Client %s was not approved",
1805
logger.warning("Client %s was not approved",
2398
1807
if self.server.use_dbus:
2399
1808
# Emit D-Bus signal
2400
1809
client.Rejected("Denied")
2403
# wait until timeout or approved
1812
#wait until timeout or approved
2404
1813
time = datetime.datetime.now()
2405
1814
client.changedstate.acquire()
2406
1815
client.changedstate.wait(delay.total_seconds())
2421
1830
delay -= time2 - time
2424
session.send(client.secret)
2425
except gnutls.Error as error:
2426
log.warning("gnutls send failed", exc_info=error)
2429
log.info("Sending secret to %s", client.name)
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)
2430
1846
# bump the timeout using extended_timeout
2431
1847
client.bump_timeout(client.extended_timeout)
2432
1848
if self.server.use_dbus:
2433
1849
# Emit D-Bus signal
2434
1850
client.GotSecret()
2437
1853
if approval_required:
2438
1854
client.approvals_pending -= 1
2441
except gnutls.Error as error:
2442
log.warning("GnuTLS bye failed", exc_info=error)
1857
except gnutls.errors.GNUTLSError as error:
1858
logger.warning("GnuTLS bye failed",
2445
1862
def peer_certificate(session):
2446
"Return the peer's certificate as a bytestring"
2448
cert_type = gnutls.certificate_type_get2(
2449
session, gnutls.CTYPE_PEERS)
2450
except AttributeError:
2451
cert_type = gnutls.certificate_type_get(session)
2452
if gnutls.has_rawpk:
2453
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2455
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2456
# If not a valid certificate type...
2457
if cert_type not in valid_cert_types:
2458
log.info("Cert type %r not in %r", cert_type,
2460
# ...return invalid data
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
2462
1870
list_size = ctypes.c_uint(1)
2463
cert_list = (gnutls.certificate_get_peers
2464
(session, ctypes.byref(list_size)))
1871
cert_list = (gnutls.library.functions
1872
.gnutls_certificate_get_peers
1873
(session._c_object, ctypes.byref(list_size)))
2465
1874
if not bool(cert_list) and list_size.value != 0:
2466
raise gnutls.Error("error getting peer certificate")
1875
raise gnutls.errors.GNUTLSError("error getting peer"
2467
1877
if list_size.value == 0:
2469
1879
cert = cert_list[0]
2470
1880
return ctypes.string_at(cert.data, cert.size)
2473
def key_id(certificate):
2474
"Convert a certificate bytestring to a hexdigit key ID"
2475
# New GnuTLS "datum" with the public key
2476
datum = gnutls.datum_t(
2477
ctypes.cast(ctypes.c_char_p(certificate),
2478
ctypes.POINTER(ctypes.c_ubyte)),
2479
ctypes.c_uint(len(certificate)))
2480
# XXX all these need to be created in the gnutls "module"
2481
# New empty GnuTLS certificate
2482
pubkey = gnutls.pubkey_t()
2483
gnutls.pubkey_init(ctypes.byref(pubkey))
2484
# Import the raw public key into the certificate
2485
gnutls.pubkey_import(pubkey,
2486
ctypes.byref(datum),
2487
gnutls.X509_FMT_DER)
2488
# New buffer for the key ID
2489
buf = ctypes.create_string_buffer(32)
2490
buf_len = ctypes.c_size_t(len(buf))
2491
# Get the key ID from the raw public key into the buffer
2492
gnutls.pubkey_get_key_id(
2494
gnutls.KEYID_USE_SHA256,
2495
ctypes.cast(ctypes.byref(buf),
2496
ctypes.POINTER(ctypes.c_ubyte)),
2497
ctypes.byref(buf_len))
2498
# Deinit the certificate
2499
gnutls.pubkey_deinit(pubkey)
2501
# Convert the buffer to a Python bytestring
2502
key_id = ctypes.string_at(buf, buf_len.value)
2503
# Convert the bytestring to hexadecimal notation
2504
hex_key_id = binascii.hexlify(key_id).upper()
2508
1883
def fingerprint(openpgp):
2509
1884
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2510
1885
# New GnuTLS "datum" with the OpenPGP public key
2511
datum = gnutls.datum_t(
1886
datum = gnutls.library.types.gnutls_datum_t(
2512
1887
ctypes.cast(ctypes.c_char_p(openpgp),
2513
1888
ctypes.POINTER(ctypes.c_ubyte)),
2514
1889
ctypes.c_uint(len(openpgp)))
2515
1890
# New empty GnuTLS certificate
2516
crt = gnutls.openpgp_crt_t()
2517
gnutls.openpgp_crt_init(ctypes.byref(crt))
1891
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
2518
1894
# Import the OpenPGP public key into the certificate
2519
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2520
gnutls.OPENPGP_FMT_RAW)
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2521
1898
# Verify the self signature in the key
2522
1899
crtverify = ctypes.c_uint()
2523
gnutls.openpgp_crt_verify_self(crt, 0,
2524
ctypes.byref(crtverify))
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
2525
1902
if crtverify.value != 0:
2526
gnutls.openpgp_crt_deinit(crt)
2527
raise gnutls.CertificateSecurityError(code
1903
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
2529
1906
# New buffer for the fingerprint
2530
1907
buf = ctypes.create_string_buffer(20)
2531
1908
buf_len = ctypes.c_size_t()
2532
1909
# Get the fingerprint from the certificate into the buffer
2533
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2534
ctypes.byref(buf_len))
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2535
1912
# Deinit the certificate
2536
gnutls.openpgp_crt_deinit(crt)
1913
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2537
1914
# Convert the buffer to a Python bytestring
2538
1915
fpr = ctypes.string_at(buf, buf_len.value)
2539
1916
# Convert the bytestring to hexadecimal notation
2628
2004
# socket_wrapper(), if socketfd was set.
2629
2005
socketserver.TCPServer.__init__(self, server_address,
2630
2006
RequestHandlerClass)
2632
2008
def server_bind(self):
2633
2009
"""This overrides the normal server_bind() function
2634
2010
to bind to an interface if one was specified, and also NOT to
2635
2011
bind to an address or port if they were not specified."""
2636
global SO_BINDTODEVICE
2637
2012
if self.interface is not None:
2638
2013
if SO_BINDTODEVICE is None:
2639
# Fall back to a hard-coded value which seems to be
2641
log.warning("SO_BINDTODEVICE not found, trying 25")
2642
SO_BINDTODEVICE = 25
2644
self.socket.setsockopt(
2645
socket.SOL_SOCKET, SO_BINDTODEVICE,
2646
(self.interface + "\0").encode("utf-8"))
2647
except socket.error as error:
2648
if error.errno == errno.EPERM:
2649
log.error("No permission to bind to interface %s",
2651
elif error.errno == errno.ENOPROTOOPT:
2652
log.error("SO_BINDTODEVICE not available; cannot"
2653
" bind to interface %s", self.interface)
2654
elif error.errno == errno.ENODEV:
2655
log.error("Interface %s does not exist, cannot"
2656
" bind", self.interface)
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)
2659
2035
# Only bind(2) the socket if we really need to.
2660
2036
if self.server_address[0] or self.server_address[1]:
2661
if self.server_address[1]:
2662
self.allow_reuse_address = True
2663
2037
if not self.server_address[0]:
2664
2038
if self.address_family == socket.AF_INET6:
2665
any_address = "::" # in6addr_any
2039
any_address = "::" # in6addr_any
2667
any_address = "0.0.0.0" # INADDR_ANY
2041
any_address = "0.0.0.0" # INADDR_ANY
2668
2042
self.server_address = (any_address,
2669
2043
self.server_address[1])
2670
2044
elif not self.server_address[1]:
2704
2078
self.gnutls_priority = gnutls_priority
2705
2079
IPv6_TCPServer.__init__(self, server_address,
2706
2080
RequestHandlerClass,
2707
interface=interface,
2081
interface = interface,
2082
use_ipv6 = use_ipv6,
2083
socketfd = socketfd)
2711
2085
def server_activate(self):
2712
2086
if self.enabled:
2713
2087
return socketserver.TCPServer.server_activate(self)
2715
2089
def enable(self):
2716
2090
self.enabled = True
2718
2092
def add_pipe(self, parent_pipe, proc):
2719
2093
# Call "handle_ipc" for both data and EOF events
2721
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2722
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2723
2097
functools.partial(self.handle_ipc,
2724
parent_pipe=parent_pipe,
2098
parent_pipe = parent_pipe,
2727
2101
def handle_ipc(self, source, condition,
2728
2102
parent_pipe=None,
2730
2104
client_object=None):
2731
2105
# error, or the other end of multiprocessing.Pipe has closed
2732
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2106
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2733
2107
# Wait for other process to exit
2737
2111
# Read a request from the child
2738
2112
request = parent_pipe.recv()
2739
2113
command = request[0]
2741
if command == "init":
2742
key_id = request[1].decode("ascii")
2743
fpr = request[2].decode("ascii")
2744
address = request[3]
2746
for c in self.clients.values():
2747
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2748
"27AE41E4649B934CA495991B7852B855"):
2750
if key_id and c.key_id == key_id:
2753
if fpr and c.fingerprint == fpr:
2115
if command == 'init':
2117
address = request[2]
2119
for c in self.clients.itervalues():
2120
if c.fingerprint == fpr:
2757
log.info("Client not found for key ID: %s, address:"
2758
" %s", key_id or fpr, address)
2124
logger.info("Client not found for fingerprint: %s, ad"
2125
"dress: %s", fpr, address)
2759
2126
if self.use_dbus:
2760
2127
# Emit D-Bus signal
2761
mandos_dbus_service.ClientNotFound(key_id or fpr,
2128
mandos_dbus_service.ClientNotFound(fpr,
2763
2130
parent_pipe.send(False)
2767
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2768
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2133
gobject.io_add_watch(
2134
parent_pipe.fileno(),
2135
gobject.IO_IN | gobject.IO_HUP,
2769
2136
functools.partial(self.handle_ipc,
2770
parent_pipe=parent_pipe,
2772
client_object=client))
2137
parent_pipe = parent_pipe,
2139
client_object = client))
2773
2140
parent_pipe.send(True)
2774
2141
# remove the old hook in favor of the new above hook on
2777
if command == "funcall":
2144
if command == 'funcall':
2778
2145
funcname = request[1]
2779
2146
args = request[2]
2780
2147
kwargs = request[3]
2782
parent_pipe.send(("data", getattr(client_object,
2149
parent_pipe.send(('data', getattr(client_object,
2783
2150
funcname)(*args,
2786
if command == "getattr":
2153
if command == 'getattr':
2787
2154
attrname = request[1]
2788
2155
if isinstance(client_object.__getattribute__(attrname),
2789
collections.abc.Callable):
2790
parent_pipe.send(("function", ))
2156
collections.Callable):
2157
parent_pipe.send(('function', ))
2792
2159
parent_pipe.send((
2793
"data", client_object.__getattribute__(attrname)))
2795
if command == "setattr":
2160
'data', client_object.__getattribute__(attrname)))
2162
if command == 'setattr':
2796
2163
attrname = request[1]
2797
2164
value = request[2]
2798
2165
setattr(client_object, attrname, value)
2803
2170
def rfc3339_duration_to_delta(duration):
2804
2171
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2806
>>> timedelta = datetime.timedelta
2807
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2809
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2811
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2813
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2815
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2817
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2819
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
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)
2824
2189
# Parsing an RFC 3339 duration with regular expressions is not
2825
2190
# possible - there would have to be multiple places for the same
2826
2191
# values, like seconds. The current code, while more esoteric, is
2827
2192
# cleaner without depending on a parsing library. If Python had a
2828
2193
# built-in library for parsing we would use it, but we'd like to
2829
2194
# avoid excessive use of external libraries.
2831
2196
# New type for defining tokens, syntax, and semantics all-in-one
2832
2197
Token = collections.namedtuple("Token", (
2833
2198
"regexp", # To match token; if "value" is not None, must have
3225
2581
"se.bsnet.fukt.Mandos", bus,
3226
2582
do_not_queue=True)
3227
2583
except dbus.exceptions.DBusException as e:
3228
log.error("Disabling D-Bus:", exc_info=e)
2584
logger.error("Disabling D-Bus:", exc_info=e)
3229
2585
use_dbus = False
3230
2586
server_settings["use_dbus"] = False
3231
2587
tcp_server.use_dbus = False
3233
2589
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3234
2590
service = AvahiServiceToSyslog(
3235
name=server_settings["servicename"],
3236
servicetype="_mandos._tcp",
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
3239
2595
if server_settings["interface"]:
3240
2596
service.interface = if_nametoindex(
3241
2597
server_settings["interface"].encode("utf-8"))
3243
2599
global multiprocessing_manager
3244
2600
multiprocessing_manager = multiprocessing.Manager()
3246
2602
client_class = Client
3248
client_class = functools.partial(ClientDBus, bus=bus)
2604
client_class = functools.partial(ClientDBus, bus = bus)
3250
2606
client_settings = Client.config_parser(client_config)
3251
2607
old_client_settings = {}
3252
2608
clients_data = {}
3254
2610
# This is used to redirect stdout and stderr for checker processes
3256
wnull = open(os.devnull, "w") # A writable /dev/null
2612
wnull = open(os.devnull, "w") # A writable /dev/null
3257
2613
# Only used if server is running in foreground but not in debug
3259
2615
if debug or not foreground:
3262
2618
# Get client data and settings from last running state.
3263
2619
if server_settings["restore"]:
3265
2621
with open(stored_state_path, "rb") as stored_state:
3266
if sys.version_info.major == 2:
3267
clients_data, old_client_settings = pickle.load(
3270
bytes_clients_data, bytes_old_client_settings = (
3271
pickle.load(stored_state, encoding="bytes"))
3272
# Fix bytes to strings
3275
clients_data = {(key.decode("utf-8")
3276
if isinstance(key, bytes)
3279
bytes_clients_data.items()}
3280
del bytes_clients_data
3281
for key in clients_data:
3282
value = {(k.decode("utf-8")
3283
if isinstance(k, bytes) else k): v
3285
clients_data[key].items()}
3286
clients_data[key] = value
3288
value["client_structure"] = [
3290
if isinstance(s, bytes)
3292
value["client_structure"]]
3293
# .name, .host, and .checker_command
3294
for k in ("name", "host", "checker_command"):
3295
if isinstance(value[k], bytes):
3296
value[k] = value[k].decode("utf-8")
3297
if "key_id" not in value:
3298
value["key_id"] = ""
3299
elif "fingerprint" not in value:
3300
value["fingerprint"] = ""
3301
# old_client_settings
3303
old_client_settings = {
3304
(key.decode("utf-8")
3305
if isinstance(key, bytes)
3308
bytes_old_client_settings.items()}
3309
del bytes_old_client_settings
3310
# .host and .checker_command
3311
for value in old_client_settings.values():
3312
for attribute in ("host", "checker_command"):
3313
if isinstance(value[attribute], bytes):
3314
value[attribute] = (value[attribute]
2622
clients_data, old_client_settings = pickle.load(
3316
2624
os.remove(stored_state_path)
3317
2625
except IOError as e:
3318
2626
if e.errno == errno.ENOENT:
3319
log.warning("Could not load persistent state:"
3320
" %s", os.strerror(e.errno))
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
3322
log.critical("Could not load persistent state:",
2630
logger.critical("Could not load persistent state:",
3325
2633
except EOFError as e:
3326
log.warning("Could not load persistent state: EOFError:",
2634
logger.warning("Could not load persistent state: "
3329
2638
with PGPEngine() as pgp:
3330
2639
for client_name, client in clients_data.items():
3331
2640
# Skip removed clients
3332
2641
if client_name not in client_settings:
3335
2644
# Decide which value to use after restoring saved state.
3336
2645
# We have three different values: Old config file,
3337
2646
# new config file, and saved state.
3410
2723
print(pid, file=pidfile)
3411
2724
except IOError:
3412
log.error("Could not write to file %r with PID %d",
2725
logger.error("Could not write to file %r with PID %d",
3415
2728
del pidfilename
3417
for termsig in (signal.SIGHUP, signal.SIGTERM):
3418
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3419
lambda: main_loop.quit() and False)
2730
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2731
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3423
2735
@alternate_dbus_interfaces(
3424
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3425
class MandosDBusService(DBusObjectWithObjectManager):
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2737
class MandosDBusService(DBusObjectWithProperties):
3426
2738
"""A D-Bus proxy object"""
3428
2740
def __init__(self):
3429
2741
dbus.service.Object.__init__(self, bus, "/")
3431
2743
_interface = "se.recompile.Mandos"
2745
@dbus_interface_annotations(_interface)
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
3433
2751
@dbus.service.signal(_interface, signature="o")
3434
2752
def ClientAdded(self, objpath):
3438
2756
@dbus.service.signal(_interface, signature="ss")
3439
def ClientNotFound(self, key_id, address):
2757
def ClientNotFound(self, fingerprint, address):
3443
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3445
2761
@dbus.service.signal(_interface, signature="os")
3446
2762
def ClientRemoved(self, objpath, name):
3450
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3452
2766
@dbus.service.method(_interface, out_signature="ao")
3453
2767
def GetAllClients(self):
3455
2769
return dbus.Array(c.dbus_object_path for c in
3456
tcp_server.clients.values())
3458
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2770
tcp_server.clients.itervalues())
3460
2772
@dbus.service.method(_interface,
3461
2773
out_signature="a{oa{sv}}")
3462
2774
def GetAllClientsWithProperties(self):
3464
2776
return dbus.Dictionary(
3465
{c.dbus_object_path: c.GetAll(
3466
"se.recompile.Mandos.Client")
3467
for c in tcp_server.clients.values()},
2777
{ c.dbus_object_path: c.GetAll("")
2778
for c in tcp_server.clients.itervalues() },
3468
2779
signature="oa{sv}")
3470
2781
@dbus.service.method(_interface, in_signature="o")
3471
2782
def RemoveClient(self, object_path):
3473
for c in tcp_server.clients.values():
2784
for c in tcp_server.clients.itervalues():
3474
2785
if c.dbus_object_path == object_path:
3475
2786
del tcp_server.clients[c.name]
3476
2787
c.remove_from_connection()
3477
# Don't signal the disabling
2788
# Don't signal anything except ClientRemoved
3478
2789
c.disable(quiet=True)
3479
# Emit D-Bus signal for removal
3480
self.client_removed_signal(c)
2791
self.ClientRemoved(object_path, c.name)
3482
2793
raise KeyError(object_path)
3486
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3487
out_signature="a{oa{sa{sv}}}")
3488
def GetManagedObjects(self):
3490
return dbus.Dictionary(
3491
{client.dbus_object_path:
3493
{interface: client.GetAll(interface)
3495
client._get_all_interface_names()})
3496
for client in tcp_server.clients.values()})
3498
def client_added_signal(self, client):
3499
"""Send the new standard signal and the old signal"""
3501
# New standard signal
3502
self.InterfacesAdded(
3503
client.dbus_object_path,
3505
{interface: client.GetAll(interface)
3507
client._get_all_interface_names()}))
3509
self.ClientAdded(client.dbus_object_path)
3511
def client_removed_signal(self, client):
3512
"""Send the new standard signal and the old signal"""
3514
# New standard signal
3515
self.InterfacesRemoved(
3516
client.dbus_object_path,
3517
client._get_all_interface_names())
3519
self.ClientRemoved(client.dbus_object_path,
3522
2797
mandos_dbus_service = MandosDBusService()
3524
# Save modules to variables to exempt the modules from being
3525
# unloaded before the function registered with atexit() is run.
3526
mp = multiprocessing
3530
2800
"Cleanup function; run on exit"
3532
2802
service.cleanup()
3534
mp.active_children()
2804
multiprocessing.active_children()
3536
2806
if not (tcp_server.clients or client_settings):
3539
2809
# Store client before exiting. Secrets are encrypted with key
3540
2810
# based on what config file has. If config file is
3541
2811
# removed/edited, old secret will thus be unrecovable.
3543
2813
with PGPEngine() as pgp:
3544
for client in tcp_server.clients.values():
2814
for client in tcp_server.clients.itervalues():
3545
2815
key = client_settings[client.name]["secret"]
3546
2816
client.encrypted_secret = pgp.encrypt(client.secret,
3548
2818
client_dict = {}
3550
2820
# A list of attributes that can not be pickled
3552
exclude = {"bus", "changedstate", "secret",
3553
"checker", "server_settings"}
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
3554
2824
for name, typ in inspect.getmembers(dbus.service
3556
2826
exclude.add(name)
3558
2828
client_dict["encrypted_secret"] = (client
3559
2829
.encrypted_secret)
3560
2830
for attr in client.client_structure:
3561
2831
if attr not in exclude:
3562
2832
client_dict[attr] = getattr(client, attr)
3564
2834
clients[client.name] = client_dict
3565
2835
del client_settings[client.name]["secret"]
3568
2838
with tempfile.NamedTemporaryFile(
3570
2840
suffix=".pickle",
3572
2842
dir=os.path.dirname(stored_state_path),
3573
2843
delete=False) as stored_state:
3574
pickle.dump((clients, client_settings), stored_state,
2844
pickle.dump((clients, client_settings), stored_state)
3576
2845
tempname = stored_state.name
3577
2846
os.rename(tempname, stored_state_path)
3578
2847
except (IOError, OSError) as e:
3582
2851
except NameError:
3584
2853
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3585
log.warning("Could not save persistent state: %s",
3586
os.strerror(e.errno))
2854
logger.warning("Could not save persistent state: {}"
2855
.format(os.strerror(e.errno)))
3588
log.warning("Could not save persistent state:",
2857
logger.warning("Could not save persistent state:",
3592
2861
# Delete all clients, and settings from config
3593
2862
while tcp_server.clients:
3594
2863
name, client = tcp_server.clients.popitem()
3596
2865
client.remove_from_connection()
3597
# Don't signal the disabling
2866
# Don't signal anything except ClientRemoved
3598
2867
client.disable(quiet=True)
3599
# Emit D-Bus signal for removal
3601
mandos_dbus_service.client_removed_signal(client)
2870
mandos_dbus_service.ClientRemoved(
2871
client.dbus_object_path, client.name)
3602
2872
client_settings.clear()
3604
2874
atexit.register(cleanup)
3606
for client in tcp_server.clients.values():
2876
for client in tcp_server.clients.itervalues():
3608
# Emit D-Bus signal for adding
3609
mandos_dbus_service.client_added_signal(client)
2879
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3610
2880
# Need to initiate checking of clients
3611
2881
if client.enabled:
3612
2882
client.init_checker()
3614
2884
tcp_server.enable()
3615
2885
tcp_server.server_activate()
3617
2887
# Find out what port we got
3619
2889
service.port = tcp_server.socket.getsockname()[1]
3621
log.info("Now listening on address %r, port %d, flowinfo %d,"
3622
" scope_id %d", *tcp_server.socket.getsockname())
2891
logger.info("Now listening on address %r, port %d,"
2892
" flowinfo %d, scope_id %d",
2893
*tcp_server.socket.getsockname())
3624
log.info("Now listening on address %r, port %d",
3625
*tcp_server.socket.getsockname())
3627
# service.interface = tcp_server.socket.getsockname()[3]
2895
logger.info("Now listening on address %r, port %d",
2896
*tcp_server.socket.getsockname())
2898
#service.interface = tcp_server.socket.getsockname()[3]
3631
2902
# From the Avahi example code
3633
2904
service.activate()
3634
2905
except dbus.exceptions.DBusException as error:
3635
log.critical("D-Bus Exception", exc_info=error)
2906
logger.critical("D-Bus Exception", exc_info=error)
3638
2909
# End of Avahi example code
3641
GLib.IOChannel.unix_new(tcp_server.fileno()),
3642
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3643
lambda *args, **kwargs: (tcp_server.handle_request
3644
(*args[2:], **kwargs) or True))
3646
log.debug("Starting main loop")
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")
3647
2917
main_loop.run()
3648
2918
except AvahiError as error:
3649
log.critical("Avahi Error", exc_info=error)
2919
logger.critical("Avahi Error", exc_info=error)
3652
2922
except KeyboardInterrupt:
3654
2924
print("", file=sys.stderr)
3655
log.debug("Server received KeyboardInterrupt")
3656
log.debug("Server exiting")
2925
logger.debug("Server received KeyboardInterrupt")
2926
logger.debug("Server exiting")
3657
2927
# Must run before the D-Bus bus name gets deregistered
3661
def parse_test_args():
3662
# type: () -> argparse.Namespace
3663
parser = argparse.ArgumentParser(add_help=False)
3664
parser.add_argument("--check", action="store_true")
3665
parser.add_argument("--prefix", )
3666
args, unknown_args = parser.parse_known_args()
3668
# Remove test options from sys.argv
3669
sys.argv[1:] = unknown_args
3672
# Add all tests from doctest strings
3673
def load_tests(loader, tests, none):
3675
tests.addTests(doctest.DocTestSuite())
3678
if __name__ == "__main__":
3679
options = parse_test_args()
3682
extra_test_prefix = options.prefix
3683
if extra_test_prefix is not None:
3684
if not (unittest.main(argv=[""], exit=False)
3685
.result.wasSuccessful()):
3687
class ExtraTestLoader(unittest.TestLoader):
3688
testMethodPrefix = extra_test_prefix
3689
# Call using ./scriptname --test [--verbose]
3690
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3692
unittest.main(argv=[""])
3700
# (lambda (&optional extra)
3701
# (if (not (funcall run-tests-in-test-buffer default-directory
3703
# (funcall show-test-buffer-in-test-window)
3704
# (funcall remove-test-window)
3705
# (if extra (message "Extra tests run successfully!"))))
3706
# run-tests-in-test-buffer:
3707
# (lambda (dir &optional extra)
3708
# (with-current-buffer (get-buffer-create "*Test*")
3709
# (setq buffer-read-only nil
3710
# default-directory dir)
3712
# (compilation-mode))
3713
# (let ((process-result
3714
# (let ((inhibit-read-only t))
3715
# (process-file-shell-command
3716
# (funcall get-command-line extra) nil "*Test*"))))
3717
# (and (numberp process-result)
3718
# (= process-result 0))))
3720
# (lambda (&optional extra)
3721
# (let ((quoted-script
3722
# (shell-quote-argument (funcall get-script-name))))
3724
# (concat "%s --check" (if extra " --prefix=atest" ""))
3728
# (if (fboundp 'file-local-name)
3729
# (file-local-name (buffer-file-name))
3730
# (or (file-remote-p (buffer-file-name) 'localname)
3731
# (buffer-file-name))))
3732
# remove-test-window:
3734
# (let ((test-window (get-buffer-window "*Test*")))
3735
# (if test-window (delete-window test-window))))
3736
# show-test-buffer-in-test-window:
3738
# (when (not (get-buffer-window-list "*Test*"))
3739
# (setq next-error-last-buffer (get-buffer "*Test*"))
3740
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3741
# (display-buffer-overriding-action
3742
# `((display-buffer-in-side-window) (side . ,side)
3743
# (window-height . fit-window-to-buffer)
3744
# (window-width . fit-window-to-buffer))))
3745
# (display-buffer "*Test*"))))
3748
# (let* ((run-extra-tests (lambda () (interactive)
3749
# (funcall run-tests t)))
3750
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3751
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3752
# (setq minor-mode-overriding-map-alist
3753
# (cons `(run-tests . ,outer-keymap)
3754
# minor-mode-overriding-map-alist)))
3755
# (add-hook 'after-save-hook run-tests 90 t))
2931
if __name__ == '__main__':