69
import cPickle as pickle
65
import cPickle as pickle
72
66
import multiprocessing
81
74
import dbus.service
82
from gi.repository import GLib
83
77
from dbus.mainloop.glib import DBusGMainLoop
86
80
import xml.dom.minidom
89
# Try to find the value of SO_BINDTODEVICE:
91
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
# newer, and it is also the most natural place for it:
93
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
85
except AttributeError:
96
# This is where SO_BINDTODEVICE was up to and including Python
98
87
from IN import SO_BINDTODEVICE
99
88
except ImportError:
100
# In Python 2.7 it seems to have been removed entirely.
101
# Try running the C preprocessor:
103
cc = subprocess.Popen(["cc", "--language=c", "-E",
105
stdin=subprocess.PIPE,
106
stdout=subprocess.PIPE)
107
stdout = cc.communicate(
108
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
except (OSError, ValueError, IndexError):
112
SO_BINDTODEVICE = None
114
if sys.version_info.major == 2:
89
SO_BINDTODEVICE = None
118
92
stored_state_file = "clients.pickle"
120
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
126
103
except (OSError, AttributeError):
128
104
def if_nametoindex(interface):
129
105
"Get an interface index the hard way, i.e. using fcntl()"
130
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
131
107
with contextlib.closing(socket.socket()) as s:
132
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
135
113
return interface_index
138
def copy_function(func):
139
"""Make a copy of a function"""
140
if sys.version_info.major == 2:
141
return types.FunctionType(func.func_code,
147
return types.FunctionType(func.__code__,
154
116
def initlogger(debug, level=logging.WARNING):
155
117
"""init logger and add loglevel"""
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
161
119
syslogger.setFormatter(logging.Formatter
162
120
('Mandos [%(process)d]: %(levelname)s:'
164
122
logger.addHandler(syslogger)
167
125
console = logging.StreamHandler()
168
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
225
169
os.rmdir(self.tempdir)
226
170
self.tempdir = None
228
172
def password_encode(self, password):
229
173
# Passphrase can not be empty and can not contain newlines or
230
174
# NUL bytes. So we prefix it and hex encode it.
231
encoded = b"mandos" + binascii.hexlify(password)
232
if len(encoded) > 2048:
233
# GnuPG can't handle long passwords, so encode differently
234
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
235
.replace(b"\n", b"\\n")
236
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
239
177
def encrypt(self, data, password):
240
178
passphrase = self.password_encode(password)
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
243
181
passfile.write(passphrase)
245
proc = subprocess.Popen([self.gpg, '--symmetric',
183
proc = subprocess.Popen(['gpg', '--symmetric',
246
184
'--passphrase-file',
248
186
+ self.gnupgargs,
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
253
191
if proc.returncode != 0:
254
192
raise PGPError(err)
255
193
return ciphertext
257
195
def decrypt(self, data, password):
258
196
passphrase = self.password_encode(password)
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
261
199
passfile.write(passphrase)
263
proc = subprocess.Popen([self.gpg, '--decrypt',
201
proc = subprocess.Popen(['gpg', '--decrypt',
264
202
'--passphrase-file',
266
204
+ self.gnupgargs,
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
271
210
if proc.returncode != 0:
272
211
raise PGPError(err)
273
212
return decrypted_plaintext
276
# Pretend that we have an Avahi module
278
"""This isn't so much a class as it is a module-like namespace.
279
It is instantiated once, and simulates having an Avahi module."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
289
def string_array_to_txt_array(self, t):
290
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
for s in t), signature="ay")
292
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
293
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
294
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
295
SERVER_INVALID = 0 # avahi-common/defs.h
296
SERVER_REGISTERING = 1 # avahi-common/defs.h
297
SERVER_RUNNING = 2 # avahi-common/defs.h
298
SERVER_COLLISION = 3 # avahi-common/defs.h
299
SERVER_FAILURE = 4 # avahi-common/defs.h
303
215
class AvahiError(Exception):
304
216
def __init__(self, value, *args, **kwargs):
305
217
self.value = value
306
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
310
222
class AvahiServiceError(AvahiError):
314
225
class AvahiGroupError(AvahiError):
318
229
class AvahiService(object):
319
230
"""An Avahi (Zeroconf) service.
322
233
interface: integer; avahi.IF_UNSPEC or an interface index.
323
234
Used to optionally bind to the specified interface.
488
377
follow_name_owner_changes=True),
489
378
avahi.DBUS_INTERFACE_SERVER)
490
379
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
380
self.server_state_changed)
492
381
self.server_state_changed(self.server.GetState())
495
384
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
386
"""Add the new name to the syslog messages"""
498
ret = AvahiService.rename(self, *args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
505
# Pretend that we have a GnuTLS module
506
class GnuTLS(object):
507
"""This isn't so much a class as it is a module-like namespace.
508
It is instantiated once, and simulates having a GnuTLS module."""
510
library = ctypes.util.find_library("gnutls")
512
library = ctypes.util.find_library("gnutls-deb0")
513
_library = ctypes.cdll.LoadLibrary(library)
515
_need_version = b"3.3.0"
518
# Need to use class name "GnuTLS" here, since this method is
519
# called before the assignment to the "gnutls" global variable
521
if GnuTLS.check_version(self._need_version) is None:
522
raise GnuTLS.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
525
# Unless otherwise indicated, the constants and types below are
526
# all from the gnutls/gnutls.h C header file.
536
E_NO_CERTIFICATE_FOUND = -49
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
# We need to use the class name "GnuTLS" here, since this
566
# exception might be raised from within GnuTLS.__init__,
567
# which is called before the assignment to the "gnutls"
568
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
570
# Default usage is by a message string, but if a return
571
# code is passed, convert it to a string with
574
if message is None and code is not None:
575
message = GnuTLS.strerror(code)
576
return super(GnuTLS.Error, self).__init__(
579
class CertificateSecurityError(Error):
583
class Credentials(object):
585
self._c_object = gnutls.certificate_credentials_t()
586
gnutls.certificate_allocate_credentials(
587
ctypes.byref(self._c_object))
588
self.type = gnutls.CRD_CERTIFICATE
591
gnutls.certificate_free_credentials(self._c_object)
593
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
595
self._c_object = gnutls.session_t()
596
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
gnutls.set_default_priority(self._c_object)
598
gnutls.transport_set_ptr(self._c_object, socket.fileno())
599
gnutls.handshake_set_private_extensions(self._c_object,
602
if credentials is None:
603
credentials = gnutls.Credentials()
604
gnutls.credentials_set(self._c_object, credentials.type,
605
ctypes.cast(credentials._c_object,
607
self.credentials = credentials
610
gnutls.deinit(self._c_object)
613
return gnutls.handshake(self._c_object)
615
def send(self, data):
619
data_len -= gnutls.record_send(self._c_object,
624
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
626
# Error handling functions
627
def _error_code(result):
628
"""A function to raise exceptions on errors, suitable
629
for the 'restype' attribute on ctypes functions"""
632
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
636
def _retry_on_error(result, func, arguments):
637
"""A function to retry on some errors, suitable
638
for the 'errcheck' attribute on ctypes functions"""
640
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
641
return _error_code(result)
642
result = func(*arguments)
645
# Unless otherwise indicated, the function declarations below are
646
# all from the gnutls/gnutls.h C header file.
649
priority_set_direct = _library.gnutls_priority_set_direct
650
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
ctypes.POINTER(ctypes.c_char_p)]
652
priority_set_direct.restype = _error_code
654
init = _library.gnutls_init
655
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
init.restype = _error_code
658
set_default_priority = _library.gnutls_set_default_priority
659
set_default_priority.argtypes = [session_t]
660
set_default_priority.restype = _error_code
662
record_send = _library.gnutls_record_send
663
record_send.argtypes = [session_t, ctypes.c_void_p,
665
record_send.restype = ctypes.c_ssize_t
666
record_send.errcheck = _retry_on_error
668
certificate_allocate_credentials = (
669
_library.gnutls_certificate_allocate_credentials)
670
certificate_allocate_credentials.argtypes = [
671
ctypes.POINTER(certificate_credentials_t)]
672
certificate_allocate_credentials.restype = _error_code
674
certificate_free_credentials = (
675
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
678
certificate_free_credentials.restype = None
680
handshake_set_private_extensions = (
681
_library.gnutls_handshake_set_private_extensions)
682
handshake_set_private_extensions.argtypes = [session_t,
684
handshake_set_private_extensions.restype = None
686
credentials_set = _library.gnutls_credentials_set
687
credentials_set.argtypes = [session_t, credentials_type_t,
689
credentials_set.restype = _error_code
691
strerror = _library.gnutls_strerror
692
strerror.argtypes = [ctypes.c_int]
693
strerror.restype = ctypes.c_char_p
695
certificate_type_get = _library.gnutls_certificate_type_get
696
certificate_type_get.argtypes = [session_t]
697
certificate_type_get.restype = _error_code
699
certificate_get_peers = _library.gnutls_certificate_get_peers
700
certificate_get_peers.argtypes = [session_t,
701
ctypes.POINTER(ctypes.c_uint)]
702
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
global_set_log_level = _library.gnutls_global_set_log_level
705
global_set_log_level.argtypes = [ctypes.c_int]
706
global_set_log_level.restype = None
708
global_set_log_function = _library.gnutls_global_set_log_function
709
global_set_log_function.argtypes = [log_func]
710
global_set_log_function.restype = None
712
deinit = _library.gnutls_deinit
713
deinit.argtypes = [session_t]
714
deinit.restype = None
716
handshake = _library.gnutls_handshake
717
handshake.argtypes = [session_t]
718
handshake.restype = _error_code
719
handshake.errcheck = _retry_on_error
721
transport_set_ptr = _library.gnutls_transport_set_ptr
722
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
transport_set_ptr.restype = None
725
bye = _library.gnutls_bye
726
bye.argtypes = [session_t, close_request_t]
727
bye.restype = _error_code
728
bye.errcheck = _retry_on_error
730
check_version = _library.gnutls_check_version
731
check_version.argtypes = [ctypes.c_char_p]
732
check_version.restype = ctypes.c_char_p
734
# All the function declarations below are from gnutls/openpgp.h
736
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
openpgp_crt_init.restype = _error_code
740
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
ctypes.POINTER(datum_t),
744
openpgp_crt_import.restype = _error_code
746
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
ctypes.POINTER(ctypes.c_uint)]
749
openpgp_crt_verify_self.restype = _error_code
751
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
openpgp_crt_deinit.restype = None
755
openpgp_crt_get_fingerprint = (
756
_library.gnutls_openpgp_crt_get_fingerprint)
757
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
761
openpgp_crt_get_fingerprint.restype = _error_code
763
# Remove non-public functions
764
del _error_code, _retry_on_error
765
# Create the global "gnutls" object, simulating a module
769
def call_pipe(connection, # : multiprocessing.Connection
770
func, *args, **kwargs):
771
"""This function is meant to be called by multiprocessing.Process
773
This function runs func(*args, **kwargs), and writes the resulting
774
return value on the provided multiprocessing.Connection.
776
connection.send(func(*args, **kwargs))
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
780
402
class Client(object):
781
403
"""A representation of a client host served by this server.
784
406
approved: bool(); 'None' if not yet approved/disapproved
785
407
approval_delay: datetime.timedelta(); Time to wait for approval
960
595
logger.info("Disabling client %s", self.name)
961
596
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
597
gobject.source_remove(self.disable_initiator_tag)
963
598
self.disable_initiator_tag = None
964
599
self.expires = None
965
600
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
601
gobject.source_remove(self.checker_initiator_tag)
967
602
self.checker_initiator_tag = None
968
603
self.stop_checker()
969
604
self.enabled = False
971
606
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
607
# Do not run this again if called by a gobject.timeout_add
975
610
def __del__(self):
978
613
def init_checker(self):
979
614
# Schedule a new checker to be started an 'interval' from now,
980
615
# and every interval from then on.
981
616
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
986
621
# Schedule a disable() when 'timeout' has passed
987
622
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
990
int(self.timeout.total_seconds() * 1000), self.disable)
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
991
627
# Also start a new checker *right now*.
992
628
self.start_checker()
994
def checker_callback(self, source, condition, connection,
630
def checker_callback(self, pid, condition, command):
996
631
"""The checker has completed, so take appropriate actions."""
997
632
self.checker_callback_tag = None
998
633
self.checker = None
999
# Read return code from connection (see call_pipe)
1000
returncode = connection.recv()
1004
self.last_checker_status = returncode
1005
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1006
636
if self.last_checker_status == 0:
1007
637
logger.info("Checker for %(name)s succeeded",
1009
639
self.checked_ok()
1011
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
1013
644
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
1015
645
logger.warning("Checker for %(name)s crashed?",
1019
648
def checked_ok(self):
1020
649
"""Assert that the client has been seen, alive and well."""
1021
650
self.last_checked_ok = datetime.datetime.utcnow()
1022
651
self.last_checker_status = 0
1023
self.last_checker_signal = None
1024
652
self.bump_timeout()
1026
654
def bump_timeout(self, timeout=None):
1027
655
"""Bump up the timeout for this client."""
1028
656
if timeout is None:
1029
657
timeout = self.timeout
1030
658
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
659
gobject.source_remove(self.disable_initiator_tag)
1032
660
self.disable_initiator_tag = None
1033
661
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1036
665
self.expires = datetime.datetime.utcnow() + timeout
1038
667
def need_approval(self):
1039
668
self.last_approval_request = datetime.datetime.utcnow()
1041
670
def start_checker(self):
1042
671
"""Start a new checker subprocess if one is not running.
1044
673
If a checker already exists, leave it running and do
1046
675
# The reason for not killing a running checker is that if we
1051
680
# checkers alone, the checker would have to take more time
1052
681
# than 'timeout' for the client to be disabled, which is as it
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
1059
697
# Start a new checker if needed
1060
698
if self.checker is None:
1061
699
# Escape attributes for the shell
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1066
705
command = self.checker_command % escaped_attrs
1067
706
except TypeError as error:
1068
707
logger.error('Could not format string "%s"',
1069
self.checker_command,
708
self.checker_command, exc_info=error)
709
return True # Try again later
710
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
1071
return True # Try again later
1072
self.current_checker_command = command
1073
logger.info("Starting checker %r for %s", command,
1075
# We don't need to redirect stdout and stderr, since
1076
# in normal mode, that is already done by daemon(),
1077
# and in debug mode we don't want to. (Stdin is
1078
# always replaced by /dev/null.)
1079
# The exception is when not debugging but nevertheless
1080
# running in the foreground; use the previously
1082
popen_args = {"close_fds": True,
1085
if (not self.server_settings["debug"]
1086
and self.server_settings["foreground"]):
1087
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
1090
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
1094
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1097
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
752
# Re-run this periodically if run by gobject.timeout_add
1101
755
def stop_checker(self):
1102
756
"""Force the checker process, if any, to stop."""
1103
757
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
758
gobject.source_remove(self.checker_callback_tag)
1105
759
self.checker_callback_tag = None
1106
760
if getattr(self, "checker", None) is None:
1108
762
logger.debug("Stopping checker for %(name)s", vars(self))
1109
self.checker.terminate()
764
self.checker.terminate()
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
1110
771
self.checker = None
1113
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1117
776
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
777
become properties on the D-Bus.
1120
779
The decorated method will be called with no arguments by "Get"
1121
780
and with one argument by "Set".
1123
782
The parameters, where they are supported, are the same as
1124
783
dbus.service.method, except there is only "signature", since the
1125
784
type from Get() and the type sent to Set() is the same.
1208
class DBusObjectWithAnnotations(dbus.service.Object):
1209
"""A D-Bus object with annotations.
1211
Classes inheriting from this can use the dbus_annotations
1212
decorator to add annotations to methods or signals.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1216
869
def _is_dbus_thing(thing):
1217
870
"""Returns a function testing if an attribute is a D-Bus thing
1219
872
If called like _is_dbus_thing("method") it returns a function
1220
873
suitable for use as predicate to inspect.getmembers().
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1225
878
def _get_all_dbus_things(self, thing):
1226
879
"""Returns a generator of (name, attribute) pairs
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
1229
883
athing.__get__(self))
1230
884
for cls in self.__class__.__mro__
1231
885
for name, athing in
1232
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1234
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1238
def Introspect(self, object_path, connection):
1239
"""Overloading of standard D-Bus method.
1241
Inserts annotation tags on methods and signals.
1243
xmlstring = dbus.service.Object.Introspect(self, object_path,
1246
document = xml.dom.minidom.parseString(xmlstring)
1248
for if_tag in document.getElementsByTagName("interface"):
1249
# Add annotation tags
1250
for typ in ("method", "signal"):
1251
for tag in if_tag.getElementsByTagName(typ):
1253
for name, prop in (self.
1254
_get_all_dbus_things(typ)):
1255
if (name == tag.getAttribute("name")
1256
and prop._dbus_interface
1257
== if_tag.getAttribute("name")):
1258
annots.update(getattr(
1259
prop, "_dbus_annotations", {}))
1260
for name, value in annots.items():
1261
ann_tag = document.createElement(
1263
ann_tag.setAttribute("name", name)
1264
ann_tag.setAttribute("value", value)
1265
tag.appendChild(ann_tag)
1266
# Add interface annotation tags
1267
for annotation, value in dict(
1268
itertools.chain.from_iterable(
1269
annotations().items()
1270
for name, annotations
1271
in self._get_all_dbus_things("interface")
1272
if name == if_tag.getAttribute("name")
1274
ann_tag = document.createElement("annotation")
1275
ann_tag.setAttribute("name", annotation)
1276
ann_tag.setAttribute("value", value)
1277
if_tag.appendChild(ann_tag)
1278
# Fix argument name for the Introspect method itself
1279
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1281
for cn in if_tag.getElementsByTagName("method"):
1282
if cn.getAttribute("name") == "Introspect":
1283
for arg in cn.getElementsByTagName("arg"):
1284
if (arg.getAttribute("direction")
1286
arg.setAttribute("name",
1288
xmlstring = document.toxml("utf-8")
1290
except (AttributeError, xml.dom.DOMException,
1291
xml.parsers.expat.ExpatError) as error:
1292
logger.error("Failed to override Introspection method",
1297
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1298
"""A D-Bus object with properties.
1300
Classes inheriting from this can use the dbus_service_property
1301
decorator to expose methods as D-Bus properties. It exposes the
1302
standard Get(), Set(), and GetAll() methods on the D-Bus.
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1305
889
def _get_dbus_property(self, interface_name, property_name):
1306
890
"""Returns a bound method if one exists which is a D-Bus
1307
891
property with the specified name and interface.
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1312
897
if (value._dbus_name == property_name
1313
898
and value._dbus_interface == interface_name):
1314
899
return value.__get__(self)
1316
901
# No such property
1317
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
self.dbus_object_path, interface_name, property_name))
1321
def _get_all_interface_names(cls):
1322
"""Get a sequence of all interfaces supported by an object"""
1323
return (name for name in set(getattr(getattr(x, attr),
1324
"_dbus_interface", None)
1325
for x in (inspect.getmro(cls))
1327
if name is not None)
1329
@dbus.service.method(dbus.PROPERTIES_IFACE,
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1331
907
out_signature="v")
1332
908
def Get(self, interface_name, property_name):
1333
909
"""Standard D-Bus property Get() method, see D-Bus standard.
1461
1038
exc_info=error)
1462
1039
return xmlstring
1465
dbus.OBJECT_MANAGER_IFACE
1466
except AttributeError:
1467
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1470
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1471
"""A D-Bus object with an ObjectManager.
1473
Classes inheriting from this exposes the standard
1474
GetManagedObjects call and the InterfacesAdded and
1475
InterfacesRemoved signals on the standard
1476
"org.freedesktop.DBus.ObjectManager" interface.
1478
Note: No signals are sent automatically; they must be sent
1481
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1482
out_signature="a{oa{sa{sv}}}")
1483
def GetManagedObjects(self):
1484
"""This function must be overridden"""
1485
raise NotImplementedError()
1487
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1488
signature="oa{sa{sv}}")
1489
def InterfacesAdded(self, object_path, interfaces_and_properties):
1492
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1493
def InterfacesRemoved(self, object_path, interfaces):
1496
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1498
path_keyword='object_path',
1499
connection_keyword='connection')
1500
def Introspect(self, object_path, connection):
1501
"""Overloading of standard D-Bus method.
1503
Override return argument name of GetManagedObjects to be
1504
"objpath_interfaces_and_properties"
1506
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1510
document = xml.dom.minidom.parseString(xmlstring)
1512
for if_tag in document.getElementsByTagName("interface"):
1513
# Fix argument name for the GetManagedObjects method
1514
if (if_tag.getAttribute("name")
1515
== dbus.OBJECT_MANAGER_IFACE):
1516
for cn in if_tag.getElementsByTagName("method"):
1517
if (cn.getAttribute("name")
1518
== "GetManagedObjects"):
1519
for arg in cn.getElementsByTagName("arg"):
1520
if (arg.getAttribute("direction")
1524
"objpath_interfaces"
1526
xmlstring = document.toxml("utf-8")
1528
except (AttributeError, xml.dom.DOMException,
1529
xml.parsers.expat.ExpatError) as error:
1530
logger.error("Failed to override Introspection method",
1535
1042
def datetime_to_dbus(dt, variant_level=0):
1536
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1538
return dbus.String("", variant_level=variant_level)
1539
return dbus.String(dt.isoformat(), variant_level=variant_level)
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1542
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1573
1080
# Ignore non-D-Bus attributes, and D-Bus attributes
1574
1081
# with the wrong interface name
1575
1082
if (not hasattr(attribute, "_dbus_interface")
1576
or not attribute._dbus_interface.startswith(
1577
orig_interface_name)):
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1579
1086
# Create an alternate D-Bus interface name based on
1580
1087
# the current name
1581
alt_interface = attribute._dbus_interface.replace(
1582
orig_interface_name, alt_interface_name)
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1583
1091
interface_names.add(alt_interface)
1584
1092
# Is this a D-Bus signal?
1585
1093
if getattr(attribute, "_dbus_is_signal", False):
1586
1094
# Extract the original non-method undecorated
1587
1095
# function by black magic
1588
if sys.version_info.major == 2:
1589
nonmethod_func = (dict(
1096
nonmethod_func = (dict(
1590
1097
zip(attribute.func_code.co_freevars,
1591
attribute.__closure__))
1592
["func"].cell_contents)
1594
nonmethod_func = (dict(
1595
zip(attribute.__code__.co_freevars,
1596
attribute.__closure__))
1597
["func"].cell_contents)
1098
attribute.__closure__))["func"]
1598
1100
# Create a new, but exactly alike, function
1599
1101
# object, and decorate it to be a new D-Bus signal
1600
1102
# with the alternate D-Bus interface name
1601
new_function = copy_function(nonmethod_func)
1602
new_function = (dbus.service.signal(
1604
attribute._dbus_signature)(new_function))
1103
new_function = (dbus.service.signal
1105
attribute._dbus_signature)
1106
(types.FunctionType(
1107
nonmethod_func.func_code,
1108
nonmethod_func.func_globals,
1109
nonmethod_func.func_name,
1110
nonmethod_func.func_defaults,
1111
nonmethod_func.func_closure)))
1605
1112
# Copy annotations, if any
1607
new_function._dbus_annotations = dict(
1608
attribute._dbus_annotations)
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1609
1116
except AttributeError:
1612
1118
# Define a creator of a function to call both the
1613
1119
# original and alternate functions, so both the
1614
1120
# original and alternate signals gets sent when
1697
1210
if interface_names:
1698
1211
# Replace the class with a new subclass of it with
1699
1212
# methods, signals, etc. as created above.
1700
if sys.version_info.major == 2:
1701
cls = type(b"{}Alternate".format(cls.__name__),
1704
cls = type("{}Alternate".format(cls.__name__),
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1711
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
1712
"se.bsnet.fukt.Mandos"})
1220
"se.bsnet.fukt.Mandos"})
1713
1221
class ClientDBus(Client, DBusObjectWithProperties):
1714
1222
"""A Client class using D-Bus
1717
1225
dbus_object_path: dbus.ObjectPath
1718
1226
bus: dbus.SystemBus()
1721
1229
runtime_expansions = (Client.runtime_expansions
1722
+ ("dbus_object_path", ))
1724
_interface = "se.recompile.Mandos.Client"
1230
+ ("dbus_object_path",))
1726
1232
# dbus.service.Object doesn't use super(), so we can't either.
1728
def __init__(self, bus=None, *args, **kwargs):
1234
def __init__(self, bus = None, *args, **kwargs):
1730
1236
Client.__init__(self, *args, **kwargs)
1731
1237
# Only now, when this client is initialized, can it show up on
1733
client_object_name = str(self.name).translate(
1239
client_object_name = unicode(self.name).translate(
1734
1240
{ord("."): ord("_"),
1735
1241
ord("-"): ord("_")})
1736
self.dbus_object_path = dbus.ObjectPath(
1737
"/clients/" + client_object_name)
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1738
1244
DBusObjectWithProperties.__init__(self, self.bus,
1739
1245
self.dbus_object_path)
1741
def notifychangeproperty(transform_func, dbus_name,
1742
type_func=lambda x: x,
1744
invalidate_only=False,
1745
_interface=_interface):
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1746
1250
""" Modify a variable so that it's a property which announces
1747
1251
its changes to DBus.
1749
1253
transform_fun: Function that takes a value and a variant_level
1750
1254
and transforms it to a D-Bus type.
1751
1255
dbus_name: D-Bus name of the variable
1827
1320
if hasattr(DBusObjectWithProperties, "__del__"):
1828
1321
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1829
1322
Client.__del__(self, *args, **kwargs)
1831
def checker_callback(self, source, condition,
1832
connection, command, *args, **kwargs):
1833
ret = Client.checker_callback(self, source, condition,
1834
connection, command, *args,
1836
exitstatus = self.last_checker_status
1324
def checker_callback(self, pid, condition, command,
1326
self.checker_callback_tag = None
1328
if os.WIFEXITED(condition):
1329
exitstatus = os.WEXITSTATUS(condition)
1838
1330
# Emit D-Bus signal
1839
1331
self.CheckerCompleted(dbus.Int16(exitstatus),
1840
# This is specific to GNU libC
1841
dbus.Int64(exitstatus << 8),
1332
dbus.Int64(condition),
1842
1333
dbus.String(command))
1844
1335
# Emit D-Bus signal
1845
1336
self.CheckerCompleted(dbus.Int16(-1),
1847
# This is specific to GNU libC
1849
| self.last_checker_signal),
1337
dbus.Int64(condition),
1850
1338
dbus.String(command))
1340
return Client.checker_callback(self, pid, condition, command,
1853
1343
def start_checker(self, *args, **kwargs):
1854
old_checker_pid = getattr(self.checker, "pid", None)
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1855
1349
r = Client.start_checker(self, *args, **kwargs)
1856
1350
# Only if new checker process was started
1857
1351
if (self.checker is not None
1903
1403
server to mandos-client
1907
1407
# Rejected - signal
1908
1408
@dbus.service.signal(_interface, signature="s")
1909
1409
def Rejected(self, reason):
1913
1413
# NeedApproval - signal
1914
1414
@dbus.service.signal(_interface, signature="tb")
1915
1415
def NeedApproval(self, timeout, default):
1917
1417
return self.need_approval()
1921
1421
# Approve - method
1922
1422
@dbus.service.method(_interface, in_signature="b")
1923
1423
def Approve(self, value):
1924
1424
self.approve(value)
1926
1426
# CheckedOK - method
1927
1427
@dbus.service.method(_interface)
1928
1428
def CheckedOK(self):
1929
1429
self.checked_ok()
1931
1431
# Enable - method
1932
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1933
1432
@dbus.service.method(_interface)
1934
1433
def Enable(self):
1938
1437
# StartChecker - method
1939
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1940
1438
@dbus.service.method(_interface)
1941
1439
def StartChecker(self):
1943
1441
self.start_checker()
1945
1443
# Disable - method
1946
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1947
1444
@dbus.service.method(_interface)
1948
1445
def Disable(self):
1952
1449
# StopChecker - method
1953
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1954
1450
@dbus.service.method(_interface)
1955
1451
def StopChecker(self):
1956
1452
self.stop_checker()
1960
1456
# ApprovalPending - property
1961
1457
@dbus_service_property(_interface, signature="b", access="read")
1962
1458
def ApprovalPending_dbus_property(self):
1963
1459
return dbus.Boolean(bool(self.approvals_pending))
1965
1461
# ApprovedByDefault - property
1966
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
1968
1463
access="readwrite")
1969
1464
def ApprovedByDefault_dbus_property(self, value=None):
1970
1465
if value is None: # get
1971
1466
return dbus.Boolean(self.approved_by_default)
1972
1467
self.approved_by_default = bool(value)
1974
1469
# ApprovalDelay - property
1975
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
1977
1471
access="readwrite")
1978
1472
def ApprovalDelay_dbus_property(self, value=None):
1979
1473
if value is None: # get
1980
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1982
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1984
1477
# ApprovalDuration - property
1985
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
1987
1479
access="readwrite")
1988
1480
def ApprovalDuration_dbus_property(self, value=None):
1989
1481
if value is None: # get
1990
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1992
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1994
1486
# Name - property
1996
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1997
1487
@dbus_service_property(_interface, signature="s", access="read")
1998
1488
def Name_dbus_property(self):
1999
1489
return dbus.String(self.name)
2001
1491
# Fingerprint - property
2003
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2004
1492
@dbus_service_property(_interface, signature="s", access="read")
2005
1493
def Fingerprint_dbus_property(self):
2006
1494
return dbus.String(self.fingerprint)
2008
1496
# Host - property
2009
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
2011
1498
access="readwrite")
2012
1499
def Host_dbus_property(self, value=None):
2013
1500
if value is None: # get
2014
1501
return dbus.String(self.host)
2015
self.host = str(value)
1502
self.host = unicode(value)
2017
1504
# Created - property
2019
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2020
1505
@dbus_service_property(_interface, signature="s", access="read")
2021
1506
def Created_dbus_property(self):
2022
1507
return datetime_to_dbus(self.created)
2024
1509
# LastEnabled - property
2025
1510
@dbus_service_property(_interface, signature="s", access="read")
2026
1511
def LastEnabled_dbus_property(self):
2027
1512
return datetime_to_dbus(self.last_enabled)
2029
1514
# Enabled - property
2030
@dbus_service_property(_interface,
1515
@dbus_service_property(_interface, signature="b",
2032
1516
access="readwrite")
2033
1517
def Enabled_dbus_property(self, value=None):
2034
1518
if value is None: # get
2083
1566
if (getattr(self, "disable_initiator_tag", None)
2086
GLib.source_remove(self.disable_initiator_tag)
2087
self.disable_initiator_tag = GLib.timeout_add(
2088
int((self.expires - now).total_seconds() * 1000),
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2091
1575
# ExtendedTimeout - property
2092
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
2094
1577
access="readwrite")
2095
1578
def ExtendedTimeout_dbus_property(self, value=None):
2096
1579
if value is None: # get
2097
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2099
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2101
1583
# Interval - property
2102
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2104
1585
access="readwrite")
2105
1586
def Interval_dbus_property(self, value=None):
2106
1587
if value is None: # get
2107
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
2108
1589
self.interval = datetime.timedelta(0, 0, 0, value)
2109
1590
if getattr(self, "checker_initiator_tag", None) is None:
2111
1592
if self.enabled:
2112
1593
# Reschedule checker run
2113
GLib.source_remove(self.checker_initiator_tag)
2114
self.checker_initiator_tag = GLib.timeout_add(
2115
value, self.start_checker)
2116
self.start_checker() # Start one now, too
1594
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
2118
1599
# Checker - property
2119
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
2121
1601
access="readwrite")
2122
1602
def Checker_dbus_property(self, value=None):
2123
1603
if value is None: # get
2124
1604
return dbus.String(self.checker_command)
2125
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
2127
1607
# CheckerRunning - property
2128
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
2130
1609
access="readwrite")
2131
1610
def CheckerRunning_dbus_property(self, value=None):
2132
1611
if value is None: # get
2189
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
2190
1659
"""A class to handle client connections.
2192
1661
Instantiated once for each connection to handle it.
2193
1662
Note: This will run in its own forked process."""
2195
1664
def handle(self):
2196
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
2197
1666
logger.info("TCP connection from: %s",
2198
str(self.client_address))
1667
unicode(self.client_address))
2199
1668
logger.debug("Pipe FD: %d",
2200
1669
self.server.child_pipe.fileno())
2202
session = gnutls.ClientSession(self.request)
2204
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2205
# "+AES-256-CBC", "+SHA1",
2206
# "+COMP-NULL", "+CTYPE-OPENPGP",
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1676
# Note: gnutls.connection.X509Credentials is really a
1677
# generic GnuTLS certificate credentials object so long as
1678
# no X.509 keys are added to it. Therefore, we can use it
1679
# here despite using OpenPGP certificates.
1681
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1682
# "+AES-256-CBC", "+SHA1",
1683
# "+COMP-NULL", "+CTYPE-OPENPGP",
2208
1685
# Use a fallback default, since this MUST be set.
2209
1686
priority = self.server.gnutls_priority
2210
1687
if priority is None:
2211
1688
priority = "NORMAL"
2212
gnutls.priority_set_direct(session._c_object,
2213
priority.encode("utf-8"),
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2216
1693
# Start communication using the Mandos protocol
2217
1694
# Get protocol number
2218
1695
line = self.request.makefile().readline()
2219
1696
logger.debug("Protocol version: %r", line)
2221
1698
if int(line.strip().split()[0]) > 1:
2222
raise RuntimeError(line)
2223
1700
except (ValueError, IndexError, RuntimeError) as error:
2224
1701
logger.error("Unknown protocol version: %s", error)
2227
1704
# Start GnuTLS connection
2229
1706
session.handshake()
2230
except gnutls.Error as error:
1707
except gnutls.errors.GNUTLSError as error:
2231
1708
logger.warning("Handshake failed: %s", error)
2232
1709
# Do not run session.bye() here: the session is not
2233
1710
# established. Just abandon the request.
2235
1712
logger.debug("Handshake succeeded")
2237
1714
approval_required = False
2240
fpr = self.fingerprint(
2241
self.peer_certificate(session))
2242
except (TypeError, gnutls.Error) as error:
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
2243
1721
logger.warning("Bad certificate: %s", error)
2245
1723
logger.debug("Fingerprint: %s", fpr)
2248
1726
client = ProxyClient(child_pipe, fpr,
2249
1727
self.client_address)
2250
1728
except KeyError:
2253
1731
if client.approval_delay:
2254
1732
delay = client.approval_delay
2255
1733
client.approvals_pending += 1
2256
1734
approval_required = True
2259
1737
if not client.enabled:
2260
1738
logger.info("Client %s is disabled",
2262
1740
if self.server.use_dbus:
2263
1741
# Emit D-Bus signal
2264
1742
client.Rejected("Disabled")
2267
1745
if client.approved or not client.approval_delay:
2268
# We are approved or approval is disabled
1746
#We are approved or approval is disabled
2270
1748
elif client.approved is None:
2271
1749
logger.info("Client %s needs approval",
2304
1784
delay -= time2 - time
2307
session.send(client.secret)
2308
except gnutls.Error as error:
2309
logger.warning("gnutls send failed",
1787
while sent_size < len(client.secret):
1789
sent = session.send(client.secret[sent_size:])
1790
except gnutls.errors.GNUTLSError as error:
1791
logger.warning("gnutls send failed",
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
2313
1799
logger.info("Sending secret to %s", client.name)
2314
1800
# bump the timeout using extended_timeout
2315
1801
client.bump_timeout(client.extended_timeout)
2316
1802
if self.server.use_dbus:
2317
1803
# Emit D-Bus signal
2318
1804
client.GotSecret()
2321
1807
if approval_required:
2322
1808
client.approvals_pending -= 1
2325
except gnutls.Error as error:
1811
except gnutls.errors.GNUTLSError as error:
2326
1812
logger.warning("GnuTLS bye failed",
2327
1813
exc_info=error)
2330
1816
def peer_certificate(session):
2331
1817
"Return the peer's OpenPGP certificate as a bytestring"
2332
1818
# If not an OpenPGP certificate...
2333
if (gnutls.certificate_type_get(session._c_object)
2334
!= gnutls.CRT_OPENPGP):
2335
# ...return invalid data
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1821
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1822
# ...do the normal thing
1823
return session.peer_certificate
2337
1824
list_size = ctypes.c_uint(1)
2338
cert_list = (gnutls.certificate_get_peers
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2339
1827
(session._c_object, ctypes.byref(list_size)))
2340
1828
if not bool(cert_list) and list_size.value != 0:
2341
raise gnutls.Error("error getting peer certificate")
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2342
1831
if list_size.value == 0:
2344
1833
cert = cert_list[0]
2345
1834
return ctypes.string_at(cert.data, cert.size)
2348
1837
def fingerprint(openpgp):
2349
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2350
1839
# New GnuTLS "datum" with the OpenPGP public key
2351
datum = gnutls.datum_t(
2352
ctypes.cast(ctypes.c_char_p(openpgp),
2353
ctypes.POINTER(ctypes.c_ubyte)),
2354
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2355
1845
# New empty GnuTLS certificate
2356
crt = gnutls.openpgp_crt_t()
2357
gnutls.openpgp_crt_init(ctypes.byref(crt))
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2358
1849
# Import the OpenPGP public key into the certificate
2359
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2360
gnutls.OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2361
1854
# Verify the self signature in the key
2362
1855
crtverify = ctypes.c_uint()
2363
gnutls.openpgp_crt_verify_self(crt, 0,
2364
ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2365
1859
if crtverify.value != 0:
2366
gnutls.openpgp_crt_deinit(crt)
2367
raise gnutls.CertificateSecurityError("Verify failed")
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2368
1863
# New buffer for the fingerprint
2369
1864
buf = ctypes.create_string_buffer(20)
2370
1865
buf_len = ctypes.c_size_t()
2371
1866
# Get the fingerprint from the certificate into the buffer
2372
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2373
ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2374
1870
# Deinit the certificate
2375
gnutls.openpgp_crt_deinit(crt)
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2376
1872
# Convert the buffer to a Python bytestring
2377
1873
fpr = ctypes.string_at(buf, buf_len.value)
2378
1874
# Convert the bytestring to hexadecimal notation
2383
1879
class MultiprocessingMixIn(object):
2384
1880
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2386
1881
def sub_process_main(self, request, address):
2388
1883
self.finish_request(request, address)
2389
1884
except Exception:
2390
1885
self.handle_error(request, address)
2391
1886
self.close_request(request)
2393
1888
def process_request(self, request, address):
2394
1889
"""Start a new process to process the request."""
2395
proc = multiprocessing.Process(target=self.sub_process_main,
2396
args=(request, address))
1890
proc = multiprocessing.Process(target = self.sub_process_main,
1891
args = (request, address))
2401
1896
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2402
1897
""" adds a pipe to the MixIn """
2404
1898
def process_request(self, request, client_address):
2405
1899
"""Overrides and wraps the original process_request().
2407
1901
This function creates a new pipe in self.pipe
2409
1903
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2411
1905
proc = MultiprocessingMixIn.process_request(self, request,
2412
1906
client_address)
2413
1907
self.child_pipe.close()
2414
1908
self.add_pipe(parent_pipe, proc)
2416
1910
def add_pipe(self, parent_pipe, proc):
2417
1911
"""Dummy function; override as necessary"""
2418
raise NotImplementedError()
1912
raise NotImplementedError
2421
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2422
1916
socketserver.TCPServer, object):
2423
1917
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2426
1920
enabled: Boolean; whether this server is activated yet
2427
1921
interface: None or a network interface name (string)
2428
1922
use_ipv6: Boolean; to use IPv6 or not
2431
1924
def __init__(self, server_address, RequestHandlerClass,
1925
interface=None, use_ipv6=True, socketfd=None):
2435
1926
"""If socketfd is set, use that file descriptor instead of
2436
1927
creating a new one with socket.socket().
2467
1957
# socket_wrapper(), if socketfd was set.
2468
1958
socketserver.TCPServer.__init__(self, server_address,
2469
1959
RequestHandlerClass)
2471
1961
def server_bind(self):
2472
1962
"""This overrides the normal server_bind() function
2473
1963
to bind to an interface if one was specified, and also NOT to
2474
1964
bind to an address or port if they were not specified."""
2475
global SO_BINDTODEVICE
2476
1965
if self.interface is not None:
2477
1966
if SO_BINDTODEVICE is None:
2478
# Fall back to a hard-coded value which seems to be
2480
logger.warning("SO_BINDTODEVICE not found, trying 25")
2481
SO_BINDTODEVICE = 25
2483
self.socket.setsockopt(
2484
socket.SOL_SOCKET, SO_BINDTODEVICE,
2485
(self.interface + "\0").encode("utf-8"))
2486
except socket.error as error:
2487
if error.errno == errno.EPERM:
2488
logger.error("No permission to bind to"
2489
" interface %s", self.interface)
2490
elif error.errno == errno.ENOPROTOOPT:
2491
logger.error("SO_BINDTODEVICE not available;"
2492
" cannot bind to interface %s",
2494
elif error.errno == errno.ENODEV:
2495
logger.error("Interface %s does not exist,"
2496
" cannot bind", self.interface)
1967
logger.error("SO_BINDTODEVICE does not exist;"
1968
" cannot bind to interface %s",
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
1975
except socket.error as error:
1976
if error.errno == errno.EPERM:
1977
logger.error("No permission to bind to"
1978
" interface %s", self.interface)
1979
elif error.errno == errno.ENOPROTOOPT:
1980
logger.error("SO_BINDTODEVICE not available;"
1981
" cannot bind to interface %s",
1983
elif error.errno == errno.ENODEV:
1984
logger.error("Interface %s does not exist,"
1985
" cannot bind", self.interface)
2499
1988
# Only bind(2) the socket if we really need to.
2500
1989
if self.server_address[0] or self.server_address[1]:
2501
1990
if not self.server_address[0]:
2502
1991
if self.address_family == socket.AF_INET6:
2503
any_address = "::" # in6addr_any
1992
any_address = "::" # in6addr_any
2505
any_address = "0.0.0.0" # INADDR_ANY
1994
any_address = "0.0.0.0" # INADDR_ANY
2506
1995
self.server_address = (any_address,
2507
1996
self.server_address[1])
2508
1997
elif not self.server_address[1]:
2509
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2510
2000
# if self.interface:
2511
2001
# self.server_address = (self.server_address[0],
2899
2378
server_settings["socket"] = os.dup(server_settings
2901
2380
del server_config
2903
2382
# Override the settings from the config file with command line
2904
2383
# options, if set.
2905
2384
for option in ("interface", "address", "port", "debug",
2906
"priority", "servicename", "configdir", "use_dbus",
2907
"use_ipv6", "debuglevel", "restore", "statedir",
2908
"socket", "foreground", "zeroconf"):
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2909
2388
value = getattr(options, option)
2910
2389
if value is not None:
2911
2390
server_settings[option] = value
2913
2392
# Force all strings to be unicode
2914
2393
for option in server_settings.keys():
2915
if isinstance(server_settings[option], bytes):
2916
server_settings[option] = (server_settings[option]
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2918
2396
# Force all boolean options to be boolean
2919
2397
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2920
"foreground", "zeroconf"):
2921
2399
server_settings[option] = bool(server_settings[option])
2922
2400
# Debug implies foreground
2923
2401
if server_settings["debug"]:
2924
2402
server_settings["foreground"] = True
2925
2403
# Now we have our good server settings in "server_settings"
2927
2405
##################################################################
2929
if (not server_settings["zeroconf"]
2930
and not (server_settings["port"]
2931
or server_settings["socket"] != "")):
2932
parser.error("Needs port or socket to work without Zeroconf")
2934
2407
# For convenience
2935
2408
debug = server_settings["debug"]
2936
2409
debuglevel = server_settings["debuglevel"]
2950
2422
level = getattr(logging, debuglevel.upper())
2951
2423
initlogger(debug, level)
2953
2425
if server_settings["servicename"] != "Mandos":
2954
syslogger.setFormatter(
2955
logging.Formatter('Mandos ({}) [%(process)d]:'
2956
' %(levelname)s: %(message)s'.format(
2957
server_settings["servicename"])))
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2959
2432
# Parse config file with clients
2960
2433
client_config = configparser.SafeConfigParser(Client
2961
2434
.client_defaults)
2962
2435
client_config.read(os.path.join(server_settings["configdir"],
2963
2436
"clients.conf"))
2965
2438
global mandos_dbus_service
2966
2439
mandos_dbus_service = None
2969
if server_settings["socket"] != "":
2970
socketfd = server_settings["socket"]
2971
tcp_server = MandosServer(
2972
(server_settings["address"], server_settings["port"]),
2974
interface=(server_settings["interface"] or None),
2976
gnutls_priority=server_settings["priority"],
2441
tcp_server = MandosServer((server_settings["address"],
2442
server_settings["port"]),
2444
interface=(server_settings["interface"]
2448
server_settings["priority"],
2450
socketfd=(server_settings["socket"]
2979
2452
if not foreground:
2980
2453
pidfilename = "/run/mandos.pid"
2981
if not os.path.isdir("/run/."):
2982
pidfilename = "/var/run/mandos.pid"
2985
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2456
pidfile = open(pidfilename, "w")
2986
2457
except IOError as e:
2987
2458
logger.error("Could not open file %r", pidfilename,
2990
for name, group in (("_mandos", "_mandos"),
2991
("mandos", "mandos"),
2992
("nobody", "nogroup")):
2461
for name in ("_mandos", "mandos", "nobody"):
2994
2463
uid = pwd.getpwnam(name).pw_uid
2995
gid = pwd.getpwnam(group).pw_gid
2464
gid = pwd.getpwnam(name).pw_gid
2997
2466
except KeyError:
3006
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3008
2474
except OSError as error:
3009
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3010
.format(uid, gid, os.strerror(error.errno)))
3011
2475
if error.errno != errno.EPERM:
3015
2479
# Enable all possible GnuTLS debugging
3017
2481
# "Use a log level over 10 to enable all debugging options."
3018
2482
# - GnuTLS manual
3019
gnutls.global_set_log_level(11)
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3022
2486
def debug_gnutls(level, string):
3023
2487
logger.debug("GnuTLS: %s", string[:-1])
3025
gnutls.global_set_log_function(debug_gnutls)
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3027
2492
# Redirect stdin so all checkers get /dev/null
3028
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3029
2494
os.dup2(null, sys.stdin.fileno())
3033
2498
# Need to fork before connecting to D-Bus
3034
2499
if not foreground:
3035
2500
# Close all input and output, do double fork, etc.
3038
# multiprocessing will use threads, so before we use GLib we need
3039
# to inform GLib that threads will be used.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
3042
2507
global main_loop
3043
2508
# From the Avahi example code
3044
2509
DBusGMainLoop(set_as_default=True)
3045
main_loop = GLib.MainLoop()
2510
main_loop = gobject.MainLoop()
3046
2511
bus = dbus.SystemBus()
3047
2512
# End of Avahi example code
3050
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
3053
old_bus_name = dbus.service.BusName(
3054
"se.bsnet.fukt.Mandos", bus,
3056
except dbus.exceptions.DBusException as e:
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
3057
2521
logger.error("Disabling D-Bus:", exc_info=e)
3058
2522
use_dbus = False
3059
2523
server_settings["use_dbus"] = False
3060
2524
tcp_server.use_dbus = False
3062
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3063
service = AvahiServiceToSyslog(
3064
name=server_settings["servicename"],
3065
servicetype="_mandos._tcp",
3068
if server_settings["interface"]:
3069
service.interface = if_nametoindex(
3070
server_settings["interface"].encode("utf-8"))
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
3072
2534
global multiprocessing_manager
3073
2535
multiprocessing_manager = multiprocessing.Manager()
3075
2537
client_class = Client
3077
client_class = functools.partial(ClientDBus, bus=bus)
2539
client_class = functools.partial(ClientDBus, bus = bus)
3079
2541
client_settings = Client.config_parser(client_config)
3080
2542
old_client_settings = {}
3081
2543
clients_data = {}
3083
2545
# This is used to redirect stdout and stderr for checker processes
3085
wnull = open(os.devnull, "w") # A writable /dev/null
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3086
2548
# Only used if server is running in foreground but not in debug
3088
2550
if debug or not foreground:
3091
2553
# Get client data and settings from last running state.
3092
2554
if server_settings["restore"]:
3094
2556
with open(stored_state_path, "rb") as stored_state:
3095
if sys.version_info.major == 2:
3096
clients_data, old_client_settings = pickle.load(
3099
bytes_clients_data, bytes_old_client_settings = (
3100
pickle.load(stored_state, encoding="bytes"))
3101
# Fix bytes to strings
3104
clients_data = {(key.decode("utf-8")
3105
if isinstance(key, bytes)
3108
bytes_clients_data.items()}
3109
del bytes_clients_data
3110
for key in clients_data:
3111
value = {(k.decode("utf-8")
3112
if isinstance(k, bytes) else k): v
3114
clients_data[key].items()}
3115
clients_data[key] = value
3117
value["client_structure"] = [
3119
if isinstance(s, bytes)
3121
value["client_structure"]]
3123
for k in ("name", "host"):
3124
if isinstance(value[k], bytes):
3125
value[k] = value[k].decode("utf-8")
3126
# old_client_settings
3128
old_client_settings = {
3129
(key.decode("utf-8")
3130
if isinstance(key, bytes)
3133
bytes_old_client_settings.items()}
3134
del bytes_old_client_settings
3136
for value in old_client_settings.values():
3137
if isinstance(value["host"], bytes):
3138
value["host"] = (value["host"]
2557
clients_data, old_client_settings = (pickle.load
3140
2559
os.remove(stored_state_path)
3141
2560
except IOError as e:
3142
2561
if e.errno == errno.ENOENT:
3143
logger.warning("Could not load persistent state:"
3144
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3146
2565
logger.critical("Could not load persistent state:",
3149
2568
except EOFError as e:
3150
2569
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
3154
2572
with PGPEngine() as pgp:
3155
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
3156
2574
# Skip removed clients
3157
2575
if client_name not in client_settings:
3160
2578
# Decide which value to use after restoring saved state.
3161
2579
# We have three different values: Old config file,
3162
2580
# new config file, and saved state.
3220
2638
for client_name in (set(client_settings)
3221
2639
- set(old_client_settings)):
3222
2640
clients_data[client_name] = client_settings[client_name]
3224
2642
# Create all client objects
3225
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
3226
2644
tcp_server.clients[client_name] = client_class(
3229
server_settings=server_settings)
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3231
2648
if not tcp_server.clients:
3232
2649
logger.warning("No clients defined")
3234
2651
if not foreground:
3235
2652
if pidfile is not None:
3239
print(pid, file=pidfile)
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3240
2657
except IOError:
3241
2658
logger.error("Could not write to file %r with PID %d",
3242
2659
pidfilename, pid)
3244
2661
del pidfilename
3246
for termsig in (signal.SIGHUP, signal.SIGTERM):
3247
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3248
lambda: main_loop.quit() and False)
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3252
@alternate_dbus_interfaces(
3253
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3254
class MandosDBusService(DBusObjectWithObjectManager):
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3255
2670
"""A D-Bus proxy object"""
3257
2671
def __init__(self):
3258
2672
dbus.service.Object.__init__(self, bus, "/")
3260
2673
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
3262
2681
@dbus.service.signal(_interface, signature="o")
3263
2682
def ClientAdded(self, objpath):
3267
2686
@dbus.service.signal(_interface, signature="ss")
3268
2687
def ClientNotFound(self, fingerprint, address):
3272
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3274
2691
@dbus.service.signal(_interface, signature="os")
3275
2692
def ClientRemoved(self, objpath, name):
3279
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3281
2696
@dbus.service.method(_interface, out_signature="ao")
3282
2697
def GetAllClients(self):
3284
return dbus.Array(c.dbus_object_path for c in
3285
tcp_server.clients.values())
3287
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3289
2703
@dbus.service.method(_interface,
3290
2704
out_signature="a{oa{sv}}")
3291
2705
def GetAllClientsWithProperties(self):
3293
2707
return dbus.Dictionary(
3294
{c.dbus_object_path: c.GetAll(
3295
"se.recompile.Mandos.Client")
3296
for c in tcp_server.clients.values()},
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3297
2710
signature="oa{sv}")
3299
2712
@dbus.service.method(_interface, in_signature="o")
3300
2713
def RemoveClient(self, object_path):
3302
for c in tcp_server.clients.values():
2715
for c in tcp_server.clients.itervalues():
3303
2716
if c.dbus_object_path == object_path:
3304
2717
del tcp_server.clients[c.name]
3305
2718
c.remove_from_connection()
3306
# Don't signal the disabling
2719
# Don't signal anything except ClientRemoved
3307
2720
c.disable(quiet=True)
3308
# Emit D-Bus signal for removal
3309
self.client_removed_signal(c)
2722
self.ClientRemoved(object_path, c.name)
3311
2724
raise KeyError(object_path)
3315
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3316
out_signature="a{oa{sa{sv}}}")
3317
def GetManagedObjects(self):
3319
return dbus.Dictionary(
3320
{client.dbus_object_path:
3322
{interface: client.GetAll(interface)
3324
client._get_all_interface_names()})
3325
for client in tcp_server.clients.values()})
3327
def client_added_signal(self, client):
3328
"""Send the new standard signal and the old signal"""
3330
# New standard signal
3331
self.InterfacesAdded(
3332
client.dbus_object_path,
3334
{interface: client.GetAll(interface)
3336
client._get_all_interface_names()}))
3338
self.ClientAdded(client.dbus_object_path)
3340
def client_removed_signal(self, client):
3341
"""Send the new standard signal and the old signal"""
3343
# New standard signal
3344
self.InterfacesRemoved(
3345
client.dbus_object_path,
3346
client._get_all_interface_names())
3348
self.ClientRemoved(client.dbus_object_path,
3351
2728
mandos_dbus_service = MandosDBusService()
3353
# Save modules to variables to exempt the modules from being
3354
# unloaded before the function registered with atexit() is run.
3355
mp = multiprocessing
3359
2731
"Cleanup function; run on exit"
3363
mp.active_children()
2734
multiprocessing.active_children()
3365
2736
if not (tcp_server.clients or client_settings):
3368
2739
# Store client before exiting. Secrets are encrypted with key
3369
2740
# based on what config file has. If config file is
3370
2741
# removed/edited, old secret will thus be unrecovable.
3372
2743
with PGPEngine() as pgp:
3373
for client in tcp_server.clients.values():
2744
for client in tcp_server.clients.itervalues():
3374
2745
key = client_settings[client.name]["secret"]
3375
2746
client.encrypted_secret = pgp.encrypt(client.secret,
3377
2748
client_dict = {}
3379
2750
# A list of attributes that can not be pickled
3381
exclude = {"bus", "changedstate", "secret",
3382
"checker", "server_settings"}
3383
for name, typ in inspect.getmembers(dbus.service
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3385
2756
exclude.add(name)
3387
2758
client_dict["encrypted_secret"] = (client
3388
2759
.encrypted_secret)
3389
2760
for attr in client.client_structure:
3390
2761
if attr not in exclude:
3391
2762
client_dict[attr] = getattr(client, attr)
3393
2764
clients[client.name] = client_dict
3394
2765
del client_settings[client.name]["secret"]
3397
with tempfile.NamedTemporaryFile(
3401
dir=os.path.dirname(stored_state_path),
3402
delete=False) as stored_state:
3403
pickle.dump((clients, client_settings), stored_state,
3405
tempname = stored_state.name
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2772
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
3406
2774
os.rename(tempname, stored_state_path)
3407
2775
except (IOError, OSError) as e: