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()
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
126
101
except (OSError, AttributeError):
128
102
def if_nametoindex(interface):
129
103
"Get an interface index the hard way, i.e. using fcntl()"
130
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
131
105
with contextlib.closing(socket.socket()) as s:
132
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
135
111
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
114
def initlogger(debug, level=logging.WARNING):
155
115
"""init logger and add loglevel"""
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
syslogger = (logging.handlers.SysLogHandler
119
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
161
121
syslogger.setFormatter(logging.Formatter
162
122
('Mandos [%(process)d]: %(levelname)s:'
164
124
logger.addHandler(syslogger)
167
127
console = logging.StreamHandler()
168
128
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
235
181
.replace(b"\n", b"\\n")
236
182
.replace(b"\0", b"\\x00"))
239
185
def encrypt(self, data, password):
240
186
passphrase = self.password_encode(password)
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
187
with tempfile.NamedTemporaryFile(dir=self.tempdir
243
189
passfile.write(passphrase)
245
proc = subprocess.Popen([self.gpg, '--symmetric',
191
proc = subprocess.Popen(['gpg', '--symmetric',
246
192
'--passphrase-file',
248
194
+ self.gnupgargs,
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
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)
253
199
if proc.returncode != 0:
254
200
raise PGPError(err)
255
201
return ciphertext
257
203
def decrypt(self, data, password):
258
204
passphrase = self.password_encode(password)
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
205
with tempfile.NamedTemporaryFile(dir = self.tempdir
261
207
passfile.write(passphrase)
263
proc = subprocess.Popen([self.gpg, '--decrypt',
209
proc = subprocess.Popen(['gpg', '--decrypt',
264
210
'--passphrase-file',
266
212
+ self.gnupgargs,
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
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
271
218
if proc.returncode != 0:
272
219
raise PGPError(err)
273
220
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
223
class AvahiError(Exception):
304
224
def __init__(self, value, *args, **kwargs):
305
225
self.value = value
306
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))
310
230
class AvahiServiceError(AvahiError):
314
233
class AvahiGroupError(AvahiError):
318
237
class AvahiService(object):
319
238
"""An Avahi (Zeroconf) service.
322
241
interface: integer; avahi.IF_UNSPEC or an interface index.
323
242
Used to optionally bind to the specified interface.
488
385
follow_name_owner_changes=True),
489
386
avahi.DBUS_INTERFACE_SERVER)
490
387
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
388
self.server_state_changed)
492
389
self.server_state_changed(self.server.GetState())
495
392
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
394
"""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'
395
ret = AvahiService.rename(self)
396
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
398
' %(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.cdll.LoadLibrary(
511
ctypes.util.find_library("gnutls"))
512
_need_version = b"3.3.0"
515
# Need to use class name "GnuTLS" here, since this method is
516
# called before the assignment to the "gnutls" global variable
518
if GnuTLS.check_version(self._need_version) is None:
519
raise GnuTLS.Error("Needs GnuTLS {} or later"
520
.format(self._need_version))
522
# Unless otherwise indicated, the constants and types below are
523
# all from the gnutls/gnutls.h C header file.
533
E_NO_CERTIFICATE_FOUND = -49
534
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
537
class session_int(ctypes.Structure):
539
session_t = ctypes.POINTER(session_int)
541
class certificate_credentials_st(ctypes.Structure):
543
certificate_credentials_t = ctypes.POINTER(
544
certificate_credentials_st)
545
certificate_type_t = ctypes.c_int
547
class datum_t(ctypes.Structure):
548
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
549
('size', ctypes.c_uint)]
551
class openpgp_crt_int(ctypes.Structure):
553
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
554
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
555
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
556
credentials_type_t = ctypes.c_int
557
transport_ptr_t = ctypes.c_void_p
558
close_request_t = ctypes.c_int
561
class Error(Exception):
562
# We need to use the class name "GnuTLS" here, since this
563
# exception might be raised from within GnuTLS.__init__,
564
# which is called before the assignment to the "gnutls"
565
# global variable has happened.
566
def __init__(self, message=None, code=None, args=()):
567
# Default usage is by a message string, but if a return
568
# code is passed, convert it to a string with
571
if message is None and code is not None:
572
message = GnuTLS.strerror(code)
573
return super(GnuTLS.Error, self).__init__(
576
class CertificateSecurityError(Error):
580
class Credentials(object):
582
self._c_object = gnutls.certificate_credentials_t()
583
gnutls.certificate_allocate_credentials(
584
ctypes.byref(self._c_object))
585
self.type = gnutls.CRD_CERTIFICATE
588
gnutls.certificate_free_credentials(self._c_object)
590
class ClientSession(object):
591
def __init__(self, socket, credentials=None):
592
self._c_object = gnutls.session_t()
593
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
594
gnutls.set_default_priority(self._c_object)
595
gnutls.transport_set_ptr(self._c_object, socket.fileno())
596
gnutls.handshake_set_private_extensions(self._c_object,
599
if credentials is None:
600
credentials = gnutls.Credentials()
601
gnutls.credentials_set(self._c_object, credentials.type,
602
ctypes.cast(credentials._c_object,
604
self.credentials = credentials
607
gnutls.deinit(self._c_object)
610
return gnutls.handshake(self._c_object)
612
def send(self, data):
616
data_len -= gnutls.record_send(self._c_object,
621
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
623
# Error handling functions
624
def _error_code(result):
625
"""A function to raise exceptions on errors, suitable
626
for the 'restype' attribute on ctypes functions"""
629
if result == gnutls.E_NO_CERTIFICATE_FOUND:
630
raise gnutls.CertificateSecurityError(code=result)
631
raise gnutls.Error(code=result)
633
def _retry_on_error(result, func, arguments):
634
"""A function to retry on some errors, suitable
635
for the 'errcheck' attribute on ctypes functions"""
637
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
638
return _error_code(result)
639
result = func(*arguments)
642
# Unless otherwise indicated, the function declarations below are
643
# all from the gnutls/gnutls.h C header file.
646
priority_set_direct = _library.gnutls_priority_set_direct
647
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
648
ctypes.POINTER(ctypes.c_char_p)]
649
priority_set_direct.restype = _error_code
651
init = _library.gnutls_init
652
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
653
init.restype = _error_code
655
set_default_priority = _library.gnutls_set_default_priority
656
set_default_priority.argtypes = [session_t]
657
set_default_priority.restype = _error_code
659
record_send = _library.gnutls_record_send
660
record_send.argtypes = [session_t, ctypes.c_void_p,
662
record_send.restype = ctypes.c_ssize_t
663
record_send.errcheck = _retry_on_error
665
certificate_allocate_credentials = (
666
_library.gnutls_certificate_allocate_credentials)
667
certificate_allocate_credentials.argtypes = [
668
ctypes.POINTER(certificate_credentials_t)]
669
certificate_allocate_credentials.restype = _error_code
671
certificate_free_credentials = (
672
_library.gnutls_certificate_free_credentials)
673
certificate_free_credentials.argtypes = [
674
certificate_credentials_t]
675
certificate_free_credentials.restype = None
677
handshake_set_private_extensions = (
678
_library.gnutls_handshake_set_private_extensions)
679
handshake_set_private_extensions.argtypes = [session_t,
681
handshake_set_private_extensions.restype = None
683
credentials_set = _library.gnutls_credentials_set
684
credentials_set.argtypes = [session_t, credentials_type_t,
686
credentials_set.restype = _error_code
688
strerror = _library.gnutls_strerror
689
strerror.argtypes = [ctypes.c_int]
690
strerror.restype = ctypes.c_char_p
692
certificate_type_get = _library.gnutls_certificate_type_get
693
certificate_type_get.argtypes = [session_t]
694
certificate_type_get.restype = _error_code
696
certificate_get_peers = _library.gnutls_certificate_get_peers
697
certificate_get_peers.argtypes = [session_t,
698
ctypes.POINTER(ctypes.c_uint)]
699
certificate_get_peers.restype = ctypes.POINTER(datum_t)
701
global_set_log_level = _library.gnutls_global_set_log_level
702
global_set_log_level.argtypes = [ctypes.c_int]
703
global_set_log_level.restype = None
705
global_set_log_function = _library.gnutls_global_set_log_function
706
global_set_log_function.argtypes = [log_func]
707
global_set_log_function.restype = None
709
deinit = _library.gnutls_deinit
710
deinit.argtypes = [session_t]
711
deinit.restype = None
713
handshake = _library.gnutls_handshake
714
handshake.argtypes = [session_t]
715
handshake.restype = _error_code
716
handshake.errcheck = _retry_on_error
718
transport_set_ptr = _library.gnutls_transport_set_ptr
719
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
720
transport_set_ptr.restype = None
722
bye = _library.gnutls_bye
723
bye.argtypes = [session_t, close_request_t]
724
bye.restype = _error_code
725
bye.errcheck = _retry_on_error
727
check_version = _library.gnutls_check_version
728
check_version.argtypes = [ctypes.c_char_p]
729
check_version.restype = ctypes.c_char_p
731
# All the function declarations below are from gnutls/openpgp.h
733
openpgp_crt_init = _library.gnutls_openpgp_crt_init
734
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
735
openpgp_crt_init.restype = _error_code
737
openpgp_crt_import = _library.gnutls_openpgp_crt_import
738
openpgp_crt_import.argtypes = [openpgp_crt_t,
739
ctypes.POINTER(datum_t),
741
openpgp_crt_import.restype = _error_code
743
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
744
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
745
ctypes.POINTER(ctypes.c_uint)]
746
openpgp_crt_verify_self.restype = _error_code
748
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
749
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
750
openpgp_crt_deinit.restype = None
752
openpgp_crt_get_fingerprint = (
753
_library.gnutls_openpgp_crt_get_fingerprint)
754
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
758
openpgp_crt_get_fingerprint.restype = _error_code
760
# Remove non-public functions
761
del _error_code, _retry_on_error
762
# Create the global "gnutls" object, simulating a module
766
def call_pipe(connection, # : multiprocessing.Connection
767
func, *args, **kwargs):
768
"""This function is meant to be called by multiprocessing.Process
770
This function runs func(*args, **kwargs), and writes the resulting
771
return value on the provided multiprocessing.Connection.
773
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))
777
410
class Client(object):
778
411
"""A representation of a client host served by this server.
781
414
approved: bool(); 'None' if not yet approved/disapproved
782
415
approval_delay: datetime.timedelta(); Time to wait for approval
819
450
disabled, or None
820
451
server_settings: The server_settings dict from main()
823
454
runtime_expansions = ("approval_delay", "approval_duration",
824
455
"created", "enabled", "expires",
825
456
"fingerprint", "host", "interval",
826
457
"last_approval_request", "last_checked_ok",
827
458
"last_enabled", "name", "timeout")
830
"extended_timeout": "PT15M",
832
"checker": "fping -q -- %%(host)s",
834
"approval_delay": "PT0S",
835
"approval_duration": "PT1S",
836
"approved_by_default": "True",
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
462
"checker": "fping -q -- %%(host)s",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
466
"approved_by_default": "True",
470
def timeout_milliseconds(self):
471
"Return the 'timeout' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.timeout)
474
def extended_timeout_milliseconds(self):
475
"Return the 'extended_timeout' attribute in milliseconds"
476
return timedelta_to_milliseconds(self.extended_timeout)
478
def interval_milliseconds(self):
479
"Return the 'interval' attribute in milliseconds"
480
return timedelta_to_milliseconds(self.interval)
482
def approval_delay_milliseconds(self):
483
return timedelta_to_milliseconds(self.approval_delay)
841
486
def config_parser(config):
842
487
"""Construct a new dict of client settings of this form:
957
603
logger.info("Disabling client %s", self.name)
958
604
if getattr(self, "disable_initiator_tag", None) is not None:
959
GLib.source_remove(self.disable_initiator_tag)
605
gobject.source_remove(self.disable_initiator_tag)
960
606
self.disable_initiator_tag = None
961
607
self.expires = None
962
608
if getattr(self, "checker_initiator_tag", None) is not None:
963
GLib.source_remove(self.checker_initiator_tag)
609
gobject.source_remove(self.checker_initiator_tag)
964
610
self.checker_initiator_tag = None
965
611
self.stop_checker()
966
612
self.enabled = False
968
614
self.send_changedstate()
969
# 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
972
618
def __del__(self):
975
621
def init_checker(self):
976
622
# Schedule a new checker to be started an 'interval' from now,
977
623
# and every interval from then on.
978
624
if self.checker_initiator_tag is not None:
979
GLib.source_remove(self.checker_initiator_tag)
980
self.checker_initiator_tag = GLib.timeout_add(
981
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(),
983
629
# Schedule a disable() when 'timeout' has passed
984
630
if self.disable_initiator_tag is not None:
985
GLib.source_remove(self.disable_initiator_tag)
986
self.disable_initiator_tag = GLib.timeout_add(
987
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(),
988
635
# Also start a new checker *right now*.
989
636
self.start_checker()
991
def checker_callback(self, source, condition, connection,
638
def checker_callback(self, pid, condition, command):
993
639
"""The checker has completed, so take appropriate actions."""
994
640
self.checker_callback_tag = None
995
641
self.checker = None
996
# Read return code from connection (see call_pipe)
997
returncode = connection.recv()
1001
self.last_checker_status = returncode
1002
self.last_checker_signal = None
642
if os.WIFEXITED(condition):
643
self.last_checker_status = os.WEXITSTATUS(condition)
1003
644
if self.last_checker_status == 0:
1004
645
logger.info("Checker for %(name)s succeeded",
1006
647
self.checked_ok()
1008
logger.info("Checker for %(name)s failed", vars(self))
649
logger.info("Checker for %(name)s failed",
1010
652
self.last_checker_status = -1
1011
self.last_checker_signal = -returncode
1012
653
logger.warning("Checker for %(name)s crashed?",
1016
656
def checked_ok(self):
1017
657
"""Assert that the client has been seen, alive and well."""
1018
658
self.last_checked_ok = datetime.datetime.utcnow()
1019
659
self.last_checker_status = 0
1020
self.last_checker_signal = None
1021
660
self.bump_timeout()
1023
662
def bump_timeout(self, timeout=None):
1024
663
"""Bump up the timeout for this client."""
1025
664
if timeout is None:
1026
665
timeout = self.timeout
1027
666
if self.disable_initiator_tag is not None:
1028
GLib.source_remove(self.disable_initiator_tag)
667
gobject.source_remove(self.disable_initiator_tag)
1029
668
self.disable_initiator_tag = None
1030
669
if getattr(self, "enabled", False):
1031
self.disable_initiator_tag = GLib.timeout_add(
1032
int(timeout.total_seconds() * 1000), self.disable)
670
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
1033
673
self.expires = datetime.datetime.utcnow() + timeout
1035
675
def need_approval(self):
1036
676
self.last_approval_request = datetime.datetime.utcnow()
1038
678
def start_checker(self):
1039
679
"""Start a new checker subprocess if one is not running.
1041
681
If a checker already exists, leave it running and do
1043
683
# The reason for not killing a running checker is that if we
1048
688
# checkers alone, the checker would have to take more time
1049
689
# than 'timeout' for the client to be disabled, which is as it
1052
if self.checker is not None and not self.checker.is_alive():
1053
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)
1056
706
# Start a new checker if needed
1057
707
if self.checker is None:
1058
708
# Escape attributes for the shell
1060
attr: re.escape(str(getattr(self, attr)))
1061
for attr in self.runtime_expansions}
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
712
self.runtime_expansions)
1063
714
command = self.checker_command % escaped_attrs
1064
715
except TypeError as error:
1065
716
logger.error('Could not format string "%s"',
1066
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",
1068
return True # Try again later
1069
self.current_checker_command = command
1070
logger.info("Starting checker %r for %s", command,
1072
# We don't need to redirect stdout and stderr, since
1073
# in normal mode, that is already done by daemon(),
1074
# and in debug mode we don't want to. (Stdin is
1075
# always replaced by /dev/null.)
1076
# The exception is when not debugging but nevertheless
1077
# running in the foreground; use the previously
1079
popen_args = {"close_fds": True,
1082
if (not self.server_settings["debug"]
1083
and self.server_settings["foreground"]):
1084
popen_args.update({"stdout": wnull,
1086
pipe = multiprocessing.Pipe(duplex=False)
1087
self.checker = multiprocessing.Process(
1089
args=(pipe[1], subprocess.call, command),
1091
self.checker.start()
1092
self.checker_callback_tag = GLib.io_add_watch(
1093
pipe[0].fileno(), GLib.IO_IN,
1094
self.checker_callback, pipe[0], command)
1095
# 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
1098
764
def stop_checker(self):
1099
765
"""Force the checker process, if any, to stop."""
1100
766
if self.checker_callback_tag:
1101
GLib.source_remove(self.checker_callback_tag)
767
gobject.source_remove(self.checker_callback_tag)
1102
768
self.checker_callback_tag = None
1103
769
if getattr(self, "checker", None) is None:
1105
771
logger.debug("Stopping checker for %(name)s", vars(self))
1106
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
1107
780
self.checker = None
1110
def dbus_service_property(dbus_interface,
783
def dbus_service_property(dbus_interface, signature="v",
784
access="readwrite", byte_arrays=False):
1114
785
"""Decorators for marking methods of a DBusObjectWithProperties to
1115
786
become properties on the D-Bus.
1117
788
The decorated method will be called with no arguments by "Get"
1118
789
and with one argument by "Set".
1120
791
The parameters, where they are supported, are the same as
1121
792
dbus.service.method, except there is only "signature", since the
1122
793
type from Get() and the type sent to Set() is the same.
1205
class DBusObjectWithAnnotations(dbus.service.Object):
1206
"""A D-Bus object with annotations.
1208
Classes inheriting from this can use the dbus_annotations
1209
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.
1213
878
def _is_dbus_thing(thing):
1214
879
"""Returns a function testing if an attribute is a D-Bus thing
1216
881
If called like _is_dbus_thing("method") it returns a function
1217
882
suitable for use as predicate to inspect.getmembers().
1219
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1222
887
def _get_all_dbus_things(self, thing):
1223
888
"""Returns a generator of (name, attribute) pairs
1225
return ((getattr(athing.__get__(self), "_dbus_name", name),
890
return ((getattr(athing.__get__(self), "_dbus_name",
1226
892
athing.__get__(self))
1227
893
for cls in self.__class__.__mro__
1228
894
for name, athing in
1229
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1231
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1233
path_keyword='object_path',
1234
connection_keyword='connection')
1235
def Introspect(self, object_path, connection):
1236
"""Overloading of standard D-Bus method.
1238
Inserts annotation tags on methods and signals.
1240
xmlstring = dbus.service.Object.Introspect(self, object_path,
1243
document = xml.dom.minidom.parseString(xmlstring)
1245
for if_tag in document.getElementsByTagName("interface"):
1246
# Add annotation tags
1247
for typ in ("method", "signal"):
1248
for tag in if_tag.getElementsByTagName(typ):
1250
for name, prop in (self.
1251
_get_all_dbus_things(typ)):
1252
if (name == tag.getAttribute("name")
1253
and prop._dbus_interface
1254
== if_tag.getAttribute("name")):
1255
annots.update(getattr(
1256
prop, "_dbus_annotations", {}))
1257
for name, value in annots.items():
1258
ann_tag = document.createElement(
1260
ann_tag.setAttribute("name", name)
1261
ann_tag.setAttribute("value", value)
1262
tag.appendChild(ann_tag)
1263
# Add interface annotation tags
1264
for annotation, value in dict(
1265
itertools.chain.from_iterable(
1266
annotations().items()
1267
for name, annotations
1268
in self._get_all_dbus_things("interface")
1269
if name == if_tag.getAttribute("name")
1271
ann_tag = document.createElement("annotation")
1272
ann_tag.setAttribute("name", annotation)
1273
ann_tag.setAttribute("value", value)
1274
if_tag.appendChild(ann_tag)
1275
# Fix argument name for the Introspect method itself
1276
if (if_tag.getAttribute("name")
1277
== dbus.INTROSPECTABLE_IFACE):
1278
for cn in if_tag.getElementsByTagName("method"):
1279
if cn.getAttribute("name") == "Introspect":
1280
for arg in cn.getElementsByTagName("arg"):
1281
if (arg.getAttribute("direction")
1283
arg.setAttribute("name",
1285
xmlstring = document.toxml("utf-8")
1287
except (AttributeError, xml.dom.DOMException,
1288
xml.parsers.expat.ExpatError) as error:
1289
logger.error("Failed to override Introspection method",
1294
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1295
"""A D-Bus object with properties.
1297
Classes inheriting from this can use the dbus_service_property
1298
decorator to expose methods as D-Bus properties. It exposes the
1299
standard Get(), Set(), and GetAll() methods on the D-Bus.
895
inspect.getmembers(cls,
896
self._is_dbus_thing(thing)))
1302
898
def _get_dbus_property(self, interface_name, property_name):
1303
899
"""Returns a bound method if one exists which is a D-Bus
1304
900
property with the specified name and interface.
1306
for cls in self.__class__.__mro__:
1307
for name, value in inspect.getmembers(
1308
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"))):
1309
906
if (value._dbus_name == property_name
1310
907
and value._dbus_interface == interface_name):
1311
908
return value.__get__(self)
1313
910
# No such property
1314
raise DBusPropertyNotFound("{}:{}.{}".format(
1315
self.dbus_object_path, interface_name, property_name))
1318
def _get_all_interface_names(cls):
1319
"""Get a sequence of all interfaces supported by an object"""
1320
return (name for name in set(getattr(getattr(x, attr),
1321
"_dbus_interface", None)
1322
for x in (inspect.getmro(cls))
1324
if name is not None)
1326
@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",
1328
916
out_signature="v")
1329
917
def Get(self, interface_name, property_name):
1330
918
"""Standard D-Bus property Get() method, see D-Bus standard.
1458
1049
exc_info=error)
1459
1050
return xmlstring
1462
dbus.OBJECT_MANAGER_IFACE
1463
except AttributeError:
1464
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1467
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1468
"""A D-Bus object with an ObjectManager.
1470
Classes inheriting from this exposes the standard
1471
GetManagedObjects call and the InterfacesAdded and
1472
InterfacesRemoved signals on the standard
1473
"org.freedesktop.DBus.ObjectManager" interface.
1475
Note: No signals are sent automatically; they must be sent
1478
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1479
out_signature="a{oa{sa{sv}}}")
1480
def GetManagedObjects(self):
1481
"""This function must be overridden"""
1482
raise NotImplementedError()
1484
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1485
signature="oa{sa{sv}}")
1486
def InterfacesAdded(self, object_path, interfaces_and_properties):
1489
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1490
def InterfacesRemoved(self, object_path, interfaces):
1493
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1495
path_keyword='object_path',
1496
connection_keyword='connection')
1497
def Introspect(self, object_path, connection):
1498
"""Overloading of standard D-Bus method.
1500
Override return argument name of GetManagedObjects to be
1501
"objpath_interfaces_and_properties"
1503
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1507
document = xml.dom.minidom.parseString(xmlstring)
1509
for if_tag in document.getElementsByTagName("interface"):
1510
# Fix argument name for the GetManagedObjects method
1511
if (if_tag.getAttribute("name")
1512
== dbus.OBJECT_MANAGER_IFACE):
1513
for cn in if_tag.getElementsByTagName("method"):
1514
if (cn.getAttribute("name")
1515
== "GetManagedObjects"):
1516
for arg in cn.getElementsByTagName("arg"):
1517
if (arg.getAttribute("direction")
1521
"objpath_interfaces"
1523
xmlstring = document.toxml("utf-8")
1525
except (AttributeError, xml.dom.DOMException,
1526
xml.parsers.expat.ExpatError) as error:
1527
logger.error("Failed to override Introspection method",
1532
1053
def datetime_to_dbus(dt, variant_level=0):
1533
1054
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1535
return dbus.String("", variant_level=variant_level)
1536
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)
1539
1061
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1570
1091
# Ignore non-D-Bus attributes, and D-Bus attributes
1571
1092
# with the wrong interface name
1572
1093
if (not hasattr(attribute, "_dbus_interface")
1573
or not attribute._dbus_interface.startswith(
1574
orig_interface_name)):
1094
or not attribute._dbus_interface
1095
.startswith(orig_interface_name)):
1576
1097
# Create an alternate D-Bus interface name based on
1577
1098
# the current name
1578
alt_interface = attribute._dbus_interface.replace(
1579
orig_interface_name, alt_interface_name)
1099
alt_interface = (attribute._dbus_interface
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1580
1102
interface_names.add(alt_interface)
1581
1103
# Is this a D-Bus signal?
1582
1104
if getattr(attribute, "_dbus_is_signal", False):
1583
1105
# Extract the original non-method undecorated
1584
1106
# function by black magic
1585
if sys.version_info.major == 2:
1586
nonmethod_func = (dict(
1107
nonmethod_func = (dict(
1587
1108
zip(attribute.func_code.co_freevars,
1588
attribute.__closure__))
1589
["func"].cell_contents)
1591
nonmethod_func = (dict(
1592
zip(attribute.__code__.co_freevars,
1593
attribute.__closure__))
1594
["func"].cell_contents)
1109
attribute.__closure__))["func"]
1595
1111
# Create a new, but exactly alike, function
1596
1112
# object, and decorate it to be a new D-Bus signal
1597
1113
# with the alternate D-Bus interface name
1598
new_function = copy_function(nonmethod_func)
1599
new_function = (dbus.service.signal(
1601
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)))
1602
1123
# Copy annotations, if any
1604
new_function._dbus_annotations = dict(
1605
attribute._dbus_annotations)
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1606
1127
except AttributeError:
1609
1129
# Define a creator of a function to call both the
1610
1130
# original and alternate functions, so both the
1611
1131
# original and alternate signals gets sent when
1694
1221
if interface_names:
1695
1222
# Replace the class with a new subclass of it with
1696
1223
# methods, signals, etc. as created above.
1697
if sys.version_info.major == 2:
1698
cls = type(b"{}Alternate".format(cls.__name__),
1701
cls = type("{}Alternate".format(cls.__name__),
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1708
1230
@alternate_dbus_interfaces({"se.recompile.Mandos":
1709
"se.bsnet.fukt.Mandos"})
1231
"se.bsnet.fukt.Mandos"})
1710
1232
class ClientDBus(Client, DBusObjectWithProperties):
1711
1233
"""A Client class using D-Bus
1714
1236
dbus_object_path: dbus.ObjectPath
1715
1237
bus: dbus.SystemBus()
1718
1240
runtime_expansions = (Client.runtime_expansions
1719
+ ("dbus_object_path", ))
1721
_interface = "se.recompile.Mandos.Client"
1241
+ ("dbus_object_path",))
1723
1243
# dbus.service.Object doesn't use super(), so we can't either.
1725
def __init__(self, bus=None, *args, **kwargs):
1245
def __init__(self, bus = None, *args, **kwargs):
1727
1247
Client.__init__(self, *args, **kwargs)
1728
1248
# Only now, when this client is initialized, can it show up on
1730
client_object_name = str(self.name).translate(
1250
client_object_name = unicode(self.name).translate(
1731
1251
{ord("."): ord("_"),
1732
1252
ord("-"): ord("_")})
1733
self.dbus_object_path = dbus.ObjectPath(
1734
"/clients/" + client_object_name)
1253
self.dbus_object_path = (dbus.ObjectPath
1254
("/clients/" + client_object_name))
1735
1255
DBusObjectWithProperties.__init__(self, self.bus,
1736
1256
self.dbus_object_path)
1738
def notifychangeproperty(transform_func, dbus_name,
1739
type_func=lambda x: x,
1741
invalidate_only=False,
1742
_interface=_interface):
1258
def notifychangeproperty(transform_func,
1259
dbus_name, type_func=lambda x: x,
1743
1261
""" Modify a variable so that it's a property which announces
1744
1262
its changes to DBus.
1746
1264
transform_fun: Function that takes a value and a variant_level
1747
1265
and transforms it to a D-Bus type.
1748
1266
dbus_name: D-Bus name of the variable
1900
1410
server to mandos-client
1904
1414
# Rejected - signal
1905
1415
@dbus.service.signal(_interface, signature="s")
1906
1416
def Rejected(self, reason):
1910
1420
# NeedApproval - signal
1911
1421
@dbus.service.signal(_interface, signature="tb")
1912
1422
def NeedApproval(self, timeout, default):
1914
1424
return self.need_approval()
1918
1428
# Approve - method
1919
1429
@dbus.service.method(_interface, in_signature="b")
1920
1430
def Approve(self, value):
1921
1431
self.approve(value)
1923
1433
# CheckedOK - method
1924
1434
@dbus.service.method(_interface)
1925
1435
def CheckedOK(self):
1926
1436
self.checked_ok()
1928
1438
# Enable - method
1929
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1930
1439
@dbus.service.method(_interface)
1931
1440
def Enable(self):
1935
1444
# StartChecker - method
1936
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1937
1445
@dbus.service.method(_interface)
1938
1446
def StartChecker(self):
1940
1448
self.start_checker()
1942
1450
# Disable - method
1943
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1944
1451
@dbus.service.method(_interface)
1945
1452
def Disable(self):
1949
1456
# StopChecker - method
1950
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1951
1457
@dbus.service.method(_interface)
1952
1458
def StopChecker(self):
1953
1459
self.stop_checker()
1957
1463
# ApprovalPending - property
1958
1464
@dbus_service_property(_interface, signature="b", access="read")
1959
1465
def ApprovalPending_dbus_property(self):
1960
1466
return dbus.Boolean(bool(self.approvals_pending))
1962
1468
# ApprovedByDefault - property
1963
@dbus_service_property(_interface,
1469
@dbus_service_property(_interface, signature="b",
1965
1470
access="readwrite")
1966
1471
def ApprovedByDefault_dbus_property(self, value=None):
1967
1472
if value is None: # get
1968
1473
return dbus.Boolean(self.approved_by_default)
1969
1474
self.approved_by_default = bool(value)
1971
1476
# ApprovalDelay - property
1972
@dbus_service_property(_interface,
1477
@dbus_service_property(_interface, signature="t",
1974
1478
access="readwrite")
1975
1479
def ApprovalDelay_dbus_property(self, value=None):
1976
1480
if value is None: # get
1977
return dbus.UInt64(self.approval_delay.total_seconds()
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1979
1482
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1981
1484
# ApprovalDuration - property
1982
@dbus_service_property(_interface,
1485
@dbus_service_property(_interface, signature="t",
1984
1486
access="readwrite")
1985
1487
def ApprovalDuration_dbus_property(self, value=None):
1986
1488
if value is None: # get
1987
return dbus.UInt64(self.approval_duration.total_seconds()
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1989
1491
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1991
1493
# Name - property
1993
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1994
1494
@dbus_service_property(_interface, signature="s", access="read")
1995
1495
def Name_dbus_property(self):
1996
1496
return dbus.String(self.name)
1998
1498
# Fingerprint - property
2000
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2001
1499
@dbus_service_property(_interface, signature="s", access="read")
2002
1500
def Fingerprint_dbus_property(self):
2003
1501
return dbus.String(self.fingerprint)
2005
1503
# Host - property
2006
@dbus_service_property(_interface,
1504
@dbus_service_property(_interface, signature="s",
2008
1505
access="readwrite")
2009
1506
def Host_dbus_property(self, value=None):
2010
1507
if value is None: # get
2011
1508
return dbus.String(self.host)
2012
self.host = str(value)
1509
self.host = unicode(value)
2014
1511
# Created - property
2016
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2017
1512
@dbus_service_property(_interface, signature="s", access="read")
2018
1513
def Created_dbus_property(self):
2019
1514
return datetime_to_dbus(self.created)
2021
1516
# LastEnabled - property
2022
1517
@dbus_service_property(_interface, signature="s", access="read")
2023
1518
def LastEnabled_dbus_property(self):
2024
1519
return datetime_to_dbus(self.last_enabled)
2026
1521
# Enabled - property
2027
@dbus_service_property(_interface,
1522
@dbus_service_property(_interface, signature="b",
2029
1523
access="readwrite")
2030
1524
def Enabled_dbus_property(self, value=None):
2031
1525
if value is None: # get
2080
1573
if (getattr(self, "disable_initiator_tag", None)
2083
GLib.source_remove(self.disable_initiator_tag)
2084
self.disable_initiator_tag = GLib.timeout_add(
2085
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),
2088
1582
# ExtendedTimeout - property
2089
@dbus_service_property(_interface,
1583
@dbus_service_property(_interface, signature="t",
2091
1584
access="readwrite")
2092
1585
def ExtendedTimeout_dbus_property(self, value=None):
2093
1586
if value is None: # get
2094
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
2096
1588
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2098
1590
# Interval - property
2099
@dbus_service_property(_interface,
1591
@dbus_service_property(_interface, signature="t",
2101
1592
access="readwrite")
2102
1593
def Interval_dbus_property(self, value=None):
2103
1594
if value is None: # get
2104
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
return dbus.UInt64(self.interval_milliseconds())
2105
1596
self.interval = datetime.timedelta(0, 0, 0, value)
2106
1597
if getattr(self, "checker_initiator_tag", None) is None:
2108
1599
if self.enabled:
2109
1600
# Reschedule checker run
2110
GLib.source_remove(self.checker_initiator_tag)
2111
self.checker_initiator_tag = GLib.timeout_add(
2112
value, self.start_checker)
2113
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
2115
1606
# Checker - property
2116
@dbus_service_property(_interface,
1607
@dbus_service_property(_interface, signature="s",
2118
1608
access="readwrite")
2119
1609
def Checker_dbus_property(self, value=None):
2120
1610
if value is None: # get
2121
1611
return dbus.String(self.checker_command)
2122
self.checker_command = str(value)
1612
self.checker_command = unicode(value)
2124
1614
# CheckerRunning - property
2125
@dbus_service_property(_interface,
1615
@dbus_service_property(_interface, signature="b",
2127
1616
access="readwrite")
2128
1617
def CheckerRunning_dbus_property(self, value=None):
2129
1618
if value is None: # get
2186
1665
class ClientHandler(socketserver.BaseRequestHandler, object):
2187
1666
"""A class to handle client connections.
2189
1668
Instantiated once for each connection to handle it.
2190
1669
Note: This will run in its own forked process."""
2192
1671
def handle(self):
2193
1672
with contextlib.closing(self.server.child_pipe) as child_pipe:
2194
1673
logger.info("TCP connection from: %s",
2195
str(self.client_address))
1674
unicode(self.client_address))
2196
1675
logger.debug("Pipe FD: %d",
2197
1676
self.server.child_pipe.fileno())
2199
session = gnutls.ClientSession(self.request)
2201
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2202
# "+AES-256-CBC", "+SHA1",
2203
# "+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",
2205
1692
# Use a fallback default, since this MUST be set.
2206
1693
priority = self.server.gnutls_priority
2207
1694
if priority is None:
2208
1695
priority = "NORMAL"
2209
gnutls.priority_set_direct(session._c_object,
2210
priority.encode("utf-8"),
1696
(gnutls.library.functions
1697
.gnutls_priority_set_direct(session._c_object,
2213
1700
# Start communication using the Mandos protocol
2214
1701
# Get protocol number
2215
1702
line = self.request.makefile().readline()
2301
1791
delay -= time2 - time
2304
session.send(client.secret)
2305
except gnutls.Error as error:
2306
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))
2310
1806
logger.info("Sending secret to %s", client.name)
2311
1807
# bump the timeout using extended_timeout
2312
1808
client.bump_timeout(client.extended_timeout)
2313
1809
if self.server.use_dbus:
2314
1810
# Emit D-Bus signal
2315
1811
client.GotSecret()
2318
1814
if approval_required:
2319
1815
client.approvals_pending -= 1
2322
except gnutls.Error as error:
1818
except gnutls.errors.GNUTLSError as error:
2323
1819
logger.warning("GnuTLS bye failed",
2324
1820
exc_info=error)
2327
1823
def peer_certificate(session):
2328
1824
"Return the peer's OpenPGP certificate as a bytestring"
2329
1825
# If not an OpenPGP certificate...
2330
if (gnutls.certificate_type_get(session._c_object)
2331
!= gnutls.CRT_OPENPGP):
2332
# ...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
2334
1831
list_size = ctypes.c_uint(1)
2335
cert_list = (gnutls.certificate_get_peers
1832
cert_list = (gnutls.library.functions
1833
.gnutls_certificate_get_peers
2336
1834
(session._c_object, ctypes.byref(list_size)))
2337
1835
if not bool(cert_list) and list_size.value != 0:
2338
raise gnutls.Error("error getting peer certificate")
1836
raise gnutls.errors.GNUTLSError("error getting peer"
2339
1838
if list_size.value == 0:
2341
1840
cert = cert_list[0]
2342
1841
return ctypes.string_at(cert.data, cert.size)
2345
1844
def fingerprint(openpgp):
2346
1845
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2347
1846
# New GnuTLS "datum" with the OpenPGP public key
2348
datum = gnutls.datum_t(
2349
ctypes.cast(ctypes.c_char_p(openpgp),
2350
ctypes.POINTER(ctypes.c_ubyte)),
2351
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))))
2352
1852
# New empty GnuTLS certificate
2353
crt = gnutls.openpgp_crt_t()
2354
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)))
2355
1856
# Import the OpenPGP public key into the certificate
2356
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2357
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))
2358
1861
# Verify the self signature in the key
2359
1862
crtverify = ctypes.c_uint()
2360
gnutls.openpgp_crt_verify_self(crt, 0,
2361
ctypes.byref(crtverify))
1863
(gnutls.library.functions
1864
.gnutls_openpgp_crt_verify_self(crt, 0,
1865
ctypes.byref(crtverify)))
2362
1866
if crtverify.value != 0:
2363
gnutls.openpgp_crt_deinit(crt)
2364
raise gnutls.CertificateSecurityError("Verify failed")
1867
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1868
raise (gnutls.errors.CertificateSecurityError
2365
1870
# New buffer for the fingerprint
2366
1871
buf = ctypes.create_string_buffer(20)
2367
1872
buf_len = ctypes.c_size_t()
2368
1873
# Get the fingerprint from the certificate into the buffer
2369
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2370
ctypes.byref(buf_len))
1874
(gnutls.library.functions
1875
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1876
ctypes.byref(buf_len)))
2371
1877
# Deinit the certificate
2372
gnutls.openpgp_crt_deinit(crt)
1878
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2373
1879
# Convert the buffer to a Python bytestring
2374
1880
fpr = ctypes.string_at(buf, buf_len.value)
2375
1881
# Convert the bytestring to hexadecimal notation
2464
1964
# socket_wrapper(), if socketfd was set.
2465
1965
socketserver.TCPServer.__init__(self, server_address,
2466
1966
RequestHandlerClass)
2468
1968
def server_bind(self):
2469
1969
"""This overrides the normal server_bind() function
2470
1970
to bind to an interface if one was specified, and also NOT to
2471
1971
bind to an address or port if they were not specified."""
2472
global SO_BINDTODEVICE
2473
1972
if self.interface is not None:
2474
1973
if SO_BINDTODEVICE is None:
2475
# Fall back to a hard-coded value which seems to be
2477
logger.warning("SO_BINDTODEVICE not found, trying 25")
2478
SO_BINDTODEVICE = 25
2480
self.socket.setsockopt(
2481
socket.SOL_SOCKET, SO_BINDTODEVICE,
2482
(self.interface + "\0").encode("utf-8"))
2483
except socket.error as error:
2484
if error.errno == errno.EPERM:
2485
logger.error("No permission to bind to"
2486
" interface %s", self.interface)
2487
elif error.errno == errno.ENOPROTOOPT:
2488
logger.error("SO_BINDTODEVICE not available;"
2489
" cannot bind to interface %s",
2491
elif error.errno == errno.ENODEV:
2492
logger.error("Interface %s does not exist,"
2493
" 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)
2496
1995
# Only bind(2) the socket if we really need to.
2497
1996
if self.server_address[0] or self.server_address[1]:
2498
1997
if not self.server_address[0]:
2499
1998
if self.address_family == socket.AF_INET6:
2500
any_address = "::" # in6addr_any
1999
any_address = "::" # in6addr_any
2502
any_address = "0.0.0.0" # INADDR_ANY
2001
any_address = "0.0.0.0" # INADDR_ANY
2503
2002
self.server_address = (any_address,
2504
2003
self.server_address[1])
2505
2004
elif not self.server_address[1]:
2506
self.server_address = (self.server_address[0], 0)
2005
self.server_address = (self.server_address[0],
2507
2007
# if self.interface:
2508
2008
# self.server_address = (self.server_address[0],
2896
2385
server_settings["socket"] = os.dup(server_settings
2898
2387
del server_config
2900
2389
# Override the settings from the config file with command line
2901
2390
# options, if set.
2902
2391
for option in ("interface", "address", "port", "debug",
2903
"priority", "servicename", "configdir", "use_dbus",
2904
"use_ipv6", "debuglevel", "restore", "statedir",
2905
"socket", "foreground", "zeroconf"):
2392
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2906
2395
value = getattr(options, option)
2907
2396
if value is not None:
2908
2397
server_settings[option] = value
2910
2399
# Force all strings to be unicode
2911
2400
for option in server_settings.keys():
2912
if isinstance(server_settings[option], bytes):
2913
server_settings[option] = (server_settings[option]
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2915
2403
# Force all boolean options to be boolean
2916
2404
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2917
"foreground", "zeroconf"):
2918
2406
server_settings[option] = bool(server_settings[option])
2919
2407
# Debug implies foreground
2920
2408
if server_settings["debug"]:
2921
2409
server_settings["foreground"] = True
2922
2410
# Now we have our good server settings in "server_settings"
2924
2412
##################################################################
2926
if (not server_settings["zeroconf"]
2927
and not (server_settings["port"]
2928
or server_settings["socket"] != "")):
2929
parser.error("Needs port or socket to work without Zeroconf")
2931
2414
# For convenience
2932
2415
debug = server_settings["debug"]
2933
2416
debuglevel = server_settings["debuglevel"]
2947
2429
level = getattr(logging, debuglevel.upper())
2948
2430
initlogger(debug, level)
2950
2432
if server_settings["servicename"] != "Mandos":
2951
syslogger.setFormatter(
2952
logging.Formatter('Mandos ({}) [%(process)d]:'
2953
' %(levelname)s: %(message)s'.format(
2954
server_settings["servicename"])))
2433
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2435
' %(levelname)s: %(message)s'
2436
.format(server_settings
2956
2439
# Parse config file with clients
2957
2440
client_config = configparser.SafeConfigParser(Client
2958
2441
.client_defaults)
2959
2442
client_config.read(os.path.join(server_settings["configdir"],
2960
2443
"clients.conf"))
2962
2445
global mandos_dbus_service
2963
2446
mandos_dbus_service = None
2966
if server_settings["socket"] != "":
2967
socketfd = server_settings["socket"]
2968
tcp_server = MandosServer(
2969
(server_settings["address"], server_settings["port"]),
2971
interface=(server_settings["interface"] or None),
2973
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"]
2976
2459
if not foreground:
2977
2460
pidfilename = "/run/mandos.pid"
2978
2461
if not os.path.isdir("/run/."):
2979
2462
pidfilename = "/var/run/mandos.pid"
2982
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2465
pidfile = open(pidfilename, "w")
2983
2466
except IOError as e:
2984
2467
logger.error("Could not open file %r", pidfilename,
2987
for name, group in (("_mandos", "_mandos"),
2988
("mandos", "mandos"),
2989
("nobody", "nogroup")):
2470
for name in ("_mandos", "mandos", "nobody"):
2991
2472
uid = pwd.getpwnam(name).pw_uid
2992
gid = pwd.getpwnam(group).pw_gid
2473
gid = pwd.getpwnam(name).pw_gid
2994
2475
except KeyError:
3003
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3005
2483
except OSError as error:
3006
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3007
.format(uid, gid, os.strerror(error.errno)))
3008
2484
if error.errno != errno.EPERM:
3012
2488
# Enable all possible GnuTLS debugging
3014
2490
# "Use a log level over 10 to enable all debugging options."
3015
2491
# - GnuTLS manual
3016
gnutls.global_set_log_level(11)
2492
gnutls.library.functions.gnutls_global_set_log_level(11)
2494
@gnutls.library.types.gnutls_log_func
3019
2495
def debug_gnutls(level, string):
3020
2496
logger.debug("GnuTLS: %s", string[:-1])
3022
gnutls.global_set_log_function(debug_gnutls)
2498
(gnutls.library.functions
2499
.gnutls_global_set_log_function(debug_gnutls))
3024
2501
# Redirect stdin so all checkers get /dev/null
3025
2502
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3026
2503
os.dup2(null, sys.stdin.fileno())
3030
2507
# Need to fork before connecting to D-Bus
3031
2508
if not foreground:
3032
2509
# Close all input and output, do double fork, etc.
3035
# multiprocessing will use threads, so before we use GLib we need
3036
# 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()
3039
2516
global main_loop
3040
2517
# From the Avahi example code
3041
2518
DBusGMainLoop(set_as_default=True)
3042
main_loop = GLib.MainLoop()
2519
main_loop = gobject.MainLoop()
3043
2520
bus = dbus.SystemBus()
3044
2521
# End of Avahi example code
3047
2524
bus_name = dbus.service.BusName("se.recompile.Mandos",
3050
old_bus_name = dbus.service.BusName(
3051
"se.bsnet.fukt.Mandos", bus,
3053
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:
3054
2530
logger.error("Disabling D-Bus:", exc_info=e)
3055
2531
use_dbus = False
3056
2532
server_settings["use_dbus"] = False
3057
2533
tcp_server.use_dbus = False
3059
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3060
service = AvahiServiceToSyslog(
3061
name=server_settings["servicename"],
3062
servicetype="_mandos._tcp",
3065
if server_settings["interface"]:
3066
service.interface = if_nametoindex(
3067
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"])))
3069
2543
global multiprocessing_manager
3070
2544
multiprocessing_manager = multiprocessing.Manager()
3072
2546
client_class = Client
3074
client_class = functools.partial(ClientDBus, bus=bus)
2548
client_class = functools.partial(ClientDBus, bus = bus)
3076
2550
client_settings = Client.config_parser(client_config)
3077
2551
old_client_settings = {}
3078
2552
clients_data = {}
3080
2554
# This is used to redirect stdout and stderr for checker processes
3082
wnull = open(os.devnull, "w") # A writable /dev/null
2556
wnull = open(os.devnull, "w") # A writable /dev/null
3083
2557
# Only used if server is running in foreground but not in debug
3085
2559
if debug or not foreground:
3088
2562
# Get client data and settings from last running state.
3089
2563
if server_settings["restore"]:
3091
2565
with open(stored_state_path, "rb") as stored_state:
3092
if sys.version_info.major == 2:
3093
clients_data, old_client_settings = pickle.load(
3096
bytes_clients_data, bytes_old_client_settings = (
3097
pickle.load(stored_state, encoding="bytes"))
3098
# Fix bytes to strings
3101
clients_data = {(key.decode("utf-8")
3102
if isinstance(key, bytes)
3105
bytes_clients_data.items()}
3106
del bytes_clients_data
3107
for key in clients_data:
3108
value = {(k.decode("utf-8")
3109
if isinstance(k, bytes) else k): v
3111
clients_data[key].items()}
3112
clients_data[key] = value
3114
value["client_structure"] = [
3116
if isinstance(s, bytes)
3118
value["client_structure"]]
3120
for k in ("name", "host"):
3121
if isinstance(value[k], bytes):
3122
value[k] = value[k].decode("utf-8")
3123
# old_client_settings
3125
old_client_settings = {
3126
(key.decode("utf-8")
3127
if isinstance(key, bytes)
3130
bytes_old_client_settings.items()}
3131
del bytes_old_client_settings
3133
for value in old_client_settings.values():
3134
if isinstance(value["host"], bytes):
3135
value["host"] = (value["host"]
2566
clients_data, old_client_settings = (pickle.load
3137
2568
os.remove(stored_state_path)
3138
2569
except IOError as e:
3139
2570
if e.errno == errno.ENOENT:
3140
logger.warning("Could not load persistent state:"
3141
" {}".format(os.strerror(e.errno)))
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
3143
2574
logger.critical("Could not load persistent state:",
3146
2577
except EOFError as e:
3147
2578
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
3151
2581
with PGPEngine() as pgp:
3152
for client_name, client in clients_data.items():
2582
for client_name, client in clients_data.iteritems():
3153
2583
# Skip removed clients
3154
2584
if client_name not in client_settings:
3157
2587
# Decide which value to use after restoring saved state.
3158
2588
# We have three different values: Old config file,
3159
2589
# new config file, and saved state.
3217
2647
for client_name in (set(client_settings)
3218
2648
- set(old_client_settings)):
3219
2649
clients_data[client_name] = client_settings[client_name]
3221
2651
# Create all client objects
3222
for client_name, client in clients_data.items():
2652
for client_name, client in clients_data.iteritems():
3223
2653
tcp_server.clients[client_name] = client_class(
3226
server_settings=server_settings)
2654
name = client_name, settings = client,
2655
server_settings = server_settings)
3228
2657
if not tcp_server.clients:
3229
2658
logger.warning("No clients defined")
3231
2660
if not foreground:
3232
2661
if pidfile is not None:
3236
print(pid, file=pidfile)
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
3237
2666
except IOError:
3238
2667
logger.error("Could not write to file %r with PID %d",
3239
2668
pidfilename, pid)
3241
2670
del pidfilename
3243
for termsig in (signal.SIGHUP, signal.SIGTERM):
3244
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3245
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())
3249
@alternate_dbus_interfaces(
3250
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3251
class MandosDBusService(DBusObjectWithObjectManager):
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2678
class MandosDBusService(DBusObjectWithProperties):
3252
2679
"""A D-Bus proxy object"""
3254
2680
def __init__(self):
3255
2681
dbus.service.Object.__init__(self, bus, "/")
3257
2682
_interface = "se.recompile.Mandos"
2684
@dbus_interface_annotations(_interface)
2686
return { "org.freedesktop.DBus.Property"
2687
".EmitsChangedSignal":
3259
2690
@dbus.service.signal(_interface, signature="o")
3260
2691
def ClientAdded(self, objpath):
3264
2695
@dbus.service.signal(_interface, signature="ss")
3265
2696
def ClientNotFound(self, fingerprint, address):
3269
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3271
2700
@dbus.service.signal(_interface, signature="os")
3272
2701
def ClientRemoved(self, objpath, name):
3276
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3278
2705
@dbus.service.method(_interface, out_signature="ao")
3279
2706
def GetAllClients(self):
3281
return dbus.Array(c.dbus_object_path for c in
3282
tcp_server.clients.values())
3284
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2708
return dbus.Array(c.dbus_object_path
2710
tcp_server.clients.itervalues())
3286
2712
@dbus.service.method(_interface,
3287
2713
out_signature="a{oa{sv}}")
3288
2714
def GetAllClientsWithProperties(self):
3290
2716
return dbus.Dictionary(
3291
{c.dbus_object_path: c.GetAll(
3292
"se.recompile.Mandos.Client")
3293
for c in tcp_server.clients.values()},
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
3294
2719
signature="oa{sv}")
3296
2721
@dbus.service.method(_interface, in_signature="o")
3297
2722
def RemoveClient(self, object_path):
3299
for c in tcp_server.clients.values():
2724
for c in tcp_server.clients.itervalues():
3300
2725
if c.dbus_object_path == object_path:
3301
2726
del tcp_server.clients[c.name]
3302
2727
c.remove_from_connection()
3303
# Don't signal the disabling
2728
# Don't signal anything except ClientRemoved
3304
2729
c.disable(quiet=True)
3305
# Emit D-Bus signal for removal
3306
self.client_removed_signal(c)
2731
self.ClientRemoved(object_path, c.name)
3308
2733
raise KeyError(object_path)
3312
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3313
out_signature="a{oa{sa{sv}}}")
3314
def GetManagedObjects(self):
3316
return dbus.Dictionary(
3317
{client.dbus_object_path:
3319
{interface: client.GetAll(interface)
3321
client._get_all_interface_names()})
3322
for client in tcp_server.clients.values()})
3324
def client_added_signal(self, client):
3325
"""Send the new standard signal and the old signal"""
3327
# New standard signal
3328
self.InterfacesAdded(
3329
client.dbus_object_path,
3331
{interface: client.GetAll(interface)
3333
client._get_all_interface_names()}))
3335
self.ClientAdded(client.dbus_object_path)
3337
def client_removed_signal(self, client):
3338
"""Send the new standard signal and the old signal"""
3340
# New standard signal
3341
self.InterfacesRemoved(
3342
client.dbus_object_path,
3343
client._get_all_interface_names())
3345
self.ClientRemoved(client.dbus_object_path,
3348
2737
mandos_dbus_service = MandosDBusService()
3350
# Save modules to variables to exempt the modules from being
3351
# unloaded before the function registered with atexit() is run.
3352
mp = multiprocessing
3356
2740
"Cleanup function; run on exit"
3360
mp.active_children()
2743
multiprocessing.active_children()
3362
2745
if not (tcp_server.clients or client_settings):
3365
2748
# Store client before exiting. Secrets are encrypted with key
3366
2749
# based on what config file has. If config file is
3367
2750
# removed/edited, old secret will thus be unrecovable.
3369
2752
with PGPEngine() as pgp:
3370
for client in tcp_server.clients.values():
2753
for client in tcp_server.clients.itervalues():
3371
2754
key = client_settings[client.name]["secret"]
3372
2755
client.encrypted_secret = pgp.encrypt(client.secret,
3374
2757
client_dict = {}
3376
2759
# A list of attributes that can not be pickled
3378
exclude = {"bus", "changedstate", "secret",
3379
"checker", "server_settings"}
3380
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)):
3382
2765
exclude.add(name)
3384
2767
client_dict["encrypted_secret"] = (client
3385
2768
.encrypted_secret)
3386
2769
for attr in client.client_structure:
3387
2770
if attr not in exclude:
3388
2771
client_dict[attr] = getattr(client, attr)
3390
2773
clients[client.name] = client_dict
3391
2774
del client_settings[client.name]["secret"]
3394
with tempfile.NamedTemporaryFile(
3398
dir=os.path.dirname(stored_state_path),
3399
delete=False) as stored_state:
3400
pickle.dump((clients, client_settings), stored_state,
3402
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
3403
2783
os.rename(tempname, stored_state_path)
3404
2784
except (IOError, OSError) as e: