65
import cPickle as pickle
69
import cPickle as pickle
66
72
import multiprocessing
74
81
import dbus.service
82
from gi.repository import GLib
77
83
from dbus.mainloop.glib import DBusGMainLoop
80
86
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:
84
93
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
94
except AttributeError:
96
# This is where SO_BINDTODEVICE was up to and including Python
87
98
from IN import SO_BINDTODEVICE
88
99
except ImportError:
89
SO_BINDTODEVICE = None
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:
92
118
stored_state_file = "clients.pickle"
94
120
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
103
126
except (OSError, AttributeError):
104
128
def if_nametoindex(interface):
105
129
"Get an interface index the hard way, i.e. using fcntl()"
106
130
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
131
with contextlib.closing(socket.socket()) as s:
108
132
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
135
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__,
116
154
def initlogger(debug, level=logging.WARNING):
117
155
"""init logger and add loglevel"""
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
161
syslogger.setFormatter(logging.Formatter
120
162
('Mandos [%(process)d]: %(levelname)s:'
122
164
logger.addHandler(syslogger)
125
167
console = logging.StreamHandler()
126
168
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
225
os.rmdir(self.tempdir)
170
226
self.tempdir = None
172
228
def password_encode(self, password):
173
229
# Passphrase can not be empty and can not contain newlines or
174
230
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
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"))
177
239
def encrypt(self, data, password):
178
240
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
181
243
passfile.write(passphrase)
183
proc = subprocess.Popen(['gpg', '--symmetric',
245
proc = subprocess.Popen([self.gpg, '--symmetric',
184
246
'--passphrase-file',
186
248
+ self.gnupgargs,
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
191
253
if proc.returncode != 0:
192
254
raise PGPError(err)
193
255
return ciphertext
195
257
def decrypt(self, data, password):
196
258
passphrase = self.password_encode(password)
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
199
261
passfile.write(passphrase)
201
proc = subprocess.Popen(['gpg', '--decrypt',
263
proc = subprocess.Popen([self.gpg, '--decrypt',
202
264
'--passphrase-file',
204
266
+ self.gnupgargs,
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
210
271
if proc.returncode != 0:
211
272
raise PGPError(err)
212
273
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
215
303
class AvahiError(Exception):
216
304
def __init__(self, value, *args, **kwargs):
217
305
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
306
return super(AvahiError, self).__init__(value, *args,
222
310
class AvahiServiceError(AvahiError):
225
314
class AvahiGroupError(AvahiError):
229
318
class AvahiService(object):
230
319
"""An Avahi (Zeroconf) service.
233
322
interface: integer; avahi.IF_UNSPEC or an interface index.
234
323
Used to optionally bind to the specified interface.
377
488
follow_name_owner_changes=True),
378
489
avahi.DBUS_INTERFACE_SERVER)
379
490
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
491
self.server_state_changed)
381
492
self.server_state_changed(self.server.GetState())
384
495
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
386
497
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
498
ret = AvahiService.rename(self, *args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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))
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))
402
780
class Client(object):
403
781
"""A representation of a client host served by this server.
406
784
approved: bool(); 'None' if not yet approved/disapproved
407
785
approval_delay: datetime.timedelta(); Time to wait for approval
595
960
logger.info("Disabling client %s", self.name)
596
961
if getattr(self, "disable_initiator_tag", None) is not None:
597
gobject.source_remove(self.disable_initiator_tag)
962
GLib.source_remove(self.disable_initiator_tag)
598
963
self.disable_initiator_tag = None
599
964
self.expires = None
600
965
if getattr(self, "checker_initiator_tag", None) is not None:
601
gobject.source_remove(self.checker_initiator_tag)
966
GLib.source_remove(self.checker_initiator_tag)
602
967
self.checker_initiator_tag = None
603
968
self.stop_checker()
604
969
self.enabled = False
606
971
self.send_changedstate()
607
# Do not run this again if called by a gobject.timeout_add
972
# Do not run this again if called by a GLib.timeout_add
610
975
def __del__(self):
613
978
def init_checker(self):
614
979
# Schedule a new checker to be started an 'interval' from now,
615
980
# and every interval from then on.
616
981
if self.checker_initiator_tag is not None:
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
621
986
# Schedule a disable() when 'timeout' has passed
622
987
if self.disable_initiator_tag is not None:
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
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)
627
991
# Also start a new checker *right now*.
628
992
self.start_checker()
630
def checker_callback(self, pid, condition, command):
994
def checker_callback(self, source, condition, connection,
631
996
"""The checker has completed, so take appropriate actions."""
632
997
self.checker_callback_tag = None
633
998
self.checker = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
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
636
1006
if self.last_checker_status == 0:
637
1007
logger.info("Checker for %(name)s succeeded",
639
1009
self.checked_ok()
641
logger.info("Checker for %(name)s failed",
1011
logger.info("Checker for %(name)s failed", vars(self))
644
1013
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
645
1015
logger.warning("Checker for %(name)s crashed?",
648
1019
def checked_ok(self):
649
1020
"""Assert that the client has been seen, alive and well."""
650
1021
self.last_checked_ok = datetime.datetime.utcnow()
651
1022
self.last_checker_status = 0
1023
self.last_checker_signal = None
652
1024
self.bump_timeout()
654
1026
def bump_timeout(self, timeout=None):
655
1027
"""Bump up the timeout for this client."""
656
1028
if timeout is None:
657
1029
timeout = self.timeout
658
1030
if self.disable_initiator_tag is not None:
659
gobject.source_remove(self.disable_initiator_tag)
1031
GLib.source_remove(self.disable_initiator_tag)
660
1032
self.disable_initiator_tag = None
661
1033
if getattr(self, "enabled", False):
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
665
1036
self.expires = datetime.datetime.utcnow() + timeout
667
1038
def need_approval(self):
668
1039
self.last_approval_request = datetime.datetime.utcnow()
670
1041
def start_checker(self):
671
1042
"""Start a new checker subprocess if one is not running.
673
1044
If a checker already exists, leave it running and do
675
1046
# The reason for not killing a running checker is that if we
680
1051
# checkers alone, the checker would have to take more time
681
1052
# than 'timeout' for the client to be disabled, which is as it
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)
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
697
1059
# Start a new checker if needed
698
1060
if self.checker is None:
699
1061
# Escape attributes for the shell
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
705
1066
command = self.checker_command % escaped_attrs
706
1067
except TypeError as error:
707
1068
logger.error('Could not format string "%s"',
708
self.checker_command, exc_info=error)
709
return True # Try again later
1069
self.checker_command,
1071
return True # Try again later
710
1072
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",
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
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
755
1101
def stop_checker(self):
756
1102
"""Force the checker process, if any, to stop."""
757
1103
if self.checker_callback_tag:
758
gobject.source_remove(self.checker_callback_tag)
1104
GLib.source_remove(self.checker_callback_tag)
759
1105
self.checker_callback_tag = None
760
1106
if getattr(self, "checker", None) is None:
762
1108
logger.debug("Stopping checker for %(name)s", vars(self))
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
1109
self.checker.terminate()
771
1110
self.checker = None
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1113
def dbus_service_property(dbus_interface,
776
1117
"""Decorators for marking methods of a DBusObjectWithProperties to
777
1118
become properties on the D-Bus.
779
1120
The decorated method will be called with no arguments by "Get"
780
1121
and with one argument by "Set".
782
1123
The parameters, where they are supported, are the same as
783
1124
dbus.service.method, except there is only "signature", since the
784
1125
type from Get() and the type sent to Set() is the same.
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.
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.
869
1216
def _is_dbus_thing(thing):
870
1217
"""Returns a function testing if an attribute is a D-Bus thing
872
1219
If called like _is_dbus_thing("method") it returns a function
873
1220
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
878
1225
def _get_all_dbus_things(self, thing):
879
1226
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name",
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
1229
athing.__get__(self))
884
1230
for cls in self.__class__.__mro__
885
1231
for name, athing in
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
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.
889
1305
def _get_dbus_property(self, interface_name, property_name):
890
1306
"""Returns a bound method if one exists which is a D-Bus
891
1307
property with the specified name and interface.
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
897
1312
if (value._dbus_name == property_name
898
1313
and value._dbus_interface == interface_name):
899
1314
return value.__get__(self)
901
1316
# No such property
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
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,
907
1331
out_signature="v")
908
1332
def Get(self, interface_name, property_name):
909
1333
"""Standard D-Bus property Get() method, see D-Bus standard.
1038
1461
exc_info=error)
1039
1462
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",
1042
1535
def datetime_to_dbus(dt, variant_level=0):
1043
1536
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1538
return dbus.String("", variant_level=variant_level)
1539
return dbus.String(dt.isoformat(), variant_level=variant_level)
1050
1542
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1080
1573
# Ignore non-D-Bus attributes, and D-Bus attributes
1081
1574
# with the wrong interface name
1082
1575
if (not hasattr(attribute, "_dbus_interface")
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1576
or not attribute._dbus_interface.startswith(
1577
orig_interface_name)):
1086
1579
# Create an alternate D-Bus interface name based on
1087
1580
# the current name
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1581
alt_interface = attribute._dbus_interface.replace(
1582
orig_interface_name, alt_interface_name)
1091
1583
interface_names.add(alt_interface)
1092
1584
# Is this a D-Bus signal?
1093
1585
if getattr(attribute, "_dbus_is_signal", False):
1094
1586
# Extract the original non-method undecorated
1095
1587
# function by black magic
1096
nonmethod_func = (dict(
1588
if sys.version_info.major == 2:
1589
nonmethod_func = (dict(
1097
1590
zip(attribute.func_code.co_freevars,
1098
attribute.__closure__))["func"]
1591
attribute.__closure__))
1592
["func"].cell_contents)
1594
nonmethod_func = (dict(
1595
zip(attribute.__code__.co_freevars,
1596
attribute.__closure__))
1597
["func"].cell_contents)
1100
1598
# Create a new, but exactly alike, function
1101
1599
# object, and decorate it to be a new D-Bus signal
1102
1600
# with the alternate D-Bus interface name
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)))
1601
new_function = copy_function(nonmethod_func)
1602
new_function = (dbus.service.signal(
1604
attribute._dbus_signature)(new_function))
1112
1605
# Copy annotations, if any
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1607
new_function._dbus_annotations = dict(
1608
attribute._dbus_annotations)
1116
1609
except AttributeError:
1118
1612
# Define a creator of a function to call both the
1119
1613
# original and alternate functions, so both the
1120
1614
# original and alternate signals gets sent when
1210
1697
if interface_names:
1211
1698
# Replace the class with a new subclass of it with
1212
1699
# methods, signals, etc. as created above.
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1700
if sys.version_info.major == 2:
1701
cls = type(b"{}Alternate".format(cls.__name__),
1704
cls = type("{}Alternate".format(cls.__name__),
1219
1711
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
"se.bsnet.fukt.Mandos"})
1712
"se.bsnet.fukt.Mandos"})
1221
1713
class ClientDBus(Client, DBusObjectWithProperties):
1222
1714
"""A Client class using D-Bus
1225
1717
dbus_object_path: dbus.ObjectPath
1226
1718
bus: dbus.SystemBus()
1229
1721
runtime_expansions = (Client.runtime_expansions
1230
+ ("dbus_object_path",))
1722
+ ("dbus_object_path", ))
1724
_interface = "se.recompile.Mandos.Client"
1232
1726
# dbus.service.Object doesn't use super(), so we can't either.
1234
def __init__(self, bus = None, *args, **kwargs):
1728
def __init__(self, bus=None, *args, **kwargs):
1236
1730
Client.__init__(self, *args, **kwargs)
1237
1731
# Only now, when this client is initialized, can it show up on
1239
client_object_name = unicode(self.name).translate(
1733
client_object_name = str(self.name).translate(
1240
1734
{ord("."): ord("_"),
1241
1735
ord("-"): ord("_")})
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1736
self.dbus_object_path = dbus.ObjectPath(
1737
"/clients/" + client_object_name)
1244
1738
DBusObjectWithProperties.__init__(self, self.bus,
1245
1739
self.dbus_object_path)
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1741
def notifychangeproperty(transform_func, dbus_name,
1742
type_func=lambda x: x,
1744
invalidate_only=False,
1745
_interface=_interface):
1250
1746
""" Modify a variable so that it's a property which announces
1251
1747
its changes to DBus.
1253
1749
transform_fun: Function that takes a value and a variant_level
1254
1750
and transforms it to a D-Bus type.
1255
1751
dbus_name: D-Bus name of the variable
1320
1827
if hasattr(DBusObjectWithProperties, "__del__"):
1321
1828
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1322
1829
Client.__del__(self, *args, **kwargs)
1324
def checker_callback(self, pid, condition, command,
1326
self.checker_callback_tag = None
1328
if os.WIFEXITED(condition):
1329
exitstatus = os.WEXITSTATUS(condition)
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
1330
1838
# Emit D-Bus signal
1331
1839
self.CheckerCompleted(dbus.Int16(exitstatus),
1332
dbus.Int64(condition),
1840
# This is specific to GNU libC
1841
dbus.Int64(exitstatus << 8),
1333
1842
dbus.String(command))
1335
1844
# Emit D-Bus signal
1336
1845
self.CheckerCompleted(dbus.Int16(-1),
1337
dbus.Int64(condition),
1847
# This is specific to GNU libC
1849
| self.last_checker_signal),
1338
1850
dbus.String(command))
1340
return Client.checker_callback(self, pid, condition, command,
1343
1853
def start_checker(self, *args, **kwargs):
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1854
old_checker_pid = getattr(self.checker, "pid", None)
1349
1855
r = Client.start_checker(self, *args, **kwargs)
1350
1856
# Only if new checker process was started
1351
1857
if (self.checker is not None
1403
1903
server to mandos-client
1407
1907
# Rejected - signal
1408
1908
@dbus.service.signal(_interface, signature="s")
1409
1909
def Rejected(self, reason):
1413
1913
# NeedApproval - signal
1414
1914
@dbus.service.signal(_interface, signature="tb")
1415
1915
def NeedApproval(self, timeout, default):
1417
1917
return self.need_approval()
1421
1921
# Approve - method
1422
1922
@dbus.service.method(_interface, in_signature="b")
1423
1923
def Approve(self, value):
1424
1924
self.approve(value)
1426
1926
# CheckedOK - method
1427
1927
@dbus.service.method(_interface)
1428
1928
def CheckedOK(self):
1429
1929
self.checked_ok()
1431
1931
# Enable - method
1932
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1432
1933
@dbus.service.method(_interface)
1433
1934
def Enable(self):
1437
1938
# StartChecker - method
1939
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1940
@dbus.service.method(_interface)
1439
1941
def StartChecker(self):
1441
1943
self.start_checker()
1443
1945
# Disable - method
1946
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
1947
@dbus.service.method(_interface)
1445
1948
def Disable(self):
1449
1952
# StopChecker - method
1953
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
1954
@dbus.service.method(_interface)
1451
1955
def StopChecker(self):
1452
1956
self.stop_checker()
1456
1960
# ApprovalPending - property
1457
1961
@dbus_service_property(_interface, signature="b", access="read")
1458
1962
def ApprovalPending_dbus_property(self):
1459
1963
return dbus.Boolean(bool(self.approvals_pending))
1461
1965
# ApprovedByDefault - property
1462
@dbus_service_property(_interface, signature="b",
1966
@dbus_service_property(_interface,
1463
1968
access="readwrite")
1464
1969
def ApprovedByDefault_dbus_property(self, value=None):
1465
1970
if value is None: # get
1466
1971
return dbus.Boolean(self.approved_by_default)
1467
1972
self.approved_by_default = bool(value)
1469
1974
# ApprovalDelay - property
1470
@dbus_service_property(_interface, signature="t",
1975
@dbus_service_property(_interface,
1471
1977
access="readwrite")
1472
1978
def ApprovalDelay_dbus_property(self, value=None):
1473
1979
if value is None: # get
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1980
return dbus.UInt64(self.approval_delay.total_seconds()
1475
1982
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1477
1984
# ApprovalDuration - property
1478
@dbus_service_property(_interface, signature="t",
1985
@dbus_service_property(_interface,
1479
1987
access="readwrite")
1480
1988
def ApprovalDuration_dbus_property(self, value=None):
1481
1989
if value is None: # get
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1990
return dbus.UInt64(self.approval_duration.total_seconds()
1484
1992
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1486
1994
# Name - property
1996
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1487
1997
@dbus_service_property(_interface, signature="s", access="read")
1488
1998
def Name_dbus_property(self):
1489
1999
return dbus.String(self.name)
1491
2001
# Fingerprint - property
2003
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1492
2004
@dbus_service_property(_interface, signature="s", access="read")
1493
2005
def Fingerprint_dbus_property(self):
1494
2006
return dbus.String(self.fingerprint)
1496
2008
# Host - property
1497
@dbus_service_property(_interface, signature="s",
2009
@dbus_service_property(_interface,
1498
2011
access="readwrite")
1499
2012
def Host_dbus_property(self, value=None):
1500
2013
if value is None: # get
1501
2014
return dbus.String(self.host)
1502
self.host = unicode(value)
2015
self.host = str(value)
1504
2017
# Created - property
2019
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1505
2020
@dbus_service_property(_interface, signature="s", access="read")
1506
2021
def Created_dbus_property(self):
1507
2022
return datetime_to_dbus(self.created)
1509
2024
# LastEnabled - property
1510
2025
@dbus_service_property(_interface, signature="s", access="read")
1511
2026
def LastEnabled_dbus_property(self):
1512
2027
return datetime_to_dbus(self.last_enabled)
1514
2029
# Enabled - property
1515
@dbus_service_property(_interface, signature="b",
2030
@dbus_service_property(_interface,
1516
2032
access="readwrite")
1517
2033
def Enabled_dbus_property(self, value=None):
1518
2034
if value is None: # get
1566
2083
if (getattr(self, "disable_initiator_tag", None)
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2086
GLib.source_remove(self.disable_initiator_tag)
2087
self.disable_initiator_tag = GLib.timeout_add(
2088
int((self.expires - now).total_seconds() * 1000),
1575
2091
# ExtendedTimeout - property
1576
@dbus_service_property(_interface, signature="t",
2092
@dbus_service_property(_interface,
1577
2094
access="readwrite")
1578
2095
def ExtendedTimeout_dbus_property(self, value=None):
1579
2096
if value is None: # get
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2097
return dbus.UInt64(self.extended_timeout.total_seconds()
1581
2099
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1583
2101
# Interval - property
1584
@dbus_service_property(_interface, signature="t",
2102
@dbus_service_property(_interface,
1585
2104
access="readwrite")
1586
2105
def Interval_dbus_property(self, value=None):
1587
2106
if value is None: # get
1588
return dbus.UInt64(self.interval_milliseconds())
2107
return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
2108
self.interval = datetime.timedelta(0, 0, 0, value)
1590
2109
if getattr(self, "checker_initiator_tag", None) is None:
1592
2111
if self.enabled:
1593
2112
# Reschedule checker run
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
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
1599
2118
# Checker - property
1600
@dbus_service_property(_interface, signature="s",
2119
@dbus_service_property(_interface,
1601
2121
access="readwrite")
1602
2122
def Checker_dbus_property(self, value=None):
1603
2123
if value is None: # get
1604
2124
return dbus.String(self.checker_command)
1605
self.checker_command = unicode(value)
2125
self.checker_command = str(value)
1607
2127
# CheckerRunning - property
1608
@dbus_service_property(_interface, signature="b",
2128
@dbus_service_property(_interface,
1609
2130
access="readwrite")
1610
2131
def CheckerRunning_dbus_property(self, value=None):
1611
2132
if value is None: # get
1658
2189
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
2190
"""A class to handle client connections.
1661
2192
Instantiated once for each connection to handle it.
1662
2193
Note: This will run in its own forked process."""
1664
2195
def handle(self):
1665
2196
with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
2197
logger.info("TCP connection from: %s",
1667
unicode(self.client_address))
2198
str(self.client_address))
1668
2199
logger.debug("Pipe FD: %d",
1669
2200
self.server.child_pipe.fileno())
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",
2202
session = gnutls.ClientSession(self.request)
2204
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2205
# "+AES-256-CBC", "+SHA1",
2206
# "+COMP-NULL", "+CTYPE-OPENPGP",
1685
2208
# Use a fallback default, since this MUST be set.
1686
2209
priority = self.server.gnutls_priority
1687
2210
if priority is None:
1688
2211
priority = "NORMAL"
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2212
gnutls.priority_set_direct(session._c_object,
2213
priority.encode("utf-8"),
1693
2216
# Start communication using the Mandos protocol
1694
2217
# Get protocol number
1695
2218
line = self.request.makefile().readline()
1696
2219
logger.debug("Protocol version: %r", line)
1698
2221
if int(line.strip().split()[0]) > 1:
2222
raise RuntimeError(line)
1700
2223
except (ValueError, IndexError, RuntimeError) as error:
1701
2224
logger.error("Unknown protocol version: %s", error)
1704
2227
# Start GnuTLS connection
1706
2229
session.handshake()
1707
except gnutls.errors.GNUTLSError as error:
2230
except gnutls.Error as error:
1708
2231
logger.warning("Handshake failed: %s", error)
1709
2232
# Do not run session.bye() here: the session is not
1710
2233
# established. Just abandon the request.
1712
2235
logger.debug("Handshake succeeded")
1714
2237
approval_required = False
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
2240
fpr = self.fingerprint(
2241
self.peer_certificate(session))
2242
except (TypeError, gnutls.Error) as error:
1721
2243
logger.warning("Bad certificate: %s", error)
1723
2245
logger.debug("Fingerprint: %s", fpr)
1726
2248
client = ProxyClient(child_pipe, fpr,
1727
2249
self.client_address)
1728
2250
except KeyError:
1731
2253
if client.approval_delay:
1732
2254
delay = client.approval_delay
1733
2255
client.approvals_pending += 1
1734
2256
approval_required = True
1737
2259
if not client.enabled:
1738
2260
logger.info("Client %s is disabled",
1740
2262
if self.server.use_dbus:
1741
2263
# Emit D-Bus signal
1742
2264
client.Rejected("Disabled")
1745
2267
if client.approved or not client.approval_delay:
1746
#We are approved or approval is disabled
2268
# We are approved or approval is disabled
1748
2270
elif client.approved is None:
1749
2271
logger.info("Client %s needs approval",
1784
2304
delay -= time2 - time
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))
2307
session.send(client.secret)
2308
except gnutls.Error as error:
2309
logger.warning("gnutls send failed",
1799
2313
logger.info("Sending secret to %s", client.name)
1800
2314
# bump the timeout using extended_timeout
1801
2315
client.bump_timeout(client.extended_timeout)
1802
2316
if self.server.use_dbus:
1803
2317
# Emit D-Bus signal
1804
2318
client.GotSecret()
1807
2321
if approval_required:
1808
2322
client.approvals_pending -= 1
1811
except gnutls.errors.GNUTLSError as error:
2325
except gnutls.Error as error:
1812
2326
logger.warning("GnuTLS bye failed",
1813
2327
exc_info=error)
1816
2330
def peer_certificate(session):
1817
2331
"Return the peer's OpenPGP certificate as a bytestring"
1818
2332
# If not an OpenPGP certificate...
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
2333
if (gnutls.certificate_type_get(session._c_object)
2334
!= gnutls.CRT_OPENPGP):
2335
# ...return invalid data
1824
2337
list_size = ctypes.c_uint(1)
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2338
cert_list = (gnutls.certificate_get_peers
1827
2339
(session._c_object, ctypes.byref(list_size)))
1828
2340
if not bool(cert_list) and list_size.value != 0:
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2341
raise gnutls.Error("error getting peer certificate")
1831
2342
if list_size.value == 0:
1833
2344
cert = cert_list[0]
1834
2345
return ctypes.string_at(cert.data, cert.size)
1837
2348
def fingerprint(openpgp):
1838
2349
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
2350
# New GnuTLS "datum" with the OpenPGP public key
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
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)))
1845
2355
# New empty GnuTLS certificate
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2356
crt = gnutls.openpgp_crt_t()
2357
gnutls.openpgp_crt_init(ctypes.byref(crt))
1849
2358
# Import the OpenPGP public key into the certificate
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2359
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2360
gnutls.OPENPGP_FMT_RAW)
1854
2361
# Verify the self signature in the key
1855
2362
crtverify = ctypes.c_uint()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2363
gnutls.openpgp_crt_verify_self(crt, 0,
2364
ctypes.byref(crtverify))
1859
2365
if crtverify.value != 0:
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2366
gnutls.openpgp_crt_deinit(crt)
2367
raise gnutls.CertificateSecurityError("Verify failed")
1863
2368
# New buffer for the fingerprint
1864
2369
buf = ctypes.create_string_buffer(20)
1865
2370
buf_len = ctypes.c_size_t()
1866
2371
# Get the fingerprint from the certificate into the buffer
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2372
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2373
ctypes.byref(buf_len))
1870
2374
# Deinit the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2375
gnutls.openpgp_crt_deinit(crt)
1872
2376
# Convert the buffer to a Python bytestring
1873
2377
fpr = ctypes.string_at(buf, buf_len.value)
1874
2378
# Convert the bytestring to hexadecimal notation
1879
2383
class MultiprocessingMixIn(object):
1880
2384
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1881
2386
def sub_process_main(self, request, address):
1883
2388
self.finish_request(request, address)
1884
2389
except Exception:
1885
2390
self.handle_error(request, address)
1886
2391
self.close_request(request)
1888
2393
def process_request(self, request, address):
1889
2394
"""Start a new process to process the request."""
1890
proc = multiprocessing.Process(target = self.sub_process_main,
1891
args = (request, address))
2395
proc = multiprocessing.Process(target=self.sub_process_main,
2396
args=(request, address))
1896
2401
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1897
2402
""" adds a pipe to the MixIn """
1898
2404
def process_request(self, request, client_address):
1899
2405
"""Overrides and wraps the original process_request().
1901
2407
This function creates a new pipe in self.pipe
1903
2409
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1905
2411
proc = MultiprocessingMixIn.process_request(self, request,
1906
2412
client_address)
1907
2413
self.child_pipe.close()
1908
2414
self.add_pipe(parent_pipe, proc)
1910
2416
def add_pipe(self, parent_pipe, proc):
1911
2417
"""Dummy function; override as necessary"""
1912
raise NotImplementedError
2418
raise NotImplementedError()
1915
2421
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1916
2422
socketserver.TCPServer, object):
1917
2423
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1920
2426
enabled: Boolean; whether this server is activated yet
1921
2427
interface: None or a network interface name (string)
1922
2428
use_ipv6: Boolean; to use IPv6 or not
1924
2431
def __init__(self, server_address, RequestHandlerClass,
1925
interface=None, use_ipv6=True, socketfd=None):
1926
2435
"""If socketfd is set, use that file descriptor instead of
1927
2436
creating a new one with socket.socket().
1957
2467
# socket_wrapper(), if socketfd was set.
1958
2468
socketserver.TCPServer.__init__(self, server_address,
1959
2469
RequestHandlerClass)
1961
2471
def server_bind(self):
1962
2472
"""This overrides the normal server_bind() function
1963
2473
to bind to an interface if one was specified, and also NOT to
1964
2474
bind to an address or port if they were not specified."""
2475
global SO_BINDTODEVICE
1965
2476
if self.interface is not None:
1966
2477
if SO_BINDTODEVICE is None:
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)
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)
1988
2499
# Only bind(2) the socket if we really need to.
1989
2500
if self.server_address[0] or self.server_address[1]:
1990
2501
if not self.server_address[0]:
1991
2502
if self.address_family == socket.AF_INET6:
1992
any_address = "::" # in6addr_any
2503
any_address = "::" # in6addr_any
1994
any_address = "0.0.0.0" # INADDR_ANY
2505
any_address = "0.0.0.0" # INADDR_ANY
1995
2506
self.server_address = (any_address,
1996
2507
self.server_address[1])
1997
2508
elif not self.server_address[1]:
1998
self.server_address = (self.server_address[0],
2509
self.server_address = (self.server_address[0], 0)
2000
2510
# if self.interface:
2001
2511
# self.server_address = (self.server_address[0],
2378
2899
server_settings["socket"] = os.dup(server_settings
2380
2901
del server_config
2382
2903
# Override the settings from the config file with command line
2383
2904
# options, if set.
2384
2905
for option in ("interface", "address", "port", "debug",
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2906
"priority", "servicename", "configdir", "use_dbus",
2907
"use_ipv6", "debuglevel", "restore", "statedir",
2908
"socket", "foreground", "zeroconf"):
2388
2909
value = getattr(options, option)
2389
2910
if value is not None:
2390
2911
server_settings[option] = value
2392
2913
# Force all strings to be unicode
2393
2914
for option in server_settings.keys():
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2915
if isinstance(server_settings[option], bytes):
2916
server_settings[option] = (server_settings[option]
2396
2918
# Force all boolean options to be boolean
2397
2919
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2920
"foreground", "zeroconf"):
2399
2921
server_settings[option] = bool(server_settings[option])
2400
2922
# Debug implies foreground
2401
2923
if server_settings["debug"]:
2402
2924
server_settings["foreground"] = True
2403
2925
# Now we have our good server settings in "server_settings"
2405
2927
##################################################################
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")
2407
2934
# For convenience
2408
2935
debug = server_settings["debug"]
2409
2936
debuglevel = server_settings["debuglevel"]
2422
2950
level = getattr(logging, debuglevel.upper())
2423
2951
initlogger(debug, level)
2425
2953
if server_settings["servicename"] != "Mandos":
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2954
syslogger.setFormatter(
2955
logging.Formatter('Mandos ({}) [%(process)d]:'
2956
' %(levelname)s: %(message)s'.format(
2957
server_settings["servicename"])))
2432
2959
# Parse config file with clients
2433
2960
client_config = configparser.SafeConfigParser(Client
2434
2961
.client_defaults)
2435
2962
client_config.read(os.path.join(server_settings["configdir"],
2436
2963
"clients.conf"))
2438
2965
global mandos_dbus_service
2439
2966
mandos_dbus_service = None
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"]
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"],
2452
2979
if not foreground:
2453
pidfilename = "/var/run/mandos.pid"
2980
pidfilename = "/run/mandos.pid"
2981
if not os.path.isdir("/run/."):
2982
pidfilename = "/var/run/mandos.pid"
2456
pidfile = open(pidfilename, "w")
2985
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2986
except IOError as e:
2458
2987
logger.error("Could not open file %r", pidfilename,
2461
for name in ("_mandos", "mandos", "nobody"):
2990
for name, group in (("_mandos", "_mandos"),
2991
("mandos", "mandos"),
2992
("nobody", "nogroup")):
2463
2994
uid = pwd.getpwnam(name).pw_uid
2464
gid = pwd.getpwnam(name).pw_gid
2995
gid = pwd.getpwnam(group).pw_gid
2466
2997
except KeyError:
3006
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2474
3008
except OSError as error:
3009
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3010
.format(uid, gid, os.strerror(error.errno)))
2475
3011
if error.errno != errno.EPERM:
2479
3015
# Enable all possible GnuTLS debugging
2481
3017
# "Use a log level over 10 to enable all debugging options."
2482
3018
# - GnuTLS manual
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3019
gnutls.global_set_log_level(11)
2486
3022
def debug_gnutls(level, string):
2487
3023
logger.debug("GnuTLS: %s", string[:-1])
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3025
gnutls.global_set_log_function(debug_gnutls)
2492
3027
# Redirect stdin so all checkers get /dev/null
2493
3028
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2494
3029
os.dup2(null, sys.stdin.fileno())
2498
3033
# Need to fork before connecting to D-Bus
2499
3034
if not foreground:
2500
3035
# Close all input and output, do double fork, etc.
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()
3038
# multiprocessing will use threads, so before we use GLib we need
3039
# to inform GLib that threads will be used.
2507
3042
global main_loop
2508
3043
# From the Avahi example code
2509
3044
DBusGMainLoop(set_as_default=True)
2510
main_loop = gobject.MainLoop()
3045
main_loop = GLib.MainLoop()
2511
3046
bus = dbus.SystemBus()
2512
3047
# End of Avahi example code
2515
3050
bus_name = dbus.service.BusName("se.recompile.Mandos",
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:
3053
old_bus_name = dbus.service.BusName(
3054
"se.bsnet.fukt.Mandos", bus,
3056
except dbus.exceptions.DBusException as e:
2521
3057
logger.error("Disabling D-Bus:", exc_info=e)
2522
3058
use_dbus = False
2523
3059
server_settings["use_dbus"] = False
2524
3060
tcp_server.use_dbus = False
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"])))
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"))
2534
3072
global multiprocessing_manager
2535
3073
multiprocessing_manager = multiprocessing.Manager()
2537
3075
client_class = Client
2539
client_class = functools.partial(ClientDBus, bus = bus)
3077
client_class = functools.partial(ClientDBus, bus=bus)
2541
3079
client_settings = Client.config_parser(client_config)
2542
3080
old_client_settings = {}
2543
3081
clients_data = {}
2545
3083
# This is used to redirect stdout and stderr for checker processes
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3085
wnull = open(os.devnull, "w") # A writable /dev/null
2548
3086
# Only used if server is running in foreground but not in debug
2550
3088
if debug or not foreground:
2553
3091
# Get client data and settings from last running state.
2554
3092
if server_settings["restore"]:
2556
3094
with open(stored_state_path, "rb") as stored_state:
2557
clients_data, old_client_settings = (pickle.load
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"]
2559
3140
os.remove(stored_state_path)
2560
3141
except IOError as e:
2561
3142
if e.errno == errno.ENOENT:
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3143
logger.warning("Could not load persistent state:"
3144
" {}".format(os.strerror(e.errno)))
2565
3146
logger.critical("Could not load persistent state:",
2568
3149
except EOFError as e:
2569
3150
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2572
3154
with PGPEngine() as pgp:
2573
for client_name, client in clients_data.iteritems():
3155
for client_name, client in clients_data.items():
2574
3156
# Skip removed clients
2575
3157
if client_name not in client_settings:
2578
3160
# Decide which value to use after restoring saved state.
2579
3161
# We have three different values: Old config file,
2580
3162
# new config file, and saved state.
2638
3220
for client_name in (set(client_settings)
2639
3221
- set(old_client_settings)):
2640
3222
clients_data[client_name] = client_settings[client_name]
2642
3224
# Create all client objects
2643
for client_name, client in clients_data.iteritems():
3225
for client_name, client in clients_data.items():
2644
3226
tcp_server.clients[client_name] = client_class(
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3229
server_settings=server_settings)
2648
3231
if not tcp_server.clients:
2649
3232
logger.warning("No clients defined")
2651
3234
if not foreground:
2652
3235
if pidfile is not None:
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3239
print(pid, file=pidfile)
2657
3240
except IOError:
2658
3241
logger.error("Could not write to file %r with PID %d",
2659
3242
pidfilename, pid)
2661
3244
del pidfilename
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3246
for termsig in (signal.SIGHUP, signal.SIGTERM):
3247
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3248
lambda: main_loop.quit() and False)
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3252
@alternate_dbus_interfaces(
3253
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3254
class MandosDBusService(DBusObjectWithObjectManager):
2670
3255
"""A D-Bus proxy object"""
2671
3257
def __init__(self):
2672
3258
dbus.service.Object.__init__(self, bus, "/")
2673
3260
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2681
3262
@dbus.service.signal(_interface, signature="o")
2682
3263
def ClientAdded(self, objpath):
2686
3267
@dbus.service.signal(_interface, signature="ss")
2687
3268
def ClientNotFound(self, fingerprint, address):
3272
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2691
3274
@dbus.service.signal(_interface, signature="os")
2692
3275
def ClientRemoved(self, objpath, name):
3279
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2696
3281
@dbus.service.method(_interface, out_signature="ao")
2697
3282
def GetAllClients(self):
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3284
return dbus.Array(c.dbus_object_path for c in
3285
tcp_server.clients.values())
3287
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2703
3289
@dbus.service.method(_interface,
2704
3290
out_signature="a{oa{sv}}")
2705
3291
def GetAllClientsWithProperties(self):
2707
3293
return dbus.Dictionary(
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3294
{c.dbus_object_path: c.GetAll(
3295
"se.recompile.Mandos.Client")
3296
for c in tcp_server.clients.values()},
2710
3297
signature="oa{sv}")
2712
3299
@dbus.service.method(_interface, in_signature="o")
2713
3300
def RemoveClient(self, object_path):
2715
for c in tcp_server.clients.itervalues():
3302
for c in tcp_server.clients.values():
2716
3303
if c.dbus_object_path == object_path:
2717
3304
del tcp_server.clients[c.name]
2718
3305
c.remove_from_connection()
2719
# Don't signal anything except ClientRemoved
3306
# Don't signal the disabling
2720
3307
c.disable(quiet=True)
2722
self.ClientRemoved(object_path, c.name)
3308
# Emit D-Bus signal for removal
3309
self.client_removed_signal(c)
2724
3311
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,
2728
3351
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
2731
3359
"Cleanup function; run on exit"
2734
multiprocessing.active_children()
3363
mp.active_children()
2736
3365
if not (tcp_server.clients or client_settings):
2739
3368
# Store client before exiting. Secrets are encrypted with key
2740
3369
# based on what config file has. If config file is
2741
3370
# removed/edited, old secret will thus be unrecovable.
2743
3372
with PGPEngine() as pgp:
2744
for client in tcp_server.clients.itervalues():
3373
for client in tcp_server.clients.values():
2745
3374
key = client_settings[client.name]["secret"]
2746
3375
client.encrypted_secret = pgp.encrypt(client.secret,
2748
3377
client_dict = {}
2750
3379
# A list of attributes that can not be pickled
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3381
exclude = {"bus", "changedstate", "secret",
3382
"checker", "server_settings"}
3383
for name, typ in inspect.getmembers(dbus.service
2756
3385
exclude.add(name)
2758
3387
client_dict["encrypted_secret"] = (client
2759
3388
.encrypted_secret)
2760
3389
for attr in client.client_structure:
2761
3390
if attr not in exclude:
2762
3391
client_dict[attr] = getattr(client, attr)
2764
3393
clients[client.name] = client_dict
2765
3394
del client_settings[client.name]["secret"]
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
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
2774
3406
os.rename(tempname, stored_state_path)
2775
3407
except (IOError, OSError) as e: