69
import cPickle as pickle
65
import cPickle as pickle
72
66
import multiprocessing
81
74
import dbus.service
82
from gi.repository import GLib
83
77
from dbus.mainloop.glib import DBusGMainLoop
86
80
import xml.dom.minidom
89
# Try to find the value of SO_BINDTODEVICE:
91
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
# newer, and it is also the most natural place for it:
93
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
85
except AttributeError:
96
# This is where SO_BINDTODEVICE was up to and including Python
98
87
from IN import SO_BINDTODEVICE
99
88
except ImportError:
100
# In Python 2.7 it seems to have been removed entirely.
101
# Try running the C preprocessor:
103
cc = subprocess.Popen(["cc", "--language=c", "-E",
105
stdin=subprocess.PIPE,
106
stdout=subprocess.PIPE)
107
stdout = cc.communicate(
108
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
except (OSError, ValueError, IndexError):
112
SO_BINDTODEVICE = None
114
if sys.version_info.major == 2:
89
SO_BINDTODEVICE = None
118
92
stored_state_file = "clients.pickle"
120
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
126
103
except (OSError, AttributeError):
128
104
def if_nametoindex(interface):
129
105
"Get an interface index the hard way, i.e. using fcntl()"
130
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
131
107
with contextlib.closing(socket.socket()) as s:
132
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
135
113
return interface_index
138
def copy_function(func):
139
"""Make a copy of a function"""
140
if sys.version_info.major == 2:
141
return types.FunctionType(func.func_code,
147
return types.FunctionType(func.__code__,
154
116
def initlogger(debug, level=logging.WARNING):
155
117
"""init logger and add loglevel"""
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
161
119
syslogger.setFormatter(logging.Formatter
162
120
('Mandos [%(process)d]: %(levelname)s:'
164
122
logger.addHandler(syslogger)
167
125
console = logging.StreamHandler()
168
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
235
179
.replace(b"\n", b"\\n")
236
180
.replace(b"\0", b"\\x00"))
239
183
def encrypt(self, data, password):
240
184
passphrase = self.password_encode(password)
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
243
187
passfile.write(passphrase)
245
proc = subprocess.Popen([self.gpg, '--symmetric',
189
proc = subprocess.Popen(['gpg', '--symmetric',
246
190
'--passphrase-file',
248
192
+ self.gnupgargs,
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
253
197
if proc.returncode != 0:
254
198
raise PGPError(err)
255
199
return ciphertext
257
201
def decrypt(self, data, password):
258
202
passphrase = self.password_encode(password)
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
261
205
passfile.write(passphrase)
263
proc = subprocess.Popen([self.gpg, '--decrypt',
207
proc = subprocess.Popen(['gpg', '--decrypt',
264
208
'--passphrase-file',
266
210
+ self.gnupgargs,
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
271
216
if proc.returncode != 0:
272
217
raise PGPError(err)
273
218
return decrypted_plaintext
276
# Pretend that we have an Avahi module
278
"""This isn't so much a class as it is a module-like namespace.
279
It is instantiated once, and simulates having an Avahi module."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
289
def string_array_to_txt_array(self, t):
290
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
for s in t), signature="ay")
292
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
293
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
294
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
295
SERVER_INVALID = 0 # avahi-common/defs.h
296
SERVER_REGISTERING = 1 # avahi-common/defs.h
297
SERVER_RUNNING = 2 # avahi-common/defs.h
298
SERVER_COLLISION = 3 # avahi-common/defs.h
299
SERVER_FAILURE = 4 # avahi-common/defs.h
303
221
class AvahiError(Exception):
304
222
def __init__(self, value, *args, **kwargs):
305
223
self.value = value
306
return super(AvahiError, self).__init__(value, *args,
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
310
228
class AvahiServiceError(AvahiError):
314
231
class AvahiGroupError(AvahiError):
318
235
class AvahiService(object):
319
236
"""An Avahi (Zeroconf) service.
322
239
interface: integer; avahi.IF_UNSPEC or an interface index.
323
240
Used to optionally bind to the specified interface.
488
383
follow_name_owner_changes=True),
489
384
avahi.DBUS_INTERFACE_SERVER)
490
385
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
386
self.server_state_changed)
492
387
self.server_state_changed(self.server.GetState())
495
390
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
392
"""Add the new name to the syslog messages"""
498
ret = AvahiService.rename(self, *args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
505
# Pretend that we have a GnuTLS module
506
class GnuTLS(object):
507
"""This isn't so much a class as it is a module-like namespace.
508
It is instantiated once, and simulates having a GnuTLS module."""
510
library = ctypes.util.find_library("gnutls")
512
library = ctypes.util.find_library("gnutls-deb0")
513
_library = ctypes.cdll.LoadLibrary(library)
515
_need_version = b"3.3.0"
518
# Need to use class name "GnuTLS" here, since this method is
519
# called before the assignment to the "gnutls" global variable
521
if GnuTLS.check_version(self._need_version) is None:
522
raise GnuTLS.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
525
# Unless otherwise indicated, the constants and types below are
526
# all from the gnutls/gnutls.h C header file.
536
E_NO_CERTIFICATE_FOUND = -49
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
# We need to use the class name "GnuTLS" here, since this
566
# exception might be raised from within GnuTLS.__init__,
567
# which is called before the assignment to the "gnutls"
568
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
570
# Default usage is by a message string, but if a return
571
# code is passed, convert it to a string with
574
if message is None and code is not None:
575
message = GnuTLS.strerror(code)
576
return super(GnuTLS.Error, self).__init__(
579
class CertificateSecurityError(Error):
583
class Credentials(object):
585
self._c_object = gnutls.certificate_credentials_t()
586
gnutls.certificate_allocate_credentials(
587
ctypes.byref(self._c_object))
588
self.type = gnutls.CRD_CERTIFICATE
591
gnutls.certificate_free_credentials(self._c_object)
593
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
595
self._c_object = gnutls.session_t()
596
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
gnutls.set_default_priority(self._c_object)
598
gnutls.transport_set_ptr(self._c_object, socket.fileno())
599
gnutls.handshake_set_private_extensions(self._c_object,
602
if credentials is None:
603
credentials = gnutls.Credentials()
604
gnutls.credentials_set(self._c_object, credentials.type,
605
ctypes.cast(credentials._c_object,
607
self.credentials = credentials
610
gnutls.deinit(self._c_object)
613
return gnutls.handshake(self._c_object)
615
def send(self, data):
619
data_len -= gnutls.record_send(self._c_object,
624
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
626
# Error handling functions
627
def _error_code(result):
628
"""A function to raise exceptions on errors, suitable
629
for the 'restype' attribute on ctypes functions"""
632
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
636
def _retry_on_error(result, func, arguments):
637
"""A function to retry on some errors, suitable
638
for the 'errcheck' attribute on ctypes functions"""
640
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
641
return _error_code(result)
642
result = func(*arguments)
645
# Unless otherwise indicated, the function declarations below are
646
# all from the gnutls/gnutls.h C header file.
649
priority_set_direct = _library.gnutls_priority_set_direct
650
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
ctypes.POINTER(ctypes.c_char_p)]
652
priority_set_direct.restype = _error_code
654
init = _library.gnutls_init
655
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
init.restype = _error_code
658
set_default_priority = _library.gnutls_set_default_priority
659
set_default_priority.argtypes = [session_t]
660
set_default_priority.restype = _error_code
662
record_send = _library.gnutls_record_send
663
record_send.argtypes = [session_t, ctypes.c_void_p,
665
record_send.restype = ctypes.c_ssize_t
666
record_send.errcheck = _retry_on_error
668
certificate_allocate_credentials = (
669
_library.gnutls_certificate_allocate_credentials)
670
certificate_allocate_credentials.argtypes = [
671
ctypes.POINTER(certificate_credentials_t)]
672
certificate_allocate_credentials.restype = _error_code
674
certificate_free_credentials = (
675
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
678
certificate_free_credentials.restype = None
680
handshake_set_private_extensions = (
681
_library.gnutls_handshake_set_private_extensions)
682
handshake_set_private_extensions.argtypes = [session_t,
684
handshake_set_private_extensions.restype = None
686
credentials_set = _library.gnutls_credentials_set
687
credentials_set.argtypes = [session_t, credentials_type_t,
689
credentials_set.restype = _error_code
691
strerror = _library.gnutls_strerror
692
strerror.argtypes = [ctypes.c_int]
693
strerror.restype = ctypes.c_char_p
695
certificate_type_get = _library.gnutls_certificate_type_get
696
certificate_type_get.argtypes = [session_t]
697
certificate_type_get.restype = _error_code
699
certificate_get_peers = _library.gnutls_certificate_get_peers
700
certificate_get_peers.argtypes = [session_t,
701
ctypes.POINTER(ctypes.c_uint)]
702
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
global_set_log_level = _library.gnutls_global_set_log_level
705
global_set_log_level.argtypes = [ctypes.c_int]
706
global_set_log_level.restype = None
708
global_set_log_function = _library.gnutls_global_set_log_function
709
global_set_log_function.argtypes = [log_func]
710
global_set_log_function.restype = None
712
deinit = _library.gnutls_deinit
713
deinit.argtypes = [session_t]
714
deinit.restype = None
716
handshake = _library.gnutls_handshake
717
handshake.argtypes = [session_t]
718
handshake.restype = _error_code
719
handshake.errcheck = _retry_on_error
721
transport_set_ptr = _library.gnutls_transport_set_ptr
722
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
transport_set_ptr.restype = None
725
bye = _library.gnutls_bye
726
bye.argtypes = [session_t, close_request_t]
727
bye.restype = _error_code
728
bye.errcheck = _retry_on_error
730
check_version = _library.gnutls_check_version
731
check_version.argtypes = [ctypes.c_char_p]
732
check_version.restype = ctypes.c_char_p
734
# All the function declarations below are from gnutls/openpgp.h
736
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
openpgp_crt_init.restype = _error_code
740
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
ctypes.POINTER(datum_t),
744
openpgp_crt_import.restype = _error_code
746
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
ctypes.POINTER(ctypes.c_uint)]
749
openpgp_crt_verify_self.restype = _error_code
751
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
openpgp_crt_deinit.restype = None
755
openpgp_crt_get_fingerprint = (
756
_library.gnutls_openpgp_crt_get_fingerprint)
757
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
761
openpgp_crt_get_fingerprint.restype = _error_code
763
# Remove non-public functions
764
del _error_code, _retry_on_error
765
# Create the global "gnutls" object, simulating a module
769
def call_pipe(connection, # : multiprocessing.Connection
770
func, *args, **kwargs):
771
"""This function is meant to be called by multiprocessing.Process
773
This function runs func(*args, **kwargs), and writes the resulting
774
return value on the provided multiprocessing.Connection.
776
connection.send(func(*args, **kwargs))
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))
780
408
class Client(object):
781
409
"""A representation of a client host served by this server.
784
412
approved: bool(); 'None' if not yet approved/disapproved
785
413
approval_delay: datetime.timedelta(); Time to wait for approval
960
601
logger.info("Disabling client %s", self.name)
961
602
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
603
gobject.source_remove(self.disable_initiator_tag)
963
604
self.disable_initiator_tag = None
964
605
self.expires = None
965
606
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
607
gobject.source_remove(self.checker_initiator_tag)
967
608
self.checker_initiator_tag = None
968
609
self.stop_checker()
969
610
self.enabled = False
971
612
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
613
# Do not run this again if called by a gobject.timeout_add
975
616
def __del__(self):
978
619
def init_checker(self):
979
620
# Schedule a new checker to be started an 'interval' from now,
980
621
# and every interval from then on.
981
622
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),
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
986
627
# Schedule a disable() when 'timeout' has passed
987
628
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)
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
991
633
# Also start a new checker *right now*.
992
634
self.start_checker()
994
def checker_callback(self, source, condition, connection,
636
def checker_callback(self, pid, condition, command):
996
637
"""The checker has completed, so take appropriate actions."""
997
638
self.checker_callback_tag = None
998
639
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
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1006
642
if self.last_checker_status == 0:
1007
643
logger.info("Checker for %(name)s succeeded",
1009
645
self.checked_ok()
1011
logger.info("Checker for %(name)s failed", vars(self))
647
logger.info("Checker for %(name)s failed",
1013
650
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
1015
651
logger.warning("Checker for %(name)s crashed?",
1019
654
def checked_ok(self):
1020
655
"""Assert that the client has been seen, alive and well."""
1021
656
self.last_checked_ok = datetime.datetime.utcnow()
1022
657
self.last_checker_status = 0
1023
self.last_checker_signal = None
1024
658
self.bump_timeout()
1026
660
def bump_timeout(self, timeout=None):
1027
661
"""Bump up the timeout for this client."""
1028
662
if timeout is None:
1029
663
timeout = self.timeout
1030
664
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
665
gobject.source_remove(self.disable_initiator_tag)
1032
666
self.disable_initiator_tag = None
1033
667
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1036
671
self.expires = datetime.datetime.utcnow() + timeout
1038
673
def need_approval(self):
1039
674
self.last_approval_request = datetime.datetime.utcnow()
1041
676
def start_checker(self):
1042
677
"""Start a new checker subprocess if one is not running.
1044
679
If a checker already exists, leave it running and do
1046
681
# The reason for not killing a running checker is that if we
1051
686
# checkers alone, the checker would have to take more time
1052
687
# 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")
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)
1059
704
# Start a new checker if needed
1060
705
if self.checker is None:
1061
706
# Escape attributes for the shell
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
1066
712
command = self.checker_command % escaped_attrs
1067
713
except TypeError as error:
1068
714
logger.error('Could not format string "%s"',
1069
self.checker_command,
715
self.checker_command, exc_info=error)
716
return True # Try again later
717
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",
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
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
1101
762
def stop_checker(self):
1102
763
"""Force the checker process, if any, to stop."""
1103
764
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
765
gobject.source_remove(self.checker_callback_tag)
1105
766
self.checker_callback_tag = None
1106
767
if getattr(self, "checker", None) is None:
1108
769
logger.debug("Stopping checker for %(name)s", vars(self))
1109
self.checker.terminate()
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
778
self.checker = None
1113
def dbus_service_property(dbus_interface,
781
def dbus_service_property(dbus_interface, signature="v",
782
access="readwrite", byte_arrays=False):
1117
783
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
784
become properties on the D-Bus.
1120
786
The decorated method will be called with no arguments by "Get"
1121
787
and with one argument by "Set".
1123
789
The parameters, where they are supported, are the same as
1124
790
dbus.service.method, except there is only "signature", since the
1125
791
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.
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.
1216
876
def _is_dbus_thing(thing):
1217
877
"""Returns a function testing if an attribute is a D-Bus thing
1219
879
If called like _is_dbus_thing("method") it returns a function
1220
880
suitable for use as predicate to inspect.getmembers().
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1225
885
def _get_all_dbus_things(self, thing):
1226
886
"""Returns a generator of (name, attribute) pairs
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
888
return ((getattr(athing.__get__(self), "_dbus_name",
1229
890
athing.__get__(self))
1230
891
for cls in self.__class__.__mro__
1231
892
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.
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
1305
896
def _get_dbus_property(self, interface_name, property_name):
1306
897
"""Returns a bound method if one exists which is a D-Bus
1307
898
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")):
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
903
self._is_dbus_thing("property"))):
1312
904
if (value._dbus_name == property_name
1313
905
and value._dbus_interface == interface_name):
1314
906
return value.__get__(self)
1316
908
# 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,
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1331
914
out_signature="v")
1332
915
def Get(self, interface_name, property_name):
1333
916
"""Standard D-Bus property Get() method, see D-Bus standard.
1461
1045
exc_info=error)
1462
1046
return xmlstring
1465
dbus.OBJECT_MANAGER_IFACE
1466
except AttributeError:
1467
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1470
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1471
"""A D-Bus object with an ObjectManager.
1473
Classes inheriting from this exposes the standard
1474
GetManagedObjects call and the InterfacesAdded and
1475
InterfacesRemoved signals on the standard
1476
"org.freedesktop.DBus.ObjectManager" interface.
1478
Note: No signals are sent automatically; they must be sent
1481
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1482
out_signature="a{oa{sa{sv}}}")
1483
def GetManagedObjects(self):
1484
"""This function must be overridden"""
1485
raise NotImplementedError()
1487
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1488
signature="oa{sa{sv}}")
1489
def InterfacesAdded(self, object_path, interfaces_and_properties):
1492
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1493
def InterfacesRemoved(self, object_path, interfaces):
1496
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1498
path_keyword='object_path',
1499
connection_keyword='connection')
1500
def Introspect(self, object_path, connection):
1501
"""Overloading of standard D-Bus method.
1503
Override return argument name of GetManagedObjects to be
1504
"objpath_interfaces_and_properties"
1506
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1510
document = xml.dom.minidom.parseString(xmlstring)
1512
for if_tag in document.getElementsByTagName("interface"):
1513
# Fix argument name for the GetManagedObjects method
1514
if (if_tag.getAttribute("name")
1515
== dbus.OBJECT_MANAGER_IFACE):
1516
for cn in if_tag.getElementsByTagName("method"):
1517
if (cn.getAttribute("name")
1518
== "GetManagedObjects"):
1519
for arg in cn.getElementsByTagName("arg"):
1520
if (arg.getAttribute("direction")
1524
"objpath_interfaces"
1526
xmlstring = document.toxml("utf-8")
1528
except (AttributeError, xml.dom.DOMException,
1529
xml.parsers.expat.ExpatError) as error:
1530
logger.error("Failed to override Introspection method",
1535
1049
def datetime_to_dbus(dt, variant_level=0):
1536
1050
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1538
return dbus.String("", variant_level=variant_level)
1539
return dbus.String(dt.isoformat(), variant_level=variant_level)
1052
return dbus.String("", variant_level = variant_level)
1053
return dbus.String(dt.isoformat(),
1054
variant_level=variant_level)
1542
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1573
1087
# Ignore non-D-Bus attributes, and D-Bus attributes
1574
1088
# with the wrong interface name
1575
1089
if (not hasattr(attribute, "_dbus_interface")
1576
or not attribute._dbus_interface.startswith(
1577
orig_interface_name)):
1090
or not attribute._dbus_interface
1091
.startswith(orig_interface_name)):
1579
1093
# Create an alternate D-Bus interface name based on
1580
1094
# the current name
1581
alt_interface = attribute._dbus_interface.replace(
1582
orig_interface_name, alt_interface_name)
1095
alt_interface = (attribute._dbus_interface
1096
.replace(orig_interface_name,
1097
alt_interface_name))
1583
1098
interface_names.add(alt_interface)
1584
1099
# Is this a D-Bus signal?
1585
1100
if getattr(attribute, "_dbus_is_signal", False):
1586
1101
# Extract the original non-method undecorated
1587
1102
# function by black magic
1588
if sys.version_info.major == 2:
1589
nonmethod_func = (dict(
1103
nonmethod_func = (dict(
1590
1104
zip(attribute.func_code.co_freevars,
1591
attribute.__closure__))
1592
["func"].cell_contents)
1594
nonmethod_func = (dict(
1595
zip(attribute.__code__.co_freevars,
1596
attribute.__closure__))
1597
["func"].cell_contents)
1105
attribute.__closure__))["func"]
1598
1107
# Create a new, but exactly alike, function
1599
1108
# object, and decorate it to be a new D-Bus signal
1600
1109
# with the alternate D-Bus interface name
1601
new_function = copy_function(nonmethod_func)
1602
new_function = (dbus.service.signal(
1604
attribute._dbus_signature)(new_function))
1110
new_function = (dbus.service.signal
1112
attribute._dbus_signature)
1113
(types.FunctionType(
1114
nonmethod_func.func_code,
1115
nonmethod_func.func_globals,
1116
nonmethod_func.func_name,
1117
nonmethod_func.func_defaults,
1118
nonmethod_func.func_closure)))
1605
1119
# Copy annotations, if any
1607
new_function._dbus_annotations = dict(
1608
attribute._dbus_annotations)
1121
new_function._dbus_annotations = (
1122
dict(attribute._dbus_annotations))
1609
1123
except AttributeError:
1612
1125
# Define a creator of a function to call both the
1613
1126
# original and alternate functions, so both the
1614
1127
# original and alternate signals gets sent when
1697
1217
if interface_names:
1698
1218
# Replace the class with a new subclass of it with
1699
1219
# methods, signals, etc. as created above.
1700
if sys.version_info.major == 2:
1701
cls = type(b"{}Alternate".format(cls.__name__),
1704
cls = type("{}Alternate".format(cls.__name__),
1220
cls = type(b"{0}Alternate".format(cls.__name__),
1711
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1712
"se.bsnet.fukt.Mandos"})
1227
"se.bsnet.fukt.Mandos"})
1713
1228
class ClientDBus(Client, DBusObjectWithProperties):
1714
1229
"""A Client class using D-Bus
1717
1232
dbus_object_path: dbus.ObjectPath
1718
1233
bus: dbus.SystemBus()
1721
1236
runtime_expansions = (Client.runtime_expansions
1722
+ ("dbus_object_path", ))
1724
_interface = "se.recompile.Mandos.Client"
1237
+ ("dbus_object_path",))
1726
1239
# dbus.service.Object doesn't use super(), so we can't either.
1728
def __init__(self, bus=None, *args, **kwargs):
1241
def __init__(self, bus = None, *args, **kwargs):
1730
1243
Client.__init__(self, *args, **kwargs)
1731
1244
# Only now, when this client is initialized, can it show up on
1733
client_object_name = str(self.name).translate(
1246
client_object_name = unicode(self.name).translate(
1734
1247
{ord("."): ord("_"),
1735
1248
ord("-"): ord("_")})
1736
self.dbus_object_path = dbus.ObjectPath(
1737
"/clients/" + client_object_name)
1249
self.dbus_object_path = (dbus.ObjectPath
1250
("/clients/" + client_object_name))
1738
1251
DBusObjectWithProperties.__init__(self, self.bus,
1739
1252
self.dbus_object_path)
1741
def notifychangeproperty(transform_func, dbus_name,
1742
type_func=lambda x: x,
1744
invalidate_only=False,
1745
_interface=_interface):
1254
def notifychangeproperty(transform_func,
1255
dbus_name, type_func=lambda x: x,
1746
1257
""" Modify a variable so that it's a property which announces
1747
1258
its changes to DBus.
1749
1260
transform_fun: Function that takes a value and a variant_level
1750
1261
and transforms it to a D-Bus type.
1751
1262
dbus_name: D-Bus name of the variable
1827
1327
if hasattr(DBusObjectWithProperties, "__del__"):
1828
1328
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1829
1329
Client.__del__(self, *args, **kwargs)
1831
def checker_callback(self, source, condition,
1832
connection, command, *args, **kwargs):
1833
ret = Client.checker_callback(self, source, condition,
1834
connection, command, *args,
1836
exitstatus = self.last_checker_status
1331
def checker_callback(self, pid, condition, command,
1333
self.checker_callback_tag = None
1335
if os.WIFEXITED(condition):
1336
exitstatus = os.WEXITSTATUS(condition)
1838
1337
# Emit D-Bus signal
1839
1338
self.CheckerCompleted(dbus.Int16(exitstatus),
1840
# This is specific to GNU libC
1841
dbus.Int64(exitstatus << 8),
1339
dbus.Int64(condition),
1842
1340
dbus.String(command))
1844
1342
# Emit D-Bus signal
1845
1343
self.CheckerCompleted(dbus.Int16(-1),
1847
# This is specific to GNU libC
1849
| self.last_checker_signal),
1344
dbus.Int64(condition),
1850
1345
dbus.String(command))
1347
return Client.checker_callback(self, pid, condition, command,
1853
1350
def start_checker(self, *args, **kwargs):
1854
old_checker_pid = getattr(self.checker, "pid", None)
1351
old_checker = self.checker
1352
if self.checker is not None:
1353
old_checker_pid = self.checker.pid
1355
old_checker_pid = None
1855
1356
r = Client.start_checker(self, *args, **kwargs)
1856
1357
# Only if new checker process was started
1857
1358
if (self.checker is not None
1903
1410
server to mandos-client
1907
1414
# Rejected - signal
1908
1415
@dbus.service.signal(_interface, signature="s")
1909
1416
def Rejected(self, reason):
1913
1420
# NeedApproval - signal
1914
1421
@dbus.service.signal(_interface, signature="tb")
1915
1422
def NeedApproval(self, timeout, default):
1917
1424
return self.need_approval()
1921
1428
# Approve - method
1922
1429
@dbus.service.method(_interface, in_signature="b")
1923
1430
def Approve(self, value):
1924
1431
self.approve(value)
1926
1433
# CheckedOK - method
1927
1434
@dbus.service.method(_interface)
1928
1435
def CheckedOK(self):
1929
1436
self.checked_ok()
1931
1438
# Enable - method
1932
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1933
1439
@dbus.service.method(_interface)
1934
1440
def Enable(self):
1938
1444
# StartChecker - method
1939
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1940
1445
@dbus.service.method(_interface)
1941
1446
def StartChecker(self):
1943
1448
self.start_checker()
1945
1450
# Disable - method
1946
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1947
1451
@dbus.service.method(_interface)
1948
1452
def Disable(self):
1952
1456
# StopChecker - method
1953
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1954
1457
@dbus.service.method(_interface)
1955
1458
def StopChecker(self):
1956
1459
self.stop_checker()
1960
1463
# ApprovalPending - property
1961
1464
@dbus_service_property(_interface, signature="b", access="read")
1962
1465
def ApprovalPending_dbus_property(self):
1963
1466
return dbus.Boolean(bool(self.approvals_pending))
1965
1468
# ApprovedByDefault - property
1966
@dbus_service_property(_interface,
1469
@dbus_service_property(_interface, signature="b",
1968
1470
access="readwrite")
1969
1471
def ApprovedByDefault_dbus_property(self, value=None):
1970
1472
if value is None: # get
1971
1473
return dbus.Boolean(self.approved_by_default)
1972
1474
self.approved_by_default = bool(value)
1974
1476
# ApprovalDelay - property
1975
@dbus_service_property(_interface,
1477
@dbus_service_property(_interface, signature="t",
1977
1478
access="readwrite")
1978
1479
def ApprovalDelay_dbus_property(self, value=None):
1979
1480
if value is None: # get
1980
return dbus.UInt64(self.approval_delay.total_seconds()
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1982
1482
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1984
1484
# ApprovalDuration - property
1985
@dbus_service_property(_interface,
1485
@dbus_service_property(_interface, signature="t",
1987
1486
access="readwrite")
1988
1487
def ApprovalDuration_dbus_property(self, value=None):
1989
1488
if value is None: # get
1990
return dbus.UInt64(self.approval_duration.total_seconds()
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1992
1491
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1994
1493
# Name - property
1996
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1997
1494
@dbus_service_property(_interface, signature="s", access="read")
1998
1495
def Name_dbus_property(self):
1999
1496
return dbus.String(self.name)
2001
1498
# Fingerprint - property
2003
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2004
1499
@dbus_service_property(_interface, signature="s", access="read")
2005
1500
def Fingerprint_dbus_property(self):
2006
1501
return dbus.String(self.fingerprint)
2008
1503
# Host - property
2009
@dbus_service_property(_interface,
1504
@dbus_service_property(_interface, signature="s",
2011
1505
access="readwrite")
2012
1506
def Host_dbus_property(self, value=None):
2013
1507
if value is None: # get
2014
1508
return dbus.String(self.host)
2015
self.host = str(value)
1509
self.host = unicode(value)
2017
1511
# Created - property
2019
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2020
1512
@dbus_service_property(_interface, signature="s", access="read")
2021
1513
def Created_dbus_property(self):
2022
1514
return datetime_to_dbus(self.created)
2024
1516
# LastEnabled - property
2025
1517
@dbus_service_property(_interface, signature="s", access="read")
2026
1518
def LastEnabled_dbus_property(self):
2027
1519
return datetime_to_dbus(self.last_enabled)
2029
1521
# Enabled - property
2030
@dbus_service_property(_interface,
1522
@dbus_service_property(_interface, signature="b",
2032
1523
access="readwrite")
2033
1524
def Enabled_dbus_property(self, value=None):
2034
1525
if value is None: # get
2083
1573
if (getattr(self, "disable_initiator_tag", None)
2086
GLib.source_remove(self.disable_initiator_tag)
2087
self.disable_initiator_tag = GLib.timeout_add(
2088
int((self.expires - now).total_seconds() * 1000),
1576
gobject.source_remove(self.disable_initiator_tag)
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
2091
1582
# ExtendedTimeout - property
2092
@dbus_service_property(_interface,
1583
@dbus_service_property(_interface, signature="t",
2094
1584
access="readwrite")
2095
1585
def ExtendedTimeout_dbus_property(self, value=None):
2096
1586
if value is None: # get
2097
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
2099
1588
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2101
1590
# Interval - property
2102
@dbus_service_property(_interface,
1591
@dbus_service_property(_interface, signature="t",
2104
1592
access="readwrite")
2105
1593
def Interval_dbus_property(self, value=None):
2106
1594
if value is None: # get
2107
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
return dbus.UInt64(self.interval_milliseconds())
2108
1596
self.interval = datetime.timedelta(0, 0, 0, value)
2109
1597
if getattr(self, "checker_initiator_tag", None) is None:
2111
1599
if self.enabled:
2112
1600
# Reschedule checker run
2113
GLib.source_remove(self.checker_initiator_tag)
2114
self.checker_initiator_tag = GLib.timeout_add(
2115
value, self.start_checker)
2116
self.start_checker() # Start one now, too
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
2118
1606
# Checker - property
2119
@dbus_service_property(_interface,
1607
@dbus_service_property(_interface, signature="s",
2121
1608
access="readwrite")
2122
1609
def Checker_dbus_property(self, value=None):
2123
1610
if value is None: # get
2124
1611
return dbus.String(self.checker_command)
2125
self.checker_command = str(value)
1612
self.checker_command = unicode(value)
2127
1614
# CheckerRunning - property
2128
@dbus_service_property(_interface,
1615
@dbus_service_property(_interface, signature="b",
2130
1616
access="readwrite")
2131
1617
def CheckerRunning_dbus_property(self, value=None):
2132
1618
if value is None: # get
2189
1665
class ClientHandler(socketserver.BaseRequestHandler, object):
2190
1666
"""A class to handle client connections.
2192
1668
Instantiated once for each connection to handle it.
2193
1669
Note: This will run in its own forked process."""
2195
1671
def handle(self):
2196
1672
with contextlib.closing(self.server.child_pipe) as child_pipe:
2197
1673
logger.info("TCP connection from: %s",
2198
str(self.client_address))
1674
unicode(self.client_address))
2199
1675
logger.debug("Pipe FD: %d",
2200
1676
self.server.child_pipe.fileno())
2202
session = gnutls.ClientSession(self.request)
2204
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2205
# "+AES-256-CBC", "+SHA1",
2206
# "+COMP-NULL", "+CTYPE-OPENPGP",
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",
2208
1692
# Use a fallback default, since this MUST be set.
2209
1693
priority = self.server.gnutls_priority
2210
1694
if priority is None:
2211
1695
priority = "NORMAL"
2212
gnutls.priority_set_direct(session._c_object,
2213
priority.encode("utf-8"),
1696
(gnutls.library.functions
1697
.gnutls_priority_set_direct(session._c_object,
2216
1700
# Start communication using the Mandos protocol
2217
1701
# Get protocol number
2218
1702
line = self.request.makefile().readline()
2304
1791
delay -= time2 - time
2307
session.send(client.secret)
2308
except gnutls.Error as error:
2309
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))
2313
1806
logger.info("Sending secret to %s", client.name)
2314
1807
# bump the timeout using extended_timeout
2315
1808
client.bump_timeout(client.extended_timeout)
2316
1809
if self.server.use_dbus:
2317
1810
# Emit D-Bus signal
2318
1811
client.GotSecret()
2321
1814
if approval_required:
2322
1815
client.approvals_pending -= 1
2325
except gnutls.Error as error:
1818
except gnutls.errors.GNUTLSError as error:
2326
1819
logger.warning("GnuTLS bye failed",
2327
1820
exc_info=error)
2330
1823
def peer_certificate(session):
2331
1824
"Return the peer's OpenPGP certificate as a bytestring"
2332
1825
# If not an OpenPGP certificate...
2333
if (gnutls.certificate_type_get(session._c_object)
2334
!= gnutls.CRT_OPENPGP):
2335
# ...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
2337
1831
list_size = ctypes.c_uint(1)
2338
cert_list = (gnutls.certificate_get_peers
1832
cert_list = (gnutls.library.functions
1833
.gnutls_certificate_get_peers
2339
1834
(session._c_object, ctypes.byref(list_size)))
2340
1835
if not bool(cert_list) and list_size.value != 0:
2341
raise gnutls.Error("error getting peer certificate")
1836
raise gnutls.errors.GNUTLSError("error getting peer"
2342
1838
if list_size.value == 0:
2344
1840
cert = cert_list[0]
2345
1841
return ctypes.string_at(cert.data, cert.size)
2348
1844
def fingerprint(openpgp):
2349
1845
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2350
1846
# New GnuTLS "datum" with the OpenPGP public key
2351
datum = gnutls.datum_t(
2352
ctypes.cast(ctypes.c_char_p(openpgp),
2353
ctypes.POINTER(ctypes.c_ubyte)),
2354
ctypes.c_uint(len(openpgp)))
1847
datum = (gnutls.library.types
1848
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1851
ctypes.c_uint(len(openpgp))))
2355
1852
# New empty GnuTLS certificate
2356
crt = gnutls.openpgp_crt_t()
2357
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)))
2358
1856
# Import the OpenPGP public key into the certificate
2359
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2360
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))
2361
1861
# Verify the self signature in the key
2362
1862
crtverify = ctypes.c_uint()
2363
gnutls.openpgp_crt_verify_self(crt, 0,
2364
ctypes.byref(crtverify))
1863
(gnutls.library.functions
1864
.gnutls_openpgp_crt_verify_self(crt, 0,
1865
ctypes.byref(crtverify)))
2365
1866
if crtverify.value != 0:
2366
gnutls.openpgp_crt_deinit(crt)
2367
raise gnutls.CertificateSecurityError("Verify failed")
1867
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1868
raise (gnutls.errors.CertificateSecurityError
2368
1870
# New buffer for the fingerprint
2369
1871
buf = ctypes.create_string_buffer(20)
2370
1872
buf_len = ctypes.c_size_t()
2371
1873
# Get the fingerprint from the certificate into the buffer
2372
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2373
ctypes.byref(buf_len))
1874
(gnutls.library.functions
1875
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1876
ctypes.byref(buf_len)))
2374
1877
# Deinit the certificate
2375
gnutls.openpgp_crt_deinit(crt)
1878
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2376
1879
# Convert the buffer to a Python bytestring
2377
1880
fpr = ctypes.string_at(buf, buf_len.value)
2378
1881
# Convert the bytestring to hexadecimal notation
2467
1964
# socket_wrapper(), if socketfd was set.
2468
1965
socketserver.TCPServer.__init__(self, server_address,
2469
1966
RequestHandlerClass)
2471
1968
def server_bind(self):
2472
1969
"""This overrides the normal server_bind() function
2473
1970
to bind to an interface if one was specified, and also NOT to
2474
1971
bind to an address or port if they were not specified."""
2475
global SO_BINDTODEVICE
2476
1972
if self.interface is not None:
2477
1973
if SO_BINDTODEVICE is None:
2478
# Fall back to a hard-coded value which seems to be
2480
logger.warning("SO_BINDTODEVICE not found, trying 25")
2481
SO_BINDTODEVICE = 25
2483
self.socket.setsockopt(
2484
socket.SOL_SOCKET, SO_BINDTODEVICE,
2485
(self.interface + "\0").encode("utf-8"))
2486
except socket.error as error:
2487
if error.errno == errno.EPERM:
2488
logger.error("No permission to bind to"
2489
" interface %s", self.interface)
2490
elif error.errno == errno.ENOPROTOOPT:
2491
logger.error("SO_BINDTODEVICE not available;"
2492
" cannot bind to interface %s",
2494
elif error.errno == errno.ENODEV:
2495
logger.error("Interface %s does not exist,"
2496
" cannot bind", self.interface)
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)
2499
1995
# Only bind(2) the socket if we really need to.
2500
1996
if self.server_address[0] or self.server_address[1]:
2501
1997
if not self.server_address[0]:
2502
1998
if self.address_family == socket.AF_INET6:
2503
any_address = "::" # in6addr_any
1999
any_address = "::" # in6addr_any
2505
any_address = "0.0.0.0" # INADDR_ANY
2001
any_address = "0.0.0.0" # INADDR_ANY
2506
2002
self.server_address = (any_address,
2507
2003
self.server_address[1])
2508
2004
elif not self.server_address[1]:
2509
self.server_address = (self.server_address[0], 0)
2005
self.server_address = (self.server_address[0],
2510
2007
# if self.interface:
2511
2008
# self.server_address = (self.server_address[0],
2899
2385
server_settings["socket"] = os.dup(server_settings
2901
2387
del server_config
2903
2389
# Override the settings from the config file with command line
2904
2390
# options, if set.
2905
2391
for option in ("interface", "address", "port", "debug",
2906
"priority", "servicename", "configdir", "use_dbus",
2907
"use_ipv6", "debuglevel", "restore", "statedir",
2908
"socket", "foreground", "zeroconf"):
2392
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2909
2395
value = getattr(options, option)
2910
2396
if value is not None:
2911
2397
server_settings[option] = value
2913
2399
# Force all strings to be unicode
2914
2400
for option in server_settings.keys():
2915
if isinstance(server_settings[option], bytes):
2916
server_settings[option] = (server_settings[option]
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2918
2403
# Force all boolean options to be boolean
2919
2404
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2920
"foreground", "zeroconf"):
2921
2406
server_settings[option] = bool(server_settings[option])
2922
2407
# Debug implies foreground
2923
2408
if server_settings["debug"]:
2924
2409
server_settings["foreground"] = True
2925
2410
# Now we have our good server settings in "server_settings"
2927
2412
##################################################################
2929
if (not server_settings["zeroconf"]
2930
and not (server_settings["port"]
2931
or server_settings["socket"] != "")):
2932
parser.error("Needs port or socket to work without Zeroconf")
2934
2414
# For convenience
2935
2415
debug = server_settings["debug"]
2936
2416
debuglevel = server_settings["debuglevel"]
2950
2429
level = getattr(logging, debuglevel.upper())
2951
2430
initlogger(debug, level)
2953
2432
if server_settings["servicename"] != "Mandos":
2954
syslogger.setFormatter(
2955
logging.Formatter('Mandos ({}) [%(process)d]:'
2956
' %(levelname)s: %(message)s'.format(
2957
server_settings["servicename"])))
2433
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2435
' %(levelname)s: %(message)s'
2436
.format(server_settings
2959
2439
# Parse config file with clients
2960
2440
client_config = configparser.SafeConfigParser(Client
2961
2441
.client_defaults)
2962
2442
client_config.read(os.path.join(server_settings["configdir"],
2963
2443
"clients.conf"))
2965
2445
global mandos_dbus_service
2966
2446
mandos_dbus_service = None
2969
if server_settings["socket"] != "":
2970
socketfd = server_settings["socket"]
2971
tcp_server = MandosServer(
2972
(server_settings["address"], server_settings["port"]),
2974
interface=(server_settings["interface"] or None),
2976
gnutls_priority=server_settings["priority"],
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"]
2979
2459
if not foreground:
2980
2460
pidfilename = "/run/mandos.pid"
2981
2461
if not os.path.isdir("/run/."):
2982
2462
pidfilename = "/var/run/mandos.pid"
2985
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2465
pidfile = open(pidfilename, "w")
2986
2466
except IOError as e:
2987
2467
logger.error("Could not open file %r", pidfilename,
2990
for name, group in (("_mandos", "_mandos"),
2991
("mandos", "mandos"),
2992
("nobody", "nogroup")):
2470
for name in ("_mandos", "mandos", "nobody"):
2994
2472
uid = pwd.getpwnam(name).pw_uid
2995
gid = pwd.getpwnam(group).pw_gid
2473
gid = pwd.getpwnam(name).pw_gid
2997
2475
except KeyError:
3006
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3008
2483
except OSError as error:
3009
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3010
.format(uid, gid, os.strerror(error.errno)))
3011
2484
if error.errno != errno.EPERM:
3015
2488
# Enable all possible GnuTLS debugging
3017
2490
# "Use a log level over 10 to enable all debugging options."
3018
2491
# - GnuTLS manual
3019
gnutls.global_set_log_level(11)
2492
gnutls.library.functions.gnutls_global_set_log_level(11)
2494
@gnutls.library.types.gnutls_log_func
3022
2495
def debug_gnutls(level, string):
3023
2496
logger.debug("GnuTLS: %s", string[:-1])
3025
gnutls.global_set_log_function(debug_gnutls)
2498
(gnutls.library.functions
2499
.gnutls_global_set_log_function(debug_gnutls))
3027
2501
# Redirect stdin so all checkers get /dev/null
3028
2502
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3029
2503
os.dup2(null, sys.stdin.fileno())
3033
2507
# Need to fork before connecting to D-Bus
3034
2508
if not foreground:
3035
2509
# Close all input and output, do double fork, etc.
3038
# multiprocessing will use threads, so before we use GLib we need
3039
# to inform GLib that threads will be used.
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()
3042
2516
global main_loop
3043
2517
# From the Avahi example code
3044
2518
DBusGMainLoop(set_as_default=True)
3045
main_loop = GLib.MainLoop()
2519
main_loop = gobject.MainLoop()
3046
2520
bus = dbus.SystemBus()
3047
2521
# End of Avahi example code
3050
2524
bus_name = dbus.service.BusName("se.recompile.Mandos",
3053
old_bus_name = dbus.service.BusName(
3054
"se.bsnet.fukt.Mandos", bus,
3056
except dbus.exceptions.DBusException as e:
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:
3057
2530
logger.error("Disabling D-Bus:", exc_info=e)
3058
2531
use_dbus = False
3059
2532
server_settings["use_dbus"] = False
3060
2533
tcp_server.use_dbus = False
3062
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3063
service = AvahiServiceToSyslog(
3064
name=server_settings["servicename"],
3065
servicetype="_mandos._tcp",
3068
if server_settings["interface"]:
3069
service.interface = if_nametoindex(
3070
server_settings["interface"].encode("utf-8"))
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"])))
3072
2543
global multiprocessing_manager
3073
2544
multiprocessing_manager = multiprocessing.Manager()
3075
2546
client_class = Client
3077
client_class = functools.partial(ClientDBus, bus=bus)
2548
client_class = functools.partial(ClientDBus, bus = bus)
3079
2550
client_settings = Client.config_parser(client_config)
3080
2551
old_client_settings = {}
3081
2552
clients_data = {}
3083
2554
# This is used to redirect stdout and stderr for checker processes
3085
wnull = open(os.devnull, "w") # A writable /dev/null
2556
wnull = open(os.devnull, "w") # A writable /dev/null
3086
2557
# Only used if server is running in foreground but not in debug
3088
2559
if debug or not foreground:
3091
2562
# Get client data and settings from last running state.
3092
2563
if server_settings["restore"]:
3094
2565
with open(stored_state_path, "rb") as stored_state:
3095
if sys.version_info.major == 2:
3096
clients_data, old_client_settings = pickle.load(
3099
bytes_clients_data, bytes_old_client_settings = (
3100
pickle.load(stored_state, encoding="bytes"))
3101
# Fix bytes to strings
3104
clients_data = {(key.decode("utf-8")
3105
if isinstance(key, bytes)
3108
bytes_clients_data.items()}
3109
del bytes_clients_data
3110
for key in clients_data:
3111
value = {(k.decode("utf-8")
3112
if isinstance(k, bytes) else k): v
3114
clients_data[key].items()}
3115
clients_data[key] = value
3117
value["client_structure"] = [
3119
if isinstance(s, bytes)
3121
value["client_structure"]]
3123
for k in ("name", "host"):
3124
if isinstance(value[k], bytes):
3125
value[k] = value[k].decode("utf-8")
3126
# old_client_settings
3128
old_client_settings = {
3129
(key.decode("utf-8")
3130
if isinstance(key, bytes)
3133
bytes_old_client_settings.items()}
3134
del bytes_old_client_settings
3136
for value in old_client_settings.values():
3137
if isinstance(value["host"], bytes):
3138
value["host"] = (value["host"]
2566
clients_data, old_client_settings = (pickle.load
3140
2568
os.remove(stored_state_path)
3141
2569
except IOError as e:
3142
2570
if e.errno == errno.ENOENT:
3143
logger.warning("Could not load persistent state:"
3144
" {}".format(os.strerror(e.errno)))
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
3146
2574
logger.critical("Could not load persistent state:",
3149
2577
except EOFError as e:
3150
2578
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
3154
2581
with PGPEngine() as pgp:
3155
for client_name, client in clients_data.items():
2582
for client_name, client in clients_data.iteritems():
3156
2583
# Skip removed clients
3157
2584
if client_name not in client_settings:
3160
2587
# Decide which value to use after restoring saved state.
3161
2588
# We have three different values: Old config file,
3162
2589
# new config file, and saved state.
3220
2647
for client_name in (set(client_settings)
3221
2648
- set(old_client_settings)):
3222
2649
clients_data[client_name] = client_settings[client_name]
3224
2651
# Create all client objects
3225
for client_name, client in clients_data.items():
2652
for client_name, client in clients_data.iteritems():
3226
2653
tcp_server.clients[client_name] = client_class(
3229
server_settings=server_settings)
2654
name = client_name, settings = client,
2655
server_settings = server_settings)
3231
2657
if not tcp_server.clients:
3232
2658
logger.warning("No clients defined")
3234
2660
if not foreground:
3235
2661
if pidfile is not None:
3239
print(pid, file=pidfile)
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
3240
2666
except IOError:
3241
2667
logger.error("Could not write to file %r with PID %d",
3242
2668
pidfilename, pid)
3244
2670
del pidfilename
3246
for termsig in (signal.SIGHUP, signal.SIGTERM):
3247
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3248
lambda: main_loop.quit() and False)
2672
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2673
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3252
@alternate_dbus_interfaces(
3253
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3254
class MandosDBusService(DBusObjectWithObjectManager):
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2678
class MandosDBusService(DBusObjectWithProperties):
3255
2679
"""A D-Bus proxy object"""
3257
2680
def __init__(self):
3258
2681
dbus.service.Object.__init__(self, bus, "/")
3260
2682
_interface = "se.recompile.Mandos"
2684
@dbus_interface_annotations(_interface)
2686
return { "org.freedesktop.DBus.Property"
2687
".EmitsChangedSignal":
3262
2690
@dbus.service.signal(_interface, signature="o")
3263
2691
def ClientAdded(self, objpath):
3267
2695
@dbus.service.signal(_interface, signature="ss")
3268
2696
def ClientNotFound(self, fingerprint, address):
3272
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3274
2700
@dbus.service.signal(_interface, signature="os")
3275
2701
def ClientRemoved(self, objpath, name):
3279
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3281
2705
@dbus.service.method(_interface, out_signature="ao")
3282
2706
def GetAllClients(self):
3284
return dbus.Array(c.dbus_object_path for c in
3285
tcp_server.clients.values())
3287
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2708
return dbus.Array(c.dbus_object_path
2710
tcp_server.clients.itervalues())
3289
2712
@dbus.service.method(_interface,
3290
2713
out_signature="a{oa{sv}}")
3291
2714
def GetAllClientsWithProperties(self):
3293
2716
return dbus.Dictionary(
3294
{c.dbus_object_path: c.GetAll(
3295
"se.recompile.Mandos.Client")
3296
for c in tcp_server.clients.values()},
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
3297
2719
signature="oa{sv}")
3299
2721
@dbus.service.method(_interface, in_signature="o")
3300
2722
def RemoveClient(self, object_path):
3302
for c in tcp_server.clients.values():
2724
for c in tcp_server.clients.itervalues():
3303
2725
if c.dbus_object_path == object_path:
3304
2726
del tcp_server.clients[c.name]
3305
2727
c.remove_from_connection()
3306
# Don't signal the disabling
2728
# Don't signal anything except ClientRemoved
3307
2729
c.disable(quiet=True)
3308
# Emit D-Bus signal for removal
3309
self.client_removed_signal(c)
2731
self.ClientRemoved(object_path, c.name)
3311
2733
raise KeyError(object_path)
3315
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3316
out_signature="a{oa{sa{sv}}}")
3317
def GetManagedObjects(self):
3319
return dbus.Dictionary(
3320
{client.dbus_object_path:
3322
{interface: client.GetAll(interface)
3324
client._get_all_interface_names()})
3325
for client in tcp_server.clients.values()})
3327
def client_added_signal(self, client):
3328
"""Send the new standard signal and the old signal"""
3330
# New standard signal
3331
self.InterfacesAdded(
3332
client.dbus_object_path,
3334
{interface: client.GetAll(interface)
3336
client._get_all_interface_names()}))
3338
self.ClientAdded(client.dbus_object_path)
3340
def client_removed_signal(self, client):
3341
"""Send the new standard signal and the old signal"""
3343
# New standard signal
3344
self.InterfacesRemoved(
3345
client.dbus_object_path,
3346
client._get_all_interface_names())
3348
self.ClientRemoved(client.dbus_object_path,
3351
2737
mandos_dbus_service = MandosDBusService()
3353
# Save modules to variables to exempt the modules from being
3354
# unloaded before the function registered with atexit() is run.
3355
mp = multiprocessing
3359
2740
"Cleanup function; run on exit"
3363
mp.active_children()
2743
multiprocessing.active_children()
3365
2745
if not (tcp_server.clients or client_settings):
3368
2748
# Store client before exiting. Secrets are encrypted with key
3369
2749
# based on what config file has. If config file is
3370
2750
# removed/edited, old secret will thus be unrecovable.
3372
2752
with PGPEngine() as pgp:
3373
for client in tcp_server.clients.values():
2753
for client in tcp_server.clients.itervalues():
3374
2754
key = client_settings[client.name]["secret"]
3375
2755
client.encrypted_secret = pgp.encrypt(client.secret,
3377
2757
client_dict = {}
3379
2759
# A list of attributes that can not be pickled
3381
exclude = {"bus", "changedstate", "secret",
3382
"checker", "server_settings"}
3383
for name, typ in inspect.getmembers(dbus.service
2761
exclude = set(("bus", "changedstate", "secret",
2762
"checker", "server_settings"))
2763
for name, typ in (inspect.getmembers
2764
(dbus.service.Object)):
3385
2765
exclude.add(name)
3387
2767
client_dict["encrypted_secret"] = (client
3388
2768
.encrypted_secret)
3389
2769
for attr in client.client_structure:
3390
2770
if attr not in exclude:
3391
2771
client_dict[attr] = getattr(client, attr)
3393
2773
clients[client.name] = client_dict
3394
2774
del client_settings[client.name]["secret"]
3397
with tempfile.NamedTemporaryFile(
3401
dir=os.path.dirname(stored_state_path),
3402
delete=False) as stored_state:
3403
pickle.dump((clients, client_settings), stored_state,
3405
tempname = stored_state.name
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
3406
2783
os.rename(tempname, stored_state_path)
3407
2784
except (IOError, OSError) as e: