2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
27
# GNU General Public License for more details.
27
29
# You should have received a copy of the GNU General Public License
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
31
32
# Contact the authors at <mandos@recompile.se>.
34
35
from __future__ import (division, absolute_import, print_function,
37
from future_builtins import *
39
from future_builtins import *
39
import SocketServer as socketserver
44
import SocketServer as socketserver
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
52
import ConfigParser as configparser
65
import cPickle as pickle
70
import cPickle as pickle
66
73
import multiprocessing
74
82
import dbus.service
83
from gi.repository import GLib
77
84
from dbus.mainloop.glib import DBusGMainLoop
80
87
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
84
94
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
95
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
87
99
from IN import SO_BINDTODEVICE
88
100
except ImportError:
89
SO_BINDTODEVICE = None
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
92
119
stored_state_file = "clients.pickle"
94
121
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"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
103
127
except (OSError, AttributeError):
104
129
def if_nametoindex(interface):
105
130
"Get an interface index the hard way, i.e. using fcntl()"
106
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
132
with contextlib.closing(socket.socket()) as s:
108
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
136
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
116
155
def initlogger(debug, level=logging.WARNING):
117
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
162
syslogger.setFormatter(logging.Formatter
120
163
('Mandos [%(process)d]: %(levelname)s:'
122
165
logger.addHandler(syslogger)
125
168
console = logging.StreamHandler()
126
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
179
236
.replace(b"\n", b"\\n")
180
237
.replace(b"\0", b"\\x00"))
183
240
def encrypt(self, data, password):
184
241
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
187
244
passfile.write(passphrase)
189
proc = subprocess.Popen(['gpg', '--symmetric',
246
proc = subprocess.Popen([self.gpg, '--symmetric',
190
247
'--passphrase-file',
192
249
+ self.gnupgargs,
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
197
254
if proc.returncode != 0:
198
255
raise PGPError(err)
199
256
return ciphertext
201
258
def decrypt(self, data, password):
202
259
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
205
262
passfile.write(passphrase)
207
proc = subprocess.Popen(['gpg', '--decrypt',
264
proc = subprocess.Popen([self.gpg, '--decrypt',
208
265
'--passphrase-file',
210
267
+ self.gnupgargs,
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
216
272
if proc.returncode != 0:
217
273
raise PGPError(err)
218
274
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
221
304
class AvahiError(Exception):
222
305
def __init__(self, value, *args, **kwargs):
223
306
self.value = value
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
228
311
class AvahiServiceError(AvahiError):
231
315
class AvahiGroupError(AvahiError):
235
319
class AvahiService(object):
236
320
"""An Avahi (Zeroconf) service.
239
323
interface: integer; avahi.IF_UNSPEC or an interface index.
240
324
Used to optionally bind to the specified interface.
383
489
follow_name_owner_changes=True),
384
490
avahi.DBUS_INTERFACE_SERVER)
385
491
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
492
self.server_state_changed)
387
493
self.server_state_changed(self.server.GetState())
390
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
392
498
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
499
ret = super(AvahiServiceToSyslog, self).rename(self, *args,
501
syslogger.setFormatter(logging.Formatter(
502
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
507
# Pretend that we have a GnuTLS module
508
class GnuTLS(object):
509
"""This isn't so much a class as it is a module-like namespace.
510
It is instantiated once, and simulates having a GnuTLS module."""
512
library = ctypes.util.find_library("gnutls")
514
library = ctypes.util.find_library("gnutls-deb0")
515
_library = ctypes.cdll.LoadLibrary(library)
517
_need_version = b"3.3.0"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
526
# Unless otherwise indicated, the constants and types below are
527
# all from the gnutls/gnutls.h C header file.
537
E_NO_CERTIFICATE_FOUND = -49
538
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
541
class session_int(ctypes.Structure):
543
session_t = ctypes.POINTER(session_int)
545
class certificate_credentials_st(ctypes.Structure):
547
certificate_credentials_t = ctypes.POINTER(
548
certificate_credentials_st)
549
certificate_type_t = ctypes.c_int
551
class datum_t(ctypes.Structure):
552
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
553
('size', ctypes.c_uint)]
555
class openpgp_crt_int(ctypes.Structure):
557
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
558
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
559
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
560
credentials_type_t = ctypes.c_int
561
transport_ptr_t = ctypes.c_void_p
562
close_request_t = ctypes.c_int
565
class Error(Exception):
566
# We need to use the class name "GnuTLS" here, since this
567
# exception might be raised from within GnuTLS.__init__,
568
# which is called before the assignment to the "gnutls"
569
# global variable has happened.
570
def __init__(self, message=None, code=None, args=()):
571
# Default usage is by a message string, but if a return
572
# code is passed, convert it to a string with
575
if message is None and code is not None:
576
message = GnuTLS.strerror(code)
577
return super(GnuTLS.Error, self).__init__(
580
class CertificateSecurityError(Error):
584
class Credentials(object):
586
self._c_object = gnutls.certificate_credentials_t()
587
gnutls.certificate_allocate_credentials(
588
ctypes.byref(self._c_object))
589
self.type = gnutls.CRD_CERTIFICATE
592
gnutls.certificate_free_credentials(self._c_object)
594
class ClientSession(object):
595
def __init__(self, socket, credentials=None):
596
self._c_object = gnutls.session_t()
597
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
598
gnutls.set_default_priority(self._c_object)
599
gnutls.transport_set_ptr(self._c_object, socket.fileno())
600
gnutls.handshake_set_private_extensions(self._c_object,
603
if credentials is None:
604
credentials = gnutls.Credentials()
605
gnutls.credentials_set(self._c_object, credentials.type,
606
ctypes.cast(credentials._c_object,
608
self.credentials = credentials
611
gnutls.deinit(self._c_object)
614
return gnutls.handshake(self._c_object)
616
def send(self, data):
620
data_len -= gnutls.record_send(self._c_object,
625
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
627
# Error handling functions
628
def _error_code(result):
629
"""A function to raise exceptions on errors, suitable
630
for the 'restype' attribute on ctypes functions"""
633
if result == gnutls.E_NO_CERTIFICATE_FOUND:
634
raise gnutls.CertificateSecurityError(code=result)
635
raise gnutls.Error(code=result)
637
def _retry_on_error(result, func, arguments):
638
"""A function to retry on some errors, suitable
639
for the 'errcheck' attribute on ctypes functions"""
641
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
642
return _error_code(result)
643
result = func(*arguments)
646
# Unless otherwise indicated, the function declarations below are
647
# all from the gnutls/gnutls.h C header file.
650
priority_set_direct = _library.gnutls_priority_set_direct
651
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
652
ctypes.POINTER(ctypes.c_char_p)]
653
priority_set_direct.restype = _error_code
655
init = _library.gnutls_init
656
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
657
init.restype = _error_code
659
set_default_priority = _library.gnutls_set_default_priority
660
set_default_priority.argtypes = [session_t]
661
set_default_priority.restype = _error_code
663
record_send = _library.gnutls_record_send
664
record_send.argtypes = [session_t, ctypes.c_void_p,
666
record_send.restype = ctypes.c_ssize_t
667
record_send.errcheck = _retry_on_error
669
certificate_allocate_credentials = (
670
_library.gnutls_certificate_allocate_credentials)
671
certificate_allocate_credentials.argtypes = [
672
ctypes.POINTER(certificate_credentials_t)]
673
certificate_allocate_credentials.restype = _error_code
675
certificate_free_credentials = (
676
_library.gnutls_certificate_free_credentials)
677
certificate_free_credentials.argtypes = [
678
certificate_credentials_t]
679
certificate_free_credentials.restype = None
681
handshake_set_private_extensions = (
682
_library.gnutls_handshake_set_private_extensions)
683
handshake_set_private_extensions.argtypes = [session_t,
685
handshake_set_private_extensions.restype = None
687
credentials_set = _library.gnutls_credentials_set
688
credentials_set.argtypes = [session_t, credentials_type_t,
690
credentials_set.restype = _error_code
692
strerror = _library.gnutls_strerror
693
strerror.argtypes = [ctypes.c_int]
694
strerror.restype = ctypes.c_char_p
696
certificate_type_get = _library.gnutls_certificate_type_get
697
certificate_type_get.argtypes = [session_t]
698
certificate_type_get.restype = _error_code
700
certificate_get_peers = _library.gnutls_certificate_get_peers
701
certificate_get_peers.argtypes = [session_t,
702
ctypes.POINTER(ctypes.c_uint)]
703
certificate_get_peers.restype = ctypes.POINTER(datum_t)
705
global_set_log_level = _library.gnutls_global_set_log_level
706
global_set_log_level.argtypes = [ctypes.c_int]
707
global_set_log_level.restype = None
709
global_set_log_function = _library.gnutls_global_set_log_function
710
global_set_log_function.argtypes = [log_func]
711
global_set_log_function.restype = None
713
deinit = _library.gnutls_deinit
714
deinit.argtypes = [session_t]
715
deinit.restype = None
717
handshake = _library.gnutls_handshake
718
handshake.argtypes = [session_t]
719
handshake.restype = _error_code
720
handshake.errcheck = _retry_on_error
722
transport_set_ptr = _library.gnutls_transport_set_ptr
723
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
724
transport_set_ptr.restype = None
726
bye = _library.gnutls_bye
727
bye.argtypes = [session_t, close_request_t]
728
bye.restype = _error_code
729
bye.errcheck = _retry_on_error
731
check_version = _library.gnutls_check_version
732
check_version.argtypes = [ctypes.c_char_p]
733
check_version.restype = ctypes.c_char_p
735
# All the function declarations below are from gnutls/openpgp.h
737
openpgp_crt_init = _library.gnutls_openpgp_crt_init
738
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
739
openpgp_crt_init.restype = _error_code
741
openpgp_crt_import = _library.gnutls_openpgp_crt_import
742
openpgp_crt_import.argtypes = [openpgp_crt_t,
743
ctypes.POINTER(datum_t),
745
openpgp_crt_import.restype = _error_code
747
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
748
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
749
ctypes.POINTER(ctypes.c_uint)]
750
openpgp_crt_verify_self.restype = _error_code
752
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
753
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
754
openpgp_crt_deinit.restype = None
756
openpgp_crt_get_fingerprint = (
757
_library.gnutls_openpgp_crt_get_fingerprint)
758
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
762
openpgp_crt_get_fingerprint.restype = _error_code
764
# Remove non-public functions
765
del _error_code, _retry_on_error
766
# Create the global "gnutls" object, simulating a module
770
def call_pipe(connection, # : multiprocessing.Connection
771
func, *args, **kwargs):
772
"""This function is meant to be called by multiprocessing.Process
774
This function runs func(*args, **kwargs), and writes the resulting
775
return value on the provided multiprocessing.Connection.
777
connection.send(func(*args, **kwargs))
408
781
class Client(object):
409
782
"""A representation of a client host served by this server.
412
785
approved: bool(); 'None' if not yet approved/disapproved
413
786
approval_delay: datetime.timedelta(); Time to wait for approval
601
961
logger.info("Disabling client %s", self.name)
602
962
if getattr(self, "disable_initiator_tag", None) is not None:
603
gobject.source_remove(self.disable_initiator_tag)
963
GLib.source_remove(self.disable_initiator_tag)
604
964
self.disable_initiator_tag = None
605
965
self.expires = None
606
966
if getattr(self, "checker_initiator_tag", None) is not None:
607
gobject.source_remove(self.checker_initiator_tag)
967
GLib.source_remove(self.checker_initiator_tag)
608
968
self.checker_initiator_tag = None
609
969
self.stop_checker()
610
970
self.enabled = False
612
972
self.send_changedstate()
613
# Do not run this again if called by a gobject.timeout_add
973
# Do not run this again if called by a GLib.timeout_add
616
976
def __del__(self):
619
979
def init_checker(self):
620
980
# Schedule a new checker to be started an 'interval' from now,
621
981
# and every interval from then on.
622
982
if self.checker_initiator_tag is not None:
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
983
GLib.source_remove(self.checker_initiator_tag)
984
self.checker_initiator_tag = GLib.timeout_add(
985
int(self.interval.total_seconds() * 1000),
627
987
# Schedule a disable() when 'timeout' has passed
628
988
if self.disable_initiator_tag is not None:
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
989
GLib.source_remove(self.disable_initiator_tag)
990
self.disable_initiator_tag = GLib.timeout_add(
991
int(self.timeout.total_seconds() * 1000), self.disable)
633
992
# Also start a new checker *right now*.
634
993
self.start_checker()
636
def checker_callback(self, pid, condition, command):
995
def checker_callback(self, source, condition, connection,
637
997
"""The checker has completed, so take appropriate actions."""
638
998
self.checker_callback_tag = None
639
999
self.checker = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1000
# Read return code from connection (see call_pipe)
1001
returncode = connection.recv()
1005
self.last_checker_status = returncode
1006
self.last_checker_signal = None
642
1007
if self.last_checker_status == 0:
643
1008
logger.info("Checker for %(name)s succeeded",
645
1010
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
1012
logger.info("Checker for %(name)s failed", vars(self))
650
1014
self.last_checker_status = -1
1015
self.last_checker_signal = -returncode
651
1016
logger.warning("Checker for %(name)s crashed?",
654
1020
def checked_ok(self):
655
1021
"""Assert that the client has been seen, alive and well."""
656
1022
self.last_checked_ok = datetime.datetime.utcnow()
657
1023
self.last_checker_status = 0
1024
self.last_checker_signal = None
658
1025
self.bump_timeout()
660
1027
def bump_timeout(self, timeout=None):
661
1028
"""Bump up the timeout for this client."""
662
1029
if timeout is None:
663
1030
timeout = self.timeout
664
1031
if self.disable_initiator_tag is not None:
665
gobject.source_remove(self.disable_initiator_tag)
1032
GLib.source_remove(self.disable_initiator_tag)
666
1033
self.disable_initiator_tag = None
667
1034
if getattr(self, "enabled", False):
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1035
self.disable_initiator_tag = GLib.timeout_add(
1036
int(timeout.total_seconds() * 1000), self.disable)
671
1037
self.expires = datetime.datetime.utcnow() + timeout
673
1039
def need_approval(self):
674
1040
self.last_approval_request = datetime.datetime.utcnow()
676
1042
def start_checker(self):
677
1043
"""Start a new checker subprocess if one is not running.
679
1045
If a checker already exists, leave it running and do
681
1047
# The reason for not killing a running checker is that if we
686
1052
# checkers alone, the checker would have to take more time
687
1053
# than 'timeout' for the client to be disabled, which is as it
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except AttributeError:
695
except OSError as error:
696
if error.errno != errno.ECHILD:
700
logger.warning("Checker was a zombie")
701
gobject.source_remove(self.checker_callback_tag)
702
self.checker_callback(pid, status,
703
self.current_checker_command)
1056
if self.checker is not None and not self.checker.is_alive():
1057
logger.warning("Checker was not alive; joining")
704
1060
# Start a new checker if needed
705
1061
if self.checker is None:
706
1062
# Escape attributes for the shell
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
1064
attr: re.escape(str(getattr(self, attr)))
1065
for attr in self.runtime_expansions}
712
1067
command = self.checker_command % escaped_attrs
713
1068
except TypeError as error:
714
1069
logger.error('Could not format string "%s"',
715
self.checker_command, exc_info=error)
716
return True # Try again later
1070
self.checker_command,
1072
return True # Try again later
717
1073
self.current_checker_command = command
719
logger.info("Starting checker %r for %s",
721
# We don't need to redirect stdout and stderr, since
722
# in normal mode, that is already done by daemon(),
723
# and in debug mode we don't want to. (Stdin is
724
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
741
self.checker_callback_tag = (gobject.child_watch_add
743
self.checker_callback,
745
# The checker may have completed before the gobject
746
# watch was added. Check for this.
748
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
except OSError as error:
750
if error.errno == errno.ECHILD:
751
# This should never happen
752
logger.error("Child process vanished",
757
gobject.source_remove(self.checker_callback_tag)
758
self.checker_callback(pid, status, command)
759
# Re-run this periodically if run by gobject.timeout_add
1074
logger.info("Starting checker %r for %s", command,
1076
# We don't need to redirect stdout and stderr, since
1077
# in normal mode, that is already done by daemon(),
1078
# and in debug mode we don't want to. (Stdin is
1079
# always replaced by /dev/null.)
1080
# The exception is when not debugging but nevertheless
1081
# running in the foreground; use the previously
1083
popen_args = {"close_fds": True,
1086
if (not self.server_settings["debug"]
1087
and self.server_settings["foreground"]):
1088
popen_args.update({"stdout": wnull,
1090
pipe = multiprocessing.Pipe(duplex=False)
1091
self.checker = multiprocessing.Process(
1093
args=(pipe[1], subprocess.call, command),
1095
self.checker.start()
1096
self.checker_callback_tag = GLib.io_add_watch(
1097
pipe[0].fileno(), GLib.IO_IN,
1098
self.checker_callback, pipe[0], command)
1099
# Re-run this periodically if run by GLib.timeout_add
762
1102
def stop_checker(self):
763
1103
"""Force the checker process, if any, to stop."""
764
1104
if self.checker_callback_tag:
765
gobject.source_remove(self.checker_callback_tag)
1105
GLib.source_remove(self.checker_callback_tag)
766
1106
self.checker_callback_tag = None
767
1107
if getattr(self, "checker", None) is None:
769
1109
logger.debug("Stopping checker for %(name)s", vars(self))
771
self.checker.terminate()
773
#if self.checker.poll() is None:
774
# self.checker.kill()
775
except OSError as error:
776
if error.errno != errno.ESRCH: # No such process
1110
self.checker.terminate()
778
1111
self.checker = None
781
def dbus_service_property(dbus_interface, signature="v",
782
access="readwrite", byte_arrays=False):
1114
def dbus_service_property(dbus_interface,
783
1118
"""Decorators for marking methods of a DBusObjectWithProperties to
784
1119
become properties on the D-Bus.
786
1121
The decorated method will be called with no arguments by "Get"
787
1122
and with one argument by "Set".
789
1124
The parameters, where they are supported, are the same as
790
1125
dbus.service.method, except there is only "signature", since the
791
1126
type from Get() and the type sent to Set() is the same.
867
class DBusObjectWithProperties(dbus.service.Object):
868
"""A D-Bus object with properties.
870
Classes inheriting from this can use the dbus_service_property
871
decorator to expose methods as D-Bus properties. It exposes the
872
standard Get(), Set(), and GetAll() methods on the D-Bus.
1209
class DBusObjectWithAnnotations(dbus.service.Object):
1210
"""A D-Bus object with annotations.
1212
Classes inheriting from this can use the dbus_annotations
1213
decorator to add annotations to methods or signals.
876
1217
def _is_dbus_thing(thing):
877
1218
"""Returns a function testing if an attribute is a D-Bus thing
879
1220
If called like _is_dbus_thing("method") it returns a function
880
1221
suitable for use as predicate to inspect.getmembers().
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1223
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
1226
def _get_all_dbus_things(self, thing):
886
1227
"""Returns a generator of (name, attribute) pairs
888
return ((getattr(athing.__get__(self), "_dbus_name",
1229
return ((getattr(athing.__get__(self), "_dbus_name", name),
890
1230
athing.__get__(self))
891
1231
for cls in self.__class__.__mro__
892
1232
for name, athing in
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
1233
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1235
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1237
path_keyword='object_path',
1238
connection_keyword='connection')
1239
def Introspect(self, object_path, connection):
1240
"""Overloading of standard D-Bus method.
1242
Inserts annotation tags on methods and signals.
1244
xmlstring = dbus.service.Object.Introspect(self, object_path,
1247
document = xml.dom.minidom.parseString(xmlstring)
1249
for if_tag in document.getElementsByTagName("interface"):
1250
# Add annotation tags
1251
for typ in ("method", "signal"):
1252
for tag in if_tag.getElementsByTagName(typ):
1254
for name, prop in (self.
1255
_get_all_dbus_things(typ)):
1256
if (name == tag.getAttribute("name")
1257
and prop._dbus_interface
1258
== if_tag.getAttribute("name")):
1259
annots.update(getattr(
1260
prop, "_dbus_annotations", {}))
1261
for name, value in annots.items():
1262
ann_tag = document.createElement(
1264
ann_tag.setAttribute("name", name)
1265
ann_tag.setAttribute("value", value)
1266
tag.appendChild(ann_tag)
1267
# Add interface annotation tags
1268
for annotation, value in dict(
1269
itertools.chain.from_iterable(
1270
annotations().items()
1271
for name, annotations
1272
in self._get_all_dbus_things("interface")
1273
if name == if_tag.getAttribute("name")
1275
ann_tag = document.createElement("annotation")
1276
ann_tag.setAttribute("name", annotation)
1277
ann_tag.setAttribute("value", value)
1278
if_tag.appendChild(ann_tag)
1279
# Fix argument name for the Introspect method itself
1280
if (if_tag.getAttribute("name")
1281
== dbus.INTROSPECTABLE_IFACE):
1282
for cn in if_tag.getElementsByTagName("method"):
1283
if cn.getAttribute("name") == "Introspect":
1284
for arg in cn.getElementsByTagName("arg"):
1285
if (arg.getAttribute("direction")
1287
arg.setAttribute("name",
1289
xmlstring = document.toxml("utf-8")
1291
except (AttributeError, xml.dom.DOMException,
1292
xml.parsers.expat.ExpatError) as error:
1293
logger.error("Failed to override Introspection method",
1298
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1299
"""A D-Bus object with properties.
1301
Classes inheriting from this can use the dbus_service_property
1302
decorator to expose methods as D-Bus properties. It exposes the
1303
standard Get(), Set(), and GetAll() methods on the D-Bus.
896
1306
def _get_dbus_property(self, interface_name, property_name):
897
1307
"""Returns a bound method if one exists which is a D-Bus
898
1308
property with the specified name and interface.
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
903
self._is_dbus_thing("property"))):
1310
for cls in self.__class__.__mro__:
1311
for name, value in inspect.getmembers(
1312
cls, self._is_dbus_thing("property")):
904
1313
if (value._dbus_name == property_name
905
1314
and value._dbus_interface == interface_name):
906
1315
return value.__get__(self)
908
1317
# No such property
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1318
raise DBusPropertyNotFound("{}:{}.{}".format(
1319
self.dbus_object_path, interface_name, property_name))
1322
def _get_all_interface_names(cls):
1323
"""Get a sequence of all interfaces supported by an object"""
1324
return (name for name in set(getattr(getattr(x, attr),
1325
"_dbus_interface", None)
1326
for x in (inspect.getmro(cls))
1328
if name is not None)
1330
@dbus.service.method(dbus.PROPERTIES_IFACE,
914
1332
out_signature="v")
915
1333
def Get(self, interface_name, property_name):
916
1334
"""Standard D-Bus property Get() method, see D-Bus standard.
1048
1463
return xmlstring
1467
dbus.OBJECT_MANAGER_IFACE
1468
except AttributeError:
1469
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1472
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1473
"""A D-Bus object with an ObjectManager.
1475
Classes inheriting from this exposes the standard
1476
GetManagedObjects call and the InterfacesAdded and
1477
InterfacesRemoved signals on the standard
1478
"org.freedesktop.DBus.ObjectManager" interface.
1480
Note: No signals are sent automatically; they must be sent
1483
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1484
out_signature="a{oa{sa{sv}}}")
1485
def GetManagedObjects(self):
1486
"""This function must be overridden"""
1487
raise NotImplementedError()
1489
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1490
signature="oa{sa{sv}}")
1491
def InterfacesAdded(self, object_path, interfaces_and_properties):
1494
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1495
def InterfacesRemoved(self, object_path, interfaces):
1498
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1500
path_keyword='object_path',
1501
connection_keyword='connection')
1502
def Introspect(self, object_path, connection):
1503
"""Overloading of standard D-Bus method.
1505
Override return argument name of GetManagedObjects to be
1506
"objpath_interfaces_and_properties"
1508
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1512
document = xml.dom.minidom.parseString(xmlstring)
1514
for if_tag in document.getElementsByTagName("interface"):
1515
# Fix argument name for the GetManagedObjects method
1516
if (if_tag.getAttribute("name")
1517
== dbus.OBJECT_MANAGER_IFACE):
1518
for cn in if_tag.getElementsByTagName("method"):
1519
if (cn.getAttribute("name")
1520
== "GetManagedObjects"):
1521
for arg in cn.getElementsByTagName("arg"):
1522
if (arg.getAttribute("direction")
1526
"objpath_interfaces"
1528
xmlstring = document.toxml("utf-8")
1530
except (AttributeError, xml.dom.DOMException,
1531
xml.parsers.expat.ExpatError) as error:
1532
logger.error("Failed to override Introspection method",
1051
1537
def datetime_to_dbus(dt, variant_level=0):
1052
1538
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1054
return dbus.String("", variant_level = variant_level)
1055
return dbus.String(dt.isoformat(),
1056
variant_level=variant_level)
1540
return dbus.String("", variant_level=variant_level)
1541
return dbus.String(dt.isoformat(), variant_level=variant_level)
1059
1544
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1089
1575
# Ignore non-D-Bus attributes, and D-Bus attributes
1090
1576
# with the wrong interface name
1091
1577
if (not hasattr(attribute, "_dbus_interface")
1092
or not attribute._dbus_interface
1093
.startswith(orig_interface_name)):
1578
or not attribute._dbus_interface.startswith(
1579
orig_interface_name)):
1095
1581
# Create an alternate D-Bus interface name based on
1096
1582
# the current name
1097
alt_interface = (attribute._dbus_interface
1098
.replace(orig_interface_name,
1099
alt_interface_name))
1583
alt_interface = attribute._dbus_interface.replace(
1584
orig_interface_name, alt_interface_name)
1100
1585
interface_names.add(alt_interface)
1101
1586
# Is this a D-Bus signal?
1102
1587
if getattr(attribute, "_dbus_is_signal", False):
1103
1588
# Extract the original non-method undecorated
1104
1589
# function by black magic
1105
nonmethod_func = (dict(
1590
if sys.version_info.major == 2:
1591
nonmethod_func = (dict(
1106
1592
zip(attribute.func_code.co_freevars,
1107
attribute.__closure__))["func"]
1593
attribute.__closure__))
1594
["func"].cell_contents)
1596
nonmethod_func = (dict(
1597
zip(attribute.__code__.co_freevars,
1598
attribute.__closure__))
1599
["func"].cell_contents)
1109
1600
# Create a new, but exactly alike, function
1110
1601
# object, and decorate it to be a new D-Bus signal
1111
1602
# with the alternate D-Bus interface name
1112
new_function = (dbus.service.signal
1114
attribute._dbus_signature)
1115
(types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)))
1603
new_function = copy_function(nonmethod_func)
1604
new_function = (dbus.service.signal(
1606
attribute._dbus_signature)(new_function))
1121
1607
# Copy annotations, if any
1123
new_function._dbus_annotations = (
1124
dict(attribute._dbus_annotations))
1609
new_function._dbus_annotations = dict(
1610
attribute._dbus_annotations)
1125
1611
except AttributeError:
1127
1614
# Define a creator of a function to call both the
1128
1615
# original and alternate functions, so both the
1129
1616
# original and alternate signals gets sent when
1219
1699
if interface_names:
1220
1700
# Replace the class with a new subclass of it with
1221
1701
# methods, signals, etc. as created above.
1222
cls = type(b"{0}Alternate".format(cls.__name__),
1702
if sys.version_info.major == 2:
1703
cls = type(b"{}Alternate".format(cls.__name__),
1706
cls = type("{}Alternate".format(cls.__name__),
1228
1713
@alternate_dbus_interfaces({"se.recompile.Mandos":
1229
"se.bsnet.fukt.Mandos"})
1714
"se.bsnet.fukt.Mandos"})
1230
1715
class ClientDBus(Client, DBusObjectWithProperties):
1231
1716
"""A Client class using D-Bus
1234
1719
dbus_object_path: dbus.ObjectPath
1235
1720
bus: dbus.SystemBus()
1238
1723
runtime_expansions = (Client.runtime_expansions
1239
+ ("dbus_object_path",))
1724
+ ("dbus_object_path", ))
1726
_interface = "se.recompile.Mandos.Client"
1241
1728
# dbus.service.Object doesn't use super(), so we can't either.
1243
def __init__(self, bus = None, *args, **kwargs):
1730
def __init__(self, bus=None, *args, **kwargs):
1245
1732
Client.__init__(self, *args, **kwargs)
1246
1733
# Only now, when this client is initialized, can it show up on
1248
client_object_name = unicode(self.name).translate(
1735
client_object_name = str(self.name).translate(
1249
1736
{ord("."): ord("_"),
1250
1737
ord("-"): ord("_")})
1251
self.dbus_object_path = (dbus.ObjectPath
1252
("/clients/" + client_object_name))
1738
self.dbus_object_path = dbus.ObjectPath(
1739
"/clients/" + client_object_name)
1253
1740
DBusObjectWithProperties.__init__(self, self.bus,
1254
1741
self.dbus_object_path)
1256
def notifychangeproperty(transform_func,
1257
dbus_name, type_func=lambda x: x,
1743
def notifychangeproperty(transform_func, dbus_name,
1744
type_func=lambda x: x,
1746
invalidate_only=False,
1747
_interface=_interface):
1259
1748
""" Modify a variable so that it's a property which announces
1260
1749
its changes to DBus.
1262
1751
transform_fun: Function that takes a value and a variant_level
1263
1752
and transforms it to a D-Bus type.
1264
1753
dbus_name: D-Bus name of the variable
1329
1829
if hasattr(DBusObjectWithProperties, "__del__"):
1330
1830
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1331
1831
Client.__del__(self, *args, **kwargs)
1333
def checker_callback(self, pid, condition, command,
1335
self.checker_callback_tag = None
1337
if os.WIFEXITED(condition):
1338
exitstatus = os.WEXITSTATUS(condition)
1833
def checker_callback(self, source, condition,
1834
connection, command, *args, **kwargs):
1835
ret = Client.checker_callback(self, source, condition,
1836
connection, command, *args,
1838
exitstatus = self.last_checker_status
1339
1840
# Emit D-Bus signal
1340
1841
self.CheckerCompleted(dbus.Int16(exitstatus),
1341
dbus.Int64(condition),
1842
# This is specific to GNU libC
1843
dbus.Int64(exitstatus << 8),
1342
1844
dbus.String(command))
1344
1846
# Emit D-Bus signal
1345
1847
self.CheckerCompleted(dbus.Int16(-1),
1346
dbus.Int64(condition),
1849
# This is specific to GNU libC
1851
| self.last_checker_signal),
1347
1852
dbus.String(command))
1349
return Client.checker_callback(self, pid, condition, command,
1352
1855
def start_checker(self, *args, **kwargs):
1353
old_checker = self.checker
1354
if self.checker is not None:
1355
old_checker_pid = self.checker.pid
1357
old_checker_pid = None
1856
old_checker_pid = getattr(self.checker, "pid", None)
1358
1857
r = Client.start_checker(self, *args, **kwargs)
1359
1858
# Only if new checker process was started
1360
1859
if (self.checker is not None
1412
1905
server to mandos-client
1416
1909
# Rejected - signal
1417
1910
@dbus.service.signal(_interface, signature="s")
1418
1911
def Rejected(self, reason):
1422
1915
# NeedApproval - signal
1423
1916
@dbus.service.signal(_interface, signature="tb")
1424
1917
def NeedApproval(self, timeout, default):
1426
1919
return self.need_approval()
1430
1923
# Approve - method
1431
1924
@dbus.service.method(_interface, in_signature="b")
1432
1925
def Approve(self, value):
1433
1926
self.approve(value)
1435
1928
# CheckedOK - method
1436
1929
@dbus.service.method(_interface)
1437
1930
def CheckedOK(self):
1438
1931
self.checked_ok()
1440
1933
# Enable - method
1934
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1441
1935
@dbus.service.method(_interface)
1442
1936
def Enable(self):
1446
1940
# StartChecker - method
1941
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1447
1942
@dbus.service.method(_interface)
1448
1943
def StartChecker(self):
1450
1945
self.start_checker()
1452
1947
# Disable - method
1948
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1453
1949
@dbus.service.method(_interface)
1454
1950
def Disable(self):
1458
1954
# StopChecker - method
1955
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1459
1956
@dbus.service.method(_interface)
1460
1957
def StopChecker(self):
1461
1958
self.stop_checker()
1465
1962
# ApprovalPending - property
1466
1963
@dbus_service_property(_interface, signature="b", access="read")
1467
1964
def ApprovalPending_dbus_property(self):
1468
1965
return dbus.Boolean(bool(self.approvals_pending))
1470
1967
# ApprovedByDefault - property
1471
@dbus_service_property(_interface, signature="b",
1968
@dbus_service_property(_interface,
1472
1970
access="readwrite")
1473
1971
def ApprovedByDefault_dbus_property(self, value=None):
1474
1972
if value is None: # get
1475
1973
return dbus.Boolean(self.approved_by_default)
1476
1974
self.approved_by_default = bool(value)
1478
1976
# ApprovalDelay - property
1479
@dbus_service_property(_interface, signature="t",
1977
@dbus_service_property(_interface,
1480
1979
access="readwrite")
1481
1980
def ApprovalDelay_dbus_property(self, value=None):
1482
1981
if value is None: # get
1483
return dbus.UInt64(self.approval_delay_milliseconds())
1982
return dbus.UInt64(self.approval_delay.total_seconds()
1484
1984
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1486
1986
# ApprovalDuration - property
1487
@dbus_service_property(_interface, signature="t",
1987
@dbus_service_property(_interface,
1488
1989
access="readwrite")
1489
1990
def ApprovalDuration_dbus_property(self, value=None):
1490
1991
if value is None: # get
1491
return dbus.UInt64(timedelta_to_milliseconds(
1492
self.approval_duration))
1992
return dbus.UInt64(self.approval_duration.total_seconds()
1493
1994
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1495
1996
# Name - property
1998
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1496
1999
@dbus_service_property(_interface, signature="s", access="read")
1497
2000
def Name_dbus_property(self):
1498
2001
return dbus.String(self.name)
1500
2003
# Fingerprint - property
2005
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1501
2006
@dbus_service_property(_interface, signature="s", access="read")
1502
2007
def Fingerprint_dbus_property(self):
1503
2008
return dbus.String(self.fingerprint)
1505
2010
# Host - property
1506
@dbus_service_property(_interface, signature="s",
2011
@dbus_service_property(_interface,
1507
2013
access="readwrite")
1508
2014
def Host_dbus_property(self, value=None):
1509
2015
if value is None: # get
1510
2016
return dbus.String(self.host)
1511
self.host = unicode(value)
2017
self.host = str(value)
1513
2019
# Created - property
2021
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1514
2022
@dbus_service_property(_interface, signature="s", access="read")
1515
2023
def Created_dbus_property(self):
1516
2024
return datetime_to_dbus(self.created)
1518
2026
# LastEnabled - property
1519
2027
@dbus_service_property(_interface, signature="s", access="read")
1520
2028
def LastEnabled_dbus_property(self):
1521
2029
return datetime_to_dbus(self.last_enabled)
1523
2031
# Enabled - property
1524
@dbus_service_property(_interface, signature="b",
2032
@dbus_service_property(_interface,
1525
2034
access="readwrite")
1526
2035
def Enabled_dbus_property(self, value=None):
1527
2036
if value is None: # get
1575
2085
if (getattr(self, "disable_initiator_tag", None)
1578
gobject.source_remove(self.disable_initiator_tag)
1579
self.disable_initiator_tag = (
1580
gobject.timeout_add(
1581
timedelta_to_milliseconds(self.expires - now),
2088
GLib.source_remove(self.disable_initiator_tag)
2089
self.disable_initiator_tag = GLib.timeout_add(
2090
int((self.expires - now).total_seconds() * 1000),
1584
2093
# ExtendedTimeout - property
1585
@dbus_service_property(_interface, signature="t",
2094
@dbus_service_property(_interface,
1586
2096
access="readwrite")
1587
2097
def ExtendedTimeout_dbus_property(self, value=None):
1588
2098
if value is None: # get
1589
return dbus.UInt64(self.extended_timeout_milliseconds())
2099
return dbus.UInt64(self.extended_timeout.total_seconds()
1590
2101
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1592
2103
# Interval - property
1593
@dbus_service_property(_interface, signature="t",
2104
@dbus_service_property(_interface,
1594
2106
access="readwrite")
1595
2107
def Interval_dbus_property(self, value=None):
1596
2108
if value is None: # get
1597
return dbus.UInt64(self.interval_milliseconds())
2109
return dbus.UInt64(self.interval.total_seconds() * 1000)
1598
2110
self.interval = datetime.timedelta(0, 0, 0, value)
1599
2111
if getattr(self, "checker_initiator_tag", None) is None:
1601
2113
if self.enabled:
1602
2114
# Reschedule checker run
1603
gobject.source_remove(self.checker_initiator_tag)
1604
self.checker_initiator_tag = (gobject.timeout_add
1605
(value, self.start_checker))
1606
self.start_checker() # Start one now, too
2115
GLib.source_remove(self.checker_initiator_tag)
2116
self.checker_initiator_tag = GLib.timeout_add(
2117
value, self.start_checker)
2118
self.start_checker() # Start one now, too
1608
2120
# Checker - property
1609
@dbus_service_property(_interface, signature="s",
2121
@dbus_service_property(_interface,
1610
2123
access="readwrite")
1611
2124
def Checker_dbus_property(self, value=None):
1612
2125
if value is None: # get
1613
2126
return dbus.String(self.checker_command)
1614
self.checker_command = unicode(value)
2127
self.checker_command = str(value)
1616
2129
# CheckerRunning - property
1617
@dbus_service_property(_interface, signature="b",
2130
@dbus_service_property(_interface,
1618
2132
access="readwrite")
1619
2133
def CheckerRunning_dbus_property(self, value=None):
1620
2134
if value is None: # get
1667
2191
class ClientHandler(socketserver.BaseRequestHandler, object):
1668
2192
"""A class to handle client connections.
1670
2194
Instantiated once for each connection to handle it.
1671
2195
Note: This will run in its own forked process."""
1673
2197
def handle(self):
1674
2198
with contextlib.closing(self.server.child_pipe) as child_pipe:
1675
2199
logger.info("TCP connection from: %s",
1676
unicode(self.client_address))
2200
str(self.client_address))
1677
2201
logger.debug("Pipe FD: %d",
1678
2202
self.server.child_pipe.fileno())
1680
session = (gnutls.connection
1681
.ClientSession(self.request,
1683
.X509Credentials()))
1685
# Note: gnutls.connection.X509Credentials is really a
1686
# generic GnuTLS certificate credentials object so long as
1687
# no X.509 keys are added to it. Therefore, we can use it
1688
# here despite using OpenPGP certificates.
1690
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1691
# "+AES-256-CBC", "+SHA1",
1692
# "+COMP-NULL", "+CTYPE-OPENPGP",
2204
session = gnutls.ClientSession(self.request)
2206
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2207
# "+AES-256-CBC", "+SHA1",
2208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1694
2210
# Use a fallback default, since this MUST be set.
1695
2211
priority = self.server.gnutls_priority
1696
2212
if priority is None:
1697
2213
priority = "NORMAL"
1698
(gnutls.library.functions
1699
.gnutls_priority_set_direct(session._c_object,
2214
gnutls.priority_set_direct(session._c_object,
2215
priority.encode("utf-8"),
1702
2218
# Start communication using the Mandos protocol
1703
2219
# Get protocol number
1704
2220
line = self.request.makefile().readline()
1793
2306
delay -= time2 - time
1796
while sent_size < len(client.secret):
1798
sent = session.send(client.secret[sent_size:])
1799
except gnutls.errors.GNUTLSError as error:
1800
logger.warning("gnutls send failed",
1803
logger.debug("Sent: %d, remaining: %d",
1804
sent, len(client.secret)
1805
- (sent_size + sent))
2309
session.send(client.secret)
2310
except gnutls.Error as error:
2311
logger.warning("gnutls send failed",
1808
2315
logger.info("Sending secret to %s", client.name)
1809
2316
# bump the timeout using extended_timeout
1810
2317
client.bump_timeout(client.extended_timeout)
1811
2318
if self.server.use_dbus:
1812
2319
# Emit D-Bus signal
1813
2320
client.GotSecret()
1816
2323
if approval_required:
1817
2324
client.approvals_pending -= 1
1820
except gnutls.errors.GNUTLSError as error:
2327
except gnutls.Error as error:
1821
2328
logger.warning("GnuTLS bye failed",
1822
2329
exc_info=error)
1825
2332
def peer_certificate(session):
1826
2333
"Return the peer's OpenPGP certificate as a bytestring"
1827
2334
# If not an OpenPGP certificate...
1828
if (gnutls.library.functions
1829
.gnutls_certificate_type_get(session._c_object)
1830
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1831
# ...do the normal thing
1832
return session.peer_certificate
2335
if (gnutls.certificate_type_get(session._c_object)
2336
!= gnutls.CRT_OPENPGP):
2337
# ...return invalid data
1833
2339
list_size = ctypes.c_uint(1)
1834
cert_list = (gnutls.library.functions
1835
.gnutls_certificate_get_peers
2340
cert_list = (gnutls.certificate_get_peers
1836
2341
(session._c_object, ctypes.byref(list_size)))
1837
2342
if not bool(cert_list) and list_size.value != 0:
1838
raise gnutls.errors.GNUTLSError("error getting peer"
2343
raise gnutls.Error("error getting peer certificate")
1840
2344
if list_size.value == 0:
1842
2346
cert = cert_list[0]
1843
2347
return ctypes.string_at(cert.data, cert.size)
1846
2350
def fingerprint(openpgp):
1847
2351
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1848
2352
# New GnuTLS "datum" with the OpenPGP public key
1849
datum = (gnutls.library.types
1850
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1853
ctypes.c_uint(len(openpgp))))
2353
datum = gnutls.datum_t(
2354
ctypes.cast(ctypes.c_char_p(openpgp),
2355
ctypes.POINTER(ctypes.c_ubyte)),
2356
ctypes.c_uint(len(openpgp)))
1854
2357
# New empty GnuTLS certificate
1855
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2358
crt = gnutls.openpgp_crt_t()
2359
gnutls.openpgp_crt_init(ctypes.byref(crt))
1858
2360
# Import the OpenPGP public key into the certificate
1859
(gnutls.library.functions
1860
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1861
gnutls.library.constants
1862
.GNUTLS_OPENPGP_FMT_RAW))
2361
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2362
gnutls.OPENPGP_FMT_RAW)
1863
2363
# Verify the self signature in the key
1864
2364
crtverify = ctypes.c_uint()
1865
(gnutls.library.functions
1866
.gnutls_openpgp_crt_verify_self(crt, 0,
1867
ctypes.byref(crtverify)))
2365
gnutls.openpgp_crt_verify_self(crt, 0,
2366
ctypes.byref(crtverify))
1868
2367
if crtverify.value != 0:
1869
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1870
raise (gnutls.errors.CertificateSecurityError
2368
gnutls.openpgp_crt_deinit(crt)
2369
raise gnutls.CertificateSecurityError("Verify failed")
1872
2370
# New buffer for the fingerprint
1873
2371
buf = ctypes.create_string_buffer(20)
1874
2372
buf_len = ctypes.c_size_t()
1875
2373
# Get the fingerprint from the certificate into the buffer
1876
(gnutls.library.functions
1877
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1878
ctypes.byref(buf_len)))
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1879
2376
# Deinit the certificate
1880
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2377
gnutls.openpgp_crt_deinit(crt)
1881
2378
# Convert the buffer to a Python bytestring
1882
2379
fpr = ctypes.string_at(buf, buf_len.value)
1883
2380
# Convert the bytestring to hexadecimal notation
1966
2469
# socket_wrapper(), if socketfd was set.
1967
2470
socketserver.TCPServer.__init__(self, server_address,
1968
2471
RequestHandlerClass)
1970
2473
def server_bind(self):
1971
2474
"""This overrides the normal server_bind() function
1972
2475
to bind to an interface if one was specified, and also NOT to
1973
2476
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
1974
2478
if self.interface is not None:
1975
2479
if SO_BINDTODEVICE is None:
1976
logger.error("SO_BINDTODEVICE does not exist;"
1977
" cannot bind to interface %s",
1981
self.socket.setsockopt(socket.SOL_SOCKET,
1983
str(self.interface + '\0'))
1984
except socket.error as error:
1985
if error.errno == errno.EPERM:
1986
logger.error("No permission to bind to"
1987
" interface %s", self.interface)
1988
elif error.errno == errno.ENOPROTOOPT:
1989
logger.error("SO_BINDTODEVICE not available;"
1990
" cannot bind to interface %s",
1992
elif error.errno == errno.ENODEV:
1993
logger.error("Interface %s does not exist,"
1994
" cannot bind", self.interface)
2480
# Fall back to a hard-coded value which seems to be
2482
logger.warning("SO_BINDTODEVICE not found, trying 25")
2483
SO_BINDTODEVICE = 25
2485
self.socket.setsockopt(
2486
socket.SOL_SOCKET, SO_BINDTODEVICE,
2487
(self.interface + "\0").encode("utf-8"))
2488
except socket.error as error:
2489
if error.errno == errno.EPERM:
2490
logger.error("No permission to bind to"
2491
" interface %s", self.interface)
2492
elif error.errno == errno.ENOPROTOOPT:
2493
logger.error("SO_BINDTODEVICE not available;"
2494
" cannot bind to interface %s",
2496
elif error.errno == errno.ENODEV:
2497
logger.error("Interface %s does not exist,"
2498
" cannot bind", self.interface)
1997
2501
# Only bind(2) the socket if we really need to.
1998
2502
if self.server_address[0] or self.server_address[1]:
1999
2503
if not self.server_address[0]:
2000
2504
if self.address_family == socket.AF_INET6:
2001
any_address = "::" # in6addr_any
2505
any_address = "::" # in6addr_any
2003
any_address = "0.0.0.0" # INADDR_ANY
2507
any_address = "0.0.0.0" # INADDR_ANY
2004
2508
self.server_address = (any_address,
2005
2509
self.server_address[1])
2006
2510
elif not self.server_address[1]:
2007
self.server_address = (self.server_address[0],
2511
self.server_address = (self.server_address[0], 0)
2009
2512
# if self.interface:
2010
2513
# self.server_address = (self.server_address[0],
2387
2902
server_settings["socket"] = os.dup(server_settings
2389
2904
del server_config
2391
2906
# Override the settings from the config file with command line
2392
2907
# options, if set.
2393
2908
for option in ("interface", "address", "port", "debug",
2394
"priority", "servicename", "configdir",
2395
"use_dbus", "use_ipv6", "debuglevel", "restore",
2396
"statedir", "socket", "foreground"):
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2397
2912
value = getattr(options, option)
2398
2913
if value is not None:
2399
2914
server_settings[option] = value
2401
2916
# Force all strings to be unicode
2402
2917
for option in server_settings.keys():
2403
if type(server_settings[option]) is str:
2404
server_settings[option] = unicode(server_settings[option])
2918
if isinstance(server_settings[option], bytes):
2919
server_settings[option] = (server_settings[option]
2405
2921
# Force all boolean options to be boolean
2406
2922
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2923
"foreground", "zeroconf"):
2408
2924
server_settings[option] = bool(server_settings[option])
2409
2925
# Debug implies foreground
2410
2926
if server_settings["debug"]:
2411
2927
server_settings["foreground"] = True
2412
2928
# Now we have our good server settings in "server_settings"
2414
2930
##################################################################
2932
if (not server_settings["zeroconf"]
2933
and not (server_settings["port"]
2934
or server_settings["socket"] != "")):
2935
parser.error("Needs port or socket to work without Zeroconf")
2416
2937
# For convenience
2417
2938
debug = server_settings["debug"]
2418
2939
debuglevel = server_settings["debuglevel"]
2431
2953
level = getattr(logging, debuglevel.upper())
2432
2954
initlogger(debug, level)
2434
2956
if server_settings["servicename"] != "Mandos":
2435
syslogger.setFormatter(logging.Formatter
2436
('Mandos ({0}) [%(process)d]:'
2437
' %(levelname)s: %(message)s'
2438
.format(server_settings
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2441
2962
# Parse config file with clients
2442
2963
client_config = configparser.SafeConfigParser(Client
2443
2964
.client_defaults)
2444
2965
client_config.read(os.path.join(server_settings["configdir"],
2445
2966
"clients.conf"))
2447
2968
global mandos_dbus_service
2448
2969
mandos_dbus_service = None
2450
tcp_server = MandosServer((server_settings["address"],
2451
server_settings["port"]),
2453
interface=(server_settings["interface"]
2457
server_settings["priority"],
2459
socketfd=(server_settings["socket"]
2972
if server_settings["socket"] != "":
2973
socketfd = server_settings["socket"]
2974
tcp_server = MandosServer(
2975
(server_settings["address"], server_settings["port"]),
2977
interface=(server_settings["interface"] or None),
2979
gnutls_priority=server_settings["priority"],
2461
2982
if not foreground:
2462
2983
pidfilename = "/run/mandos.pid"
2463
2984
if not os.path.isdir("/run/."):
2464
2985
pidfilename = "/var/run/mandos.pid"
2467
pidfile = open(pidfilename, "w")
2988
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2468
2989
except IOError as e:
2469
2990
logger.error("Could not open file %r", pidfilename,
2472
for name in ("_mandos", "mandos", "nobody"):
2993
for name, group in (("_mandos", "_mandos"),
2994
("mandos", "mandos"),
2995
("nobody", "nogroup")):
2474
2997
uid = pwd.getpwnam(name).pw_uid
2475
gid = pwd.getpwnam(name).pw_gid
2998
gid = pwd.getpwnam(group).pw_gid
2477
3000
except KeyError:
3009
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2485
3011
except OSError as error:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
2486
3014
if error.errno != errno.EPERM:
2490
3018
# Enable all possible GnuTLS debugging
2492
3020
# "Use a log level over 10 to enable all debugging options."
2493
3021
# - GnuTLS manual
2494
gnutls.library.functions.gnutls_global_set_log_level(11)
2496
@gnutls.library.types.gnutls_log_func
3022
gnutls.global_set_log_level(11)
2497
3025
def debug_gnutls(level, string):
2498
3026
logger.debug("GnuTLS: %s", string[:-1])
2500
(gnutls.library.functions
2501
.gnutls_global_set_log_function(debug_gnutls))
3028
gnutls.global_set_log_function(debug_gnutls)
2503
3030
# Redirect stdin so all checkers get /dev/null
2504
3031
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2505
3032
os.dup2(null, sys.stdin.fileno())
2509
3036
# Need to fork before connecting to D-Bus
2510
3037
if not foreground:
2511
3038
# Close all input and output, do double fork, etc.
2514
# multiprocessing will use threads, so before we use gobject we
2515
# need to inform gobject that threads will be used.
2516
gobject.threads_init()
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2518
3045
global main_loop
2519
3046
# From the Avahi example code
2520
3047
DBusGMainLoop(set_as_default=True)
2521
main_loop = gobject.MainLoop()
3048
main_loop = GLib.MainLoop()
2522
3049
bus = dbus.SystemBus()
2523
3050
# End of Avahi example code
2526
3053
bus_name = dbus.service.BusName("se.recompile.Mandos",
2527
bus, do_not_queue=True)
2528
old_bus_name = (dbus.service.BusName
2529
("se.bsnet.fukt.Mandos", bus,
2531
except dbus.exceptions.NameExistsException as e:
3056
old_bus_name = dbus.service.BusName(
3057
"se.bsnet.fukt.Mandos", bus,
3059
except dbus.exceptions.DBusException as e:
2532
3060
logger.error("Disabling D-Bus:", exc_info=e)
2533
3061
use_dbus = False
2534
3062
server_settings["use_dbus"] = False
2535
3063
tcp_server.use_dbus = False
2536
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
service = AvahiServiceToSyslog(name =
2538
server_settings["servicename"],
2539
servicetype = "_mandos._tcp",
2540
protocol = protocol, bus = bus)
2541
if server_settings["interface"]:
2542
service.interface = (if_nametoindex
2543
(str(server_settings["interface"])))
3065
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3066
service = AvahiServiceToSyslog(
3067
name=server_settings["servicename"],
3068
servicetype="_mandos._tcp",
3071
if server_settings["interface"]:
3072
service.interface = if_nametoindex(
3073
server_settings["interface"].encode("utf-8"))
2545
3075
global multiprocessing_manager
2546
3076
multiprocessing_manager = multiprocessing.Manager()
2548
3078
client_class = Client
2550
client_class = functools.partial(ClientDBus, bus = bus)
3080
client_class = functools.partial(ClientDBus, bus=bus)
2552
3082
client_settings = Client.config_parser(client_config)
2553
3083
old_client_settings = {}
2554
3084
clients_data = {}
2556
3086
# This is used to redirect stdout and stderr for checker processes
2558
wnull = open(os.devnull, "w") # A writable /dev/null
3088
wnull = open(os.devnull, "w") # A writable /dev/null
2559
3089
# Only used if server is running in foreground but not in debug
2561
3091
if debug or not foreground:
2564
3094
# Get client data and settings from last running state.
2565
3095
if server_settings["restore"]:
2567
3097
with open(stored_state_path, "rb") as stored_state:
2568
clients_data, old_client_settings = (pickle.load
3098
if sys.version_info.major == 2:
3099
clients_data, old_client_settings = pickle.load(
3102
bytes_clients_data, bytes_old_client_settings = (
3103
pickle.load(stored_state, encoding="bytes"))
3104
# Fix bytes to strings
3107
clients_data = {(key.decode("utf-8")
3108
if isinstance(key, bytes)
3111
bytes_clients_data.items()}
3112
del bytes_clients_data
3113
for key in clients_data:
3114
value = {(k.decode("utf-8")
3115
if isinstance(k, bytes) else k): v
3117
clients_data[key].items()}
3118
clients_data[key] = value
3120
value["client_structure"] = [
3122
if isinstance(s, bytes)
3124
value["client_structure"]]
3126
for k in ("name", "host"):
3127
if isinstance(value[k], bytes):
3128
value[k] = value[k].decode("utf-8")
3129
# old_client_settings
3131
old_client_settings = {
3132
(key.decode("utf-8")
3133
if isinstance(key, bytes)
3136
bytes_old_client_settings.items()}
3137
del bytes_old_client_settings
3139
for value in old_client_settings.values():
3140
if isinstance(value["host"], bytes):
3141
value["host"] = (value["host"]
2570
3143
os.remove(stored_state_path)
2571
3144
except IOError as e:
2572
3145
if e.errno == errno.ENOENT:
2573
logger.warning("Could not load persistent state: {0}"
2574
.format(os.strerror(e.errno)))
3146
logger.warning("Could not load persistent state:"
3147
" {}".format(os.strerror(e.errno)))
2576
3149
logger.critical("Could not load persistent state:",
2579
3152
except EOFError as e:
2580
3153
logger.warning("Could not load persistent state: "
2581
"EOFError:", exc_info=e)
2583
3157
with PGPEngine() as pgp:
2584
for client_name, client in clients_data.iteritems():
3158
for client_name, client in clients_data.items():
2585
3159
# Skip removed clients
2586
3160
if client_name not in client_settings:
2589
3163
# Decide which value to use after restoring saved state.
2590
3164
# We have three different values: Old config file,
2591
3165
# new config file, and saved state.
2649
3223
for client_name in (set(client_settings)
2650
3224
- set(old_client_settings)):
2651
3225
clients_data[client_name] = client_settings[client_name]
2653
3227
# Create all client objects
2654
for client_name, client in clients_data.iteritems():
3228
for client_name, client in clients_data.items():
2655
3229
tcp_server.clients[client_name] = client_class(
2656
name = client_name, settings = client,
2657
server_settings = server_settings)
3232
server_settings=server_settings)
2659
3234
if not tcp_server.clients:
2660
3235
logger.warning("No clients defined")
2662
3237
if not foreground:
2663
3238
if pidfile is not None:
2667
pidfile.write(str(pid) + "\n".encode("utf-8"))
3242
print(pid, file=pidfile)
2668
3243
except IOError:
2669
3244
logger.error("Could not write to file %r with PID %d",
2670
3245
pidfilename, pid)
2672
3247
del pidfilename
2674
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2675
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2678
@alternate_dbus_interfaces({"se.recompile.Mandos":
2679
"se.bsnet.fukt.Mandos"})
2680
class MandosDBusService(DBusObjectWithProperties):
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2681
3258
"""A D-Bus proxy object"""
2682
3260
def __init__(self):
2683
3261
dbus.service.Object.__init__(self, bus, "/")
2684
3263
_interface = "se.recompile.Mandos"
2686
@dbus_interface_annotations(_interface)
2688
return { "org.freedesktop.DBus.Property"
2689
".EmitsChangedSignal":
2692
3265
@dbus.service.signal(_interface, signature="o")
2693
3266
def ClientAdded(self, objpath):
2697
3270
@dbus.service.signal(_interface, signature="ss")
2698
3271
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2702
3277
@dbus.service.signal(_interface, signature="os")
2703
3278
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2707
3284
@dbus.service.method(_interface, out_signature="ao")
2708
3285
def GetAllClients(self):
2710
return dbus.Array(c.dbus_object_path
2712
tcp_server.clients.itervalues())
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2714
3292
@dbus.service.method(_interface,
2715
3293
out_signature="a{oa{sv}}")
2716
3294
def GetAllClientsWithProperties(self):
2718
3296
return dbus.Dictionary(
2719
((c.dbus_object_path, c.GetAll(""))
2720
for c in tcp_server.clients.itervalues()),
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2721
3300
signature="oa{sv}")
2723
3302
@dbus.service.method(_interface, in_signature="o")
2724
3303
def RemoveClient(self, object_path):
2726
for c in tcp_server.clients.itervalues():
3305
for c in tcp_server.clients.values():
2727
3306
if c.dbus_object_path == object_path:
2728
3307
del tcp_server.clients[c.name]
2729
3308
c.remove_from_connection()
2730
# Don't signal anything except ClientRemoved
3309
# Don't signal the disabling
2731
3310
c.disable(quiet=True)
2733
self.ClientRemoved(object_path, c.name)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2735
3314
raise KeyError(object_path)
3318
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3319
out_signature="a{oa{sa{sv}}}")
3320
def GetManagedObjects(self):
3322
return dbus.Dictionary(
3323
{client.dbus_object_path:
3325
{interface: client.GetAll(interface)
3327
client._get_all_interface_names()})
3328
for client in tcp_server.clients.values()})
3330
def client_added_signal(self, client):
3331
"""Send the new standard signal and the old signal"""
3333
# New standard signal
3334
self.InterfacesAdded(
3335
client.dbus_object_path,
3337
{interface: client.GetAll(interface)
3339
client._get_all_interface_names()}))
3341
self.ClientAdded(client.dbus_object_path)
3343
def client_removed_signal(self, client):
3344
"""Send the new standard signal and the old signal"""
3346
# New standard signal
3347
self.InterfacesRemoved(
3348
client.dbus_object_path,
3349
client._get_all_interface_names())
3351
self.ClientRemoved(client.dbus_object_path,
2739
3354
mandos_dbus_service = MandosDBusService()
3356
# Save modules to variables to exempt the modules from being
3357
# unloaded before the function registered with atexit() is run.
3358
mp = multiprocessing
2742
3362
"Cleanup function; run on exit"
2745
multiprocessing.active_children()
3366
mp.active_children()
2747
3368
if not (tcp_server.clients or client_settings):
2750
3371
# Store client before exiting. Secrets are encrypted with key
2751
3372
# based on what config file has. If config file is
2752
3373
# removed/edited, old secret will thus be unrecovable.
2754
3375
with PGPEngine() as pgp:
2755
for client in tcp_server.clients.itervalues():
3376
for client in tcp_server.clients.values():
2756
3377
key = client_settings[client.name]["secret"]
2757
3378
client.encrypted_secret = pgp.encrypt(client.secret,
2759
3380
client_dict = {}
2761
3382
# A list of attributes that can not be pickled
2763
exclude = set(("bus", "changedstate", "secret",
2764
"checker", "server_settings"))
2765
for name, typ in (inspect.getmembers
2766
(dbus.service.Object)):
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2767
3388
exclude.add(name)
2769
3390
client_dict["encrypted_secret"] = (client
2770
3391
.encrypted_secret)
2771
3392
for attr in client.client_structure:
2772
3393
if attr not in exclude:
2773
3394
client_dict[attr] = getattr(client, attr)
2775
3396
clients[client.name] = client_dict
2776
3397
del client_settings[client.name]["secret"]
2779
with (tempfile.NamedTemporaryFile
2780
(mode='wb', suffix=".pickle", prefix='clients-',
2781
dir=os.path.dirname(stored_state_path),
2782
delete=False)) as stored_state:
2783
pickle.dump((clients, client_settings), stored_state)
2784
tempname=stored_state.name
3400
with tempfile.NamedTemporaryFile(
3404
dir=os.path.dirname(stored_state_path),
3405
delete=False) as stored_state:
3406
pickle.dump((clients, client_settings), stored_state,
3408
tempname = stored_state.name
2785
3409
os.rename(tempname, stored_state_path)
2786
3410
except (IOError, OSError) as e: