2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-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
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
82
74
import dbus.service
83
from gi.repository import GLib
84
77
from dbus.mainloop.glib import DBusGMainLoop
87
80
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
85
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
87
from IN import SO_BINDTODEVICE
100
88
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
89
SO_BINDTODEVICE = None
119
92
stored_state_file = "clients.pickle"
121
94
logger = logging.getLogger()
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
127
101
except (OSError, AttributeError):
129
102
def if_nametoindex(interface):
130
103
"Get an interface index the hard way, i.e. using fcntl()"
131
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
105
with contextlib.closing(socket.socket()) as s:
133
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
136
111
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__,
155
114
def initlogger(debug, level=logging.WARNING):
156
115
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
syslogger = (logging.handlers.SysLogHandler
119
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
162
121
syslogger.setFormatter(logging.Formatter
163
122
('Mandos [%(process)d]: %(levelname)s:'
165
124
logger.addHandler(syslogger)
168
127
console = logging.StreamHandler()
169
128
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
236
181
.replace(b"\n", b"\\n")
237
182
.replace(b"\0", b"\\x00"))
240
185
def encrypt(self, data, password):
241
186
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
187
with tempfile.NamedTemporaryFile(dir=self.tempdir
244
189
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
191
proc = subprocess.Popen(['gpg', '--symmetric',
247
192
'--passphrase-file',
249
194
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
195
stdin = subprocess.PIPE,
196
stdout = subprocess.PIPE,
197
stderr = subprocess.PIPE)
198
ciphertext, err = proc.communicate(input = data)
254
199
if proc.returncode != 0:
255
200
raise PGPError(err)
256
201
return ciphertext
258
203
def decrypt(self, data, password):
259
204
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
205
with tempfile.NamedTemporaryFile(dir = self.tempdir
262
207
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
209
proc = subprocess.Popen(['gpg', '--decrypt',
265
210
'--passphrase-file',
267
212
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
213
stdin = subprocess.PIPE,
214
stdout = subprocess.PIPE,
215
stderr = subprocess.PIPE)
216
decrypted_plaintext, err = proc.communicate(input
272
218
if proc.returncode != 0:
273
219
raise PGPError(err)
274
220
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
304
223
class AvahiError(Exception):
305
224
def __init__(self, value, *args, **kwargs):
306
225
self.value = value
307
return super(AvahiError, self).__init__(value, *args,
226
super(AvahiError, self).__init__(value, *args, **kwargs)
227
def __unicode__(self):
228
return unicode(repr(self.value))
311
230
class AvahiServiceError(AvahiError):
315
233
class AvahiGroupError(AvahiError):
319
237
class AvahiService(object):
320
238
"""An Avahi (Zeroconf) service.
323
241
interface: integer; avahi.IF_UNSPEC or an interface index.
324
242
Used to optionally bind to the specified interface.
489
385
follow_name_owner_changes=True),
490
386
avahi.DBUS_INTERFACE_SERVER)
491
387
self.server.connect_to_signal("StateChanged",
492
self.server_state_changed)
388
self.server_state_changed)
493
389
self.server_state_changed(self.server.GetState())
496
392
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
498
394
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
395
ret = AvahiService.rename(self)
396
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
398
' %(levelname)s: %(message)s'
506
# Pretend that we have a GnuTLS module
507
class GnuTLS(object):
508
"""This isn't so much a class as it is a module-like namespace.
509
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
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))
403
def timedelta_to_milliseconds(td):
404
"Convert a datetime.timedelta() to milliseconds"
405
return ((td.days * 24 * 60 * 60 * 1000)
406
+ (td.seconds * 1000)
407
+ (td.microseconds // 1000))
780
410
class Client(object):
781
411
"""A representation of a client host served by this server.
784
414
approved: bool(); 'None' if not yet approved/disapproved
785
415
approval_delay: datetime.timedelta(); Time to wait for approval
960
603
logger.info("Disabling client %s", self.name)
961
604
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
605
gobject.source_remove(self.disable_initiator_tag)
963
606
self.disable_initiator_tag = None
964
607
self.expires = None
965
608
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
609
gobject.source_remove(self.checker_initiator_tag)
967
610
self.checker_initiator_tag = None
968
611
self.stop_checker()
969
612
self.enabled = False
971
614
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
615
# Do not run this again if called by a gobject.timeout_add
975
618
def __del__(self):
978
621
def init_checker(self):
979
622
# Schedule a new checker to be started an 'interval' from now,
980
623
# and every interval from then on.
981
624
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
625
gobject.source_remove(self.checker_initiator_tag)
626
self.checker_initiator_tag = (gobject.timeout_add
627
(self.interval_milliseconds(),
986
629
# Schedule a disable() when 'timeout' has passed
987
630
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
990
int(self.timeout.total_seconds() * 1000), self.disable)
631
gobject.source_remove(self.disable_initiator_tag)
632
self.disable_initiator_tag = (gobject.timeout_add
633
(self.timeout_milliseconds(),
991
635
# Also start a new checker *right now*.
992
636
self.start_checker()
994
def checker_callback(self, source, condition, connection,
638
def checker_callback(self, pid, condition, command):
996
639
"""The checker has completed, so take appropriate actions."""
997
640
self.checker_callback_tag = None
998
641
self.checker = None
999
# Read return code from connection (see call_pipe)
1000
returncode = connection.recv()
1004
self.last_checker_status = returncode
1005
self.last_checker_signal = None
642
if os.WIFEXITED(condition):
643
self.last_checker_status = os.WEXITSTATUS(condition)
1006
644
if self.last_checker_status == 0:
1007
645
logger.info("Checker for %(name)s succeeded",
1009
647
self.checked_ok()
1011
logger.info("Checker for %(name)s failed", vars(self))
649
logger.info("Checker for %(name)s failed",
1013
652
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
1015
653
logger.warning("Checker for %(name)s crashed?",
1019
656
def checked_ok(self):
1020
657
"""Assert that the client has been seen, alive and well."""
1021
658
self.last_checked_ok = datetime.datetime.utcnow()
1022
659
self.last_checker_status = 0
1023
self.last_checker_signal = None
1024
660
self.bump_timeout()
1026
662
def bump_timeout(self, timeout=None):
1027
663
"""Bump up the timeout for this client."""
1028
664
if timeout is None:
1029
665
timeout = self.timeout
1030
666
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
667
gobject.source_remove(self.disable_initiator_tag)
1032
668
self.disable_initiator_tag = None
1033
669
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
670
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
1036
673
self.expires = datetime.datetime.utcnow() + timeout
1038
675
def need_approval(self):
1039
676
self.last_approval_request = datetime.datetime.utcnow()
1041
678
def start_checker(self):
1042
679
"""Start a new checker subprocess if one is not running.
1044
681
If a checker already exists, leave it running and do
1046
683
# The reason for not killing a running checker is that if we
1051
688
# checkers alone, the checker would have to take more time
1052
689
# than 'timeout' for the client to be disabled, which is as it
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
692
# If a checker exists, make sure it is not a zombie
694
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
695
except AttributeError:
697
except OSError as error:
698
if error.errno != errno.ECHILD:
702
logger.warning("Checker was a zombie")
703
gobject.source_remove(self.checker_callback_tag)
704
self.checker_callback(pid, status,
705
self.current_checker_command)
1059
706
# Start a new checker if needed
1060
707
if self.checker is None:
1061
708
# Escape attributes for the shell
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
712
self.runtime_expansions)
1066
714
command = self.checker_command % escaped_attrs
1067
715
except TypeError as error:
1068
716
logger.error('Could not format string "%s"',
1069
self.checker_command,
717
self.checker_command, exc_info=error)
718
return True # Try again later
719
self.current_checker_command = command
721
logger.info("Starting checker %r for %s",
723
# We don't need to redirect stdout and stderr, since
724
# in normal mode, that is already done by daemon(),
725
# and in debug mode we don't want to. (Stdin is
726
# always replaced by /dev/null.)
727
# The exception is when not debugging but nevertheless
728
# running in the foreground; use the previously
731
if (not self.server_settings["debug"]
732
and self.server_settings["foreground"]):
733
popen_args.update({"stdout": wnull,
735
self.checker = subprocess.Popen(command,
739
except OSError as error:
740
logger.error("Failed to start subprocess",
1071
return True # Try again later
1072
self.current_checker_command = command
1073
logger.info("Starting checker %r for %s", command,
1075
# We don't need to redirect stdout and stderr, since
1076
# in normal mode, that is already done by daemon(),
1077
# and in debug mode we don't want to. (Stdin is
1078
# always replaced by /dev/null.)
1079
# The exception is when not debugging but nevertheless
1080
# running in the foreground; use the previously
1082
popen_args = {"close_fds": True,
1085
if (not self.server_settings["debug"]
1086
and self.server_settings["foreground"]):
1087
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
1090
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
1094
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1097
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
743
self.checker_callback_tag = (gobject.child_watch_add
745
self.checker_callback,
747
# The checker may have completed before the gobject
748
# watch was added. Check for this.
750
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
751
except OSError as error:
752
if error.errno == errno.ECHILD:
753
# This should never happen
754
logger.error("Child process vanished",
759
gobject.source_remove(self.checker_callback_tag)
760
self.checker_callback(pid, status, command)
761
# Re-run this periodically if run by gobject.timeout_add
1101
764
def stop_checker(self):
1102
765
"""Force the checker process, if any, to stop."""
1103
766
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
767
gobject.source_remove(self.checker_callback_tag)
1105
768
self.checker_callback_tag = None
1106
769
if getattr(self, "checker", None) is None:
1108
771
logger.debug("Stopping checker for %(name)s", vars(self))
1109
self.checker.terminate()
773
self.checker.terminate()
775
#if self.checker.poll() is None:
776
# self.checker.kill()
777
except OSError as error:
778
if error.errno != errno.ESRCH: # No such process
1110
780
self.checker = None
1113
def dbus_service_property(dbus_interface,
783
def dbus_service_property(dbus_interface, signature="v",
784
access="readwrite", byte_arrays=False):
1117
785
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
786
become properties on the D-Bus.
1120
788
The decorated method will be called with no arguments by "Get"
1121
789
and with one argument by "Set".
1123
791
The parameters, where they are supported, are the same as
1124
792
dbus.service.method, except there is only "signature", since the
1125
793
type from Get() and the type sent to Set() is the same.
1208
class DBusObjectWithAnnotations(dbus.service.Object):
1209
"""A D-Bus object with annotations.
1211
Classes inheriting from this can use the dbus_annotations
1212
decorator to add annotations to methods or signals.
869
class DBusObjectWithProperties(dbus.service.Object):
870
"""A D-Bus object with properties.
872
Classes inheriting from this can use the dbus_service_property
873
decorator to expose methods as D-Bus properties. It exposes the
874
standard Get(), Set(), and GetAll() methods on the D-Bus.
1216
878
def _is_dbus_thing(thing):
1217
879
"""Returns a function testing if an attribute is a D-Bus thing
1219
881
If called like _is_dbus_thing("method") it returns a function
1220
882
suitable for use as predicate to inspect.getmembers().
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1225
887
def _get_all_dbus_things(self, thing):
1226
888
"""Returns a generator of (name, attribute) pairs
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
890
return ((getattr(athing.__get__(self), "_dbus_name",
1229
892
athing.__get__(self))
1230
893
for cls in self.__class__.__mro__
1231
894
for name, athing in
1232
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1234
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1238
def Introspect(self, object_path, connection):
1239
"""Overloading of standard D-Bus method.
1241
Inserts annotation tags on methods and signals.
1243
xmlstring = dbus.service.Object.Introspect(self, object_path,
1246
document = xml.dom.minidom.parseString(xmlstring)
1248
for if_tag in document.getElementsByTagName("interface"):
1249
# Add annotation tags
1250
for typ in ("method", "signal"):
1251
for tag in if_tag.getElementsByTagName(typ):
1253
for name, prop in (self.
1254
_get_all_dbus_things(typ)):
1255
if (name == tag.getAttribute("name")
1256
and prop._dbus_interface
1257
== if_tag.getAttribute("name")):
1258
annots.update(getattr(
1259
prop, "_dbus_annotations", {}))
1260
for name, value in annots.items():
1261
ann_tag = document.createElement(
1263
ann_tag.setAttribute("name", name)
1264
ann_tag.setAttribute("value", value)
1265
tag.appendChild(ann_tag)
1266
# Add interface annotation tags
1267
for annotation, value in dict(
1268
itertools.chain.from_iterable(
1269
annotations().items()
1270
for name, annotations
1271
in self._get_all_dbus_things("interface")
1272
if name == if_tag.getAttribute("name")
1274
ann_tag = document.createElement("annotation")
1275
ann_tag.setAttribute("name", annotation)
1276
ann_tag.setAttribute("value", value)
1277
if_tag.appendChild(ann_tag)
1278
# Fix argument name for the Introspect method itself
1279
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1281
for cn in if_tag.getElementsByTagName("method"):
1282
if cn.getAttribute("name") == "Introspect":
1283
for arg in cn.getElementsByTagName("arg"):
1284
if (arg.getAttribute("direction")
1286
arg.setAttribute("name",
1288
xmlstring = document.toxml("utf-8")
1290
except (AttributeError, xml.dom.DOMException,
1291
xml.parsers.expat.ExpatError) as error:
1292
logger.error("Failed to override Introspection method",
1297
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1298
"""A D-Bus object with properties.
1300
Classes inheriting from this can use the dbus_service_property
1301
decorator to expose methods as D-Bus properties. It exposes the
1302
standard Get(), Set(), and GetAll() methods on the D-Bus.
895
inspect.getmembers(cls,
896
self._is_dbus_thing(thing)))
1305
898
def _get_dbus_property(self, interface_name, property_name):
1306
899
"""Returns a bound method if one exists which is a D-Bus
1307
900
property with the specified name and interface.
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
902
for cls in self.__class__.__mro__:
903
for name, value in (inspect.getmembers
905
self._is_dbus_thing("property"))):
1312
906
if (value._dbus_name == property_name
1313
907
and value._dbus_interface == interface_name):
1314
908
return value.__get__(self)
1316
910
# No such property
1317
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
self.dbus_object_path, interface_name, property_name))
1321
def _get_all_interface_names(cls):
1322
"""Get a sequence of all interfaces supported by an object"""
1323
return (name for name in set(getattr(getattr(x, attr),
1324
"_dbus_interface", None)
1325
for x in (inspect.getmro(cls))
1327
if name is not None)
1329
@dbus.service.method(dbus.PROPERTIES_IFACE,
911
raise DBusPropertyNotFound(self.dbus_object_path + ":"
912
+ interface_name + "."
915
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1331
916
out_signature="v")
1332
917
def Get(self, interface_name, property_name):
1333
918
"""Standard D-Bus property Get() method, see D-Bus standard.
1462
1050
return xmlstring
1466
dbus.OBJECT_MANAGER_IFACE
1467
except AttributeError:
1468
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1471
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
"""A D-Bus object with an ObjectManager.
1474
Classes inheriting from this exposes the standard
1475
GetManagedObjects call and the InterfacesAdded and
1476
InterfacesRemoved signals on the standard
1477
"org.freedesktop.DBus.ObjectManager" interface.
1479
Note: No signals are sent automatically; they must be sent
1482
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1484
def GetManagedObjects(self):
1485
"""This function must be overridden"""
1486
raise NotImplementedError()
1488
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1490
def InterfacesAdded(self, object_path, interfaces_and_properties):
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1494
def InterfacesRemoved(self, object_path, interfaces):
1497
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1501
def Introspect(self, object_path, connection):
1502
"""Overloading of standard D-Bus method.
1504
Override return argument name of GetManagedObjects to be
1505
"objpath_interfaces_and_properties"
1507
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1511
document = xml.dom.minidom.parseString(xmlstring)
1513
for if_tag in document.getElementsByTagName("interface"):
1514
# Fix argument name for the GetManagedObjects method
1515
if (if_tag.getAttribute("name")
1516
== dbus.OBJECT_MANAGER_IFACE):
1517
for cn in if_tag.getElementsByTagName("method"):
1518
if (cn.getAttribute("name")
1519
== "GetManagedObjects"):
1520
for arg in cn.getElementsByTagName("arg"):
1521
if (arg.getAttribute("direction")
1525
"objpath_interfaces"
1527
xmlstring = document.toxml("utf-8")
1529
except (AttributeError, xml.dom.DOMException,
1530
xml.parsers.expat.ExpatError) as error:
1531
logger.error("Failed to override Introspection method",
1536
1053
def datetime_to_dbus(dt, variant_level=0):
1537
1054
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1539
return dbus.String("", variant_level=variant_level)
1540
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
return dbus.String("", variant_level = variant_level)
1057
return dbus.String(dt.isoformat(),
1058
variant_level=variant_level)
1543
1061
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1574
1091
# Ignore non-D-Bus attributes, and D-Bus attributes
1575
1092
# with the wrong interface name
1576
1093
if (not hasattr(attribute, "_dbus_interface")
1577
or not attribute._dbus_interface.startswith(
1578
orig_interface_name)):
1094
or not attribute._dbus_interface
1095
.startswith(orig_interface_name)):
1580
1097
# Create an alternate D-Bus interface name based on
1581
1098
# the current name
1582
alt_interface = attribute._dbus_interface.replace(
1583
orig_interface_name, alt_interface_name)
1099
alt_interface = (attribute._dbus_interface
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1584
1102
interface_names.add(alt_interface)
1585
1103
# Is this a D-Bus signal?
1586
1104
if getattr(attribute, "_dbus_is_signal", False):
1587
1105
# Extract the original non-method undecorated
1588
1106
# function by black magic
1589
if sys.version_info.major == 2:
1590
nonmethod_func = (dict(
1107
nonmethod_func = (dict(
1591
1108
zip(attribute.func_code.co_freevars,
1592
attribute.__closure__))
1593
["func"].cell_contents)
1595
nonmethod_func = (dict(
1596
zip(attribute.__code__.co_freevars,
1597
attribute.__closure__))
1598
["func"].cell_contents)
1109
attribute.__closure__))["func"]
1599
1111
# Create a new, but exactly alike, function
1600
1112
# object, and decorate it to be a new D-Bus signal
1601
1113
# with the alternate D-Bus interface name
1602
new_function = copy_function(nonmethod_func)
1603
new_function = (dbus.service.signal(
1605
attribute._dbus_signature)(new_function))
1114
new_function = (dbus.service.signal
1116
attribute._dbus_signature)
1117
(types.FunctionType(
1118
nonmethod_func.func_code,
1119
nonmethod_func.func_globals,
1120
nonmethod_func.func_name,
1121
nonmethod_func.func_defaults,
1122
nonmethod_func.func_closure)))
1606
1123
# Copy annotations, if any
1608
new_function._dbus_annotations = dict(
1609
attribute._dbus_annotations)
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1610
1127
except AttributeError:
1613
1129
# Define a creator of a function to call both the
1614
1130
# original and alternate functions, so both the
1615
1131
# original and alternate signals gets sent when
1698
1221
if interface_names:
1699
1222
# Replace the class with a new subclass of it with
1700
1223
# methods, signals, etc. as created above.
1701
if sys.version_info.major == 2:
1702
cls = type(b"{}Alternate".format(cls.__name__),
1705
cls = type("{}Alternate".format(cls.__name__),
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1712
1230
@alternate_dbus_interfaces({"se.recompile.Mandos":
1713
"se.bsnet.fukt.Mandos"})
1231
"se.bsnet.fukt.Mandos"})
1714
1232
class ClientDBus(Client, DBusObjectWithProperties):
1715
1233
"""A Client class using D-Bus
1718
1236
dbus_object_path: dbus.ObjectPath
1719
1237
bus: dbus.SystemBus()
1722
1240
runtime_expansions = (Client.runtime_expansions
1723
+ ("dbus_object_path", ))
1725
_interface = "se.recompile.Mandos.Client"
1241
+ ("dbus_object_path",))
1727
1243
# dbus.service.Object doesn't use super(), so we can't either.
1729
def __init__(self, bus=None, *args, **kwargs):
1245
def __init__(self, bus = None, *args, **kwargs):
1731
1247
Client.__init__(self, *args, **kwargs)
1732
1248
# Only now, when this client is initialized, can it show up on
1734
client_object_name = str(self.name).translate(
1250
client_object_name = unicode(self.name).translate(
1735
1251
{ord("."): ord("_"),
1736
1252
ord("-"): ord("_")})
1737
self.dbus_object_path = dbus.ObjectPath(
1738
"/clients/" + client_object_name)
1253
self.dbus_object_path = (dbus.ObjectPath
1254
("/clients/" + client_object_name))
1739
1255
DBusObjectWithProperties.__init__(self, self.bus,
1740
1256
self.dbus_object_path)
1742
def notifychangeproperty(transform_func, dbus_name,
1743
type_func=lambda x: x,
1745
invalidate_only=False,
1746
_interface=_interface):
1258
def notifychangeproperty(transform_func,
1259
dbus_name, type_func=lambda x: x,
1747
1261
""" Modify a variable so that it's a property which announces
1748
1262
its changes to DBus.
1750
1264
transform_fun: Function that takes a value and a variant_level
1751
1265
and transforms it to a D-Bus type.
1752
1266
dbus_name: D-Bus name of the variable
1904
1410
server to mandos-client
1908
1414
# Rejected - signal
1909
1415
@dbus.service.signal(_interface, signature="s")
1910
1416
def Rejected(self, reason):
1914
1420
# NeedApproval - signal
1915
1421
@dbus.service.signal(_interface, signature="tb")
1916
1422
def NeedApproval(self, timeout, default):
1918
1424
return self.need_approval()
1922
1428
# Approve - method
1923
1429
@dbus.service.method(_interface, in_signature="b")
1924
1430
def Approve(self, value):
1925
1431
self.approve(value)
1927
1433
# CheckedOK - method
1928
1434
@dbus.service.method(_interface)
1929
1435
def CheckedOK(self):
1930
1436
self.checked_ok()
1932
1438
# Enable - method
1933
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1934
1439
@dbus.service.method(_interface)
1935
1440
def Enable(self):
1939
1444
# StartChecker - method
1940
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1941
1445
@dbus.service.method(_interface)
1942
1446
def StartChecker(self):
1944
1448
self.start_checker()
1946
1450
# Disable - method
1947
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1948
1451
@dbus.service.method(_interface)
1949
1452
def Disable(self):
1953
1456
# StopChecker - method
1954
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1955
1457
@dbus.service.method(_interface)
1956
1458
def StopChecker(self):
1957
1459
self.stop_checker()
1961
1463
# ApprovalPending - property
1962
1464
@dbus_service_property(_interface, signature="b", access="read")
1963
1465
def ApprovalPending_dbus_property(self):
1964
1466
return dbus.Boolean(bool(self.approvals_pending))
1966
1468
# ApprovedByDefault - property
1967
@dbus_service_property(_interface,
1469
@dbus_service_property(_interface, signature="b",
1969
1470
access="readwrite")
1970
1471
def ApprovedByDefault_dbus_property(self, value=None):
1971
1472
if value is None: # get
1972
1473
return dbus.Boolean(self.approved_by_default)
1973
1474
self.approved_by_default = bool(value)
1975
1476
# ApprovalDelay - property
1976
@dbus_service_property(_interface,
1477
@dbus_service_property(_interface, signature="t",
1978
1478
access="readwrite")
1979
1479
def ApprovalDelay_dbus_property(self, value=None):
1980
1480
if value is None: # get
1981
return dbus.UInt64(self.approval_delay.total_seconds()
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1983
1482
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1985
1484
# ApprovalDuration - property
1986
@dbus_service_property(_interface,
1485
@dbus_service_property(_interface, signature="t",
1988
1486
access="readwrite")
1989
1487
def ApprovalDuration_dbus_property(self, value=None):
1990
1488
if value is None: # get
1991
return dbus.UInt64(self.approval_duration.total_seconds()
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1993
1491
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1995
1493
# Name - property
1997
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1998
1494
@dbus_service_property(_interface, signature="s", access="read")
1999
1495
def Name_dbus_property(self):
2000
1496
return dbus.String(self.name)
2002
1498
# Fingerprint - property
2004
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2005
1499
@dbus_service_property(_interface, signature="s", access="read")
2006
1500
def Fingerprint_dbus_property(self):
2007
1501
return dbus.String(self.fingerprint)
2009
1503
# Host - property
2010
@dbus_service_property(_interface,
1504
@dbus_service_property(_interface, signature="s",
2012
1505
access="readwrite")
2013
1506
def Host_dbus_property(self, value=None):
2014
1507
if value is None: # get
2015
1508
return dbus.String(self.host)
2016
self.host = str(value)
1509
self.host = unicode(value)
2018
1511
# Created - property
2020
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2021
1512
@dbus_service_property(_interface, signature="s", access="read")
2022
1513
def Created_dbus_property(self):
2023
1514
return datetime_to_dbus(self.created)
2025
1516
# LastEnabled - property
2026
1517
@dbus_service_property(_interface, signature="s", access="read")
2027
1518
def LastEnabled_dbus_property(self):
2028
1519
return datetime_to_dbus(self.last_enabled)
2030
1521
# Enabled - property
2031
@dbus_service_property(_interface,
1522
@dbus_service_property(_interface, signature="b",
2033
1523
access="readwrite")
2034
1524
def Enabled_dbus_property(self, value=None):
2035
1525
if value is None: # get
2084
1573
if (getattr(self, "disable_initiator_tag", None)
2087
GLib.source_remove(self.disable_initiator_tag)
2088
self.disable_initiator_tag = GLib.timeout_add(
2089
int((self.expires - now).total_seconds() * 1000),
1576
gobject.source_remove(self.disable_initiator_tag)
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
2092
1582
# ExtendedTimeout - property
2093
@dbus_service_property(_interface,
1583
@dbus_service_property(_interface, signature="t",
2095
1584
access="readwrite")
2096
1585
def ExtendedTimeout_dbus_property(self, value=None):
2097
1586
if value is None: # get
2098
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
2100
1588
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2102
1590
# Interval - property
2103
@dbus_service_property(_interface,
1591
@dbus_service_property(_interface, signature="t",
2105
1592
access="readwrite")
2106
1593
def Interval_dbus_property(self, value=None):
2107
1594
if value is None: # get
2108
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
return dbus.UInt64(self.interval_milliseconds())
2109
1596
self.interval = datetime.timedelta(0, 0, 0, value)
2110
1597
if getattr(self, "checker_initiator_tag", None) is None:
2112
1599
if self.enabled:
2113
1600
# Reschedule checker run
2114
GLib.source_remove(self.checker_initiator_tag)
2115
self.checker_initiator_tag = GLib.timeout_add(
2116
value, self.start_checker)
2117
self.start_checker() # Start one now, too
1601
gobject.source_remove(self.checker_initiator_tag)
1602
self.checker_initiator_tag = (gobject.timeout_add
1603
(value, self.start_checker))
1604
self.start_checker() # Start one now, too
2119
1606
# Checker - property
2120
@dbus_service_property(_interface,
1607
@dbus_service_property(_interface, signature="s",
2122
1608
access="readwrite")
2123
1609
def Checker_dbus_property(self, value=None):
2124
1610
if value is None: # get
2125
1611
return dbus.String(self.checker_command)
2126
self.checker_command = str(value)
1612
self.checker_command = unicode(value)
2128
1614
# CheckerRunning - property
2129
@dbus_service_property(_interface,
1615
@dbus_service_property(_interface, signature="b",
2131
1616
access="readwrite")
2132
1617
def CheckerRunning_dbus_property(self, value=None):
2133
1618
if value is None: # get
2190
1665
class ClientHandler(socketserver.BaseRequestHandler, object):
2191
1666
"""A class to handle client connections.
2193
1668
Instantiated once for each connection to handle it.
2194
1669
Note: This will run in its own forked process."""
2196
1671
def handle(self):
2197
1672
with contextlib.closing(self.server.child_pipe) as child_pipe:
2198
1673
logger.info("TCP connection from: %s",
2199
str(self.client_address))
1674
unicode(self.client_address))
2200
1675
logger.debug("Pipe FD: %d",
2201
1676
self.server.child_pipe.fileno())
2203
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
1678
session = (gnutls.connection
1679
.ClientSession(self.request,
1681
.X509Credentials()))
1683
# Note: gnutls.connection.X509Credentials is really a
1684
# generic GnuTLS certificate credentials object so long as
1685
# no X.509 keys are added to it. Therefore, we can use it
1686
# here despite using OpenPGP certificates.
1688
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1689
# "+AES-256-CBC", "+SHA1",
1690
# "+COMP-NULL", "+CTYPE-OPENPGP",
2209
1692
# Use a fallback default, since this MUST be set.
2210
1693
priority = self.server.gnutls_priority
2211
1694
if priority is None:
2212
1695
priority = "NORMAL"
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
1696
(gnutls.library.functions
1697
.gnutls_priority_set_direct(session._c_object,
2217
1700
# Start communication using the Mandos protocol
2218
1701
# Get protocol number
2219
1702
line = self.request.makefile().readline()
2305
1791
delay -= time2 - time
2308
session.send(client.secret)
2309
except gnutls.Error as error:
2310
logger.warning("gnutls send failed",
1794
while sent_size < len(client.secret):
1796
sent = session.send(client.secret[sent_size:])
1797
except gnutls.errors.GNUTLSError as error:
1798
logger.warning("gnutls send failed",
1801
logger.debug("Sent: %d, remaining: %d",
1802
sent, len(client.secret)
1803
- (sent_size + sent))
2314
1806
logger.info("Sending secret to %s", client.name)
2315
1807
# bump the timeout using extended_timeout
2316
1808
client.bump_timeout(client.extended_timeout)
2317
1809
if self.server.use_dbus:
2318
1810
# Emit D-Bus signal
2319
1811
client.GotSecret()
2322
1814
if approval_required:
2323
1815
client.approvals_pending -= 1
2326
except gnutls.Error as error:
1818
except gnutls.errors.GNUTLSError as error:
2327
1819
logger.warning("GnuTLS bye failed",
2328
1820
exc_info=error)
2331
1823
def peer_certificate(session):
2332
1824
"Return the peer's OpenPGP certificate as a bytestring"
2333
1825
# If not an OpenPGP certificate...
2334
if (gnutls.certificate_type_get(session._c_object)
2335
!= gnutls.CRT_OPENPGP):
2336
# ...return invalid data
1826
if (gnutls.library.functions
1827
.gnutls_certificate_type_get(session._c_object)
1828
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1829
# ...do the normal thing
1830
return session.peer_certificate
2338
1831
list_size = ctypes.c_uint(1)
2339
cert_list = (gnutls.certificate_get_peers
1832
cert_list = (gnutls.library.functions
1833
.gnutls_certificate_get_peers
2340
1834
(session._c_object, ctypes.byref(list_size)))
2341
1835
if not bool(cert_list) and list_size.value != 0:
2342
raise gnutls.Error("error getting peer certificate")
1836
raise gnutls.errors.GNUTLSError("error getting peer"
2343
1838
if list_size.value == 0:
2345
1840
cert = cert_list[0]
2346
1841
return ctypes.string_at(cert.data, cert.size)
2349
1844
def fingerprint(openpgp):
2350
1845
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2351
1846
# New GnuTLS "datum" with the OpenPGP public key
2352
datum = gnutls.datum_t(
2353
ctypes.cast(ctypes.c_char_p(openpgp),
2354
ctypes.POINTER(ctypes.c_ubyte)),
2355
ctypes.c_uint(len(openpgp)))
1847
datum = (gnutls.library.types
1848
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1851
ctypes.c_uint(len(openpgp))))
2356
1852
# New empty GnuTLS certificate
2357
crt = gnutls.openpgp_crt_t()
2358
gnutls.openpgp_crt_init(ctypes.byref(crt))
1853
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2359
1856
# Import the OpenPGP public key into the certificate
2360
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2361
gnutls.OPENPGP_FMT_RAW)
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1859
gnutls.library.constants
1860
.GNUTLS_OPENPGP_FMT_RAW))
2362
1861
# Verify the self signature in the key
2363
1862
crtverify = ctypes.c_uint()
2364
gnutls.openpgp_crt_verify_self(crt, 0,
2365
ctypes.byref(crtverify))
1863
(gnutls.library.functions
1864
.gnutls_openpgp_crt_verify_self(crt, 0,
1865
ctypes.byref(crtverify)))
2366
1866
if crtverify.value != 0:
2367
gnutls.openpgp_crt_deinit(crt)
2368
raise gnutls.CertificateSecurityError(code
1867
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1868
raise (gnutls.errors.CertificateSecurityError
2370
1870
# New buffer for the fingerprint
2371
1871
buf = ctypes.create_string_buffer(20)
2372
1872
buf_len = ctypes.c_size_t()
2373
1873
# Get the fingerprint from the certificate into the buffer
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1874
(gnutls.library.functions
1875
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1876
ctypes.byref(buf_len)))
2376
1877
# Deinit the certificate
2377
gnutls.openpgp_crt_deinit(crt)
1878
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2378
1879
# Convert the buffer to a Python bytestring
2379
1880
fpr = ctypes.string_at(buf, buf_len.value)
2380
1881
# Convert the bytestring to hexadecimal notation
2469
1964
# socket_wrapper(), if socketfd was set.
2470
1965
socketserver.TCPServer.__init__(self, server_address,
2471
1966
RequestHandlerClass)
2473
1968
def server_bind(self):
2474
1969
"""This overrides the normal server_bind() function
2475
1970
to bind to an interface if one was specified, and also NOT to
2476
1971
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
2478
1972
if self.interface is not None:
2479
1973
if SO_BINDTODEVICE is None:
2480
# Fall back to a hard-coded value which seems to be
2482
logger.warning("SO_BINDTODEVICE not found, trying 25")
2483
SO_BINDTODEVICE = 25
2485
self.socket.setsockopt(
2486
socket.SOL_SOCKET, SO_BINDTODEVICE,
2487
(self.interface + "\0").encode("utf-8"))
2488
except socket.error as error:
2489
if error.errno == errno.EPERM:
2490
logger.error("No permission to bind to"
2491
" interface %s", self.interface)
2492
elif error.errno == errno.ENOPROTOOPT:
2493
logger.error("SO_BINDTODEVICE not available;"
2494
" cannot bind to interface %s",
2496
elif error.errno == errno.ENODEV:
2497
logger.error("Interface %s does not exist,"
2498
" cannot bind", self.interface)
1974
logger.error("SO_BINDTODEVICE does not exist;"
1975
" cannot bind to interface %s",
1979
self.socket.setsockopt(socket.SOL_SOCKET,
1981
str(self.interface + '\0'))
1982
except socket.error as error:
1983
if error.errno == errno.EPERM:
1984
logger.error("No permission to bind to"
1985
" interface %s", self.interface)
1986
elif error.errno == errno.ENOPROTOOPT:
1987
logger.error("SO_BINDTODEVICE not available;"
1988
" cannot bind to interface %s",
1990
elif error.errno == errno.ENODEV:
1991
logger.error("Interface %s does not exist,"
1992
" cannot bind", self.interface)
2501
1995
# Only bind(2) the socket if we really need to.
2502
1996
if self.server_address[0] or self.server_address[1]:
2503
1997
if not self.server_address[0]:
2504
1998
if self.address_family == socket.AF_INET6:
2505
any_address = "::" # in6addr_any
1999
any_address = "::" # in6addr_any
2507
any_address = "0.0.0.0" # INADDR_ANY
2001
any_address = "0.0.0.0" # INADDR_ANY
2508
2002
self.server_address = (any_address,
2509
2003
self.server_address[1])
2510
2004
elif not self.server_address[1]:
2511
self.server_address = (self.server_address[0], 0)
2005
self.server_address = (self.server_address[0],
2512
2007
# if self.interface:
2513
2008
# self.server_address = (self.server_address[0],
2902
2385
server_settings["socket"] = os.dup(server_settings
2904
2387
del server_config
2906
2389
# Override the settings from the config file with command line
2907
2390
# options, if set.
2908
2391
for option in ("interface", "address", "port", "debug",
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2392
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2912
2395
value = getattr(options, option)
2913
2396
if value is not None:
2914
2397
server_settings[option] = value
2916
2399
# Force all strings to be unicode
2917
2400
for option in server_settings.keys():
2918
if isinstance(server_settings[option], bytes):
2919
server_settings[option] = (server_settings[option]
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2921
2403
# Force all boolean options to be boolean
2922
2404
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2923
"foreground", "zeroconf"):
2924
2406
server_settings[option] = bool(server_settings[option])
2925
2407
# Debug implies foreground
2926
2408
if server_settings["debug"]:
2927
2409
server_settings["foreground"] = True
2928
2410
# Now we have our good server settings in "server_settings"
2930
2412
##################################################################
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")
2937
2414
# For convenience
2938
2415
debug = server_settings["debug"]
2939
2416
debuglevel = server_settings["debuglevel"]
2953
2429
level = getattr(logging, debuglevel.upper())
2954
2430
initlogger(debug, level)
2956
2432
if server_settings["servicename"] != "Mandos":
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2433
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2435
' %(levelname)s: %(message)s'
2436
.format(server_settings
2962
2439
# Parse config file with clients
2963
2440
client_config = configparser.SafeConfigParser(Client
2964
2441
.client_defaults)
2965
2442
client_config.read(os.path.join(server_settings["configdir"],
2966
2443
"clients.conf"))
2968
2445
global mandos_dbus_service
2969
2446
mandos_dbus_service = None
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"],
2448
tcp_server = MandosServer((server_settings["address"],
2449
server_settings["port"]),
2451
interface=(server_settings["interface"]
2455
server_settings["priority"],
2457
socketfd=(server_settings["socket"]
2982
2459
if not foreground:
2983
2460
pidfilename = "/run/mandos.pid"
2984
2461
if not os.path.isdir("/run/."):
2985
2462
pidfilename = "/var/run/mandos.pid"
2988
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2465
pidfile = open(pidfilename, "w")
2989
2466
except IOError as e:
2990
2467
logger.error("Could not open file %r", pidfilename,
2993
for name, group in (("_mandos", "_mandos"),
2994
("mandos", "mandos"),
2995
("nobody", "nogroup")):
2470
for name in ("_mandos", "mandos", "nobody"):
2997
2472
uid = pwd.getpwnam(name).pw_uid
2998
gid = pwd.getpwnam(group).pw_gid
2473
gid = pwd.getpwnam(name).pw_gid
3000
2475
except KeyError:
3009
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3011
2483
except OSError as error:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
3014
2484
if error.errno != errno.EPERM:
3018
2488
# Enable all possible GnuTLS debugging
3020
2490
# "Use a log level over 10 to enable all debugging options."
3021
2491
# - GnuTLS manual
3022
gnutls.global_set_log_level(11)
2492
gnutls.library.functions.gnutls_global_set_log_level(11)
2494
@gnutls.library.types.gnutls_log_func
3025
2495
def debug_gnutls(level, string):
3026
2496
logger.debug("GnuTLS: %s", string[:-1])
3028
gnutls.global_set_log_function(debug_gnutls)
2498
(gnutls.library.functions
2499
.gnutls_global_set_log_function(debug_gnutls))
3030
2501
# Redirect stdin so all checkers get /dev/null
3031
2502
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3032
2503
os.dup2(null, sys.stdin.fileno())
3036
2507
# Need to fork before connecting to D-Bus
3037
2508
if not foreground:
3038
2509
# Close all input and output, do double fork, etc.
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2512
# multiprocessing will use threads, so before we use gobject we
2513
# need to inform gobject that threads will be used.
2514
gobject.threads_init()
3045
2516
global main_loop
3046
2517
# From the Avahi example code
3047
2518
DBusGMainLoop(set_as_default=True)
3048
main_loop = GLib.MainLoop()
2519
main_loop = gobject.MainLoop()
3049
2520
bus = dbus.SystemBus()
3050
2521
# End of Avahi example code
3053
2524
bus_name = dbus.service.BusName("se.recompile.Mandos",
3056
old_bus_name = dbus.service.BusName(
3057
"se.bsnet.fukt.Mandos", bus,
3059
except dbus.exceptions.DBusException as e:
2525
bus, do_not_queue=True)
2526
old_bus_name = (dbus.service.BusName
2527
("se.bsnet.fukt.Mandos", bus,
2529
except dbus.exceptions.NameExistsException as e:
3060
2530
logger.error("Disabling D-Bus:", exc_info=e)
3061
2531
use_dbus = False
3062
2532
server_settings["use_dbus"] = False
3063
2533
tcp_server.use_dbus = False
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"))
2534
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2535
service = AvahiServiceToSyslog(name =
2536
server_settings["servicename"],
2537
servicetype = "_mandos._tcp",
2538
protocol = protocol, bus = bus)
2539
if server_settings["interface"]:
2540
service.interface = (if_nametoindex
2541
(str(server_settings["interface"])))
3075
2543
global multiprocessing_manager
3076
2544
multiprocessing_manager = multiprocessing.Manager()
3078
2546
client_class = Client
3080
client_class = functools.partial(ClientDBus, bus=bus)
2548
client_class = functools.partial(ClientDBus, bus = bus)
3082
2550
client_settings = Client.config_parser(client_config)
3083
2551
old_client_settings = {}
3084
2552
clients_data = {}
3086
2554
# This is used to redirect stdout and stderr for checker processes
3088
wnull = open(os.devnull, "w") # A writable /dev/null
2556
wnull = open(os.devnull, "w") # A writable /dev/null
3089
2557
# Only used if server is running in foreground but not in debug
3091
2559
if debug or not foreground:
3094
2562
# Get client data and settings from last running state.
3095
2563
if server_settings["restore"]:
3097
2565
with open(stored_state_path, "rb") as stored_state:
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"]
2566
clients_data, old_client_settings = (pickle.load
3143
2568
os.remove(stored_state_path)
3144
2569
except IOError as e:
3145
2570
if e.errno == errno.ENOENT:
3146
logger.warning("Could not load persistent state:"
3147
" {}".format(os.strerror(e.errno)))
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
3149
2574
logger.critical("Could not load persistent state:",
3152
2577
except EOFError as e:
3153
2578
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
3157
2581
with PGPEngine() as pgp:
3158
for client_name, client in clients_data.items():
2582
for client_name, client in clients_data.iteritems():
3159
2583
# Skip removed clients
3160
2584
if client_name not in client_settings:
3163
2587
# Decide which value to use after restoring saved state.
3164
2588
# We have three different values: Old config file,
3165
2589
# new config file, and saved state.
3223
2647
for client_name in (set(client_settings)
3224
2648
- set(old_client_settings)):
3225
2649
clients_data[client_name] = client_settings[client_name]
3227
2651
# Create all client objects
3228
for client_name, client in clients_data.items():
2652
for client_name, client in clients_data.iteritems():
3229
2653
tcp_server.clients[client_name] = client_class(
3232
server_settings=server_settings)
2654
name = client_name, settings = client,
2655
server_settings = server_settings)
3234
2657
if not tcp_server.clients:
3235
2658
logger.warning("No clients defined")
3237
2660
if not foreground:
3238
2661
if pidfile is not None:
3242
print(pid, file=pidfile)
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
3243
2666
except IOError:
3244
2667
logger.error("Could not write to file %r with PID %d",
3245
2668
pidfilename, pid)
3247
2670
del pidfilename
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2672
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2673
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2678
class MandosDBusService(DBusObjectWithProperties):
3258
2679
"""A D-Bus proxy object"""
3260
2680
def __init__(self):
3261
2681
dbus.service.Object.__init__(self, bus, "/")
3263
2682
_interface = "se.recompile.Mandos"
2684
@dbus_interface_annotations(_interface)
2686
return { "org.freedesktop.DBus.Property"
2687
".EmitsChangedSignal":
3265
2690
@dbus.service.signal(_interface, signature="o")
3266
2691
def ClientAdded(self, objpath):
3270
2695
@dbus.service.signal(_interface, signature="ss")
3271
2696
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3277
2700
@dbus.service.signal(_interface, signature="os")
3278
2701
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3284
2705
@dbus.service.method(_interface, out_signature="ao")
3285
2706
def GetAllClients(self):
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2708
return dbus.Array(c.dbus_object_path
2710
tcp_server.clients.itervalues())
3292
2712
@dbus.service.method(_interface,
3293
2713
out_signature="a{oa{sv}}")
3294
2714
def GetAllClientsWithProperties(self):
3296
2716
return dbus.Dictionary(
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
3300
2719
signature="oa{sv}")
3302
2721
@dbus.service.method(_interface, in_signature="o")
3303
2722
def RemoveClient(self, object_path):
3305
for c in tcp_server.clients.values():
2724
for c in tcp_server.clients.itervalues():
3306
2725
if c.dbus_object_path == object_path:
3307
2726
del tcp_server.clients[c.name]
3308
2727
c.remove_from_connection()
3309
# Don't signal the disabling
2728
# Don't signal anything except ClientRemoved
3310
2729
c.disable(quiet=True)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2731
self.ClientRemoved(object_path, c.name)
3314
2733
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,
3354
2737
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
3362
2740
"Cleanup function; run on exit"
3366
mp.active_children()
2743
multiprocessing.active_children()
3368
2745
if not (tcp_server.clients or client_settings):
3371
2748
# Store client before exiting. Secrets are encrypted with key
3372
2749
# based on what config file has. If config file is
3373
2750
# removed/edited, old secret will thus be unrecovable.
3375
2752
with PGPEngine() as pgp:
3376
for client in tcp_server.clients.values():
2753
for client in tcp_server.clients.itervalues():
3377
2754
key = client_settings[client.name]["secret"]
3378
2755
client.encrypted_secret = pgp.encrypt(client.secret,
3380
2757
client_dict = {}
3382
2759
# A list of attributes that can not be pickled
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2761
exclude = set(("bus", "changedstate", "secret",
2762
"checker", "server_settings"))
2763
for name, typ in (inspect.getmembers
2764
(dbus.service.Object)):
3388
2765
exclude.add(name)
3390
2767
client_dict["encrypted_secret"] = (client
3391
2768
.encrypted_secret)
3392
2769
for attr in client.client_structure:
3393
2770
if attr not in exclude:
3394
2771
client_dict[attr] = getattr(client, attr)
3396
2773
clients[client.name] = client_dict
3397
2774
del client_settings[client.name]["secret"]
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
2777
with (tempfile.NamedTemporaryFile
2778
(mode='wb', suffix=".pickle", prefix='clients-',
2779
dir=os.path.dirname(stored_state_path),
2780
delete=False)) as stored_state:
2781
pickle.dump((clients, client_settings), stored_state)
2782
tempname=stored_state.name
3409
2783
os.rename(tempname, stored_state_path)
3410
2784
except (IOError, OSError) as e: