2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
82
81
import dbus.service
83
from gi.repository import GLib
83
from gi.repository import GObject
85
import gobject as GObject
84
86
from dbus.mainloop.glib import DBusGMainLoop
87
89
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
93
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
94
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
96
from IN import SO_BINDTODEVICE
100
97
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
98
SO_BINDTODEVICE = None
115
100
if sys.version_info.major == 2:
119
104
stored_state_file = "clients.pickle"
121
106
logger = logging.getLogger()
247
230
'--passphrase-file',
249
232
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
233
stdin = subprocess.PIPE,
234
stdout = subprocess.PIPE,
235
stderr = subprocess.PIPE)
236
ciphertext, err = proc.communicate(input = data)
254
237
if proc.returncode != 0:
255
238
raise PGPError(err)
256
239
return ciphertext
258
241
def decrypt(self, data, password):
259
242
passphrase = self.password_encode(password)
260
243
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
244
dir = self.tempdir) as passfile:
262
245
passfile.write(passphrase)
264
247
proc = subprocess.Popen([self.gpg, '--decrypt',
265
248
'--passphrase-file',
267
250
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
251
stdin = subprocess.PIPE,
252
stdout = subprocess.PIPE,
253
stderr = subprocess.PIPE)
254
decrypted_plaintext, err = proc.communicate(input = data)
272
255
if proc.returncode != 0:
273
256
raise PGPError(err)
274
257
return decrypted_plaintext
277
259
# Pretend that we have an Avahi module
278
260
class Avahi(object):
279
261
"""This isn't so much a class as it is a module-like namespace.
280
262
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
263
IF_UNSPEC = -1 # avahi-common/address.h
264
PROTO_UNSPEC = -1 # avahi-common/address.h
265
PROTO_INET = 0 # avahi-common/address.h
266
PROTO_INET6 = 1 # avahi-common/address.h
285
267
DBUS_NAME = "org.freedesktop.Avahi"
286
268
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
269
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
270
DBUS_PATH_SERVER = "/"
290
271
def string_array_to_txt_array(self, t):
291
272
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
273
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
274
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
275
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
276
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
277
SERVER_INVALID = 0 # avahi-common/defs.h
278
SERVER_REGISTERING = 1 # avahi-common/defs.h
279
SERVER_RUNNING = 2 # avahi-common/defs.h
280
SERVER_COLLISION = 3 # avahi-common/defs.h
281
SERVER_FAILURE = 4 # avahi-common/defs.h
304
284
class AvahiError(Exception):
305
285
def __init__(self, value, *args, **kwargs):
306
286
self.value = value
496
476
class AvahiServiceToSyslog(AvahiService):
497
477
def rename(self, *args, **kwargs):
498
478
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
479
ret = AvahiService.rename(self, *args, **kwargs)
500
480
syslogger.setFormatter(logging.Formatter(
501
481
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
502
482
.format(self.name)))
506
485
# Pretend that we have a GnuTLS module
507
486
class GnuTLS(object):
508
487
"""This isn't so much a class as it is a module-like namespace.
509
488
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
490
_library = ctypes.cdll.LoadLibrary(
491
ctypes.util.find_library("gnutls"))
516
492
_need_version = b"3.3.0"
518
493
def __init__(self):
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
494
# Need to use class name "GnuTLS" here, since this method is
495
# called before the assignment to the "gnutls" global variable
497
if GnuTLS.check_version(self._need_version) is None:
498
raise GnuTLS.Error("Needs GnuTLS {} or later"
499
.format(self._need_version))
525
501
# Unless otherwise indicated, the constants and types below are
526
502
# all from the gnutls/gnutls.h C header file.
530
506
E_INTERRUPTED = -52
535
511
CRD_CERTIFICATE = 1
536
512
E_NO_CERTIFICATE_FOUND = -49
537
513
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
516
class session_int(ctypes.Structure):
542
518
session_t = ctypes.POINTER(session_int)
544
519
class certificate_credentials_st(ctypes.Structure):
546
521
certificate_credentials_t = ctypes.POINTER(
547
522
certificate_credentials_st)
548
523
certificate_type_t = ctypes.c_int
550
524
class datum_t(ctypes.Structure):
551
525
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
526
('size', ctypes.c_uint)]
554
527
class openpgp_crt_int(ctypes.Structure):
556
529
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
530
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
531
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
532
credentials_type_t = ctypes.c_int
560
533
transport_ptr_t = ctypes.c_void_p
561
534
close_request_t = ctypes.c_int
564
537
class Error(Exception):
565
538
# We need to use the class name "GnuTLS" here, since this
566
539
# exception might be raised from within GnuTLS.__init__,
567
540
# which is called before the assignment to the "gnutls"
568
541
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
542
def __init__(self, message = None, code = None, args=()):
570
543
# Default usage is by a message string, but if a return
571
544
# code is passed, convert it to a string with
572
545
# gnutls.strerror()
641
614
return _error_code(result)
642
615
result = func(*arguments)
645
618
# Unless otherwise indicated, the function declarations below are
646
619
# all from the gnutls/gnutls.h C header file.
649
622
priority_set_direct = _library.gnutls_priority_set_direct
650
623
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
624
ctypes.POINTER(ctypes.c_char_p)]
652
625
priority_set_direct.restype = _error_code
654
627
init = _library.gnutls_init
655
628
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
629
init.restype = _error_code
658
631
set_default_priority = _library.gnutls_set_default_priority
659
632
set_default_priority.argtypes = [session_t]
660
633
set_default_priority.restype = _error_code
662
635
record_send = _library.gnutls_record_send
663
636
record_send.argtypes = [session_t, ctypes.c_void_p,
665
638
record_send.restype = ctypes.c_ssize_t
666
639
record_send.errcheck = _retry_on_error
668
641
certificate_allocate_credentials = (
669
642
_library.gnutls_certificate_allocate_credentials)
670
643
certificate_allocate_credentials.argtypes = [
671
644
ctypes.POINTER(certificate_credentials_t)]
672
645
certificate_allocate_credentials.restype = _error_code
674
647
certificate_free_credentials = (
675
648
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
649
certificate_free_credentials.argtypes = [certificate_credentials_t]
678
650
certificate_free_credentials.restype = None
680
652
handshake_set_private_extensions = (
681
653
_library.gnutls_handshake_set_private_extensions)
682
654
handshake_set_private_extensions.argtypes = [session_t,
684
656
handshake_set_private_extensions.restype = None
686
658
credentials_set = _library.gnutls_credentials_set
687
659
credentials_set.argtypes = [session_t, credentials_type_t,
689
661
credentials_set.restype = _error_code
691
663
strerror = _library.gnutls_strerror
692
664
strerror.argtypes = [ctypes.c_int]
693
665
strerror.restype = ctypes.c_char_p
695
667
certificate_type_get = _library.gnutls_certificate_type_get
696
668
certificate_type_get.argtypes = [session_t]
697
669
certificate_type_get.restype = _error_code
699
671
certificate_get_peers = _library.gnutls_certificate_get_peers
700
672
certificate_get_peers.argtypes = [session_t,
701
673
ctypes.POINTER(ctypes.c_uint)]
702
674
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
676
global_set_log_level = _library.gnutls_global_set_log_level
705
677
global_set_log_level.argtypes = [ctypes.c_int]
706
678
global_set_log_level.restype = None
708
680
global_set_log_function = _library.gnutls_global_set_log_function
709
681
global_set_log_function.argtypes = [log_func]
710
682
global_set_log_function.restype = None
712
684
deinit = _library.gnutls_deinit
713
685
deinit.argtypes = [session_t]
714
686
deinit.restype = None
716
688
handshake = _library.gnutls_handshake
717
689
handshake.argtypes = [session_t]
718
690
handshake.restype = _error_code
719
691
handshake.errcheck = _retry_on_error
721
693
transport_set_ptr = _library.gnutls_transport_set_ptr
722
694
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
695
transport_set_ptr.restype = None
725
697
bye = _library.gnutls_bye
726
698
bye.argtypes = [session_t, close_request_t]
727
699
bye.restype = _error_code
728
700
bye.errcheck = _retry_on_error
730
702
check_version = _library.gnutls_check_version
731
703
check_version.argtypes = [ctypes.c_char_p]
732
704
check_version.restype = ctypes.c_char_p
734
706
# All the function declarations below are from gnutls/openpgp.h
736
708
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
709
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
710
openpgp_crt_init.restype = _error_code
740
712
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
713
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
714
ctypes.POINTER(datum_t),
743
715
openpgp_crt_fmt_t]
744
716
openpgp_crt_import.restype = _error_code
746
718
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
719
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
720
ctypes.POINTER(ctypes.c_uint)]
749
721
openpgp_crt_verify_self.restype = _error_code
751
723
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
724
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
725
openpgp_crt_deinit.restype = None
755
727
openpgp_crt_get_fingerprint = (
756
728
_library.gnutls_openpgp_crt_get_fingerprint)
757
729
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
787
757
checker: subprocess.Popen(); a running checker process used
788
758
to see if the client lives.
789
759
'None' if no process is running.
790
checker_callback_tag: a GLib event source tag, or None
760
checker_callback_tag: a GObject event source tag, or None
791
761
checker_command: string; External command which is run to check
792
762
if client lives. %() expansions are done at
793
763
runtime with vars(self) as dict, so that for
794
764
instance %(name)s can be used in the command.
795
checker_initiator_tag: a GLib event source tag, or None
765
checker_initiator_tag: a GObject event source tag, or None
796
766
created: datetime.datetime(); (UTC) object creation
797
767
client_structure: Object describing what attributes a client has
798
768
and is used for storing the client at exit
799
769
current_checker_command: string; current running checker_command
800
disable_initiator_tag: a GLib event source tag, or None
770
disable_initiator_tag: a GObject event source tag, or None
802
772
fingerprint: string (40 or 32 hexadecimal digits); used to
803
773
uniquely identify the client
960
930
logger.info("Disabling client %s", self.name)
961
931
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
932
GObject.source_remove(self.disable_initiator_tag)
963
933
self.disable_initiator_tag = None
964
934
self.expires = None
965
935
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
936
GObject.source_remove(self.checker_initiator_tag)
967
937
self.checker_initiator_tag = None
968
938
self.stop_checker()
969
939
self.enabled = False
971
941
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
942
# Do not run this again if called by a GObject.timeout_add
975
945
def __del__(self):
978
948
def init_checker(self):
979
949
# Schedule a new checker to be started an 'interval' from now,
980
950
# and every interval from then on.
981
951
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
952
GObject.source_remove(self.checker_initiator_tag)
953
self.checker_initiator_tag = GObject.timeout_add(
984
954
int(self.interval.total_seconds() * 1000),
985
955
self.start_checker)
986
956
# Schedule a disable() when 'timeout' has passed
987
957
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
958
GObject.source_remove(self.disable_initiator_tag)
959
self.disable_initiator_tag = GObject.timeout_add(
990
960
int(self.timeout.total_seconds() * 1000), self.disable)
991
961
# Also start a new checker *right now*.
992
962
self.start_checker()
994
964
def checker_callback(self, source, condition, connection,
996
966
"""The checker has completed, so take appropriate actions."""
1015
985
logger.warning("Checker for %(name)s crashed?",
1019
989
def checked_ok(self):
1020
990
"""Assert that the client has been seen, alive and well."""
1021
991
self.last_checked_ok = datetime.datetime.utcnow()
1022
992
self.last_checker_status = 0
1023
993
self.last_checker_signal = None
1024
994
self.bump_timeout()
1026
996
def bump_timeout(self, timeout=None):
1027
997
"""Bump up the timeout for this client."""
1028
998
if timeout is None:
1029
999
timeout = self.timeout
1030
1000
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
1001
GObject.source_remove(self.disable_initiator_tag)
1032
1002
self.disable_initiator_tag = None
1033
1003
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
1004
self.disable_initiator_tag = GObject.timeout_add(
1035
1005
int(timeout.total_seconds() * 1000), self.disable)
1036
1006
self.expires = datetime.datetime.utcnow() + timeout
1038
1008
def need_approval(self):
1039
1009
self.last_approval_request = datetime.datetime.utcnow()
1041
1011
def start_checker(self):
1042
1012
"""Start a new checker subprocess if one is not running.
1044
1014
If a checker already exists, leave it running and do
1046
1016
# The reason for not killing a running checker is that if we
1079
1049
# The exception is when not debugging but nevertheless
1080
1050
# running in the foreground; use the previously
1081
1051
# created wnull.
1082
popen_args = {"close_fds": True,
1052
popen_args = { "close_fds": True,
1085
1055
if (not self.server_settings["debug"]
1086
1056
and self.server_settings["foreground"]):
1087
1057
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
1059
pipe = multiprocessing.Pipe(duplex = False)
1090
1060
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
1062
args = (pipe[1], subprocess.call, command),
1063
kwargs = popen_args)
1094
1064
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1065
self.checker_callback_tag = GObject.io_add_watch(
1066
pipe[0].fileno(), GObject.IO_IN,
1097
1067
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
1068
# Re-run this periodically if run by GObject.timeout_add
1101
1071
def stop_checker(self):
1102
1072
"""Force the checker process, if any, to stop."""
1103
1073
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
1074
GObject.source_remove(self.checker_callback_tag)
1105
1075
self.checker_callback_tag = None
1106
1076
if getattr(self, "checker", None) is None:
1138
1108
func._dbus_name = func.__name__
1139
1109
if func._dbus_name.endswith("_dbus_property"):
1140
1110
func._dbus_name = func._dbus_name[:-14]
1141
func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1111
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1144
1114
return decorator
1147
1117
def dbus_interface_annotations(dbus_interface):
1148
1118
"""Decorator for marking functions returning interface annotations
1152
1122
@dbus_interface_annotations("org.example.Interface")
1153
1123
def _foo(self): # Function name does not matter
1154
1124
return {"org.freedesktop.DBus.Deprecated": "true",
1155
1125
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1159
1129
def decorator(func):
1160
1130
func._dbus_is_interface = True
1161
1131
func._dbus_interface = dbus_interface
1162
1132
func._dbus_name = dbus_interface
1165
1135
return decorator
1168
1138
def dbus_annotations(annotations):
1169
1139
"""Decorator to annotate D-Bus methods, signals or properties
1172
1142
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1173
1143
"org.freedesktop.DBus.Property."
1174
1144
"EmitsChangedSignal": "false"})
1230
1200
for cls in self.__class__.__mro__
1231
1201
for name, athing in
1232
1202
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1234
1204
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1205
out_signature = "s",
1206
path_keyword = 'object_path',
1207
connection_keyword = 'connection')
1238
1208
def Introspect(self, object_path, connection):
1239
1209
"""Overloading of standard D-Bus method.
1241
1211
Inserts annotation tags on methods and signals.
1243
1213
xmlstring = dbus.service.Object.Introspect(self, object_path,
1246
1216
document = xml.dom.minidom.parseString(xmlstring)
1248
1218
for if_tag in document.getElementsByTagName("interface"):
1249
1219
# Add annotation tags
1250
1220
for typ in ("method", "signal"):
1461
1431
exc_info=error)
1462
1432
return xmlstring
1466
1435
dbus.OBJECT_MANAGER_IFACE
1467
1436
except AttributeError:
1468
1437
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1471
1439
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
1440
"""A D-Bus object with an ObjectManager.
1474
1442
Classes inheriting from this exposes the standard
1475
1443
GetManagedObjects call and the InterfacesAdded and
1476
1444
InterfacesRemoved signals on the standard
1477
1445
"org.freedesktop.DBus.ObjectManager" interface.
1479
1447
Note: No signals are sent automatically; they must be sent
1482
1450
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1451
out_signature = "a{oa{sa{sv}}}")
1484
1452
def GetManagedObjects(self):
1485
1453
"""This function must be overridden"""
1486
1454
raise NotImplementedError()
1488
1456
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1457
signature = "oa{sa{sv}}")
1490
1458
def InterfacesAdded(self, object_path, interfaces_and_properties):
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1461
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1494
1462
def InterfacesRemoved(self, object_path, interfaces):
1497
1465
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1466
out_signature = "s",
1467
path_keyword = 'object_path',
1468
connection_keyword = 'connection')
1501
1469
def Introspect(self, object_path, connection):
1502
1470
"""Overloading of standard D-Bus method.
1504
1472
Override return argument name of GetManagedObjects to be
1505
1473
"objpath_interfaces_and_properties"
1545
1512
dbus.service.Object, it will add alternate D-Bus attributes with
1546
1513
interface names according to the "alt_interface_names" mapping.
1549
1516
@alternate_dbus_interfaces({"org.example.Interface":
1550
1517
"net.example.AlternateInterface"})
1551
1518
class SampleDBusObject(dbus.service.Object):
1552
1519
@dbus.service.method("org.example.Interface")
1553
1520
def SampleDBusMethod():
1556
1523
The above "SampleDBusMethod" on "SampleDBusObject" will be
1557
1524
reachable via two interfaces: "org.example.Interface" and
1558
1525
"net.example.AlternateInterface", the latter of which will have
1559
1526
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1560
1527
"true", unless "deprecate" is passed with a False value.
1562
1529
This works for methods and signals, and also for D-Bus properties
1563
1530
(from DBusObjectWithProperties) and interfaces (from the
1564
1531
dbus_interface_annotations decorator).
1567
1534
def wrapper(cls):
1568
1535
for orig_interface_name, alt_interface_name in (
1569
1536
alt_interface_names.items()):
1713
1678
"se.bsnet.fukt.Mandos"})
1714
1679
class ClientDBus(Client, DBusObjectWithProperties):
1715
1680
"""A Client class using D-Bus
1718
1683
dbus_object_path: dbus.ObjectPath
1719
1684
bus: dbus.SystemBus()
1722
1687
runtime_expansions = (Client.runtime_expansions
1723
1688
+ ("dbus_object_path", ))
1725
1690
_interface = "se.recompile.Mandos.Client"
1727
1692
# dbus.service.Object doesn't use super(), so we can't either.
1729
def __init__(self, bus=None, *args, **kwargs):
1694
def __init__(self, bus = None, *args, **kwargs):
1731
1696
Client.__init__(self, *args, **kwargs)
1732
1697
# Only now, when this client is initialized, can it show up on
1769
1734
dbus_value = transform_func(
1770
1735
type_func(value),
1771
variant_level=variant_level)
1736
variant_level = variant_level)
1772
1737
self.PropertyChanged(dbus.String(dbus_name),
1774
1739
self.PropertiesChanged(
1776
dbus.Dictionary({dbus.String(dbus_name):
1741
dbus.Dictionary({ dbus.String(dbus_name):
1779
1744
setattr(self, attrname, value)
1781
1746
return property(lambda self: getattr(self, attrname), setter)
1783
1748
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1784
1749
approvals_pending = notifychangeproperty(dbus.Boolean,
1785
1750
"ApprovalPending",
1787
1752
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1788
1753
last_enabled = notifychangeproperty(datetime_to_dbus,
1790
1755
checker = notifychangeproperty(
1791
1756
dbus.Boolean, "CheckerRunning",
1792
type_func=lambda checker: checker is not None)
1757
type_func = lambda checker: checker is not None)
1793
1758
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1794
1759
"LastCheckedOK")
1795
1760
last_checker_status = notifychangeproperty(dbus.Int16,
1800
1765
"ApprovedByDefault")
1801
1766
approval_delay = notifychangeproperty(
1802
1767
dbus.UInt64, "ApprovalDelay",
1803
type_func=lambda td: td.total_seconds() * 1000)
1768
type_func = lambda td: td.total_seconds() * 1000)
1804
1769
approval_duration = notifychangeproperty(
1805
1770
dbus.UInt64, "ApprovalDuration",
1806
type_func=lambda td: td.total_seconds() * 1000)
1771
type_func = lambda td: td.total_seconds() * 1000)
1807
1772
host = notifychangeproperty(dbus.String, "Host")
1808
1773
timeout = notifychangeproperty(
1809
1774
dbus.UInt64, "Timeout",
1810
type_func=lambda td: td.total_seconds() * 1000)
1775
type_func = lambda td: td.total_seconds() * 1000)
1811
1776
extended_timeout = notifychangeproperty(
1812
1777
dbus.UInt64, "ExtendedTimeout",
1813
type_func=lambda td: td.total_seconds() * 1000)
1778
type_func = lambda td: td.total_seconds() * 1000)
1814
1779
interval = notifychangeproperty(
1815
1780
dbus.UInt64, "Interval",
1816
type_func=lambda td: td.total_seconds() * 1000)
1781
type_func = lambda td: td.total_seconds() * 1000)
1817
1782
checker_command = notifychangeproperty(dbus.String, "Checker")
1818
1783
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1819
1784
invalidate_only=True)
1821
1786
del notifychangeproperty
1823
1788
def __del__(self, *args, **kwargs):
1825
1790
self.remove_from_connection()
1860
1825
# Emit D-Bus signal
1861
1826
self.CheckerStarted(self.current_checker_command)
1864
1829
def _reset_approved(self):
1865
1830
self.approved = None
1868
1833
def approve(self, value=True):
1869
1834
self.approved = value
1870
GLib.timeout_add(int(self.approval_duration.total_seconds()
1871
* 1000), self._reset_approved)
1835
GObject.timeout_add(int(self.approval_duration.total_seconds()
1836
* 1000), self._reset_approved)
1872
1837
self.send_changedstate()
1874
# D-Bus methods, signals & properties
1839
## D-Bus methods, signals & properties
1880
1845
# CheckerCompleted - signal
1881
1846
@dbus.service.signal(_interface, signature="nxs")
1882
1847
def CheckerCompleted(self, exitcode, waitstatus, command):
1886
1851
# CheckerStarted - signal
1887
1852
@dbus.service.signal(_interface, signature="s")
1888
1853
def CheckerStarted(self, command):
1892
1857
# PropertyChanged - signal
1893
1858
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1894
1859
@dbus.service.signal(_interface, signature="sv")
1895
1860
def PropertyChanged(self, property, value):
1899
1864
# GotSecret - signal
1900
1865
@dbus.service.signal(_interface)
1901
1866
def GotSecret(self):
1904
1869
server to mandos-client
1908
1873
# Rejected - signal
1909
1874
@dbus.service.signal(_interface, signature="s")
1910
1875
def Rejected(self, reason):
1914
1879
# NeedApproval - signal
1915
1880
@dbus.service.signal(_interface, signature="tb")
1916
1881
def NeedApproval(self, timeout, default):
1918
1883
return self.need_approval()
1922
1887
# Approve - method
1923
1888
@dbus.service.method(_interface, in_signature="b")
1924
1889
def Approve(self, value):
1925
1890
self.approve(value)
1927
1892
# CheckedOK - method
1928
1893
@dbus.service.method(_interface)
1929
1894
def CheckedOK(self):
1930
1895
self.checked_ok()
1932
1897
# Enable - method
1933
1898
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1934
1899
@dbus.service.method(_interface)
1935
1900
def Enable(self):
1939
1904
# StartChecker - method
1940
1905
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1941
1906
@dbus.service.method(_interface)
1942
1907
def StartChecker(self):
1944
1909
self.start_checker()
1946
1911
# Disable - method
1947
1912
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1948
1913
@dbus.service.method(_interface)
1949
1914
def Disable(self):
1953
1918
# StopChecker - method
1954
1919
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1955
1920
@dbus.service.method(_interface)
1956
1921
def StopChecker(self):
1957
1922
self.stop_checker()
1961
1926
# ApprovalPending - property
1962
1927
@dbus_service_property(_interface, signature="b", access="read")
1963
1928
def ApprovalPending_dbus_property(self):
1964
1929
return dbus.Boolean(bool(self.approvals_pending))
1966
1931
# ApprovedByDefault - property
1967
1932
@dbus_service_property(_interface,
2048
2013
self.checked_ok()
2050
2015
return datetime_to_dbus(self.last_checked_ok)
2052
2017
# LastCheckerStatus - property
2053
2018
@dbus_service_property(_interface, signature="n", access="read")
2054
2019
def LastCheckerStatus_dbus_property(self):
2055
2020
return dbus.Int16(self.last_checker_status)
2057
2022
# Expires - property
2058
2023
@dbus_service_property(_interface, signature="s", access="read")
2059
2024
def Expires_dbus_property(self):
2060
2025
return datetime_to_dbus(self.expires)
2062
2027
# LastApprovalRequest - property
2063
2028
@dbus_service_property(_interface, signature="s", access="read")
2064
2029
def LastApprovalRequest_dbus_property(self):
2065
2030
return datetime_to_dbus(self.last_approval_request)
2067
2032
# Timeout - property
2068
2033
@dbus_service_property(_interface,
2190
2155
class ClientHandler(socketserver.BaseRequestHandler, object):
2191
2156
"""A class to handle client connections.
2193
2158
Instantiated once for each connection to handle it.
2194
2159
Note: This will run in its own forked process."""
2196
2161
def handle(self):
2197
2162
with contextlib.closing(self.server.child_pipe) as child_pipe:
2198
2163
logger.info("TCP connection from: %s",
2199
2164
str(self.client_address))
2200
2165
logger.debug("Pipe FD: %d",
2201
2166
self.server.child_pipe.fileno())
2203
2168
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
2170
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2171
# "+AES-256-CBC", "+SHA1",
2172
# "+COMP-NULL", "+CTYPE-OPENPGP",
2209
2174
# Use a fallback default, since this MUST be set.
2210
2175
priority = self.server.gnutls_priority
2211
2176
if priority is None:
2212
2177
priority = "NORMAL"
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
2178
gnutls.priority_set_direct(session._c_object, priority,
2217
2181
# Start communication using the Mandos protocol
2218
2182
# Get protocol number
2219
2183
line = self.request.makefile().readline()
2385
2348
class MultiprocessingMixIn(object):
2386
2349
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2388
2351
def sub_process_main(self, request, address):
2390
2353
self.finish_request(request, address)
2391
2354
except Exception:
2392
2355
self.handle_error(request, address)
2393
2356
self.close_request(request)
2395
2358
def process_request(self, request, address):
2396
2359
"""Start a new process to process the request."""
2397
proc = multiprocessing.Process(target=self.sub_process_main,
2398
args=(request, address))
2360
proc = multiprocessing.Process(target = self.sub_process_main,
2361
args = (request, address))
2403
2366
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2404
2367
""" adds a pipe to the MixIn """
2406
2369
def process_request(self, request, client_address):
2407
2370
"""Overrides and wraps the original process_request().
2409
2372
This function creates a new pipe in self.pipe
2411
2374
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2413
2376
proc = MultiprocessingMixIn.process_request(self, request,
2414
2377
client_address)
2415
2378
self.child_pipe.close()
2416
2379
self.add_pipe(parent_pipe, proc)
2418
2381
def add_pipe(self, parent_pipe, proc):
2419
2382
"""Dummy function; override as necessary"""
2420
2383
raise NotImplementedError()
2469
2431
# socket_wrapper(), if socketfd was set.
2470
2432
socketserver.TCPServer.__init__(self, server_address,
2471
2433
RequestHandlerClass)
2473
2435
def server_bind(self):
2474
2436
"""This overrides the normal server_bind() function
2475
2437
to bind to an interface if one was specified, and also NOT to
2476
2438
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
2478
2439
if self.interface is not None:
2479
2440
if SO_BINDTODEVICE is None:
2480
# Fall back to a hard-coded value which seems to be
2482
logger.warning("SO_BINDTODEVICE not found, trying 25")
2483
SO_BINDTODEVICE = 25
2485
self.socket.setsockopt(
2486
socket.SOL_SOCKET, SO_BINDTODEVICE,
2487
(self.interface + "\0").encode("utf-8"))
2488
except socket.error as error:
2489
if error.errno == errno.EPERM:
2490
logger.error("No permission to bind to"
2491
" interface %s", self.interface)
2492
elif error.errno == errno.ENOPROTOOPT:
2493
logger.error("SO_BINDTODEVICE not available;"
2494
" cannot bind to interface %s",
2496
elif error.errno == errno.ENODEV:
2497
logger.error("Interface %s does not exist,"
2498
" cannot bind", self.interface)
2441
logger.error("SO_BINDTODEVICE does not exist;"
2442
" cannot bind to interface %s",
2446
self.socket.setsockopt(
2447
socket.SOL_SOCKET, SO_BINDTODEVICE,
2448
(self.interface + "\0").encode("utf-8"))
2449
except socket.error as error:
2450
if error.errno == errno.EPERM:
2451
logger.error("No permission to bind to"
2452
" interface %s", self.interface)
2453
elif error.errno == errno.ENOPROTOOPT:
2454
logger.error("SO_BINDTODEVICE not available;"
2455
" cannot bind to interface %s",
2457
elif error.errno == errno.ENODEV:
2458
logger.error("Interface %s does not exist,"
2459
" cannot bind", self.interface)
2501
2462
# Only bind(2) the socket if we really need to.
2502
2463
if self.server_address[0] or self.server_address[1]:
2503
2464
if not self.server_address[0]:
2504
2465
if self.address_family == socket.AF_INET6:
2505
any_address = "::" # in6addr_any
2466
any_address = "::" # in6addr_any
2507
any_address = "0.0.0.0" # INADDR_ANY
2468
any_address = "0.0.0.0" # INADDR_ANY
2508
2469
self.server_address = (any_address,
2509
2470
self.server_address[1])
2510
2471
elif not self.server_address[1]:
2544
2505
self.gnutls_priority = gnutls_priority
2545
2506
IPv6_TCPServer.__init__(self, server_address,
2546
2507
RequestHandlerClass,
2547
interface=interface,
2508
interface = interface,
2509
use_ipv6 = use_ipv6,
2510
socketfd = socketfd)
2551
2512
def server_activate(self):
2552
2513
if self.enabled:
2553
2514
return socketserver.TCPServer.server_activate(self)
2555
2516
def enable(self):
2556
2517
self.enabled = True
2558
2519
def add_pipe(self, parent_pipe, proc):
2559
2520
# Call "handle_ipc" for both data and EOF events
2521
GObject.io_add_watch(
2561
2522
parent_pipe.fileno(),
2562
GLib.IO_IN | GLib.IO_HUP,
2523
GObject.IO_IN | GObject.IO_HUP,
2563
2524
functools.partial(self.handle_ipc,
2564
parent_pipe=parent_pipe,
2525
parent_pipe = parent_pipe,
2567
2528
def handle_ipc(self, source, condition,
2568
2529
parent_pipe=None,
2570
2531
client_object=None):
2571
2532
# error, or the other end of multiprocessing.Pipe has closed
2572
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2533
if condition & (GObject.IO_ERR | GObject.IO_HUP):
2573
2534
# Wait for other process to exit
2577
2538
# Read a request from the child
2578
2539
request = parent_pipe.recv()
2579
2540
command = request[0]
2581
2542
if command == 'init':
2582
fpr = request[1].decode("ascii")
2583
2544
address = request[2]
2585
2546
for c in self.clients.values():
2586
2547
if c.fingerprint == fpr:
2651
2612
>>> rfc3339_duration_to_delta("P1DT3M20S")
2652
2613
datetime.timedelta(1, 200)
2655
2616
# Parsing an RFC 3339 duration with regular expressions is not
2656
2617
# possible - there would have to be multiple places for the same
2657
2618
# values, like seconds. The current code, while more esoteric, is
2658
2619
# cleaner without depending on a parsing library. If Python had a
2659
2620
# built-in library for parsing we would use it, but we'd like to
2660
2621
# avoid excessive use of external libraries.
2662
2623
# New type for defining tokens, syntax, and semantics all-in-one
2663
2624
Token = collections.namedtuple("Token", (
2664
2625
"regexp", # To match token; if "value" is not None, must have
2851
2809
parser.add_argument("--no-zeroconf", action="store_false",
2852
2810
dest="zeroconf", help="Do not use Zeroconf",
2855
2813
options = parser.parse_args()
2857
2815
if options.check:
2859
2817
fail_count, test_count = doctest.testmod()
2860
2818
sys.exit(os.EX_OK if fail_count == 0 else 1)
2862
2820
# Default values for config file for server-global settings
2863
server_defaults = {"interface": "",
2868
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2869
":+SIGN-DSA-SHA256",
2870
"servicename": "Mandos",
2876
"statedir": "/var/lib/mandos",
2877
"foreground": "False",
2821
server_defaults = { "interface": "",
2826
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2827
":+SIGN-DSA-SHA256",
2828
"servicename": "Mandos",
2834
"statedir": "/var/lib/mandos",
2835
"foreground": "False",
2881
2839
# Parse config file for server-global settings
2882
2840
server_config = configparser.SafeConfigParser(server_defaults)
2883
2841
del server_defaults
3013
2970
.format(uid, gid, os.strerror(error.errno)))
3014
2971
if error.errno != errno.EPERM:
3018
2975
# Enable all possible GnuTLS debugging
3020
2977
# "Use a log level over 10 to enable all debugging options."
3021
2978
# - GnuTLS manual
3022
2979
gnutls.global_set_log_level(11)
3024
2981
@gnutls.log_func
3025
2982
def debug_gnutls(level, string):
3026
2983
logger.debug("GnuTLS: %s", string[:-1])
3028
2985
gnutls.global_set_log_function(debug_gnutls)
3030
2987
# Redirect stdin so all checkers get /dev/null
3031
2988
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3032
2989
os.dup2(null, sys.stdin.fileno())
3036
2993
# Need to fork before connecting to D-Bus
3037
2994
if not foreground:
3038
2995
# Close all input and output, do double fork, etc.
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2998
# multiprocessing will use threads, so before we use GObject we
2999
# need to inform GObject that threads will be used.
3000
GObject.threads_init()
3045
3002
global main_loop
3046
3003
# From the Avahi example code
3047
3004
DBusGMainLoop(set_as_default=True)
3048
main_loop = GLib.MainLoop()
3005
main_loop = GObject.MainLoop()
3049
3006
bus = dbus.SystemBus()
3050
3007
# End of Avahi example code
3065
3022
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3066
3023
service = AvahiServiceToSyslog(
3067
name=server_settings["servicename"],
3068
servicetype="_mandos._tcp",
3024
name = server_settings["servicename"],
3025
servicetype = "_mandos._tcp",
3026
protocol = protocol,
3071
3028
if server_settings["interface"]:
3072
3029
service.interface = if_nametoindex(
3073
3030
server_settings["interface"].encode("utf-8"))
3075
3032
global multiprocessing_manager
3076
3033
multiprocessing_manager = multiprocessing.Manager()
3078
3035
client_class = Client
3080
client_class = functools.partial(ClientDBus, bus=bus)
3037
client_class = functools.partial(ClientDBus, bus = bus)
3082
3039
client_settings = Client.config_parser(client_config)
3083
3040
old_client_settings = {}
3084
3041
clients_data = {}
3086
3043
# This is used to redirect stdout and stderr for checker processes
3088
wnull = open(os.devnull, "w") # A writable /dev/null
3045
wnull = open(os.devnull, "w") # A writable /dev/null
3089
3046
# Only used if server is running in foreground but not in debug
3091
3048
if debug or not foreground:
3094
3051
# Get client data and settings from last running state.
3095
3052
if server_settings["restore"]:
3097
3054
with open(stored_state_path, "rb") as stored_state:
3098
if sys.version_info.major == 2:
3055
if sys.version_info.major == 2:
3099
3056
clients_data, old_client_settings = pickle.load(
3102
3059
bytes_clients_data, bytes_old_client_settings = (
3103
pickle.load(stored_state, encoding="bytes"))
3104
# Fix bytes to strings
3060
pickle.load(stored_state, encoding = "bytes"))
3061
### Fix bytes to strings
3107
clients_data = {(key.decode("utf-8")
3108
if isinstance(key, bytes)
3111
bytes_clients_data.items()}
3112
del bytes_clients_data
3064
clients_data = { (key.decode("utf-8")
3065
if isinstance(key, bytes)
3068
bytes_clients_data.items() }
3113
3069
for key in clients_data:
3114
value = {(k.decode("utf-8")
3115
if isinstance(k, bytes) else k): v
3117
clients_data[key].items()}
3070
value = { (k.decode("utf-8")
3071
if isinstance(k, bytes) else k): v
3073
clients_data[key].items() }
3118
3074
clients_data[key] = value
3119
3075
# .client_structure
3120
3076
value["client_structure"] = [
3121
3077
(s.decode("utf-8")
3122
3078
if isinstance(s, bytes)
3123
3079
else s) for s in
3124
value["client_structure"]]
3080
value["client_structure"] ]
3125
3081
# .name & .host
3126
3082
for k in ("name", "host"):
3127
3083
if isinstance(value[k], bytes):
3128
3084
value[k] = value[k].decode("utf-8")
3129
# old_client_settings
3085
## old_client_settings
3131
3087
old_client_settings = {
3132
3088
(key.decode("utf-8")
3133
3089
if isinstance(key, bytes)
3134
3090
else key): value
3135
3091
for key, value in
3136
bytes_old_client_settings.items()}
3137
del bytes_old_client_settings
3092
bytes_old_client_settings.items() }
3139
3094
for value in old_client_settings.values():
3140
if isinstance(value["host"], bytes):
3141
value["host"] = (value["host"]
3095
value["host"] = value["host"].decode("utf-8")
3143
3096
os.remove(stored_state_path)
3144
3097
except IOError as e:
3145
3098
if e.errno == errno.ENOENT:
3245
3198
pidfilename, pid)
3247
3200
del pidfilename
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
3202
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
3203
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3255
3207
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3208
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3257
3209
class MandosDBusService(DBusObjectWithObjectManager):
3258
3210
"""A D-Bus proxy object"""
3260
3212
def __init__(self):
3261
3213
dbus.service.Object.__init__(self, bus, "/")
3263
3215
_interface = "se.recompile.Mandos"
3265
3217
@dbus.service.signal(_interface, signature="o")
3266
3218
def ClientAdded(self, objpath):
3270
3222
@dbus.service.signal(_interface, signature="ss")
3271
3223
def ClientNotFound(self, fingerprint, address):
3275
3227
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3277
3229
@dbus.service.signal(_interface, signature="os")
3278
3230
def ClientRemoved(self, objpath, name):
3282
3234
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3284
3236
@dbus.service.method(_interface, out_signature="ao")
3312
3264
self.client_removed_signal(c)
3314
3266
raise KeyError(object_path)
3318
3270
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3319
out_signature="a{oa{sa{sv}}}")
3271
out_signature = "a{oa{sa{sv}}}")
3320
3272
def GetManagedObjects(self):
3321
3273
"""D-Bus method"""
3322
3274
return dbus.Dictionary(
3323
{client.dbus_object_path:
3325
{interface: client.GetAll(interface)
3327
client._get_all_interface_names()})
3328
for client in tcp_server.clients.values()})
3275
{ client.dbus_object_path:
3277
{ interface: client.GetAll(interface)
3279
client._get_all_interface_names()})
3280
for client in tcp_server.clients.values()})
3330
3282
def client_added_signal(self, client):
3331
3283
"""Send the new standard signal and the old signal"""
3378
3325
client.encrypted_secret = pgp.encrypt(client.secret,
3380
3327
client_dict = {}
3382
3329
# A list of attributes that can not be pickled
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3331
exclude = { "bus", "changedstate", "secret",
3332
"checker", "server_settings" }
3386
3333
for name, typ in inspect.getmembers(dbus.service
3388
3335
exclude.add(name)
3390
3337
client_dict["encrypted_secret"] = (client
3391
3338
.encrypted_secret)
3392
3339
for attr in client.client_structure:
3393
3340
if attr not in exclude:
3394
3341
client_dict[attr] = getattr(client, attr)
3396
3343
clients[client.name] = client_dict
3397
3344
del client_settings[client.name]["secret"]
3400
3347
with tempfile.NamedTemporaryFile(