2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
83
74
import dbus.service
85
from gi.repository import GLib
86
77
from dbus.mainloop.glib import DBusGMainLoop
89
80
import xml.dom.minidom
92
if sys.version_info.major == 2:
95
# Show warnings by default
96
if not sys.warnoptions:
98
warnings.simplefilter("default")
100
# Try to find the value of SO_BINDTODEVICE:
102
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
103
# newer, and it is also the most natural place for it:
104
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
105
85
except AttributeError:
107
# This is where SO_BINDTODEVICE was up to and including Python
109
87
from IN import SO_BINDTODEVICE
110
88
except ImportError:
111
# In Python 2.7 it seems to have been removed entirely.
112
# Try running the C preprocessor:
114
cc = subprocess.Popen(["cc", "--language=c", "-E",
116
stdin=subprocess.PIPE,
117
stdout=subprocess.PIPE)
118
stdout = cc.communicate(
119
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
120
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
121
except (OSError, ValueError, IndexError):
123
SO_BINDTODEVICE = None
125
if sys.version_info.major == 2:
128
if sys.version_info < (3, 2):
129
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
132
92
stored_state_file = "clients.pickle"
134
94
logger = logging.getLogger()
135
logging.captureWarnings(True) # Show warnings via the logging system
139
if_nametoindex = ctypes.cdll.LoadLibrary(
140
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
141
101
except (OSError, AttributeError):
143
102
def if_nametoindex(interface):
144
103
"Get an interface index the hard way, i.e. using fcntl()"
145
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
146
105
with contextlib.closing(socket.socket()) as s:
147
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
148
struct.pack(b"16s16x", interface))
149
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
150
111
return interface_index
153
def copy_function(func):
154
"""Make a copy of a function"""
155
if sys.version_info.major == 2:
156
return types.FunctionType(func.func_code,
162
return types.FunctionType(func.__code__,
169
114
def initlogger(debug, level=logging.WARNING):
170
115
"""init logger and add loglevel"""
173
syslogger = (logging.handlers.SysLogHandler(
174
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
118
syslogger = (logging.handlers.SysLogHandler
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
176
122
syslogger.setFormatter(logging.Formatter
177
123
('Mandos [%(process)d]: %(levelname)s:'
179
125
logger.addHandler(syslogger)
182
128
console = logging.StreamHandler()
183
129
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
250
182
.replace(b"\n", b"\\n")
251
183
.replace(b"\0", b"\\x00"))
254
186
def encrypt(self, data, password):
255
187
passphrase = self.password_encode(password)
256
with tempfile.NamedTemporaryFile(
257
dir=self.tempdir) as passfile:
188
with tempfile.NamedTemporaryFile(dir=self.tempdir
258
190
passfile.write(passphrase)
260
proc = subprocess.Popen([self.gpg, '--symmetric',
192
proc = subprocess.Popen(['gpg', '--symmetric',
261
193
'--passphrase-file',
263
195
+ self.gnupgargs,
264
stdin=subprocess.PIPE,
265
stdout=subprocess.PIPE,
266
stderr=subprocess.PIPE)
267
ciphertext, err = proc.communicate(input=data)
196
stdin = subprocess.PIPE,
197
stdout = subprocess.PIPE,
198
stderr = subprocess.PIPE)
199
ciphertext, err = proc.communicate(input = data)
268
200
if proc.returncode != 0:
269
201
raise PGPError(err)
270
202
return ciphertext
272
204
def decrypt(self, data, password):
273
205
passphrase = self.password_encode(password)
274
with tempfile.NamedTemporaryFile(
275
dir=self.tempdir) as passfile:
206
with tempfile.NamedTemporaryFile(dir = self.tempdir
276
208
passfile.write(passphrase)
278
proc = subprocess.Popen([self.gpg, '--decrypt',
210
proc = subprocess.Popen(['gpg', '--decrypt',
279
211
'--passphrase-file',
281
213
+ self.gnupgargs,
282
stdin=subprocess.PIPE,
283
stdout=subprocess.PIPE,
284
stderr=subprocess.PIPE)
285
decrypted_plaintext, err = proc.communicate(input=data)
214
stdin = subprocess.PIPE,
215
stdout = subprocess.PIPE,
216
stderr = subprocess.PIPE)
217
decrypted_plaintext, err = proc.communicate(input
286
219
if proc.returncode != 0:
287
220
raise PGPError(err)
288
221
return decrypted_plaintext
291
# Pretend that we have an Avahi module
293
"""This isn't so much a class as it is a module-like namespace."""
294
IF_UNSPEC = -1 # avahi-common/address.h
295
PROTO_UNSPEC = -1 # avahi-common/address.h
296
PROTO_INET = 0 # avahi-common/address.h
297
PROTO_INET6 = 1 # avahi-common/address.h
298
DBUS_NAME = "org.freedesktop.Avahi"
299
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
300
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
301
DBUS_PATH_SERVER = "/"
304
def string_array_to_txt_array(t):
305
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
306
for s in t), signature="ay")
307
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
308
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
309
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
310
SERVER_INVALID = 0 # avahi-common/defs.h
311
SERVER_REGISTERING = 1 # avahi-common/defs.h
312
SERVER_RUNNING = 2 # avahi-common/defs.h
313
SERVER_COLLISION = 3 # avahi-common/defs.h
314
SERVER_FAILURE = 4 # avahi-common/defs.h
317
224
class AvahiError(Exception):
318
225
def __init__(self, value, *args, **kwargs):
319
226
self.value = value
320
return super(AvahiError, self).__init__(value, *args,
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
324
231
class AvahiServiceError(AvahiError):
328
234
class AvahiGroupError(AvahiError):
238
class AvahiService(object):
333
239
"""An Avahi (Zeroconf) service.
336
242
interface: integer; avahi.IF_UNSPEC or an interface index.
337
243
Used to optionally bind to the specified interface.
502
386
follow_name_owner_changes=True),
503
387
avahi.DBUS_INTERFACE_SERVER)
504
388
self.server.connect_to_signal("StateChanged",
505
self.server_state_changed)
389
self.server_state_changed)
506
390
self.server_state_changed(self.server.GetState())
509
393
class AvahiServiceToSyslog(AvahiService):
510
def rename(self, *args, **kwargs):
511
395
"""Add the new name to the syslog messages"""
512
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
513
syslogger.setFormatter(logging.Formatter(
514
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
519
# Pretend that we have a GnuTLS module
521
"""This isn't so much a class as it is a module-like namespace."""
523
library = ctypes.util.find_library("gnutls")
525
library = ctypes.util.find_library("gnutls-deb0")
526
_library = ctypes.cdll.LoadLibrary(library)
529
# Unless otherwise indicated, the constants and types below are
530
# all from the gnutls/gnutls.h C header file.
541
E_NO_CERTIFICATE_FOUND = -49
546
KEYID_USE_SHA256 = 1 # gnutls/x509.h
547
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
550
class session_int(ctypes.Structure):
552
session_t = ctypes.POINTER(session_int)
554
class certificate_credentials_st(ctypes.Structure):
556
certificate_credentials_t = ctypes.POINTER(
557
certificate_credentials_st)
558
certificate_type_t = ctypes.c_int
560
class datum_t(ctypes.Structure):
561
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
562
('size', ctypes.c_uint)]
564
class openpgp_crt_int(ctypes.Structure):
566
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
567
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
568
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
569
credentials_type_t = ctypes.c_int
570
transport_ptr_t = ctypes.c_void_p
571
close_request_t = ctypes.c_int
574
class Error(Exception):
575
def __init__(self, message=None, code=None, args=()):
576
# Default usage is by a message string, but if a return
577
# code is passed, convert it to a string with
580
if message is None and code is not None:
581
message = gnutls.strerror(code)
582
return super(gnutls.Error, self).__init__(
585
class CertificateSecurityError(Error):
591
self._c_object = gnutls.certificate_credentials_t()
592
gnutls.certificate_allocate_credentials(
593
ctypes.byref(self._c_object))
594
self.type = gnutls.CRD_CERTIFICATE
597
gnutls.certificate_free_credentials(self._c_object)
600
def __init__(self, socket, credentials=None):
601
self._c_object = gnutls.session_t()
602
gnutls_flags = gnutls.CLIENT
603
if gnutls.check_version(b"3.5.6"):
604
gnutls_flags |= gnutls.NO_TICKETS
606
gnutls_flags |= gnutls.ENABLE_RAWPK
607
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
609
gnutls.set_default_priority(self._c_object)
610
gnutls.transport_set_ptr(self._c_object, socket.fileno())
611
gnutls.handshake_set_private_extensions(self._c_object,
614
if credentials is None:
615
credentials = gnutls.Credentials()
616
gnutls.credentials_set(self._c_object, credentials.type,
617
ctypes.cast(credentials._c_object,
619
self.credentials = credentials
622
gnutls.deinit(self._c_object)
625
return gnutls.handshake(self._c_object)
627
def send(self, data):
631
data_len -= gnutls.record_send(self._c_object,
636
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
638
# Error handling functions
639
def _error_code(result):
640
"""A function to raise exceptions on errors, suitable
641
for the 'restype' attribute on ctypes functions"""
644
if result == gnutls.E_NO_CERTIFICATE_FOUND:
645
raise gnutls.CertificateSecurityError(code=result)
646
raise gnutls.Error(code=result)
648
def _retry_on_error(result, func, arguments):
649
"""A function to retry on some errors, suitable
650
for the 'errcheck' attribute on ctypes functions"""
652
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
653
return _error_code(result)
654
result = func(*arguments)
657
# Unless otherwise indicated, the function declarations below are
658
# all from the gnutls/gnutls.h C header file.
661
priority_set_direct = _library.gnutls_priority_set_direct
662
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
663
ctypes.POINTER(ctypes.c_char_p)]
664
priority_set_direct.restype = _error_code
666
init = _library.gnutls_init
667
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
668
init.restype = _error_code
670
set_default_priority = _library.gnutls_set_default_priority
671
set_default_priority.argtypes = [session_t]
672
set_default_priority.restype = _error_code
674
record_send = _library.gnutls_record_send
675
record_send.argtypes = [session_t, ctypes.c_void_p,
677
record_send.restype = ctypes.c_ssize_t
678
record_send.errcheck = _retry_on_error
680
certificate_allocate_credentials = (
681
_library.gnutls_certificate_allocate_credentials)
682
certificate_allocate_credentials.argtypes = [
683
ctypes.POINTER(certificate_credentials_t)]
684
certificate_allocate_credentials.restype = _error_code
686
certificate_free_credentials = (
687
_library.gnutls_certificate_free_credentials)
688
certificate_free_credentials.argtypes = [
689
certificate_credentials_t]
690
certificate_free_credentials.restype = None
692
handshake_set_private_extensions = (
693
_library.gnutls_handshake_set_private_extensions)
694
handshake_set_private_extensions.argtypes = [session_t,
696
handshake_set_private_extensions.restype = None
698
credentials_set = _library.gnutls_credentials_set
699
credentials_set.argtypes = [session_t, credentials_type_t,
701
credentials_set.restype = _error_code
703
strerror = _library.gnutls_strerror
704
strerror.argtypes = [ctypes.c_int]
705
strerror.restype = ctypes.c_char_p
707
certificate_type_get = _library.gnutls_certificate_type_get
708
certificate_type_get.argtypes = [session_t]
709
certificate_type_get.restype = _error_code
711
certificate_get_peers = _library.gnutls_certificate_get_peers
712
certificate_get_peers.argtypes = [session_t,
713
ctypes.POINTER(ctypes.c_uint)]
714
certificate_get_peers.restype = ctypes.POINTER(datum_t)
716
global_set_log_level = _library.gnutls_global_set_log_level
717
global_set_log_level.argtypes = [ctypes.c_int]
718
global_set_log_level.restype = None
720
global_set_log_function = _library.gnutls_global_set_log_function
721
global_set_log_function.argtypes = [log_func]
722
global_set_log_function.restype = None
724
deinit = _library.gnutls_deinit
725
deinit.argtypes = [session_t]
726
deinit.restype = None
728
handshake = _library.gnutls_handshake
729
handshake.argtypes = [session_t]
730
handshake.restype = _error_code
731
handshake.errcheck = _retry_on_error
733
transport_set_ptr = _library.gnutls_transport_set_ptr
734
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
735
transport_set_ptr.restype = None
737
bye = _library.gnutls_bye
738
bye.argtypes = [session_t, close_request_t]
739
bye.restype = _error_code
740
bye.errcheck = _retry_on_error
742
check_version = _library.gnutls_check_version
743
check_version.argtypes = [ctypes.c_char_p]
744
check_version.restype = ctypes.c_char_p
746
_need_version = b"3.3.0"
747
if check_version(_need_version) is None:
748
raise self.Error("Needs GnuTLS {} or later"
749
.format(_need_version))
751
_tls_rawpk_version = b"3.6.6"
752
has_rawpk = bool(check_version(_tls_rawpk_version))
756
class pubkey_st(ctypes.Structure):
758
pubkey_t = ctypes.POINTER(pubkey_st)
760
x509_crt_fmt_t = ctypes.c_int
762
# All the function declarations below are from gnutls/abstract.h
763
pubkey_init = _library.gnutls_pubkey_init
764
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
765
pubkey_init.restype = _error_code
767
pubkey_import = _library.gnutls_pubkey_import
768
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
770
pubkey_import.restype = _error_code
772
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
773
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
774
ctypes.POINTER(ctypes.c_ubyte),
775
ctypes.POINTER(ctypes.c_size_t)]
776
pubkey_get_key_id.restype = _error_code
778
pubkey_deinit = _library.gnutls_pubkey_deinit
779
pubkey_deinit.argtypes = [pubkey_t]
780
pubkey_deinit.restype = None
782
# All the function declarations below are from gnutls/openpgp.h
784
openpgp_crt_init = _library.gnutls_openpgp_crt_init
785
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
786
openpgp_crt_init.restype = _error_code
788
openpgp_crt_import = _library.gnutls_openpgp_crt_import
789
openpgp_crt_import.argtypes = [openpgp_crt_t,
790
ctypes.POINTER(datum_t),
792
openpgp_crt_import.restype = _error_code
794
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
795
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
796
ctypes.POINTER(ctypes.c_uint)]
797
openpgp_crt_verify_self.restype = _error_code
799
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
800
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
801
openpgp_crt_deinit.restype = None
803
openpgp_crt_get_fingerprint = (
804
_library.gnutls_openpgp_crt_get_fingerprint)
805
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
809
openpgp_crt_get_fingerprint.restype = _error_code
811
if check_version(b"3.6.4"):
812
certificate_type_get2 = _library.gnutls_certificate_type_get2
813
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
814
certificate_type_get2.restype = _error_code
816
# Remove non-public functions
817
del _error_code, _retry_on_error
820
def call_pipe(connection, # : multiprocessing.Connection
821
func, *args, **kwargs):
822
"""This function is meant to be called by multiprocessing.Process
824
This function runs func(*args, **kwargs), and writes the resulting
825
return value on the provided multiprocessing.Connection.
827
connection.send(func(*args, **kwargs))
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
411
class Client(object):
832
412
"""A representation of a client host served by this server.
835
415
approved: bool(); 'None' if not yet approved/disapproved
836
416
approval_delay: datetime.timedelta(); Time to wait for approval
837
417
approval_duration: datetime.timedelta(); Duration of one approval
838
checker: multiprocessing.Process(); a running checker process used
839
to see if the client lives. 'None' if no process is
841
checker_callback_tag: a GLib event source tag, or None
418
checker: subprocess.Popen(); a running checker process used
419
to see if the client lives.
420
'None' if no process is running.
421
checker_callback_tag: a gobject event source tag, or None
842
422
checker_command: string; External command which is run to check
843
423
if client lives. %() expansions are done at
844
424
runtime with vars(self) as dict, so that for
845
425
instance %(name)s can be used in the command.
846
checker_initiator_tag: a GLib event source tag, or None
426
checker_initiator_tag: a gobject event source tag, or None
847
427
created: datetime.datetime(); (UTC) object creation
848
428
client_structure: Object describing what attributes a client has
849
429
and is used for storing the client at exit
850
430
current_checker_command: string; current running checker_command
851
disable_initiator_tag: a GLib event source tag, or None
431
disable_initiator_tag: a gobject event source tag, or None
853
433
fingerprint: string (40 or 32 hexadecimal digits); used to
854
uniquely identify an OpenPGP client
855
key_id: string (64 hexadecimal digits); used to uniquely identify
856
a client using raw public keys
434
uniquely identify the client
857
435
host: string; available for use by the checker command
858
436
interval: datetime.timedelta(); How often to start a new checker
859
437
last_approval_request: datetime.datetime(); (UTC) or None
1016
604
logger.info("Disabling client %s", self.name)
1017
605
if getattr(self, "disable_initiator_tag", None) is not None:
1018
GLib.source_remove(self.disable_initiator_tag)
606
gobject.source_remove(self.disable_initiator_tag)
1019
607
self.disable_initiator_tag = None
1020
608
self.expires = None
1021
609
if getattr(self, "checker_initiator_tag", None) is not None:
1022
GLib.source_remove(self.checker_initiator_tag)
610
gobject.source_remove(self.checker_initiator_tag)
1023
611
self.checker_initiator_tag = None
1024
612
self.stop_checker()
1025
613
self.enabled = False
1027
615
self.send_changedstate()
1028
# Do not run this again if called by a GLib.timeout_add
616
# Do not run this again if called by a gobject.timeout_add
1031
619
def __del__(self):
1034
622
def init_checker(self):
1035
623
# Schedule a new checker to be started an 'interval' from now,
1036
624
# and every interval from then on.
1037
625
if self.checker_initiator_tag is not None:
1038
GLib.source_remove(self.checker_initiator_tag)
1039
self.checker_initiator_tag = GLib.timeout_add(
1040
int(self.interval.total_seconds() * 1000),
626
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
1042
630
# Schedule a disable() when 'timeout' has passed
1043
631
if self.disable_initiator_tag is not None:
1044
GLib.source_remove(self.disable_initiator_tag)
1045
self.disable_initiator_tag = GLib.timeout_add(
1046
int(self.timeout.total_seconds() * 1000), self.disable)
632
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
1047
636
# Also start a new checker *right now*.
1048
637
self.start_checker()
1050
def checker_callback(self, source, condition, connection,
639
def checker_callback(self, pid, condition, command):
1052
640
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
1057
641
self.checker_callback_tag = None
1058
642
self.checker = None
1061
self.last_checker_status = returncode
1062
self.last_checker_signal = None
643
if os.WIFEXITED(condition):
644
self.last_checker_status = os.WEXITSTATUS(condition)
1063
645
if self.last_checker_status == 0:
1064
646
logger.info("Checker for %(name)s succeeded",
1066
648
self.checked_ok()
1068
logger.info("Checker for %(name)s failed", vars(self))
650
logger.info("Checker for %(name)s failed",
1070
653
self.last_checker_status = -1
1071
self.last_checker_signal = -returncode
1072
654
logger.warning("Checker for %(name)s crashed?",
1076
657
def checked_ok(self):
1077
658
"""Assert that the client has been seen, alive and well."""
1078
659
self.last_checked_ok = datetime.datetime.utcnow()
1079
660
self.last_checker_status = 0
1080
self.last_checker_signal = None
1081
661
self.bump_timeout()
1083
663
def bump_timeout(self, timeout=None):
1084
664
"""Bump up the timeout for this client."""
1085
665
if timeout is None:
1086
666
timeout = self.timeout
1087
667
if self.disable_initiator_tag is not None:
1088
GLib.source_remove(self.disable_initiator_tag)
668
gobject.source_remove(self.disable_initiator_tag)
1089
669
self.disable_initiator_tag = None
1090
670
if getattr(self, "enabled", False):
1091
self.disable_initiator_tag = GLib.timeout_add(
1092
int(timeout.total_seconds() * 1000), self.disable)
671
self.disable_initiator_tag = (gobject.timeout_add
672
(timedelta_to_milliseconds
673
(timeout), self.disable))
1093
674
self.expires = datetime.datetime.utcnow() + timeout
1095
676
def need_approval(self):
1096
677
self.last_approval_request = datetime.datetime.utcnow()
1098
679
def start_checker(self):
1099
680
"""Start a new checker subprocess if one is not running.
1101
682
If a checker already exists, leave it running and do
1103
684
# The reason for not killing a running checker is that if we
1108
689
# checkers alone, the checker would have to take more time
1109
690
# than 'timeout' for the client to be disabled, which is as it
1112
if self.checker is not None and not self.checker.is_alive():
1113
logger.warning("Checker was not alive; joining")
693
# If a checker exists, make sure it is not a zombie
695
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
except AttributeError:
698
except OSError as error:
699
if error.errno != errno.ECHILD:
703
logger.warning("Checker was a zombie")
704
gobject.source_remove(self.checker_callback_tag)
705
self.checker_callback(pid, status,
706
self.current_checker_command)
1116
707
# Start a new checker if needed
1117
708
if self.checker is None:
1118
709
# Escape attributes for the shell
1120
attr: re.escape(str(getattr(self, attr)))
1121
for attr in self.runtime_expansions}
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
713
self.runtime_expansions)
1123
715
command = self.checker_command % escaped_attrs
1124
716
except TypeError as error:
1125
717
logger.error('Could not format string "%s"',
1126
self.checker_command,
718
self.checker_command, exc_info=error)
719
return True # Try again later
720
self.current_checker_command = command
722
logger.info("Starting checker %r for %s",
724
# We don't need to redirect stdout and stderr, since
725
# in normal mode, that is already done by daemon(),
726
# and in debug mode we don't want to. (Stdin is
727
# always replaced by /dev/null.)
728
# The exception is when not debugging but nevertheless
729
# running in the foreground; use the previously
732
if (not self.server_settings["debug"]
733
and self.server_settings["foreground"]):
734
popen_args.update({"stdout": wnull,
736
self.checker = subprocess.Popen(command,
740
except OSError as error:
741
logger.error("Failed to start subprocess",
1128
return True # Try again later
1129
self.current_checker_command = command
1130
logger.info("Starting checker %r for %s", command,
1132
# We don't need to redirect stdout and stderr, since
1133
# in normal mode, that is already done by daemon(),
1134
# and in debug mode we don't want to. (Stdin is
1135
# always replaced by /dev/null.)
1136
# The exception is when not debugging but nevertheless
1137
# running in the foreground; use the previously
1139
popen_args = {"close_fds": True,
1142
if (not self.server_settings["debug"]
1143
and self.server_settings["foreground"]):
1144
popen_args.update({"stdout": wnull,
1146
pipe = multiprocessing.Pipe(duplex=False)
1147
self.checker = multiprocessing.Process(
1149
args=(pipe[1], subprocess.call, command),
1151
self.checker.start()
1152
self.checker_callback_tag = GLib.io_add_watch(
1153
GLib.IOChannel.unix_new(pipe[0].fileno()),
1154
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1155
self.checker_callback, pipe[0], command)
1156
# Re-run this periodically if run by GLib.timeout_add
744
self.checker_callback_tag = (gobject.child_watch_add
746
self.checker_callback,
748
# The checker may have completed before the gobject
749
# watch was added. Check for this.
751
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
752
except OSError as error:
753
if error.errno == errno.ECHILD:
754
# This should never happen
755
logger.error("Child process vanished",
760
gobject.source_remove(self.checker_callback_tag)
761
self.checker_callback(pid, status, command)
762
# Re-run this periodically if run by gobject.timeout_add
1159
765
def stop_checker(self):
1160
766
"""Force the checker process, if any, to stop."""
1161
767
if self.checker_callback_tag:
1162
GLib.source_remove(self.checker_callback_tag)
768
gobject.source_remove(self.checker_callback_tag)
1163
769
self.checker_callback_tag = None
1164
770
if getattr(self, "checker", None) is None:
1166
772
logger.debug("Stopping checker for %(name)s", vars(self))
1167
self.checker.terminate()
774
self.checker.terminate()
776
#if self.checker.poll() is None:
777
# self.checker.kill()
778
except OSError as error:
779
if error.errno != errno.ESRCH: # No such process
1168
781
self.checker = None
1171
def dbus_service_property(dbus_interface,
784
def dbus_service_property(dbus_interface, signature="v",
785
access="readwrite", byte_arrays=False):
1175
786
"""Decorators for marking methods of a DBusObjectWithProperties to
1176
787
become properties on the D-Bus.
1178
789
The decorated method will be called with no arguments by "Get"
1179
790
and with one argument by "Set".
1181
792
The parameters, where they are supported, are the same as
1182
793
dbus.service.method, except there is only "signature", since the
1183
794
type from Get() and the type sent to Set() is the same.
1266
class DBusObjectWithAnnotations(dbus.service.Object):
1267
"""A D-Bus object with annotations.
1269
Classes inheriting from this can use the dbus_annotations
1270
decorator to add annotations to methods or signals.
870
class DBusObjectWithProperties(dbus.service.Object):
871
"""A D-Bus object with properties.
873
Classes inheriting from this can use the dbus_service_property
874
decorator to expose methods as D-Bus properties. It exposes the
875
standard Get(), Set(), and GetAll() methods on the D-Bus.
1274
879
def _is_dbus_thing(thing):
1275
880
"""Returns a function testing if an attribute is a D-Bus thing
1277
882
If called like _is_dbus_thing("method") it returns a function
1278
883
suitable for use as predicate to inspect.getmembers().
1280
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1283
888
def _get_all_dbus_things(self, thing):
1284
889
"""Returns a generator of (name, attribute) pairs
1286
return ((getattr(athing.__get__(self), "_dbus_name", name),
891
return ((getattr(athing.__get__(self), "_dbus_name",
1287
893
athing.__get__(self))
1288
894
for cls in self.__class__.__mro__
1289
895
for name, athing in
1290
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1292
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1294
path_keyword='object_path',
1295
connection_keyword='connection')
1296
def Introspect(self, object_path, connection):
1297
"""Overloading of standard D-Bus method.
1299
Inserts annotation tags on methods and signals.
1301
xmlstring = dbus.service.Object.Introspect(self, object_path,
1304
document = xml.dom.minidom.parseString(xmlstring)
1306
for if_tag in document.getElementsByTagName("interface"):
1307
# Add annotation tags
1308
for typ in ("method", "signal"):
1309
for tag in if_tag.getElementsByTagName(typ):
1311
for name, prop in (self.
1312
_get_all_dbus_things(typ)):
1313
if (name == tag.getAttribute("name")
1314
and prop._dbus_interface
1315
== if_tag.getAttribute("name")):
1316
annots.update(getattr(
1317
prop, "_dbus_annotations", {}))
1318
for name, value in annots.items():
1319
ann_tag = document.createElement(
1321
ann_tag.setAttribute("name", name)
1322
ann_tag.setAttribute("value", value)
1323
tag.appendChild(ann_tag)
1324
# Add interface annotation tags
1325
for annotation, value in dict(
1326
itertools.chain.from_iterable(
1327
annotations().items()
1328
for name, annotations
1329
in self._get_all_dbus_things("interface")
1330
if name == if_tag.getAttribute("name")
1332
ann_tag = document.createElement("annotation")
1333
ann_tag.setAttribute("name", annotation)
1334
ann_tag.setAttribute("value", value)
1335
if_tag.appendChild(ann_tag)
1336
# Fix argument name for the Introspect method itself
1337
if (if_tag.getAttribute("name")
1338
== dbus.INTROSPECTABLE_IFACE):
1339
for cn in if_tag.getElementsByTagName("method"):
1340
if cn.getAttribute("name") == "Introspect":
1341
for arg in cn.getElementsByTagName("arg"):
1342
if (arg.getAttribute("direction")
1344
arg.setAttribute("name",
1346
xmlstring = document.toxml("utf-8")
1348
except (AttributeError, xml.dom.DOMException,
1349
xml.parsers.expat.ExpatError) as error:
1350
logger.error("Failed to override Introspection method",
1355
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1356
"""A D-Bus object with properties.
1358
Classes inheriting from this can use the dbus_service_property
1359
decorator to expose methods as D-Bus properties. It exposes the
1360
standard Get(), Set(), and GetAll() methods on the D-Bus.
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
1363
899
def _get_dbus_property(self, interface_name, property_name):
1364
900
"""Returns a bound method if one exists which is a D-Bus
1365
901
property with the specified name and interface.
1367
for cls in self.__class__.__mro__:
1368
for name, value in inspect.getmembers(
1369
cls, self._is_dbus_thing("property")):
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
906
self._is_dbus_thing("property"))):
1370
907
if (value._dbus_name == property_name
1371
908
and value._dbus_interface == interface_name):
1372
909
return value.__get__(self)
1374
911
# No such property
1375
raise DBusPropertyNotFound("{}:{}.{}".format(
1376
self.dbus_object_path, interface_name, property_name))
1379
def _get_all_interface_names(cls):
1380
"""Get a sequence of all interfaces supported by an object"""
1381
return (name for name in set(getattr(getattr(x, attr),
1382
"_dbus_interface", None)
1383
for x in (inspect.getmro(cls))
1385
if name is not None)
1387
@dbus.service.method(dbus.PROPERTIES_IFACE,
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1389
917
out_signature="v")
1390
918
def Get(self, interface_name, property_name):
1391
919
"""Standard D-Bus property Get() method, see D-Bus standard.
1520
1051
return xmlstring
1524
dbus.OBJECT_MANAGER_IFACE
1525
except AttributeError:
1526
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1529
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1530
"""A D-Bus object with an ObjectManager.
1532
Classes inheriting from this exposes the standard
1533
GetManagedObjects call and the InterfacesAdded and
1534
InterfacesRemoved signals on the standard
1535
"org.freedesktop.DBus.ObjectManager" interface.
1537
Note: No signals are sent automatically; they must be sent
1540
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1541
out_signature="a{oa{sa{sv}}}")
1542
def GetManagedObjects(self):
1543
"""This function must be overridden"""
1544
raise NotImplementedError()
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1547
signature="oa{sa{sv}}")
1548
def InterfacesAdded(self, object_path, interfaces_and_properties):
1551
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1552
def InterfacesRemoved(self, object_path, interfaces):
1555
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1557
path_keyword='object_path',
1558
connection_keyword='connection')
1559
def Introspect(self, object_path, connection):
1560
"""Overloading of standard D-Bus method.
1562
Override return argument name of GetManagedObjects to be
1563
"objpath_interfaces_and_properties"
1565
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1569
document = xml.dom.minidom.parseString(xmlstring)
1571
for if_tag in document.getElementsByTagName("interface"):
1572
# Fix argument name for the GetManagedObjects method
1573
if (if_tag.getAttribute("name")
1574
== dbus.OBJECT_MANAGER_IFACE):
1575
for cn in if_tag.getElementsByTagName("method"):
1576
if (cn.getAttribute("name")
1577
== "GetManagedObjects"):
1578
for arg in cn.getElementsByTagName("arg"):
1579
if (arg.getAttribute("direction")
1583
"objpath_interfaces"
1585
xmlstring = document.toxml("utf-8")
1587
except (AttributeError, xml.dom.DOMException,
1588
xml.parsers.expat.ExpatError) as error:
1589
logger.error("Failed to override Introspection method",
1594
1054
def datetime_to_dbus(dt, variant_level=0):
1595
1055
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1597
return dbus.String("", variant_level=variant_level)
1598
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
return dbus.String("", variant_level = variant_level)
1058
return dbus.String(dt.isoformat(),
1059
variant_level=variant_level)
1601
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1962
1411
server to mandos-client
1966
1415
# Rejected - signal
1967
1416
@dbus.service.signal(_interface, signature="s")
1968
1417
def Rejected(self, reason):
1972
1421
# NeedApproval - signal
1973
1422
@dbus.service.signal(_interface, signature="tb")
1974
1423
def NeedApproval(self, timeout, default):
1976
1425
return self.need_approval()
1980
1429
# Approve - method
1981
1430
@dbus.service.method(_interface, in_signature="b")
1982
1431
def Approve(self, value):
1983
1432
self.approve(value)
1985
1434
# CheckedOK - method
1986
1435
@dbus.service.method(_interface)
1987
1436
def CheckedOK(self):
1988
1437
self.checked_ok()
1990
1439
# Enable - method
1991
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1992
1440
@dbus.service.method(_interface)
1993
1441
def Enable(self):
1997
1445
# StartChecker - method
1998
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1999
1446
@dbus.service.method(_interface)
2000
1447
def StartChecker(self):
2002
1449
self.start_checker()
2004
1451
# Disable - method
2005
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2006
1452
@dbus.service.method(_interface)
2007
1453
def Disable(self):
2011
1457
# StopChecker - method
2012
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2013
1458
@dbus.service.method(_interface)
2014
1459
def StopChecker(self):
2015
1460
self.stop_checker()
2019
1464
# ApprovalPending - property
2020
1465
@dbus_service_property(_interface, signature="b", access="read")
2021
1466
def ApprovalPending_dbus_property(self):
2022
1467
return dbus.Boolean(bool(self.approvals_pending))
2024
1469
# ApprovedByDefault - property
2025
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="b",
2027
1471
access="readwrite")
2028
1472
def ApprovedByDefault_dbus_property(self, value=None):
2029
1473
if value is None: # get
2030
1474
return dbus.Boolean(self.approved_by_default)
2031
1475
self.approved_by_default = bool(value)
2033
1477
# ApprovalDelay - property
2034
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
2036
1479
access="readwrite")
2037
1480
def ApprovalDelay_dbus_property(self, value=None):
2038
1481
if value is None: # get
2039
return dbus.UInt64(self.approval_delay.total_seconds()
1482
return dbus.UInt64(self.approval_delay_milliseconds())
2041
1483
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2043
1485
# ApprovalDuration - property
2044
@dbus_service_property(_interface,
1486
@dbus_service_property(_interface, signature="t",
2046
1487
access="readwrite")
2047
1488
def ApprovalDuration_dbus_property(self, value=None):
2048
1489
if value is None: # get
2049
return dbus.UInt64(self.approval_duration.total_seconds()
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
2051
1492
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2053
1494
# Name - property
2055
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2056
1495
@dbus_service_property(_interface, signature="s", access="read")
2057
1496
def Name_dbus_property(self):
2058
1497
return dbus.String(self.name)
2062
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2063
@dbus_service_property(_interface, signature="s", access="read")
2064
def KeyID_dbus_property(self):
2065
return dbus.String(self.key_id)
2067
1499
# Fingerprint - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2070
1500
@dbus_service_property(_interface, signature="s", access="read")
2071
1501
def Fingerprint_dbus_property(self):
2072
1502
return dbus.String(self.fingerprint)
2074
1504
# Host - property
2075
@dbus_service_property(_interface,
1505
@dbus_service_property(_interface, signature="s",
2077
1506
access="readwrite")
2078
1507
def Host_dbus_property(self, value=None):
2079
1508
if value is None: # get
2080
1509
return dbus.String(self.host)
2081
self.host = str(value)
1510
self.host = unicode(value)
2083
1512
# Created - property
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2086
1513
@dbus_service_property(_interface, signature="s", access="read")
2087
1514
def Created_dbus_property(self):
2088
1515
return datetime_to_dbus(self.created)
2090
1517
# LastEnabled - property
2091
1518
@dbus_service_property(_interface, signature="s", access="read")
2092
1519
def LastEnabled_dbus_property(self):
2093
1520
return datetime_to_dbus(self.last_enabled)
2095
1522
# Enabled - property
2096
@dbus_service_property(_interface,
1523
@dbus_service_property(_interface, signature="b",
2098
1524
access="readwrite")
2099
1525
def Enabled_dbus_property(self, value=None):
2100
1526
if value is None: # get
2149
1574
if (getattr(self, "disable_initiator_tag", None)
2152
GLib.source_remove(self.disable_initiator_tag)
2153
self.disable_initiator_tag = GLib.timeout_add(
2154
int((self.expires - now).total_seconds() * 1000),
1577
gobject.source_remove(self.disable_initiator_tag)
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
2157
1583
# ExtendedTimeout - property
2158
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2160
1585
access="readwrite")
2161
1586
def ExtendedTimeout_dbus_property(self, value=None):
2162
1587
if value is None: # get
2163
return dbus.UInt64(self.extended_timeout.total_seconds()
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
2165
1589
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2167
1591
# Interval - property
2168
@dbus_service_property(_interface,
1592
@dbus_service_property(_interface, signature="t",
2170
1593
access="readwrite")
2171
1594
def Interval_dbus_property(self, value=None):
2172
1595
if value is None: # get
2173
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
return dbus.UInt64(self.interval_milliseconds())
2174
1597
self.interval = datetime.timedelta(0, 0, 0, value)
2175
1598
if getattr(self, "checker_initiator_tag", None) is None:
2177
1600
if self.enabled:
2178
1601
# Reschedule checker run
2179
GLib.source_remove(self.checker_initiator_tag)
2180
self.checker_initiator_tag = GLib.timeout_add(
2181
value, self.start_checker)
2182
self.start_checker() # Start one now, too
1602
gobject.source_remove(self.checker_initiator_tag)
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
2184
1607
# Checker - property
2185
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="s",
2187
1609
access="readwrite")
2188
1610
def Checker_dbus_property(self, value=None):
2189
1611
if value is None: # get
2190
1612
return dbus.String(self.checker_command)
2191
self.checker_command = str(value)
1613
self.checker_command = unicode(value)
2193
1615
# CheckerRunning - property
2194
@dbus_service_property(_interface,
1616
@dbus_service_property(_interface, signature="b",
2196
1617
access="readwrite")
2197
1618
def CheckerRunning_dbus_property(self, value=None):
2198
1619
if value is None: # get
2382
1792
delay -= time2 - time
2385
session.send(client.secret)
2386
except gnutls.Error as error:
2387
logger.warning("gnutls send failed",
1795
while sent_size < len(client.secret):
1797
sent = session.send(client.secret[sent_size:])
1798
except gnutls.errors.GNUTLSError as error:
1799
logger.warning("gnutls send failed",
1802
logger.debug("Sent: %d, remaining: %d",
1803
sent, len(client.secret)
1804
- (sent_size + sent))
2391
1807
logger.info("Sending secret to %s", client.name)
2392
1808
# bump the timeout using extended_timeout
2393
1809
client.bump_timeout(client.extended_timeout)
2394
1810
if self.server.use_dbus:
2395
1811
# Emit D-Bus signal
2396
1812
client.GotSecret()
2399
1815
if approval_required:
2400
1816
client.approvals_pending -= 1
2403
except gnutls.Error as error:
1819
except gnutls.errors.GNUTLSError as error:
2404
1820
logger.warning("GnuTLS bye failed",
2405
1821
exc_info=error)
2408
1824
def peer_certificate(session):
2409
"Return the peer's certificate as a bytestring"
2411
cert_type = gnutls.certificate_type_get2(session._c_object,
2413
except AttributeError:
2414
cert_type = gnutls.certificate_type_get(session._c_object)
2415
if gnutls.has_rawpk:
2416
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2418
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2419
# If not a valid certificate type...
2420
if cert_type not in valid_cert_types:
2421
logger.info("Cert type %r not in %r", cert_type,
2423
# ...return invalid data
1825
"Return the peer's OpenPGP certificate as a bytestring"
1826
# If not an OpenPGP certificate...
1827
if (gnutls.library.functions
1828
.gnutls_certificate_type_get(session._c_object)
1829
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1830
# ...do the normal thing
1831
return session.peer_certificate
2425
1832
list_size = ctypes.c_uint(1)
2426
cert_list = (gnutls.certificate_get_peers
1833
cert_list = (gnutls.library.functions
1834
.gnutls_certificate_get_peers
2427
1835
(session._c_object, ctypes.byref(list_size)))
2428
1836
if not bool(cert_list) and list_size.value != 0:
2429
raise gnutls.Error("error getting peer certificate")
1837
raise gnutls.errors.GNUTLSError("error getting peer"
2430
1839
if list_size.value == 0:
2432
1841
cert = cert_list[0]
2433
1842
return ctypes.string_at(cert.data, cert.size)
2436
def key_id(certificate):
2437
"Convert a certificate bytestring to a hexdigit key ID"
2438
# New GnuTLS "datum" with the public key
2439
datum = gnutls.datum_t(
2440
ctypes.cast(ctypes.c_char_p(certificate),
2441
ctypes.POINTER(ctypes.c_ubyte)),
2442
ctypes.c_uint(len(certificate)))
2443
# XXX all these need to be created in the gnutls "module"
2444
# New empty GnuTLS certificate
2445
pubkey = gnutls.pubkey_t()
2446
gnutls.pubkey_init(ctypes.byref(pubkey))
2447
# Import the raw public key into the certificate
2448
gnutls.pubkey_import(pubkey,
2449
ctypes.byref(datum),
2450
gnutls.X509_FMT_DER)
2451
# New buffer for the key ID
2452
buf = ctypes.create_string_buffer(32)
2453
buf_len = ctypes.c_size_t(len(buf))
2454
# Get the key ID from the raw public key into the buffer
2455
gnutls.pubkey_get_key_id(pubkey,
2456
gnutls.KEYID_USE_SHA256,
2457
ctypes.cast(ctypes.byref(buf),
2458
ctypes.POINTER(ctypes.c_ubyte)),
2459
ctypes.byref(buf_len))
2460
# Deinit the certificate
2461
gnutls.pubkey_deinit(pubkey)
2463
# Convert the buffer to a Python bytestring
2464
key_id = ctypes.string_at(buf, buf_len.value)
2465
# Convert the bytestring to hexadecimal notation
2466
hex_key_id = binascii.hexlify(key_id).upper()
2470
1845
def fingerprint(openpgp):
2471
1846
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2472
1847
# New GnuTLS "datum" with the OpenPGP public key
2473
datum = gnutls.datum_t(
2474
ctypes.cast(ctypes.c_char_p(openpgp),
2475
ctypes.POINTER(ctypes.c_ubyte)),
2476
ctypes.c_uint(len(openpgp)))
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
ctypes.c_uint(len(openpgp))))
2477
1853
# New empty GnuTLS certificate
2478
crt = gnutls.openpgp_crt_t()
2479
gnutls.openpgp_crt_init(ctypes.byref(crt))
1854
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2480
1857
# Import the OpenPGP public key into the certificate
2481
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2482
gnutls.OPENPGP_FMT_RAW)
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
2483
1862
# Verify the self signature in the key
2484
1863
crtverify = ctypes.c_uint()
2485
gnutls.openpgp_crt_verify_self(crt, 0,
2486
ctypes.byref(crtverify))
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
2487
1867
if crtverify.value != 0:
2488
gnutls.openpgp_crt_deinit(crt)
2489
raise gnutls.CertificateSecurityError(code
1868
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1869
raise (gnutls.errors.CertificateSecurityError
2491
1871
# New buffer for the fingerprint
2492
1872
buf = ctypes.create_string_buffer(20)
2493
1873
buf_len = ctypes.c_size_t()
2494
1874
# Get the fingerprint from the certificate into the buffer
2495
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2496
ctypes.byref(buf_len))
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
2497
1878
# Deinit the certificate
2498
gnutls.openpgp_crt_deinit(crt)
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2499
1880
# Convert the buffer to a Python bytestring
2500
1881
fpr = ctypes.string_at(buf, buf_len.value)
2501
1882
# Convert the bytestring to hexadecimal notation
2590
1965
# socket_wrapper(), if socketfd was set.
2591
1966
socketserver.TCPServer.__init__(self, server_address,
2592
1967
RequestHandlerClass)
2594
1969
def server_bind(self):
2595
1970
"""This overrides the normal server_bind() function
2596
1971
to bind to an interface if one was specified, and also NOT to
2597
1972
bind to an address or port if they were not specified."""
2598
global SO_BINDTODEVICE
2599
1973
if self.interface is not None:
2600
1974
if SO_BINDTODEVICE is None:
2601
# Fall back to a hard-coded value which seems to be
2603
logger.warning("SO_BINDTODEVICE not found, trying 25")
2604
SO_BINDTODEVICE = 25
2606
self.socket.setsockopt(
2607
socket.SOL_SOCKET, SO_BINDTODEVICE,
2608
(self.interface + "\0").encode("utf-8"))
2609
except socket.error as error:
2610
if error.errno == errno.EPERM:
2611
logger.error("No permission to bind to"
2612
" interface %s", self.interface)
2613
elif error.errno == errno.ENOPROTOOPT:
2614
logger.error("SO_BINDTODEVICE not available;"
2615
" cannot bind to interface %s",
2617
elif error.errno == errno.ENODEV:
2618
logger.error("Interface %s does not exist,"
2619
" cannot bind", self.interface)
1975
logger.error("SO_BINDTODEVICE does not exist;"
1976
" cannot bind to interface %s",
1980
self.socket.setsockopt(socket.SOL_SOCKET,
1982
str(self.interface + '\0'))
1983
except socket.error as error:
1984
if error.errno == errno.EPERM:
1985
logger.error("No permission to bind to"
1986
" interface %s", self.interface)
1987
elif error.errno == errno.ENOPROTOOPT:
1988
logger.error("SO_BINDTODEVICE not available;"
1989
" cannot bind to interface %s",
1991
elif error.errno == errno.ENODEV:
1992
logger.error("Interface %s does not exist,"
1993
" cannot bind", self.interface)
2622
1996
# Only bind(2) the socket if we really need to.
2623
1997
if self.server_address[0] or self.server_address[1]:
2624
if self.server_address[1]:
2625
self.allow_reuse_address = True
2626
1998
if not self.server_address[0]:
2627
1999
if self.address_family == socket.AF_INET6:
2628
any_address = "::" # in6addr_any
2000
any_address = "::" # in6addr_any
2630
any_address = "0.0.0.0" # INADDR_ANY
2002
any_address = "0.0.0.0" # INADDR_ANY
2631
2003
self.server_address = (any_address,
2632
2004
self.server_address[1])
2633
2005
elif not self.server_address[1]:
2634
self.server_address = (self.server_address[0], 0)
2006
self.server_address = (self.server_address[0],
2635
2008
# if self.interface:
2636
2009
# self.server_address = (self.server_address[0],
2667
2035
self.gnutls_priority = gnutls_priority
2668
2036
IPv6_TCPServer.__init__(self, server_address,
2669
2037
RequestHandlerClass,
2670
interface=interface,
2038
interface = interface,
2039
use_ipv6 = use_ipv6,
2040
socketfd = socketfd)
2674
2041
def server_activate(self):
2675
2042
if self.enabled:
2676
2043
return socketserver.TCPServer.server_activate(self)
2678
2045
def enable(self):
2679
2046
self.enabled = True
2681
2048
def add_pipe(self, parent_pipe, proc):
2682
2049
# Call "handle_ipc" for both data and EOF events
2684
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2685
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2686
functools.partial(self.handle_ipc,
2687
parent_pipe=parent_pipe,
2690
def handle_ipc(self, source, condition,
2693
client_object=None):
2050
gobject.io_add_watch(parent_pipe.fileno(),
2051
gobject.IO_IN | gobject.IO_HUP,
2052
functools.partial(self.handle_ipc,
2057
def handle_ipc(self, source, condition, parent_pipe=None,
2058
proc = None, client_object=None):
2694
2059
# error, or the other end of multiprocessing.Pipe has closed
2695
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2060
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2696
2061
# Wait for other process to exit
2700
2065
# Read a request from the child
2701
2066
request = parent_pipe.recv()
2702
2067
command = request[0]
2704
2069
if command == 'init':
2705
key_id = request[1].decode("ascii")
2706
fpr = request[2].decode("ascii")
2707
address = request[3]
2709
for c in self.clients.values():
2710
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2712
if key_id and c.key_id == key_id:
2715
if fpr and c.fingerprint == fpr:
2071
address = request[2]
2073
for c in self.clients.itervalues():
2074
if c.fingerprint == fpr:
2719
logger.info("Client not found for key ID: %s, address"
2720
": %s", key_id or fpr, address)
2078
logger.info("Client not found for fingerprint: %s, ad"
2079
"dress: %s", fpr, address)
2721
2080
if self.use_dbus:
2722
2081
# Emit D-Bus signal
2723
mandos_dbus_service.ClientNotFound(key_id or fpr,
2082
mandos_dbus_service.ClientNotFound(fpr,
2725
2084
parent_pipe.send(False)
2729
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2730
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2731
functools.partial(self.handle_ipc,
2732
parent_pipe=parent_pipe,
2734
client_object=client))
2087
gobject.io_add_watch(parent_pipe.fileno(),
2088
gobject.IO_IN | gobject.IO_HUP,
2089
functools.partial(self.handle_ipc,
2735
2095
parent_pipe.send(True)
2736
2096
# remove the old hook in favor of the new above hook on
3137
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3139
2497
except OSError as error:
3140
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3141
.format(uid, gid, os.strerror(error.errno)))
3142
2498
if error.errno != errno.EPERM:
3146
2502
# Enable all possible GnuTLS debugging
3148
2504
# "Use a log level over 10 to enable all debugging options."
3149
2505
# - GnuTLS manual
3150
gnutls.global_set_log_level(11)
2506
gnutls.library.functions.gnutls_global_set_log_level(11)
2508
@gnutls.library.types.gnutls_log_func
3153
2509
def debug_gnutls(level, string):
3154
2510
logger.debug("GnuTLS: %s", string[:-1])
3156
gnutls.global_set_log_function(debug_gnutls)
2512
(gnutls.library.functions
2513
.gnutls_global_set_log_function(debug_gnutls))
3158
2515
# Redirect stdin so all checkers get /dev/null
3159
2516
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3160
2517
os.dup2(null, sys.stdin.fileno())
3164
2521
# Need to fork before connecting to D-Bus
3165
2522
if not foreground:
3166
2523
# Close all input and output, do double fork, etc.
3169
if gi.version_info < (3, 10, 2):
3170
# multiprocessing will use threads, so before we use GLib we
3171
# need to inform GLib that threads will be used.
2526
# multiprocessing will use threads, so before we use gobject we
2527
# need to inform gobject that threads will be used.
2528
gobject.threads_init()
3174
2530
global main_loop
3175
2531
# From the Avahi example code
3176
2532
DBusGMainLoop(set_as_default=True)
3177
main_loop = GLib.MainLoop()
2533
main_loop = gobject.MainLoop()
3178
2534
bus = dbus.SystemBus()
3179
2535
# End of Avahi example code
3182
2538
bus_name = dbus.service.BusName("se.recompile.Mandos",
3185
old_bus_name = dbus.service.BusName(
3186
"se.bsnet.fukt.Mandos", bus,
3188
except dbus.exceptions.DBusException as e:
2539
bus, do_not_queue=True)
2540
old_bus_name = (dbus.service.BusName
2541
("se.bsnet.fukt.Mandos", bus,
2543
except dbus.exceptions.NameExistsException as e:
3189
2544
logger.error("Disabling D-Bus:", exc_info=e)
3190
2545
use_dbus = False
3191
2546
server_settings["use_dbus"] = False
3192
2547
tcp_server.use_dbus = False
3194
2549
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3195
service = AvahiServiceToSyslog(
3196
name=server_settings["servicename"],
3197
servicetype="_mandos._tcp",
2550
service = AvahiServiceToSyslog(name =
2551
server_settings["servicename"],
2552
servicetype = "_mandos._tcp",
2553
protocol = protocol, bus = bus)
3200
2554
if server_settings["interface"]:
3201
service.interface = if_nametoindex(
3202
server_settings["interface"].encode("utf-8"))
2555
service.interface = (if_nametoindex
2556
(str(server_settings["interface"])))
3204
2558
global multiprocessing_manager
3205
2559
multiprocessing_manager = multiprocessing.Manager()
3207
2561
client_class = Client
3209
client_class = functools.partial(ClientDBus, bus=bus)
2563
client_class = functools.partial(ClientDBus, bus = bus)
3211
2565
client_settings = Client.config_parser(client_config)
3212
2566
old_client_settings = {}
3213
2567
clients_data = {}
3215
2569
# This is used to redirect stdout and stderr for checker processes
3217
wnull = open(os.devnull, "w") # A writable /dev/null
2571
wnull = open(os.devnull, "w") # A writable /dev/null
3218
2572
# Only used if server is running in foreground but not in debug
3220
2574
if debug or not foreground:
3223
2577
# Get client data and settings from last running state.
3224
2578
if server_settings["restore"]:
3226
2580
with open(stored_state_path, "rb") as stored_state:
3227
if sys.version_info.major == 2:
3228
clients_data, old_client_settings = pickle.load(
3231
bytes_clients_data, bytes_old_client_settings = (
3232
pickle.load(stored_state, encoding="bytes"))
3233
# Fix bytes to strings
3236
clients_data = {(key.decode("utf-8")
3237
if isinstance(key, bytes)
3240
bytes_clients_data.items()}
3241
del bytes_clients_data
3242
for key in clients_data:
3243
value = {(k.decode("utf-8")
3244
if isinstance(k, bytes) else k): v
3246
clients_data[key].items()}
3247
clients_data[key] = value
3249
value["client_structure"] = [
3251
if isinstance(s, bytes)
3253
value["client_structure"]]
3255
for k in ("name", "host"):
3256
if isinstance(value[k], bytes):
3257
value[k] = value[k].decode("utf-8")
3258
if "key_id" not in value:
3259
value["key_id"] = ""
3260
elif "fingerprint" not in value:
3261
value["fingerprint"] = ""
3262
# old_client_settings
3264
old_client_settings = {
3265
(key.decode("utf-8")
3266
if isinstance(key, bytes)
3269
bytes_old_client_settings.items()}
3270
del bytes_old_client_settings
3272
for value in old_client_settings.values():
3273
if isinstance(value["host"], bytes):
3274
value["host"] = (value["host"]
2581
clients_data, old_client_settings = (pickle.load
3276
2583
os.remove(stored_state_path)
3277
2584
except IOError as e:
3278
2585
if e.errno == errno.ENOENT:
3279
logger.warning("Could not load persistent state:"
3280
" {}".format(os.strerror(e.errno)))
2586
logger.warning("Could not load persistent state: {0}"
2587
.format(os.strerror(e.errno)))
3282
2589
logger.critical("Could not load persistent state:",
3285
2592
except EOFError as e:
3286
2593
logger.warning("Could not load persistent state: "
2594
"EOFError:", exc_info=e)
3290
2596
with PGPEngine() as pgp:
3291
for client_name, client in clients_data.items():
2597
for client_name, client in clients_data.iteritems():
3292
2598
# Skip removed clients
3293
2599
if client_name not in client_settings:
3296
2602
# Decide which value to use after restoring saved state.
3297
2603
# We have three different values: Old config file,
3298
2604
# new config file, and saved state.
3356
2662
for client_name in (set(client_settings)
3357
2663
- set(old_client_settings)):
3358
2664
clients_data[client_name] = client_settings[client_name]
3360
2666
# Create all client objects
3361
for client_name, client in clients_data.items():
2667
for client_name, client in clients_data.iteritems():
3362
2668
tcp_server.clients[client_name] = client_class(
3365
server_settings=server_settings)
2669
name = client_name, settings = client,
2670
server_settings = server_settings)
3367
2672
if not tcp_server.clients:
3368
2673
logger.warning("No clients defined")
3370
2675
if not foreground:
3371
2676
if pidfile is not None:
3375
print(pid, file=pidfile)
2680
pidfile.write(str(pid) + "\n".encode("utf-8"))
3376
2681
except IOError:
3377
2682
logger.error("Could not write to file %r with PID %d",
3378
2683
pidfilename, pid)
3380
2685
del pidfilename
3382
for termsig in (signal.SIGHUP, signal.SIGTERM):
3383
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3384
lambda: main_loop.quit() and False)
2687
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2688
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3388
@alternate_dbus_interfaces(
3389
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3390
class MandosDBusService(DBusObjectWithObjectManager):
2691
@alternate_dbus_interfaces({"se.recompile.Mandos":
2692
"se.bsnet.fukt.Mandos"})
2693
class MandosDBusService(DBusObjectWithProperties):
3391
2694
"""A D-Bus proxy object"""
3393
2695
def __init__(self):
3394
2696
dbus.service.Object.__init__(self, bus, "/")
3396
2697
_interface = "se.recompile.Mandos"
2699
@dbus_interface_annotations(_interface)
2701
return { "org.freedesktop.DBus.Property"
2702
".EmitsChangedSignal":
3398
2705
@dbus.service.signal(_interface, signature="o")
3399
2706
def ClientAdded(self, objpath):
3403
2710
@dbus.service.signal(_interface, signature="ss")
3404
def ClientNotFound(self, key_id, address):
2711
def ClientNotFound(self, fingerprint, address):
3408
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3410
2715
@dbus.service.signal(_interface, signature="os")
3411
2716
def ClientRemoved(self, objpath, name):
3415
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3417
2720
@dbus.service.method(_interface, out_signature="ao")
3418
2721
def GetAllClients(self):
3420
return dbus.Array(c.dbus_object_path for c in
3421
tcp_server.clients.values())
3423
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2723
return dbus.Array(c.dbus_object_path
2725
tcp_server.clients.itervalues())
3425
2727
@dbus.service.method(_interface,
3426
2728
out_signature="a{oa{sv}}")
3427
2729
def GetAllClientsWithProperties(self):
3429
2731
return dbus.Dictionary(
3430
{c.dbus_object_path: c.GetAll(
3431
"se.recompile.Mandos.Client")
3432
for c in tcp_server.clients.values()},
2732
((c.dbus_object_path, c.GetAll(""))
2733
for c in tcp_server.clients.itervalues()),
3433
2734
signature="oa{sv}")
3435
2736
@dbus.service.method(_interface, in_signature="o")
3436
2737
def RemoveClient(self, object_path):
3438
for c in tcp_server.clients.values():
2739
for c in tcp_server.clients.itervalues():
3439
2740
if c.dbus_object_path == object_path:
3440
2741
del tcp_server.clients[c.name]
3441
2742
c.remove_from_connection()
3442
# Don't signal the disabling
2743
# Don't signal anything except ClientRemoved
3443
2744
c.disable(quiet=True)
3444
# Emit D-Bus signal for removal
3445
self.client_removed_signal(c)
2746
self.ClientRemoved(object_path, c.name)
3447
2748
raise KeyError(object_path)
3451
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3452
out_signature="a{oa{sa{sv}}}")
3453
def GetManagedObjects(self):
3455
return dbus.Dictionary(
3456
{client.dbus_object_path:
3458
{interface: client.GetAll(interface)
3460
client._get_all_interface_names()})
3461
for client in tcp_server.clients.values()})
3463
def client_added_signal(self, client):
3464
"""Send the new standard signal and the old signal"""
3466
# New standard signal
3467
self.InterfacesAdded(
3468
client.dbus_object_path,
3470
{interface: client.GetAll(interface)
3472
client._get_all_interface_names()}))
3474
self.ClientAdded(client.dbus_object_path)
3476
def client_removed_signal(self, client):
3477
"""Send the new standard signal and the old signal"""
3479
# New standard signal
3480
self.InterfacesRemoved(
3481
client.dbus_object_path,
3482
client._get_all_interface_names())
3484
self.ClientRemoved(client.dbus_object_path,
3487
2752
mandos_dbus_service = MandosDBusService()
3489
# Save modules to variables to exempt the modules from being
3490
# unloaded before the function registered with atexit() is run.
3491
mp = multiprocessing
3495
2755
"Cleanup function; run on exit"
3497
2757
service.cleanup()
3499
mp.active_children()
2759
multiprocessing.active_children()
3501
2761
if not (tcp_server.clients or client_settings):
3504
2764
# Store client before exiting. Secrets are encrypted with key
3505
2765
# based on what config file has. If config file is
3506
2766
# removed/edited, old secret will thus be unrecovable.
3508
2768
with PGPEngine() as pgp:
3509
for client in tcp_server.clients.values():
2769
for client in tcp_server.clients.itervalues():
3510
2770
key = client_settings[client.name]["secret"]
3511
2771
client.encrypted_secret = pgp.encrypt(client.secret,
3513
2773
client_dict = {}
3515
2775
# A list of attributes that can not be pickled
3517
exclude = {"bus", "changedstate", "secret",
3518
"checker", "server_settings"}
3519
for name, typ in inspect.getmembers(dbus.service
2777
exclude = set(("bus", "changedstate", "secret",
2778
"checker", "server_settings"))
2779
for name, typ in (inspect.getmembers
2780
(dbus.service.Object)):
3521
2781
exclude.add(name)
3523
2783
client_dict["encrypted_secret"] = (client
3524
2784
.encrypted_secret)
3525
2785
for attr in client.client_structure:
3526
2786
if attr not in exclude:
3527
2787
client_dict[attr] = getattr(client, attr)
3529
2789
clients[client.name] = client_dict
3530
2790
del client_settings[client.name]["secret"]
3533
with tempfile.NamedTemporaryFile(
3537
dir=os.path.dirname(stored_state_path),
3538
delete=False) as stored_state:
3539
pickle.dump((clients, client_settings), stored_state,
3541
tempname = stored_state.name
2793
with (tempfile.NamedTemporaryFile
2794
(mode='wb', suffix=".pickle", prefix='clients-',
2795
dir=os.path.dirname(stored_state_path),
2796
delete=False)) as stored_state:
2797
pickle.dump((clients, client_settings), stored_state)
2798
tempname=stored_state.name
3542
2799
os.rename(tempname, stored_state_path)
3543
2800
except (IOError, OSError) as e: