249
195
.replace(b"\n", b"\\n")
250
196
.replace(b"\0", b"\\x00"))
253
199
def encrypt(self, data, password):
254
200
passphrase = self.password_encode(password)
255
201
with tempfile.NamedTemporaryFile(
256
202
dir=self.tempdir) as passfile:
257
203
passfile.write(passphrase)
259
proc = subprocess.Popen([self.gpg, '--symmetric',
205
proc = subprocess.Popen(['gpg', '--symmetric',
260
206
'--passphrase-file',
262
208
+ self.gnupgargs,
263
stdin=subprocess.PIPE,
264
stdout=subprocess.PIPE,
265
stderr=subprocess.PIPE)
266
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)
267
213
if proc.returncode != 0:
268
214
raise PGPError(err)
269
215
return ciphertext
271
217
def decrypt(self, data, password):
272
218
passphrase = self.password_encode(password)
273
219
with tempfile.NamedTemporaryFile(
274
dir=self.tempdir) as passfile:
220
dir = self.tempdir) as passfile:
275
221
passfile.write(passphrase)
277
proc = subprocess.Popen([self.gpg, '--decrypt',
223
proc = subprocess.Popen(['gpg', '--decrypt',
278
224
'--passphrase-file',
280
226
+ self.gnupgargs,
281
stdin=subprocess.PIPE,
282
stdout=subprocess.PIPE,
283
stderr=subprocess.PIPE)
284
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)
285
231
if proc.returncode != 0:
286
232
raise PGPError(err)
287
233
return decrypted_plaintext
290
# Pretend that we have an Avahi module
292
"""This isn't so much a class as it is a module-like namespace."""
293
IF_UNSPEC = -1 # avahi-common/address.h
294
PROTO_UNSPEC = -1 # avahi-common/address.h
295
PROTO_INET = 0 # avahi-common/address.h
296
PROTO_INET6 = 1 # avahi-common/address.h
297
DBUS_NAME = "org.freedesktop.Avahi"
298
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
299
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
300
DBUS_PATH_SERVER = "/"
303
def string_array_to_txt_array(t):
304
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
305
for s in t), signature="ay")
306
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
307
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
308
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
309
SERVER_INVALID = 0 # avahi-common/defs.h
310
SERVER_REGISTERING = 1 # avahi-common/defs.h
311
SERVER_RUNNING = 2 # avahi-common/defs.h
312
SERVER_COLLISION = 3 # avahi-common/defs.h
313
SERVER_FAILURE = 4 # avahi-common/defs.h
316
236
class AvahiError(Exception):
317
237
def __init__(self, value, *args, **kwargs):
318
238
self.value = value
508
417
class AvahiServiceToSyslog(AvahiService):
509
418
def rename(self, *args, **kwargs):
510
419
"""Add the new name to the syslog messages"""
511
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
420
ret = AvahiService.rename(self, *args, **kwargs)
512
421
syslogger.setFormatter(logging.Formatter(
513
422
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
514
423
.format(self.name)))
518
# Pretend that we have a GnuTLS module
520
"""This isn't so much a class as it is a module-like namespace."""
522
library = ctypes.util.find_library("gnutls")
524
library = ctypes.util.find_library("gnutls-deb0")
525
_library = ctypes.cdll.LoadLibrary(library)
528
# Unless otherwise indicated, the constants and types below are
529
# all from the gnutls/gnutls.h C header file.
540
E_NO_CERTIFICATE_FOUND = -49
545
KEYID_USE_SHA256 = 1 # gnutls/x509.h
546
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
549
class session_int(ctypes.Structure):
551
session_t = ctypes.POINTER(session_int)
553
class certificate_credentials_st(ctypes.Structure):
555
certificate_credentials_t = ctypes.POINTER(
556
certificate_credentials_st)
557
certificate_type_t = ctypes.c_int
559
class datum_t(ctypes.Structure):
560
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
561
('size', ctypes.c_uint)]
563
class openpgp_crt_int(ctypes.Structure):
565
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
566
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
567
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
568
credentials_type_t = ctypes.c_int
569
transport_ptr_t = ctypes.c_void_p
570
close_request_t = ctypes.c_int
573
class Error(Exception):
574
def __init__(self, message=None, code=None, args=()):
575
# Default usage is by a message string, but if a return
576
# code is passed, convert it to a string with
579
if message is None and code is not None:
580
message = gnutls.strerror(code)
581
return super(gnutls.Error, self).__init__(
584
class CertificateSecurityError(Error):
590
self._c_object = gnutls.certificate_credentials_t()
591
gnutls.certificate_allocate_credentials(
592
ctypes.byref(self._c_object))
593
self.type = gnutls.CRD_CERTIFICATE
596
gnutls.certificate_free_credentials(self._c_object)
599
def __init__(self, socket, credentials=None):
600
self._c_object = gnutls.session_t()
601
gnutls_flags = gnutls.CLIENT
602
if gnutls.check_version(b"3.5.6"):
603
gnutls_flags |= gnutls.NO_TICKETS
605
gnutls_flags |= gnutls.ENABLE_RAWPK
606
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
608
gnutls.set_default_priority(self._c_object)
609
gnutls.transport_set_ptr(self._c_object, socket.fileno())
610
gnutls.handshake_set_private_extensions(self._c_object,
613
if credentials is None:
614
credentials = gnutls.Credentials()
615
gnutls.credentials_set(self._c_object, credentials.type,
616
ctypes.cast(credentials._c_object,
618
self.credentials = credentials
621
gnutls.deinit(self._c_object)
624
return gnutls.handshake(self._c_object)
626
def send(self, data):
630
data_len -= gnutls.record_send(self._c_object,
635
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
637
# Error handling functions
638
def _error_code(result):
639
"""A function to raise exceptions on errors, suitable
640
for the 'restype' attribute on ctypes functions"""
643
if result == gnutls.E_NO_CERTIFICATE_FOUND:
644
raise gnutls.CertificateSecurityError(code=result)
645
raise gnutls.Error(code=result)
647
def _retry_on_error(result, func, arguments):
648
"""A function to retry on some errors, suitable
649
for the 'errcheck' attribute on ctypes functions"""
651
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
652
return _error_code(result)
653
result = func(*arguments)
656
# Unless otherwise indicated, the function declarations below are
657
# all from the gnutls/gnutls.h C header file.
660
priority_set_direct = _library.gnutls_priority_set_direct
661
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
662
ctypes.POINTER(ctypes.c_char_p)]
663
priority_set_direct.restype = _error_code
665
init = _library.gnutls_init
666
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
667
init.restype = _error_code
669
set_default_priority = _library.gnutls_set_default_priority
670
set_default_priority.argtypes = [session_t]
671
set_default_priority.restype = _error_code
673
record_send = _library.gnutls_record_send
674
record_send.argtypes = [session_t, ctypes.c_void_p,
676
record_send.restype = ctypes.c_ssize_t
677
record_send.errcheck = _retry_on_error
679
certificate_allocate_credentials = (
680
_library.gnutls_certificate_allocate_credentials)
681
certificate_allocate_credentials.argtypes = [
682
ctypes.POINTER(certificate_credentials_t)]
683
certificate_allocate_credentials.restype = _error_code
685
certificate_free_credentials = (
686
_library.gnutls_certificate_free_credentials)
687
certificate_free_credentials.argtypes = [
688
certificate_credentials_t]
689
certificate_free_credentials.restype = None
691
handshake_set_private_extensions = (
692
_library.gnutls_handshake_set_private_extensions)
693
handshake_set_private_extensions.argtypes = [session_t,
695
handshake_set_private_extensions.restype = None
697
credentials_set = _library.gnutls_credentials_set
698
credentials_set.argtypes = [session_t, credentials_type_t,
700
credentials_set.restype = _error_code
702
strerror = _library.gnutls_strerror
703
strerror.argtypes = [ctypes.c_int]
704
strerror.restype = ctypes.c_char_p
706
certificate_type_get = _library.gnutls_certificate_type_get
707
certificate_type_get.argtypes = [session_t]
708
certificate_type_get.restype = _error_code
710
certificate_get_peers = _library.gnutls_certificate_get_peers
711
certificate_get_peers.argtypes = [session_t,
712
ctypes.POINTER(ctypes.c_uint)]
713
certificate_get_peers.restype = ctypes.POINTER(datum_t)
715
global_set_log_level = _library.gnutls_global_set_log_level
716
global_set_log_level.argtypes = [ctypes.c_int]
717
global_set_log_level.restype = None
719
global_set_log_function = _library.gnutls_global_set_log_function
720
global_set_log_function.argtypes = [log_func]
721
global_set_log_function.restype = None
723
deinit = _library.gnutls_deinit
724
deinit.argtypes = [session_t]
725
deinit.restype = None
727
handshake = _library.gnutls_handshake
728
handshake.argtypes = [session_t]
729
handshake.restype = _error_code
730
handshake.errcheck = _retry_on_error
732
transport_set_ptr = _library.gnutls_transport_set_ptr
733
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
734
transport_set_ptr.restype = None
736
bye = _library.gnutls_bye
737
bye.argtypes = [session_t, close_request_t]
738
bye.restype = _error_code
739
bye.errcheck = _retry_on_error
741
check_version = _library.gnutls_check_version
742
check_version.argtypes = [ctypes.c_char_p]
743
check_version.restype = ctypes.c_char_p
745
_need_version = b"3.3.0"
746
if check_version(_need_version) is None:
747
raise self.Error("Needs GnuTLS {} or later"
748
.format(_need_version))
750
_tls_rawpk_version = b"3.6.6"
751
has_rawpk = bool(check_version(_tls_rawpk_version))
755
class pubkey_st(ctypes.Structure):
757
pubkey_t = ctypes.POINTER(pubkey_st)
759
x509_crt_fmt_t = ctypes.c_int
761
# All the function declarations below are from gnutls/abstract.h
762
pubkey_init = _library.gnutls_pubkey_init
763
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
764
pubkey_init.restype = _error_code
766
pubkey_import = _library.gnutls_pubkey_import
767
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
769
pubkey_import.restype = _error_code
771
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
772
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
773
ctypes.POINTER(ctypes.c_ubyte),
774
ctypes.POINTER(ctypes.c_size_t)]
775
pubkey_get_key_id.restype = _error_code
777
pubkey_deinit = _library.gnutls_pubkey_deinit
778
pubkey_deinit.argtypes = [pubkey_t]
779
pubkey_deinit.restype = None
781
# All the function declarations below are from gnutls/openpgp.h
783
openpgp_crt_init = _library.gnutls_openpgp_crt_init
784
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
785
openpgp_crt_init.restype = _error_code
787
openpgp_crt_import = _library.gnutls_openpgp_crt_import
788
openpgp_crt_import.argtypes = [openpgp_crt_t,
789
ctypes.POINTER(datum_t),
791
openpgp_crt_import.restype = _error_code
793
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
794
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
795
ctypes.POINTER(ctypes.c_uint)]
796
openpgp_crt_verify_self.restype = _error_code
798
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
799
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
800
openpgp_crt_deinit.restype = None
802
openpgp_crt_get_fingerprint = (
803
_library.gnutls_openpgp_crt_get_fingerprint)
804
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
808
openpgp_crt_get_fingerprint.restype = _error_code
810
if check_version(b"3.6.4"):
811
certificate_type_get2 = _library.gnutls_certificate_type_get2
812
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
813
certificate_type_get2.restype = _error_code
815
# Remove non-public functions
816
del _error_code, _retry_on_error
819
def call_pipe(connection, # : multiprocessing.Connection
820
func, *args, **kwargs):
821
"""This function is meant to be called by multiprocessing.Process
823
This function runs func(*args, **kwargs), and writes the resulting
824
return value on the provided multiprocessing.Connection.
826
connection.send(func(*args, **kwargs))
427
class Client(object):
831
428
"""A representation of a client host served by this server.
834
431
approved: bool(); 'None' if not yet approved/disapproved
835
432
approval_delay: datetime.timedelta(); Time to wait for approval
836
433
approval_duration: datetime.timedelta(); Duration of one approval
837
checker: multiprocessing.Process(); a running checker process used
838
to see if the client lives. 'None' if no process is
840
checker_callback_tag: a GLib event source tag, or None
434
checker: subprocess.Popen(); a running checker process used
435
to see if the client lives.
436
'None' if no process is running.
437
checker_callback_tag: a gobject event source tag, or None
841
438
checker_command: string; External command which is run to check
842
439
if client lives. %() expansions are done at
843
440
runtime with vars(self) as dict, so that for
844
441
instance %(name)s can be used in the command.
845
checker_initiator_tag: a GLib event source tag, or None
442
checker_initiator_tag: a gobject event source tag, or None
846
443
created: datetime.datetime(); (UTC) object creation
847
444
client_structure: Object describing what attributes a client has
848
445
and is used for storing the client at exit
849
446
current_checker_command: string; current running checker_command
850
disable_initiator_tag: a GLib event source tag, or None
447
disable_initiator_tag: a gobject event source tag, or None
852
449
fingerprint: string (40 or 32 hexadecimal digits); used to
853
uniquely identify an OpenPGP client
854
key_id: string (64 hexadecimal digits); used to uniquely identify
855
a client using raw public keys
450
uniquely identify the client
856
451
host: string; available for use by the checker command
857
452
interval: datetime.timedelta(); How often to start a new checker
858
453
last_approval_request: datetime.datetime(); (UTC) or None
1015
603
logger.info("Disabling client %s", self.name)
1016
604
if getattr(self, "disable_initiator_tag", None) is not None:
1017
GLib.source_remove(self.disable_initiator_tag)
605
gobject.source_remove(self.disable_initiator_tag)
1018
606
self.disable_initiator_tag = None
1019
607
self.expires = None
1020
608
if getattr(self, "checker_initiator_tag", None) is not None:
1021
GLib.source_remove(self.checker_initiator_tag)
609
gobject.source_remove(self.checker_initiator_tag)
1022
610
self.checker_initiator_tag = None
1023
611
self.stop_checker()
1024
612
self.enabled = False
1026
614
self.send_changedstate()
1027
# Do not run this again if called by a GLib.timeout_add
615
# Do not run this again if called by a gobject.timeout_add
1030
618
def __del__(self):
1033
621
def init_checker(self):
1034
622
# Schedule a new checker to be started an 'interval' from now,
1035
623
# and every interval from then on.
1036
624
if self.checker_initiator_tag is not None:
1037
GLib.source_remove(self.checker_initiator_tag)
1038
self.checker_initiator_tag = GLib.timeout_add(
1039
random.randrange(int(self.interval.total_seconds() * 1000
625
gobject.source_remove(self.checker_initiator_tag)
626
self.checker_initiator_tag = gobject.timeout_add(
627
int(self.interval.total_seconds() * 1000),
1041
628
self.start_checker)
1042
629
# Schedule a disable() when 'timeout' has passed
1043
630
if self.disable_initiator_tag is not None:
1044
GLib.source_remove(self.disable_initiator_tag)
1045
self.disable_initiator_tag = GLib.timeout_add(
631
gobject.source_remove(self.disable_initiator_tag)
632
self.disable_initiator_tag = gobject.timeout_add(
1046
633
int(self.timeout.total_seconds() * 1000), self.disable)
1047
634
# Also start a new checker *right now*.
1048
635
self.start_checker()
1050
def checker_callback(self, source, condition, connection,
637
def checker_callback(self, pid, condition, command):
1052
638
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
1056
if self.checker is not None:
1058
639
self.checker_callback_tag = None
1059
640
self.checker = None
1062
self.last_checker_status = returncode
1063
self.last_checker_signal = None
641
if os.WIFEXITED(condition):
642
self.last_checker_status = os.WEXITSTATUS(condition)
1064
643
if self.last_checker_status == 0:
1065
644
logger.info("Checker for %(name)s succeeded",
1129
715
return True # Try again later
1130
716
self.current_checker_command = command
1131
logger.info("Starting checker %r for %s", command,
1133
# We don't need to redirect stdout and stderr, since
1134
# in normal mode, that is already done by daemon(),
1135
# and in debug mode we don't want to. (Stdin is
1136
# always replaced by /dev/null.)
1137
# The exception is when not debugging but nevertheless
1138
# running in the foreground; use the previously
1140
popen_args = {"close_fds": True,
1143
if (not self.server_settings["debug"]
1144
and self.server_settings["foreground"]):
1145
popen_args.update({"stdout": wnull,
1147
pipe = multiprocessing.Pipe(duplex=False)
1148
self.checker = multiprocessing.Process(
1150
args=(pipe[1], subprocess.call, command),
1152
self.checker.start()
1153
self.checker_callback_tag = GLib.io_add_watch(
1154
GLib.IOChannel.unix_new(pipe[0].fileno()),
1155
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1156
self.checker_callback, pipe[0], command)
1157
# Re-run this periodically if run by GLib.timeout_add
718
logger.info("Starting checker %r for %s", command,
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
741
self.checker_callback_tag = gobject.child_watch_add(
742
self.checker.pid, self.checker_callback, data=command)
743
# The checker may have completed before the gobject
744
# watch was added. Check for this.
746
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
747
except OSError as error:
748
if error.errno == errno.ECHILD:
749
# This should never happen
750
logger.error("Child process vanished",
755
gobject.source_remove(self.checker_callback_tag)
756
self.checker_callback(pid, status, command)
757
# Re-run this periodically if run by gobject.timeout_add
1160
760
def stop_checker(self):
1161
761
"""Force the checker process, if any, to stop."""
1162
762
if self.checker_callback_tag:
1163
GLib.source_remove(self.checker_callback_tag)
763
gobject.source_remove(self.checker_callback_tag)
1164
764
self.checker_callback_tag = None
1165
765
if getattr(self, "checker", None) is None:
1167
767
logger.debug("Stopping checker for %(name)s", vars(self))
1168
self.checker.terminate()
769
self.checker.terminate()
771
#if self.checker.poll() is None:
772
# self.checker.kill()
773
except OSError as error:
774
if error.errno != errno.ESRCH: # No such process
1169
776
self.checker = None
1289
895
for cls in self.__class__.__mro__
1290
896
for name, athing in
1291
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1293
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1295
path_keyword='object_path',
1296
connection_keyword='connection')
1297
def Introspect(self, object_path, connection):
1298
"""Overloading of standard D-Bus method.
1300
Inserts annotation tags on methods and signals.
1302
xmlstring = dbus.service.Object.Introspect(self, object_path,
1305
document = xml.dom.minidom.parseString(xmlstring)
1307
for if_tag in document.getElementsByTagName("interface"):
1308
# Add annotation tags
1309
for typ in ("method", "signal"):
1310
for tag in if_tag.getElementsByTagName(typ):
1312
for name, prop in (self.
1313
_get_all_dbus_things(typ)):
1314
if (name == tag.getAttribute("name")
1315
and prop._dbus_interface
1316
== if_tag.getAttribute("name")):
1317
annots.update(getattr(
1318
prop, "_dbus_annotations", {}))
1319
for name, value in annots.items():
1320
ann_tag = document.createElement(
1322
ann_tag.setAttribute("name", name)
1323
ann_tag.setAttribute("value", value)
1324
tag.appendChild(ann_tag)
1325
# Add interface annotation tags
1326
for annotation, value in dict(
1327
itertools.chain.from_iterable(
1328
annotations().items()
1329
for name, annotations
1330
in self._get_all_dbus_things("interface")
1331
if name == if_tag.getAttribute("name")
1333
ann_tag = document.createElement("annotation")
1334
ann_tag.setAttribute("name", annotation)
1335
ann_tag.setAttribute("value", value)
1336
if_tag.appendChild(ann_tag)
1337
# Fix argument name for the Introspect method itself
1338
if (if_tag.getAttribute("name")
1339
== dbus.INTROSPECTABLE_IFACE):
1340
for cn in if_tag.getElementsByTagName("method"):
1341
if cn.getAttribute("name") == "Introspect":
1342
for arg in cn.getElementsByTagName("arg"):
1343
if (arg.getAttribute("direction")
1345
arg.setAttribute("name",
1347
xmlstring = document.toxml("utf-8")
1349
except (AttributeError, xml.dom.DOMException,
1350
xml.parsers.expat.ExpatError) as error:
1351
logger.error("Failed to override Introspection method",
1356
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1357
"""A D-Bus object with properties.
1359
Classes inheriting from this can use the dbus_service_property
1360
decorator to expose methods as D-Bus properties. It exposes the
1361
standard Get(), Set(), and GetAll() methods on the D-Bus.
1364
899
def _get_dbus_property(self, interface_name, property_name):
1365
900
"""Returns a bound method if one exists which is a D-Bus
1366
901
property with the specified name and interface.
1520
1059
return xmlstring
1524
dbus.OBJECT_MANAGER_IFACE
1525
except AttributeError:
1526
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1529
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1530
"""A D-Bus object with an ObjectManager.
1532
Classes inheriting from this exposes the standard
1533
GetManagedObjects call and the InterfacesAdded and
1534
InterfacesRemoved signals on the standard
1535
"org.freedesktop.DBus.ObjectManager" interface.
1537
Note: No signals are sent automatically; they must be sent
1540
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1541
out_signature="a{oa{sa{sv}}}")
1542
def GetManagedObjects(self):
1543
"""This function must be overridden"""
1544
raise NotImplementedError()
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1547
signature="oa{sa{sv}}")
1548
def InterfacesAdded(self, object_path, interfaces_and_properties):
1551
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1552
def InterfacesRemoved(self, object_path, interfaces):
1555
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1557
path_keyword='object_path',
1558
connection_keyword='connection')
1559
def Introspect(self, object_path, connection):
1560
"""Overloading of standard D-Bus method.
1562
Override return argument name of GetManagedObjects to be
1563
"objpath_interfaces_and_properties"
1565
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1569
document = xml.dom.minidom.parseString(xmlstring)
1571
for if_tag in document.getElementsByTagName("interface"):
1572
# Fix argument name for the GetManagedObjects method
1573
if (if_tag.getAttribute("name")
1574
== dbus.OBJECT_MANAGER_IFACE):
1575
for cn in if_tag.getElementsByTagName("method"):
1576
if (cn.getAttribute("name")
1577
== "GetManagedObjects"):
1578
for arg in cn.getElementsByTagName("arg"):
1579
if (arg.getAttribute("direction")
1583
"objpath_interfaces"
1585
xmlstring = document.toxml("utf-8")
1587
except (AttributeError, xml.dom.DOMException,
1588
xml.parsers.expat.ExpatError) as error:
1589
logger.error("Failed to override Introspection method",
1594
1062
def datetime_to_dbus(dt, variant_level=0):
1595
1063
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1597
return dbus.String("", variant_level=variant_level)
1065
return dbus.String("", variant_level = variant_level)
1598
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
2382
1818
delay -= time2 - time
2385
session.send(client.secret)
2386
except gnutls.Error as error:
2387
logger.warning("gnutls send failed",
1821
while sent_size < len(client.secret):
1823
sent = session.send(client.secret[sent_size:])
1824
except gnutls.errors.GNUTLSError as error:
1825
logger.warning("gnutls send failed",
1828
logger.debug("Sent: %d, remaining: %d", sent,
1829
len(client.secret) - (sent_size
2391
1833
logger.info("Sending secret to %s", client.name)
2392
1834
# bump the timeout using extended_timeout
2393
1835
client.bump_timeout(client.extended_timeout)
2394
1836
if self.server.use_dbus:
2395
1837
# Emit D-Bus signal
2396
1838
client.GotSecret()
2399
1841
if approval_required:
2400
1842
client.approvals_pending -= 1
2403
except gnutls.Error as error:
1845
except gnutls.errors.GNUTLSError as error:
2404
1846
logger.warning("GnuTLS bye failed",
2405
1847
exc_info=error)
2408
1850
def peer_certificate(session):
2409
"Return the peer's certificate as a bytestring"
2411
cert_type = gnutls.certificate_type_get2(session._c_object,
2413
except AttributeError:
2414
cert_type = gnutls.certificate_type_get(session._c_object)
2415
if gnutls.has_rawpk:
2416
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2418
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2419
# If not a valid certificate type...
2420
if cert_type not in valid_cert_types:
2421
logger.info("Cert type %r not in %r", cert_type,
2423
# ...return invalid data
1851
"Return the peer's OpenPGP certificate as a bytestring"
1852
# If not an OpenPGP certificate...
1853
if (gnutls.library.functions.gnutls_certificate_type_get(
1855
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1856
# ...do the normal thing
1857
return session.peer_certificate
2425
1858
list_size = ctypes.c_uint(1)
2426
cert_list = (gnutls.certificate_get_peers
1859
cert_list = (gnutls.library.functions
1860
.gnutls_certificate_get_peers
2427
1861
(session._c_object, ctypes.byref(list_size)))
2428
1862
if not bool(cert_list) and list_size.value != 0:
2429
raise gnutls.Error("error getting peer certificate")
1863
raise gnutls.errors.GNUTLSError("error getting peer"
2430
1865
if list_size.value == 0:
2432
1867
cert = cert_list[0]
2433
1868
return ctypes.string_at(cert.data, cert.size)
2436
def key_id(certificate):
2437
"Convert a certificate bytestring to a hexdigit key ID"
2438
# New GnuTLS "datum" with the public key
2439
datum = gnutls.datum_t(
2440
ctypes.cast(ctypes.c_char_p(certificate),
2441
ctypes.POINTER(ctypes.c_ubyte)),
2442
ctypes.c_uint(len(certificate)))
2443
# XXX all these need to be created in the gnutls "module"
2444
# New empty GnuTLS certificate
2445
pubkey = gnutls.pubkey_t()
2446
gnutls.pubkey_init(ctypes.byref(pubkey))
2447
# Import the raw public key into the certificate
2448
gnutls.pubkey_import(pubkey,
2449
ctypes.byref(datum),
2450
gnutls.X509_FMT_DER)
2451
# New buffer for the key ID
2452
buf = ctypes.create_string_buffer(32)
2453
buf_len = ctypes.c_size_t(len(buf))
2454
# Get the key ID from the raw public key into the buffer
2455
gnutls.pubkey_get_key_id(pubkey,
2456
gnutls.KEYID_USE_SHA256,
2457
ctypes.cast(ctypes.byref(buf),
2458
ctypes.POINTER(ctypes.c_ubyte)),
2459
ctypes.byref(buf_len))
2460
# Deinit the certificate
2461
gnutls.pubkey_deinit(pubkey)
2463
# Convert the buffer to a Python bytestring
2464
key_id = ctypes.string_at(buf, buf_len.value)
2465
# Convert the bytestring to hexadecimal notation
2466
hex_key_id = binascii.hexlify(key_id).upper()
2470
1871
def fingerprint(openpgp):
2471
1872
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2472
1873
# New GnuTLS "datum" with the OpenPGP public key
2473
datum = gnutls.datum_t(
1874
datum = gnutls.library.types.gnutls_datum_t(
2474
1875
ctypes.cast(ctypes.c_char_p(openpgp),
2475
1876
ctypes.POINTER(ctypes.c_ubyte)),
2476
1877
ctypes.c_uint(len(openpgp)))
2477
1878
# New empty GnuTLS certificate
2478
crt = gnutls.openpgp_crt_t()
2479
gnutls.openpgp_crt_init(ctypes.byref(crt))
1879
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1880
gnutls.library.functions.gnutls_openpgp_crt_init(
2480
1882
# Import the OpenPGP public key into the certificate
2481
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2482
gnutls.OPENPGP_FMT_RAW)
1883
gnutls.library.functions.gnutls_openpgp_crt_import(
1884
crt, ctypes.byref(datum),
1885
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2483
1886
# Verify the self signature in the key
2484
1887
crtverify = ctypes.c_uint()
2485
gnutls.openpgp_crt_verify_self(crt, 0,
2486
ctypes.byref(crtverify))
1888
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1889
crt, 0, ctypes.byref(crtverify))
2487
1890
if crtverify.value != 0:
2488
gnutls.openpgp_crt_deinit(crt)
2489
raise gnutls.CertificateSecurityError(code
1891
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1892
raise gnutls.errors.CertificateSecurityError(
2491
1894
# New buffer for the fingerprint
2492
1895
buf = ctypes.create_string_buffer(20)
2493
1896
buf_len = ctypes.c_size_t()
2494
1897
# Get the fingerprint from the certificate into the buffer
2495
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2496
ctypes.byref(buf_len))
1898
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1899
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2497
1900
# Deinit the certificate
2498
gnutls.openpgp_crt_deinit(crt)
1901
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2499
1902
# Convert the buffer to a Python bytestring
2500
1903
fpr = ctypes.string_at(buf, buf_len.value)
2501
1904
# Convert the bytestring to hexadecimal notation
2590
1992
# socket_wrapper(), if socketfd was set.
2591
1993
socketserver.TCPServer.__init__(self, server_address,
2592
1994
RequestHandlerClass)
2594
1996
def server_bind(self):
2595
1997
"""This overrides the normal server_bind() function
2596
1998
to bind to an interface if one was specified, and also NOT to
2597
1999
bind to an address or port if they were not specified."""
2598
global SO_BINDTODEVICE
2599
2000
if self.interface is not None:
2600
2001
if SO_BINDTODEVICE is None:
2601
# Fall back to a hard-coded value which seems to be
2603
logger.warning("SO_BINDTODEVICE not found, trying 25")
2604
SO_BINDTODEVICE = 25
2606
self.socket.setsockopt(
2607
socket.SOL_SOCKET, SO_BINDTODEVICE,
2608
(self.interface + "\0").encode("utf-8"))
2609
except socket.error as error:
2610
if error.errno == errno.EPERM:
2611
logger.error("No permission to bind to"
2612
" interface %s", self.interface)
2613
elif error.errno == errno.ENOPROTOOPT:
2614
logger.error("SO_BINDTODEVICE not available;"
2615
" cannot bind to interface %s",
2617
elif error.errno == errno.ENODEV:
2618
logger.error("Interface %s does not exist,"
2619
" cannot bind", self.interface)
2002
logger.error("SO_BINDTODEVICE does not exist;"
2003
" cannot bind to interface %s",
2007
self.socket.setsockopt(
2008
socket.SOL_SOCKET, SO_BINDTODEVICE,
2009
(self.interface + "\0").encode("utf-8"))
2010
except socket.error as error:
2011
if error.errno == errno.EPERM:
2012
logger.error("No permission to bind to"
2013
" interface %s", self.interface)
2014
elif error.errno == errno.ENOPROTOOPT:
2015
logger.error("SO_BINDTODEVICE not available;"
2016
" cannot bind to interface %s",
2018
elif error.errno == errno.ENODEV:
2019
logger.error("Interface %s does not exist,"
2020
" cannot bind", self.interface)
2622
2023
# Only bind(2) the socket if we really need to.
2623
2024
if self.server_address[0] or self.server_address[1]:
2624
if self.server_address[1]:
2625
self.allow_reuse_address = True
2626
2025
if not self.server_address[0]:
2627
2026
if self.address_family == socket.AF_INET6:
2628
any_address = "::" # in6addr_any
2027
any_address = "::" # in6addr_any
2630
any_address = "0.0.0.0" # INADDR_ANY
2029
any_address = "0.0.0.0" # INADDR_ANY
2631
2030
self.server_address = (any_address,
2632
2031
self.server_address[1])
2633
2032
elif not self.server_address[1]:
2667
2066
self.gnutls_priority = gnutls_priority
2668
2067
IPv6_TCPServer.__init__(self, server_address,
2669
2068
RequestHandlerClass,
2670
interface=interface,
2069
interface = interface,
2070
use_ipv6 = use_ipv6,
2071
socketfd = socketfd)
2674
2073
def server_activate(self):
2675
2074
if self.enabled:
2676
2075
return socketserver.TCPServer.server_activate(self)
2678
2077
def enable(self):
2679
2078
self.enabled = True
2681
2080
def add_pipe(self, parent_pipe, proc):
2682
2081
# Call "handle_ipc" for both data and EOF events
2684
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2685
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2082
gobject.io_add_watch(
2083
parent_pipe.fileno(),
2084
gobject.IO_IN | gobject.IO_HUP,
2686
2085
functools.partial(self.handle_ipc,
2687
parent_pipe=parent_pipe,
2086
parent_pipe = parent_pipe,
2690
2089
def handle_ipc(self, source, condition,
2691
2090
parent_pipe=None,
2693
2092
client_object=None):
2694
2093
# error, or the other end of multiprocessing.Pipe has closed
2695
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2094
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2696
2095
# Wait for other process to exit
2700
2099
# Read a request from the child
2701
2100
request = parent_pipe.recv()
2702
2101
command = request[0]
2704
2103
if command == 'init':
2705
key_id = request[1].decode("ascii")
2706
fpr = request[2].decode("ascii")
2707
address = request[3]
2709
for c in self.clients.values():
2710
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2712
if key_id and c.key_id == key_id:
2715
if fpr and c.fingerprint == fpr:
2105
address = request[2]
2107
for c in self.clients.itervalues():
2108
if c.fingerprint == fpr:
2719
logger.info("Client not found for key ID: %s, address"
2720
": %s", key_id or fpr, address)
2112
logger.info("Client not found for fingerprint: %s, ad"
2113
"dress: %s", fpr, address)
2721
2114
if self.use_dbus:
2722
2115
# Emit D-Bus signal
2723
mandos_dbus_service.ClientNotFound(key_id or fpr,
2116
mandos_dbus_service.ClientNotFound(fpr,
2725
2118
parent_pipe.send(False)
2729
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2730
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2121
gobject.io_add_watch(
2122
parent_pipe.fileno(),
2123
gobject.IO_IN | gobject.IO_HUP,
2731
2124
functools.partial(self.handle_ipc,
2732
parent_pipe=parent_pipe,
2734
client_object=client))
2125
parent_pipe = parent_pipe,
2127
client_object = client))
2735
2128
parent_pipe.send(True)
2736
2129
# remove the old hook in favor of the new above hook on
2740
2133
funcname = request[1]
2741
2134
args = request[2]
2742
2135
kwargs = request[3]
2744
2137
parent_pipe.send(('data', getattr(client_object,
2745
2138
funcname)(*args,
2748
2141
if command == 'getattr':
2749
2142
attrname = request[1]
2750
if isinstance(client_object.__getattribute__(attrname),
2751
collections.Callable):
2143
if callable(client_object.__getattribute__(attrname)):
2752
2144
parent_pipe.send(('function', ))
2754
2146
parent_pipe.send((
2755
2147
'data', client_object.__getattribute__(attrname)))
2757
2149
if command == 'setattr':
2758
2150
attrname = request[1]
2759
2151
value = request[2]
2760
2152
setattr(client_object, attrname, value)
2765
2157
def rfc3339_duration_to_delta(duration):
2766
2158
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2768
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2772
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2774
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2776
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2778
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2780
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2160
>>> rfc3339_duration_to_delta("P7D")
2161
datetime.timedelta(7)
2162
>>> rfc3339_duration_to_delta("PT60S")
2163
datetime.timedelta(0, 60)
2164
>>> rfc3339_duration_to_delta("PT60M")
2165
datetime.timedelta(0, 3600)
2166
>>> rfc3339_duration_to_delta("PT24H")
2167
datetime.timedelta(1)
2168
>>> rfc3339_duration_to_delta("P1W")
2169
datetime.timedelta(7)
2170
>>> rfc3339_duration_to_delta("PT5M30S")
2171
datetime.timedelta(0, 330)
2172
>>> rfc3339_duration_to_delta("P1DT3M20S")
2173
datetime.timedelta(1, 200)
2784
2176
# Parsing an RFC 3339 duration with regular expressions is not
2785
2177
# possible - there would have to be multiple places for the same
2786
2178
# values, like seconds. The current code, while more esoteric, is
2787
2179
# cleaner without depending on a parsing library. If Python had a
2788
2180
# built-in library for parsing we would use it, but we'd like to
2789
2181
# avoid excessive use of external libraries.
2791
2183
# New type for defining tokens, syntax, and semantics all-in-one
2184
Token = collections.namedtuple("Token",
2185
("regexp", # To match token; if
2186
# "value" is not None,
2187
# must have a "group"
2189
"value", # datetime.timedelta or
2191
"followers")) # Tokens valid after
2792
2193
Token = collections.namedtuple("Token", (
2793
2194
"regexp", # To match token; if "value" is not None, must have
2794
2195
# a "group" containing digits
3194
2584
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3195
2585
service = AvahiServiceToSyslog(
3196
name=server_settings["servicename"],
3197
servicetype="_mandos._tcp",
2586
name = server_settings["servicename"],
2587
servicetype = "_mandos._tcp",
2588
protocol = protocol,
3200
2590
if server_settings["interface"]:
3201
2591
service.interface = if_nametoindex(
3202
2592
server_settings["interface"].encode("utf-8"))
3204
2594
global multiprocessing_manager
3205
2595
multiprocessing_manager = multiprocessing.Manager()
3207
2597
client_class = Client
3209
client_class = functools.partial(ClientDBus, bus=bus)
2599
client_class = functools.partial(ClientDBus, bus = bus)
3211
2601
client_settings = Client.config_parser(client_config)
3212
2602
old_client_settings = {}
3213
2603
clients_data = {}
3215
2605
# This is used to redirect stdout and stderr for checker processes
3217
wnull = open(os.devnull, "w") # A writable /dev/null
2607
wnull = open(os.devnull, "w") # A writable /dev/null
3218
2608
# Only used if server is running in foreground but not in debug
3220
2610
if debug or not foreground:
3223
2613
# Get client data and settings from last running state.
3224
2614
if server_settings["restore"]:
3226
2616
with open(stored_state_path, "rb") as stored_state:
3227
if sys.version_info.major == 2:
3228
clients_data, old_client_settings = pickle.load(
3231
bytes_clients_data, bytes_old_client_settings = (
3232
pickle.load(stored_state, encoding="bytes"))
3233
# Fix bytes to strings
3236
clients_data = {(key.decode("utf-8")
3237
if isinstance(key, bytes)
3240
bytes_clients_data.items()}
3241
del bytes_clients_data
3242
for key in clients_data:
3243
value = {(k.decode("utf-8")
3244
if isinstance(k, bytes) else k): v
3246
clients_data[key].items()}
3247
clients_data[key] = value
3249
value["client_structure"] = [
3251
if isinstance(s, bytes)
3253
value["client_structure"]]
3254
# .name, .host, and .checker_command
3255
for k in ("name", "host", "checker_command"):
3256
if isinstance(value[k], bytes):
3257
value[k] = value[k].decode("utf-8")
3258
if "key_id" not in value:
3259
value["key_id"] = ""
3260
elif "fingerprint" not in value:
3261
value["fingerprint"] = ""
3262
# old_client_settings
3264
old_client_settings = {
3265
(key.decode("utf-8")
3266
if isinstance(key, bytes)
3269
bytes_old_client_settings.items()}
3270
del bytes_old_client_settings
3271
# .host and .checker_command
3272
for value in old_client_settings.values():
3273
for attribute in ("host", "checker_command"):
3274
if isinstance(value[attribute], bytes):
3275
value[attribute] = (value[attribute]
2617
clients_data, old_client_settings = pickle.load(
3277
2619
os.remove(stored_state_path)
3278
2620
except IOError as e:
3279
2621
if e.errno == errno.ENOENT:
3357
2699
for client_name in (set(client_settings)
3358
2700
- set(old_client_settings)):
3359
2701
clients_data[client_name] = client_settings[client_name]
3361
2703
# Create all client objects
3362
2704
for client_name, client in clients_data.items():
3363
2705
tcp_server.clients[client_name] = client_class(
3366
server_settings=server_settings)
2708
server_settings = server_settings)
3368
2710
if not tcp_server.clients:
3369
2711
logger.warning("No clients defined")
3371
2713
if not foreground:
3372
2714
if pidfile is not None:
3376
print(pid, file=pidfile)
2718
pidfile.write("{}\n".format(pid).encode("utf-8"))
3377
2719
except IOError:
3378
2720
logger.error("Could not write to file %r with PID %d",
3379
2721
pidfilename, pid)
3381
2723
del pidfilename
3383
for termsig in (signal.SIGHUP, signal.SIGTERM):
3384
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3385
lambda: main_loop.quit() and False)
2725
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2726
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3389
2730
@alternate_dbus_interfaces(
3390
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3391
class MandosDBusService(DBusObjectWithObjectManager):
2731
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2732
class MandosDBusService(DBusObjectWithProperties):
3392
2733
"""A D-Bus proxy object"""
3394
2735
def __init__(self):
3395
2736
dbus.service.Object.__init__(self, bus, "/")
3397
2738
_interface = "se.recompile.Mandos"
2740
@dbus_interface_annotations(_interface)
2743
"org.freedesktop.DBus.Property.EmitsChangedSignal":
3399
2746
@dbus.service.signal(_interface, signature="o")
3400
2747
def ClientAdded(self, objpath):
3404
2751
@dbus.service.signal(_interface, signature="ss")
3405
def ClientNotFound(self, key_id, address):
2752
def ClientNotFound(self, fingerprint, address):
3409
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3411
2756
@dbus.service.signal(_interface, signature="os")
3412
2757
def ClientRemoved(self, objpath, name):
3416
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3418
2761
@dbus.service.method(_interface, out_signature="ao")
3419
2762
def GetAllClients(self):
3421
2764
return dbus.Array(c.dbus_object_path for c in
3422
tcp_server.clients.values())
3424
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2765
tcp_server.clients.itervalues())
3426
2767
@dbus.service.method(_interface,
3427
2768
out_signature="a{oa{sv}}")
3428
2769
def GetAllClientsWithProperties(self):
3430
2771
return dbus.Dictionary(
3431
{c.dbus_object_path: c.GetAll(
3432
"se.recompile.Mandos.Client")
3433
for c in tcp_server.clients.values()},
2772
{ c.dbus_object_path: c.GetAll("")
2773
for c in tcp_server.clients.itervalues() },
3434
2774
signature="oa{sv}")
3436
2776
@dbus.service.method(_interface, in_signature="o")
3437
2777
def RemoveClient(self, object_path):
3439
for c in tcp_server.clients.values():
2779
for c in tcp_server.clients.itervalues():
3440
2780
if c.dbus_object_path == object_path:
3441
2781
del tcp_server.clients[c.name]
3442
2782
c.remove_from_connection()
3443
# Don't signal the disabling
2783
# Don't signal anything except ClientRemoved
3444
2784
c.disable(quiet=True)
3445
# Emit D-Bus signal for removal
3446
self.client_removed_signal(c)
2786
self.ClientRemoved(object_path, c.name)
3448
2788
raise KeyError(object_path)
3452
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3453
out_signature="a{oa{sa{sv}}}")
3454
def GetManagedObjects(self):
3456
return dbus.Dictionary(
3457
{client.dbus_object_path:
3459
{interface: client.GetAll(interface)
3461
client._get_all_interface_names()})
3462
for client in tcp_server.clients.values()})
3464
def client_added_signal(self, client):
3465
"""Send the new standard signal and the old signal"""
3467
# New standard signal
3468
self.InterfacesAdded(
3469
client.dbus_object_path,
3471
{interface: client.GetAll(interface)
3473
client._get_all_interface_names()}))
3475
self.ClientAdded(client.dbus_object_path)
3477
def client_removed_signal(self, client):
3478
"""Send the new standard signal and the old signal"""
3480
# New standard signal
3481
self.InterfacesRemoved(
3482
client.dbus_object_path,
3483
client._get_all_interface_names())
3485
self.ClientRemoved(client.dbus_object_path,
3488
2792
mandos_dbus_service = MandosDBusService()
3490
# Save modules to variables to exempt the modules from being
3491
# unloaded before the function registered with atexit() is run.
3492
mp = multiprocessing
3496
2795
"Cleanup function; run on exit"
3498
2797
service.cleanup()
3500
mp.active_children()
2799
multiprocessing.active_children()
3502
2801
if not (tcp_server.clients or client_settings):
3505
2804
# Store client before exiting. Secrets are encrypted with key
3506
2805
# based on what config file has. If config file is
3507
2806
# removed/edited, old secret will thus be unrecovable.
3509
2808
with PGPEngine() as pgp:
3510
for client in tcp_server.clients.values():
2809
for client in tcp_server.clients.itervalues():
3511
2810
key = client_settings[client.name]["secret"]
3512
2811
client.encrypted_secret = pgp.encrypt(client.secret,
3514
2813
client_dict = {}
3516
2815
# A list of attributes that can not be pickled
3518
exclude = {"bus", "changedstate", "secret",
3519
"checker", "server_settings"}
2817
exclude = { "bus", "changedstate", "secret",
2818
"checker", "server_settings" }
3520
2819
for name, typ in inspect.getmembers(dbus.service
3522
2821
exclude.add(name)
3524
2823
client_dict["encrypted_secret"] = (client
3525
2824
.encrypted_secret)
3526
2825
for attr in client.client_structure:
3527
2826
if attr not in exclude:
3528
2827
client_dict[attr] = getattr(client, attr)
3530
2829
clients[client.name] = client_dict
3531
2830
del client_settings[client.name]["secret"]
3534
2833
with tempfile.NamedTemporaryFile(