65
import cPickle as pickle
69
import cPickle as pickle
66
72
import multiprocessing
74
81
import dbus.service
82
from gi.repository import GLib
77
83
from dbus.mainloop.glib import DBusGMainLoop
80
86
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:
84
93
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
94
except AttributeError:
96
# This is where SO_BINDTODEVICE was up to and including Python
87
98
from IN import SO_BINDTODEVICE
88
99
except ImportError:
89
SO_BINDTODEVICE = None
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:
92
118
stored_state_file = "clients.pickle"
94
120
logger = logging.getLogger()
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
101
126
except (OSError, AttributeError):
102
128
def if_nametoindex(interface):
103
129
"Get an interface index the hard way, i.e. using fcntl()"
104
130
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
131
with contextlib.closing(socket.socket()) as s:
106
132
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
135
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__,
114
154
def initlogger(debug, level=logging.WARNING):
115
155
"""init logger and add loglevel"""
117
syslogger = (logging.handlers.SysLogHandler
119
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
121
161
syslogger.setFormatter(logging.Formatter
122
162
('Mandos [%(process)d]: %(levelname)s:'
124
164
logger.addHandler(syslogger)
127
167
console = logging.StreamHandler()
128
168
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
181
235
.replace(b"\n", b"\\n")
182
236
.replace(b"\0", b"\\x00"))
185
239
def encrypt(self, data, password):
186
240
passphrase = self.password_encode(password)
187
with tempfile.NamedTemporaryFile(dir=self.tempdir
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
189
243
passfile.write(passphrase)
191
proc = subprocess.Popen(['gpg', '--symmetric',
245
proc = subprocess.Popen([self.gpg, '--symmetric',
192
246
'--passphrase-file',
194
248
+ self.gnupgargs,
195
stdin = subprocess.PIPE,
196
stdout = subprocess.PIPE,
197
stderr = subprocess.PIPE)
198
ciphertext, err = proc.communicate(input = data)
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
199
253
if proc.returncode != 0:
200
254
raise PGPError(err)
201
255
return ciphertext
203
257
def decrypt(self, data, password):
204
258
passphrase = self.password_encode(password)
205
with tempfile.NamedTemporaryFile(dir = self.tempdir
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
207
261
passfile.write(passphrase)
209
proc = subprocess.Popen(['gpg', '--decrypt',
263
proc = subprocess.Popen([self.gpg, '--decrypt',
210
264
'--passphrase-file',
212
266
+ self.gnupgargs,
213
stdin = subprocess.PIPE,
214
stdout = subprocess.PIPE,
215
stderr = subprocess.PIPE)
216
decrypted_plaintext, err = proc.communicate(input
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
218
271
if proc.returncode != 0:
219
272
raise PGPError(err)
220
273
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
223
303
class AvahiError(Exception):
224
304
def __init__(self, value, *args, **kwargs):
225
305
self.value = value
226
super(AvahiError, self).__init__(value, *args, **kwargs)
227
def __unicode__(self):
228
return unicode(repr(self.value))
306
return super(AvahiError, self).__init__(value, *args,
230
310
class AvahiServiceError(AvahiError):
233
314
class AvahiGroupError(AvahiError):
237
318
class AvahiService(object):
238
319
"""An Avahi (Zeroconf) service.
241
322
interface: integer; avahi.IF_UNSPEC or an interface index.
242
323
Used to optionally bind to the specified interface.
385
488
follow_name_owner_changes=True),
386
489
avahi.DBUS_INTERFACE_SERVER)
387
490
self.server.connect_to_signal("StateChanged",
388
self.server_state_changed)
491
self.server_state_changed)
389
492
self.server_state_changed(self.server.GetState())
392
495
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
394
497
"""Add the new name to the syslog messages"""
395
ret = AvahiService.rename(self)
396
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
398
' %(levelname)s: %(message)s'
498
ret = AvahiService.rename(self, *args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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))
505
# Pretend that we have a GnuTLS module
506
class GnuTLS(object):
507
"""This isn't so much a class as it is a module-like namespace.
508
It is instantiated once, and simulates having a GnuTLS module."""
510
library = ctypes.util.find_library("gnutls")
512
library = ctypes.util.find_library("gnutls-deb0")
513
_library = ctypes.cdll.LoadLibrary(library)
515
_need_version = b"3.3.0"
518
# Need to use "self" here, since this method is called before
519
# the assignment to the "gnutls" global variable happens.
520
if self.check_version(self._need_version) is None:
521
raise self.Error("Needs GnuTLS {} or later"
522
.format(self._need_version))
524
# Unless otherwise indicated, the constants and types below are
525
# all from the gnutls/gnutls.h C header file.
535
E_NO_CERTIFICATE_FOUND = -49
536
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
539
class session_int(ctypes.Structure):
541
session_t = ctypes.POINTER(session_int)
543
class certificate_credentials_st(ctypes.Structure):
545
certificate_credentials_t = ctypes.POINTER(
546
certificate_credentials_st)
547
certificate_type_t = ctypes.c_int
549
class datum_t(ctypes.Structure):
550
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
551
('size', ctypes.c_uint)]
553
class openpgp_crt_int(ctypes.Structure):
555
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
556
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
557
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
558
credentials_type_t = ctypes.c_int
559
transport_ptr_t = ctypes.c_void_p
560
close_request_t = ctypes.c_int
563
class Error(Exception):
564
# We need to use the class name "GnuTLS" here, since this
565
# exception might be raised from within GnuTLS.__init__,
566
# which is called before the assignment to the "gnutls"
567
# global variable has happened.
568
def __init__(self, message=None, code=None, args=()):
569
# Default usage is by a message string, but if a return
570
# code is passed, convert it to a string with
573
if message is None and code is not None:
574
message = GnuTLS.strerror(code)
575
return super(GnuTLS.Error, self).__init__(
578
class CertificateSecurityError(Error):
582
class Credentials(object):
584
self._c_object = gnutls.certificate_credentials_t()
585
gnutls.certificate_allocate_credentials(
586
ctypes.byref(self._c_object))
587
self.type = gnutls.CRD_CERTIFICATE
590
gnutls.certificate_free_credentials(self._c_object)
592
class ClientSession(object):
593
def __init__(self, socket, credentials=None):
594
self._c_object = gnutls.session_t()
595
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
596
gnutls.set_default_priority(self._c_object)
597
gnutls.transport_set_ptr(self._c_object, socket.fileno())
598
gnutls.handshake_set_private_extensions(self._c_object,
601
if credentials is None:
602
credentials = gnutls.Credentials()
603
gnutls.credentials_set(self._c_object, credentials.type,
604
ctypes.cast(credentials._c_object,
606
self.credentials = credentials
609
gnutls.deinit(self._c_object)
612
return gnutls.handshake(self._c_object)
614
def send(self, data):
618
data_len -= gnutls.record_send(self._c_object,
623
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
625
# Error handling functions
626
def _error_code(result):
627
"""A function to raise exceptions on errors, suitable
628
for the 'restype' attribute on ctypes functions"""
631
if result == gnutls.E_NO_CERTIFICATE_FOUND:
632
raise gnutls.CertificateSecurityError(code=result)
633
raise gnutls.Error(code=result)
635
def _retry_on_error(result, func, arguments):
636
"""A function to retry on some errors, suitable
637
for the 'errcheck' attribute on ctypes functions"""
639
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
640
return _error_code(result)
641
result = func(*arguments)
644
# Unless otherwise indicated, the function declarations below are
645
# all from the gnutls/gnutls.h C header file.
648
priority_set_direct = _library.gnutls_priority_set_direct
649
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
650
ctypes.POINTER(ctypes.c_char_p)]
651
priority_set_direct.restype = _error_code
653
init = _library.gnutls_init
654
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
655
init.restype = _error_code
657
set_default_priority = _library.gnutls_set_default_priority
658
set_default_priority.argtypes = [session_t]
659
set_default_priority.restype = _error_code
661
record_send = _library.gnutls_record_send
662
record_send.argtypes = [session_t, ctypes.c_void_p,
664
record_send.restype = ctypes.c_ssize_t
665
record_send.errcheck = _retry_on_error
667
certificate_allocate_credentials = (
668
_library.gnutls_certificate_allocate_credentials)
669
certificate_allocate_credentials.argtypes = [
670
ctypes.POINTER(certificate_credentials_t)]
671
certificate_allocate_credentials.restype = _error_code
673
certificate_free_credentials = (
674
_library.gnutls_certificate_free_credentials)
675
certificate_free_credentials.argtypes = [
676
certificate_credentials_t]
677
certificate_free_credentials.restype = None
679
handshake_set_private_extensions = (
680
_library.gnutls_handshake_set_private_extensions)
681
handshake_set_private_extensions.argtypes = [session_t,
683
handshake_set_private_extensions.restype = None
685
credentials_set = _library.gnutls_credentials_set
686
credentials_set.argtypes = [session_t, credentials_type_t,
688
credentials_set.restype = _error_code
690
strerror = _library.gnutls_strerror
691
strerror.argtypes = [ctypes.c_int]
692
strerror.restype = ctypes.c_char_p
694
certificate_type_get = _library.gnutls_certificate_type_get
695
certificate_type_get.argtypes = [session_t]
696
certificate_type_get.restype = _error_code
698
certificate_get_peers = _library.gnutls_certificate_get_peers
699
certificate_get_peers.argtypes = [session_t,
700
ctypes.POINTER(ctypes.c_uint)]
701
certificate_get_peers.restype = ctypes.POINTER(datum_t)
703
global_set_log_level = _library.gnutls_global_set_log_level
704
global_set_log_level.argtypes = [ctypes.c_int]
705
global_set_log_level.restype = None
707
global_set_log_function = _library.gnutls_global_set_log_function
708
global_set_log_function.argtypes = [log_func]
709
global_set_log_function.restype = None
711
deinit = _library.gnutls_deinit
712
deinit.argtypes = [session_t]
713
deinit.restype = None
715
handshake = _library.gnutls_handshake
716
handshake.argtypes = [session_t]
717
handshake.restype = _error_code
718
handshake.errcheck = _retry_on_error
720
transport_set_ptr = _library.gnutls_transport_set_ptr
721
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
722
transport_set_ptr.restype = None
724
bye = _library.gnutls_bye
725
bye.argtypes = [session_t, close_request_t]
726
bye.restype = _error_code
727
bye.errcheck = _retry_on_error
729
check_version = _library.gnutls_check_version
730
check_version.argtypes = [ctypes.c_char_p]
731
check_version.restype = ctypes.c_char_p
733
# All the function declarations below are from gnutls/openpgp.h
735
openpgp_crt_init = _library.gnutls_openpgp_crt_init
736
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
737
openpgp_crt_init.restype = _error_code
739
openpgp_crt_import = _library.gnutls_openpgp_crt_import
740
openpgp_crt_import.argtypes = [openpgp_crt_t,
741
ctypes.POINTER(datum_t),
743
openpgp_crt_import.restype = _error_code
745
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
746
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
747
ctypes.POINTER(ctypes.c_uint)]
748
openpgp_crt_verify_self.restype = _error_code
750
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
751
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
752
openpgp_crt_deinit.restype = None
754
openpgp_crt_get_fingerprint = (
755
_library.gnutls_openpgp_crt_get_fingerprint)
756
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
760
openpgp_crt_get_fingerprint.restype = _error_code
762
# Remove non-public functions
763
del _error_code, _retry_on_error
764
# Create the global "gnutls" object, simulating a module
768
def call_pipe(connection, # : multiprocessing.Connection
769
func, *args, **kwargs):
770
"""This function is meant to be called by multiprocessing.Process
772
This function runs func(*args, **kwargs), and writes the resulting
773
return value on the provided multiprocessing.Connection.
775
connection.send(func(*args, **kwargs))
410
779
class Client(object):
411
780
"""A representation of a client host served by this server.
414
783
approved: bool(); 'None' if not yet approved/disapproved
415
784
approval_delay: datetime.timedelta(); Time to wait for approval
603
959
logger.info("Disabling client %s", self.name)
604
960
if getattr(self, "disable_initiator_tag", None) is not None:
605
gobject.source_remove(self.disable_initiator_tag)
961
GLib.source_remove(self.disable_initiator_tag)
606
962
self.disable_initiator_tag = None
607
963
self.expires = None
608
964
if getattr(self, "checker_initiator_tag", None) is not None:
609
gobject.source_remove(self.checker_initiator_tag)
965
GLib.source_remove(self.checker_initiator_tag)
610
966
self.checker_initiator_tag = None
611
967
self.stop_checker()
612
968
self.enabled = False
614
970
self.send_changedstate()
615
# Do not run this again if called by a gobject.timeout_add
971
# Do not run this again if called by a GLib.timeout_add
618
974
def __del__(self):
621
977
def init_checker(self):
622
978
# Schedule a new checker to be started an 'interval' from now,
623
979
# and every interval from then on.
624
980
if self.checker_initiator_tag is not None:
625
gobject.source_remove(self.checker_initiator_tag)
626
self.checker_initiator_tag = (gobject.timeout_add
627
(self.interval_milliseconds(),
981
GLib.source_remove(self.checker_initiator_tag)
982
self.checker_initiator_tag = GLib.timeout_add(
983
int(self.interval.total_seconds() * 1000),
629
985
# Schedule a disable() when 'timeout' has passed
630
986
if self.disable_initiator_tag is not None:
631
gobject.source_remove(self.disable_initiator_tag)
632
self.disable_initiator_tag = (gobject.timeout_add
633
(self.timeout_milliseconds(),
987
GLib.source_remove(self.disable_initiator_tag)
988
self.disable_initiator_tag = GLib.timeout_add(
989
int(self.timeout.total_seconds() * 1000), self.disable)
635
990
# Also start a new checker *right now*.
636
991
self.start_checker()
638
def checker_callback(self, pid, condition, command):
993
def checker_callback(self, source, condition, connection,
639
995
"""The checker has completed, so take appropriate actions."""
640
996
self.checker_callback_tag = None
641
997
self.checker = None
642
if os.WIFEXITED(condition):
643
self.last_checker_status = os.WEXITSTATUS(condition)
998
# Read return code from connection (see call_pipe)
999
returncode = connection.recv()
1003
self.last_checker_status = returncode
1004
self.last_checker_signal = None
644
1005
if self.last_checker_status == 0:
645
1006
logger.info("Checker for %(name)s succeeded",
647
1008
self.checked_ok()
649
logger.info("Checker for %(name)s failed",
1010
logger.info("Checker for %(name)s failed", vars(self))
652
1012
self.last_checker_status = -1
1013
self.last_checker_signal = -returncode
653
1014
logger.warning("Checker for %(name)s crashed?",
656
1018
def checked_ok(self):
657
1019
"""Assert that the client has been seen, alive and well."""
658
1020
self.last_checked_ok = datetime.datetime.utcnow()
659
1021
self.last_checker_status = 0
1022
self.last_checker_signal = None
660
1023
self.bump_timeout()
662
1025
def bump_timeout(self, timeout=None):
663
1026
"""Bump up the timeout for this client."""
664
1027
if timeout is None:
665
1028
timeout = self.timeout
666
1029
if self.disable_initiator_tag is not None:
667
gobject.source_remove(self.disable_initiator_tag)
1030
GLib.source_remove(self.disable_initiator_tag)
668
1031
self.disable_initiator_tag = None
669
1032
if getattr(self, "enabled", False):
670
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
1033
self.disable_initiator_tag = GLib.timeout_add(
1034
int(timeout.total_seconds() * 1000), self.disable)
673
1035
self.expires = datetime.datetime.utcnow() + timeout
675
1037
def need_approval(self):
676
1038
self.last_approval_request = datetime.datetime.utcnow()
678
1040
def start_checker(self):
679
1041
"""Start a new checker subprocess if one is not running.
681
1043
If a checker already exists, leave it running and do
683
1045
# The reason for not killing a running checker is that if we
688
1050
# checkers alone, the checker would have to take more time
689
1051
# than 'timeout' for the client to be disabled, which is as it
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)
1054
if self.checker is not None and not self.checker.is_alive():
1055
logger.warning("Checker was not alive; joining")
706
1058
# Start a new checker if needed
707
1059
if self.checker is None:
708
1060
# Escape attributes for the shell
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
712
self.runtime_expansions)
1062
attr: re.escape(str(getattr(self, attr)))
1063
for attr in self.runtime_expansions}
714
1065
command = self.checker_command % escaped_attrs
715
1066
except TypeError as error:
716
1067
logger.error('Could not format string "%s"',
717
self.checker_command, exc_info=error)
718
return True # Try again later
1068
self.checker_command,
1070
return True # Try again later
719
1071
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",
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
1072
logger.info("Starting checker %r for %s", command,
1074
# We don't need to redirect stdout and stderr, since
1075
# in normal mode, that is already done by daemon(),
1076
# and in debug mode we don't want to. (Stdin is
1077
# always replaced by /dev/null.)
1078
# The exception is when not debugging but nevertheless
1079
# running in the foreground; use the previously
1081
popen_args = {"close_fds": True,
1084
if (not self.server_settings["debug"]
1085
and self.server_settings["foreground"]):
1086
popen_args.update({"stdout": wnull,
1088
pipe = multiprocessing.Pipe(duplex=False)
1089
self.checker = multiprocessing.Process(
1091
args=(pipe[1], subprocess.call, command),
1093
self.checker.start()
1094
self.checker_callback_tag = GLib.io_add_watch(
1095
pipe[0].fileno(), GLib.IO_IN,
1096
self.checker_callback, pipe[0], command)
1097
# Re-run this periodically if run by GLib.timeout_add
764
1100
def stop_checker(self):
765
1101
"""Force the checker process, if any, to stop."""
766
1102
if self.checker_callback_tag:
767
gobject.source_remove(self.checker_callback_tag)
1103
GLib.source_remove(self.checker_callback_tag)
768
1104
self.checker_callback_tag = None
769
1105
if getattr(self, "checker", None) is None:
771
1107
logger.debug("Stopping checker for %(name)s", vars(self))
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
1108
self.checker.terminate()
780
1109
self.checker = None
783
def dbus_service_property(dbus_interface, signature="v",
784
access="readwrite", byte_arrays=False):
1112
def dbus_service_property(dbus_interface,
785
1116
"""Decorators for marking methods of a DBusObjectWithProperties to
786
1117
become properties on the D-Bus.
788
1119
The decorated method will be called with no arguments by "Get"
789
1120
and with one argument by "Set".
791
1122
The parameters, where they are supported, are the same as
792
1123
dbus.service.method, except there is only "signature", since the
793
1124
type from Get() and the type sent to Set() is the same.
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.
1207
class DBusObjectWithAnnotations(dbus.service.Object):
1208
"""A D-Bus object with annotations.
1210
Classes inheriting from this can use the dbus_annotations
1211
decorator to add annotations to methods or signals.
878
1215
def _is_dbus_thing(thing):
879
1216
"""Returns a function testing if an attribute is a D-Bus thing
881
1218
If called like _is_dbus_thing("method") it returns a function
882
1219
suitable for use as predicate to inspect.getmembers().
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1221
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
887
1224
def _get_all_dbus_things(self, thing):
888
1225
"""Returns a generator of (name, attribute) pairs
890
return ((getattr(athing.__get__(self), "_dbus_name",
1227
return ((getattr(athing.__get__(self), "_dbus_name", name),
892
1228
athing.__get__(self))
893
1229
for cls in self.__class__.__mro__
894
1230
for name, athing in
895
inspect.getmembers(cls,
896
self._is_dbus_thing(thing)))
1231
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1233
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1235
path_keyword='object_path',
1236
connection_keyword='connection')
1237
def Introspect(self, object_path, connection):
1238
"""Overloading of standard D-Bus method.
1240
Inserts annotation tags on methods and signals.
1242
xmlstring = dbus.service.Object.Introspect(self, object_path,
1245
document = xml.dom.minidom.parseString(xmlstring)
1247
for if_tag in document.getElementsByTagName("interface"):
1248
# Add annotation tags
1249
for typ in ("method", "signal"):
1250
for tag in if_tag.getElementsByTagName(typ):
1252
for name, prop in (self.
1253
_get_all_dbus_things(typ)):
1254
if (name == tag.getAttribute("name")
1255
and prop._dbus_interface
1256
== if_tag.getAttribute("name")):
1257
annots.update(getattr(
1258
prop, "_dbus_annotations", {}))
1259
for name, value in annots.items():
1260
ann_tag = document.createElement(
1262
ann_tag.setAttribute("name", name)
1263
ann_tag.setAttribute("value", value)
1264
tag.appendChild(ann_tag)
1265
# Add interface annotation tags
1266
for annotation, value in dict(
1267
itertools.chain.from_iterable(
1268
annotations().items()
1269
for name, annotations
1270
in self._get_all_dbus_things("interface")
1271
if name == if_tag.getAttribute("name")
1273
ann_tag = document.createElement("annotation")
1274
ann_tag.setAttribute("name", annotation)
1275
ann_tag.setAttribute("value", value)
1276
if_tag.appendChild(ann_tag)
1277
# Fix argument name for the Introspect method itself
1278
if (if_tag.getAttribute("name")
1279
== dbus.INTROSPECTABLE_IFACE):
1280
for cn in if_tag.getElementsByTagName("method"):
1281
if cn.getAttribute("name") == "Introspect":
1282
for arg in cn.getElementsByTagName("arg"):
1283
if (arg.getAttribute("direction")
1285
arg.setAttribute("name",
1287
xmlstring = document.toxml("utf-8")
1289
except (AttributeError, xml.dom.DOMException,
1290
xml.parsers.expat.ExpatError) as error:
1291
logger.error("Failed to override Introspection method",
1296
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1297
"""A D-Bus object with properties.
1299
Classes inheriting from this can use the dbus_service_property
1300
decorator to expose methods as D-Bus properties. It exposes the
1301
standard Get(), Set(), and GetAll() methods on the D-Bus.
898
1304
def _get_dbus_property(self, interface_name, property_name):
899
1305
"""Returns a bound method if one exists which is a D-Bus
900
1306
property with the specified name and interface.
902
for cls in self.__class__.__mro__:
903
for name, value in (inspect.getmembers
905
self._is_dbus_thing("property"))):
1308
for cls in self.__class__.__mro__:
1309
for name, value in inspect.getmembers(
1310
cls, self._is_dbus_thing("property")):
906
1311
if (value._dbus_name == property_name
907
1312
and value._dbus_interface == interface_name):
908
1313
return value.__get__(self)
910
1315
# No such property
911
raise DBusPropertyNotFound(self.dbus_object_path + ":"
912
+ interface_name + "."
915
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1316
raise DBusPropertyNotFound("{}:{}.{}".format(
1317
self.dbus_object_path, interface_name, property_name))
1320
def _get_all_interface_names(cls):
1321
"""Get a sequence of all interfaces supported by an object"""
1322
return (name for name in set(getattr(getattr(x, attr),
1323
"_dbus_interface", None)
1324
for x in (inspect.getmro(cls))
1326
if name is not None)
1328
@dbus.service.method(dbus.PROPERTIES_IFACE,
916
1330
out_signature="v")
917
1331
def Get(self, interface_name, property_name):
918
1332
"""Standard D-Bus property Get() method, see D-Bus standard.
1050
1461
return xmlstring
1465
dbus.OBJECT_MANAGER_IFACE
1466
except AttributeError:
1467
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1470
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1471
"""A D-Bus object with an ObjectManager.
1473
Classes inheriting from this exposes the standard
1474
GetManagedObjects call and the InterfacesAdded and
1475
InterfacesRemoved signals on the standard
1476
"org.freedesktop.DBus.ObjectManager" interface.
1478
Note: No signals are sent automatically; they must be sent
1481
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1482
out_signature="a{oa{sa{sv}}}")
1483
def GetManagedObjects(self):
1484
"""This function must be overridden"""
1485
raise NotImplementedError()
1487
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1488
signature="oa{sa{sv}}")
1489
def InterfacesAdded(self, object_path, interfaces_and_properties):
1492
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1493
def InterfacesRemoved(self, object_path, interfaces):
1496
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1498
path_keyword='object_path',
1499
connection_keyword='connection')
1500
def Introspect(self, object_path, connection):
1501
"""Overloading of standard D-Bus method.
1503
Override return argument name of GetManagedObjects to be
1504
"objpath_interfaces_and_properties"
1506
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1510
document = xml.dom.minidom.parseString(xmlstring)
1512
for if_tag in document.getElementsByTagName("interface"):
1513
# Fix argument name for the GetManagedObjects method
1514
if (if_tag.getAttribute("name")
1515
== dbus.OBJECT_MANAGER_IFACE):
1516
for cn in if_tag.getElementsByTagName("method"):
1517
if (cn.getAttribute("name")
1518
== "GetManagedObjects"):
1519
for arg in cn.getElementsByTagName("arg"):
1520
if (arg.getAttribute("direction")
1524
"objpath_interfaces"
1526
xmlstring = document.toxml("utf-8")
1528
except (AttributeError, xml.dom.DOMException,
1529
xml.parsers.expat.ExpatError) as error:
1530
logger.error("Failed to override Introspection method",
1053
1535
def datetime_to_dbus(dt, variant_level=0):
1054
1536
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1056
return dbus.String("", variant_level = variant_level)
1057
return dbus.String(dt.isoformat(),
1058
variant_level=variant_level)
1538
return dbus.String("", variant_level=variant_level)
1539
return dbus.String(dt.isoformat(), variant_level=variant_level)
1061
1542
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1091
1573
# Ignore non-D-Bus attributes, and D-Bus attributes
1092
1574
# with the wrong interface name
1093
1575
if (not hasattr(attribute, "_dbus_interface")
1094
or not attribute._dbus_interface
1095
.startswith(orig_interface_name)):
1576
or not attribute._dbus_interface.startswith(
1577
orig_interface_name)):
1097
1579
# Create an alternate D-Bus interface name based on
1098
1580
# the current name
1099
alt_interface = (attribute._dbus_interface
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1581
alt_interface = attribute._dbus_interface.replace(
1582
orig_interface_name, alt_interface_name)
1102
1583
interface_names.add(alt_interface)
1103
1584
# Is this a D-Bus signal?
1104
1585
if getattr(attribute, "_dbus_is_signal", False):
1105
1586
# Extract the original non-method undecorated
1106
1587
# function by black magic
1107
nonmethod_func = (dict(
1588
if sys.version_info.major == 2:
1589
nonmethod_func = (dict(
1108
1590
zip(attribute.func_code.co_freevars,
1109
attribute.__closure__))["func"]
1591
attribute.__closure__))
1592
["func"].cell_contents)
1594
nonmethod_func = (dict(
1595
zip(attribute.__code__.co_freevars,
1596
attribute.__closure__))
1597
["func"].cell_contents)
1111
1598
# Create a new, but exactly alike, function
1112
1599
# object, and decorate it to be a new D-Bus signal
1113
1600
# with the alternate D-Bus interface name
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)))
1601
new_function = copy_function(nonmethod_func)
1602
new_function = (dbus.service.signal(
1604
attribute._dbus_signature)(new_function))
1123
1605
# Copy annotations, if any
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1607
new_function._dbus_annotations = dict(
1608
attribute._dbus_annotations)
1127
1609
except AttributeError:
1129
1612
# Define a creator of a function to call both the
1130
1613
# original and alternate functions, so both the
1131
1614
# original and alternate signals gets sent when
1221
1697
if interface_names:
1222
1698
# Replace the class with a new subclass of it with
1223
1699
# methods, signals, etc. as created above.
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1700
if sys.version_info.major == 2:
1701
cls = type(b"{}Alternate".format(cls.__name__),
1704
cls = type("{}Alternate".format(cls.__name__),
1230
1711
@alternate_dbus_interfaces({"se.recompile.Mandos":
1231
"se.bsnet.fukt.Mandos"})
1712
"se.bsnet.fukt.Mandos"})
1232
1713
class ClientDBus(Client, DBusObjectWithProperties):
1233
1714
"""A Client class using D-Bus
1236
1717
dbus_object_path: dbus.ObjectPath
1237
1718
bus: dbus.SystemBus()
1240
1721
runtime_expansions = (Client.runtime_expansions
1241
+ ("dbus_object_path",))
1722
+ ("dbus_object_path", ))
1724
_interface = "se.recompile.Mandos.Client"
1243
1726
# dbus.service.Object doesn't use super(), so we can't either.
1245
def __init__(self, bus = None, *args, **kwargs):
1728
def __init__(self, bus=None, *args, **kwargs):
1247
1730
Client.__init__(self, *args, **kwargs)
1248
1731
# Only now, when this client is initialized, can it show up on
1250
client_object_name = unicode(self.name).translate(
1733
client_object_name = str(self.name).translate(
1251
1734
{ord("."): ord("_"),
1252
1735
ord("-"): ord("_")})
1253
self.dbus_object_path = (dbus.ObjectPath
1254
("/clients/" + client_object_name))
1736
self.dbus_object_path = dbus.ObjectPath(
1737
"/clients/" + client_object_name)
1255
1738
DBusObjectWithProperties.__init__(self, self.bus,
1256
1739
self.dbus_object_path)
1258
def notifychangeproperty(transform_func,
1259
dbus_name, type_func=lambda x: x,
1741
def notifychangeproperty(transform_func, dbus_name,
1742
type_func=lambda x: x,
1744
invalidate_only=False,
1745
_interface=_interface):
1261
1746
""" Modify a variable so that it's a property which announces
1262
1747
its changes to DBus.
1264
1749
transform_fun: Function that takes a value and a variant_level
1265
1750
and transforms it to a D-Bus type.
1266
1751
dbus_name: D-Bus name of the variable
1331
1827
if hasattr(DBusObjectWithProperties, "__del__"):
1332
1828
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1333
1829
Client.__del__(self, *args, **kwargs)
1335
def checker_callback(self, pid, condition, command,
1337
self.checker_callback_tag = None
1339
if os.WIFEXITED(condition):
1340
exitstatus = os.WEXITSTATUS(condition)
1831
def checker_callback(self, source, condition,
1832
connection, command, *args, **kwargs):
1833
ret = Client.checker_callback(self, source, condition,
1834
connection, command, *args,
1836
exitstatus = self.last_checker_status
1341
1838
# Emit D-Bus signal
1342
1839
self.CheckerCompleted(dbus.Int16(exitstatus),
1343
dbus.Int64(condition),
1840
# This is specific to GNU libC
1841
dbus.Int64(exitstatus << 8),
1344
1842
dbus.String(command))
1346
1844
# Emit D-Bus signal
1347
1845
self.CheckerCompleted(dbus.Int16(-1),
1348
dbus.Int64(condition),
1847
# This is specific to GNU libC
1849
| self.last_checker_signal),
1349
1850
dbus.String(command))
1351
return Client.checker_callback(self, pid, condition, command,
1354
1853
def start_checker(self, *args, **kwargs):
1355
old_checker = self.checker
1356
if self.checker is not None:
1357
old_checker_pid = self.checker.pid
1359
old_checker_pid = None
1854
old_checker_pid = getattr(self.checker, "pid", None)
1360
1855
r = Client.start_checker(self, *args, **kwargs)
1361
1856
# Only if new checker process was started
1362
1857
if (self.checker is not None
1414
1903
server to mandos-client
1418
1907
# Rejected - signal
1419
1908
@dbus.service.signal(_interface, signature="s")
1420
1909
def Rejected(self, reason):
1424
1913
# NeedApproval - signal
1425
1914
@dbus.service.signal(_interface, signature="tb")
1426
1915
def NeedApproval(self, timeout, default):
1428
1917
return self.need_approval()
1432
1921
# Approve - method
1433
1922
@dbus.service.method(_interface, in_signature="b")
1434
1923
def Approve(self, value):
1435
1924
self.approve(value)
1437
1926
# CheckedOK - method
1438
1927
@dbus.service.method(_interface)
1439
1928
def CheckedOK(self):
1440
1929
self.checked_ok()
1442
1931
# Enable - method
1932
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1443
1933
@dbus.service.method(_interface)
1444
1934
def Enable(self):
1448
1938
# StartChecker - method
1939
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1449
1940
@dbus.service.method(_interface)
1450
1941
def StartChecker(self):
1452
1943
self.start_checker()
1454
1945
# Disable - method
1946
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1455
1947
@dbus.service.method(_interface)
1456
1948
def Disable(self):
1460
1952
# StopChecker - method
1953
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1461
1954
@dbus.service.method(_interface)
1462
1955
def StopChecker(self):
1463
1956
self.stop_checker()
1467
1960
# ApprovalPending - property
1468
1961
@dbus_service_property(_interface, signature="b", access="read")
1469
1962
def ApprovalPending_dbus_property(self):
1470
1963
return dbus.Boolean(bool(self.approvals_pending))
1472
1965
# ApprovedByDefault - property
1473
@dbus_service_property(_interface, signature="b",
1966
@dbus_service_property(_interface,
1474
1968
access="readwrite")
1475
1969
def ApprovedByDefault_dbus_property(self, value=None):
1476
1970
if value is None: # get
1477
1971
return dbus.Boolean(self.approved_by_default)
1478
1972
self.approved_by_default = bool(value)
1480
1974
# ApprovalDelay - property
1481
@dbus_service_property(_interface, signature="t",
1975
@dbus_service_property(_interface,
1482
1977
access="readwrite")
1483
1978
def ApprovalDelay_dbus_property(self, value=None):
1484
1979
if value is None: # get
1485
return dbus.UInt64(self.approval_delay_milliseconds())
1980
return dbus.UInt64(self.approval_delay.total_seconds()
1486
1982
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1488
1984
# ApprovalDuration - property
1489
@dbus_service_property(_interface, signature="t",
1985
@dbus_service_property(_interface,
1490
1987
access="readwrite")
1491
1988
def ApprovalDuration_dbus_property(self, value=None):
1492
1989
if value is None: # get
1493
return dbus.UInt64(timedelta_to_milliseconds(
1494
self.approval_duration))
1990
return dbus.UInt64(self.approval_duration.total_seconds()
1495
1992
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1497
1994
# Name - property
1996
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
1997
@dbus_service_property(_interface, signature="s", access="read")
1499
1998
def Name_dbus_property(self):
1500
1999
return dbus.String(self.name)
1502
2001
# Fingerprint - property
2003
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1503
2004
@dbus_service_property(_interface, signature="s", access="read")
1504
2005
def Fingerprint_dbus_property(self):
1505
2006
return dbus.String(self.fingerprint)
1507
2008
# Host - property
1508
@dbus_service_property(_interface, signature="s",
2009
@dbus_service_property(_interface,
1509
2011
access="readwrite")
1510
2012
def Host_dbus_property(self, value=None):
1511
2013
if value is None: # get
1512
2014
return dbus.String(self.host)
1513
self.host = unicode(value)
2015
self.host = str(value)
1515
2017
# Created - property
2019
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1516
2020
@dbus_service_property(_interface, signature="s", access="read")
1517
2021
def Created_dbus_property(self):
1518
2022
return datetime_to_dbus(self.created)
1520
2024
# LastEnabled - property
1521
2025
@dbus_service_property(_interface, signature="s", access="read")
1522
2026
def LastEnabled_dbus_property(self):
1523
2027
return datetime_to_dbus(self.last_enabled)
1525
2029
# Enabled - property
1526
@dbus_service_property(_interface, signature="b",
2030
@dbus_service_property(_interface,
1527
2032
access="readwrite")
1528
2033
def Enabled_dbus_property(self, value=None):
1529
2034
if value is None: # get
1577
2083
if (getattr(self, "disable_initiator_tag", None)
1580
gobject.source_remove(self.disable_initiator_tag)
1581
self.disable_initiator_tag = (
1582
gobject.timeout_add(
1583
timedelta_to_milliseconds(self.expires - now),
2086
GLib.source_remove(self.disable_initiator_tag)
2087
self.disable_initiator_tag = GLib.timeout_add(
2088
int((self.expires - now).total_seconds() * 1000),
1586
2091
# ExtendedTimeout - property
1587
@dbus_service_property(_interface, signature="t",
2092
@dbus_service_property(_interface,
1588
2094
access="readwrite")
1589
2095
def ExtendedTimeout_dbus_property(self, value=None):
1590
2096
if value is None: # get
1591
return dbus.UInt64(self.extended_timeout_milliseconds())
2097
return dbus.UInt64(self.extended_timeout.total_seconds()
1592
2099
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1594
2101
# Interval - property
1595
@dbus_service_property(_interface, signature="t",
2102
@dbus_service_property(_interface,
1596
2104
access="readwrite")
1597
2105
def Interval_dbus_property(self, value=None):
1598
2106
if value is None: # get
1599
return dbus.UInt64(self.interval_milliseconds())
2107
return dbus.UInt64(self.interval.total_seconds() * 1000)
1600
2108
self.interval = datetime.timedelta(0, 0, 0, value)
1601
2109
if getattr(self, "checker_initiator_tag", None) is None:
1603
2111
if self.enabled:
1604
2112
# Reschedule checker run
1605
gobject.source_remove(self.checker_initiator_tag)
1606
self.checker_initiator_tag = (gobject.timeout_add
1607
(value, self.start_checker))
1608
self.start_checker() # Start one now, too
2113
GLib.source_remove(self.checker_initiator_tag)
2114
self.checker_initiator_tag = GLib.timeout_add(
2115
value, self.start_checker)
2116
self.start_checker() # Start one now, too
1610
2118
# Checker - property
1611
@dbus_service_property(_interface, signature="s",
2119
@dbus_service_property(_interface,
1612
2121
access="readwrite")
1613
2122
def Checker_dbus_property(self, value=None):
1614
2123
if value is None: # get
1615
2124
return dbus.String(self.checker_command)
1616
self.checker_command = unicode(value)
2125
self.checker_command = str(value)
1618
2127
# CheckerRunning - property
1619
@dbus_service_property(_interface, signature="b",
2128
@dbus_service_property(_interface,
1620
2130
access="readwrite")
1621
2131
def CheckerRunning_dbus_property(self, value=None):
1622
2132
if value is None: # get
1669
2189
class ClientHandler(socketserver.BaseRequestHandler, object):
1670
2190
"""A class to handle client connections.
1672
2192
Instantiated once for each connection to handle it.
1673
2193
Note: This will run in its own forked process."""
1675
2195
def handle(self):
1676
2196
with contextlib.closing(self.server.child_pipe) as child_pipe:
1677
2197
logger.info("TCP connection from: %s",
1678
unicode(self.client_address))
2198
str(self.client_address))
1679
2199
logger.debug("Pipe FD: %d",
1680
2200
self.server.child_pipe.fileno())
1682
session = (gnutls.connection
1683
.ClientSession(self.request,
1685
.X509Credentials()))
1687
# Note: gnutls.connection.X509Credentials is really a
1688
# generic GnuTLS certificate credentials object so long as
1689
# no X.509 keys are added to it. Therefore, we can use it
1690
# here despite using OpenPGP certificates.
1692
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1693
# "+AES-256-CBC", "+SHA1",
1694
# "+COMP-NULL", "+CTYPE-OPENPGP",
2202
session = gnutls.ClientSession(self.request)
2204
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2205
# "+AES-256-CBC", "+SHA1",
2206
# "+COMP-NULL", "+CTYPE-OPENPGP",
1696
2208
# Use a fallback default, since this MUST be set.
1697
2209
priority = self.server.gnutls_priority
1698
2210
if priority is None:
1699
2211
priority = "NORMAL"
1700
(gnutls.library.functions
1701
.gnutls_priority_set_direct(session._c_object,
2212
gnutls.priority_set_direct(session._c_object,
2213
priority.encode("utf-8"),
1704
2216
# Start communication using the Mandos protocol
1705
2217
# Get protocol number
1706
2218
line = self.request.makefile().readline()
1795
2304
delay -= time2 - time
1798
while sent_size < len(client.secret):
1800
sent = session.send(client.secret[sent_size:])
1801
except gnutls.errors.GNUTLSError as error:
1802
logger.warning("gnutls send failed",
1805
logger.debug("Sent: %d, remaining: %d",
1806
sent, len(client.secret)
1807
- (sent_size + sent))
2307
session.send(client.secret)
2308
except gnutls.Error as error:
2309
logger.warning("gnutls send failed",
1810
2313
logger.info("Sending secret to %s", client.name)
1811
2314
# bump the timeout using extended_timeout
1812
2315
client.bump_timeout(client.extended_timeout)
1813
2316
if self.server.use_dbus:
1814
2317
# Emit D-Bus signal
1815
2318
client.GotSecret()
1818
2321
if approval_required:
1819
2322
client.approvals_pending -= 1
1822
except gnutls.errors.GNUTLSError as error:
2325
except gnutls.Error as error:
1823
2326
logger.warning("GnuTLS bye failed",
1824
2327
exc_info=error)
1827
2330
def peer_certificate(session):
1828
2331
"Return the peer's OpenPGP certificate as a bytestring"
1829
2332
# If not an OpenPGP certificate...
1830
if (gnutls.library.functions
1831
.gnutls_certificate_type_get(session._c_object)
1832
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1833
# ...do the normal thing
1834
return session.peer_certificate
2333
if (gnutls.certificate_type_get(session._c_object)
2334
!= gnutls.CRT_OPENPGP):
2335
# ...return invalid data
1835
2337
list_size = ctypes.c_uint(1)
1836
cert_list = (gnutls.library.functions
1837
.gnutls_certificate_get_peers
2338
cert_list = (gnutls.certificate_get_peers
1838
2339
(session._c_object, ctypes.byref(list_size)))
1839
2340
if not bool(cert_list) and list_size.value != 0:
1840
raise gnutls.errors.GNUTLSError("error getting peer"
2341
raise gnutls.Error("error getting peer certificate")
1842
2342
if list_size.value == 0:
1844
2344
cert = cert_list[0]
1845
2345
return ctypes.string_at(cert.data, cert.size)
1848
2348
def fingerprint(openpgp):
1849
2349
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1850
2350
# New GnuTLS "datum" with the OpenPGP public key
1851
datum = (gnutls.library.types
1852
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1855
ctypes.c_uint(len(openpgp))))
2351
datum = gnutls.datum_t(
2352
ctypes.cast(ctypes.c_char_p(openpgp),
2353
ctypes.POINTER(ctypes.c_ubyte)),
2354
ctypes.c_uint(len(openpgp)))
1856
2355
# New empty GnuTLS certificate
1857
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2356
crt = gnutls.openpgp_crt_t()
2357
gnutls.openpgp_crt_init(ctypes.byref(crt))
1860
2358
# Import the OpenPGP public key into the certificate
1861
(gnutls.library.functions
1862
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1863
gnutls.library.constants
1864
.GNUTLS_OPENPGP_FMT_RAW))
2359
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2360
gnutls.OPENPGP_FMT_RAW)
1865
2361
# Verify the self signature in the key
1866
2362
crtverify = ctypes.c_uint()
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_verify_self(crt, 0,
1869
ctypes.byref(crtverify)))
2363
gnutls.openpgp_crt_verify_self(crt, 0,
2364
ctypes.byref(crtverify))
1870
2365
if crtverify.value != 0:
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1872
raise (gnutls.errors.CertificateSecurityError
2366
gnutls.openpgp_crt_deinit(crt)
2367
raise gnutls.CertificateSecurityError("Verify failed")
1874
2368
# New buffer for the fingerprint
1875
2369
buf = ctypes.create_string_buffer(20)
1876
2370
buf_len = ctypes.c_size_t()
1877
2371
# Get the fingerprint from the certificate into the buffer
1878
(gnutls.library.functions
1879
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1880
ctypes.byref(buf_len)))
2372
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2373
ctypes.byref(buf_len))
1881
2374
# Deinit the certificate
1882
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2375
gnutls.openpgp_crt_deinit(crt)
1883
2376
# Convert the buffer to a Python bytestring
1884
2377
fpr = ctypes.string_at(buf, buf_len.value)
1885
2378
# Convert the bytestring to hexadecimal notation
1968
2467
# socket_wrapper(), if socketfd was set.
1969
2468
socketserver.TCPServer.__init__(self, server_address,
1970
2469
RequestHandlerClass)
1972
2471
def server_bind(self):
1973
2472
"""This overrides the normal server_bind() function
1974
2473
to bind to an interface if one was specified, and also NOT to
1975
2474
bind to an address or port if they were not specified."""
2475
global SO_BINDTODEVICE
1976
2476
if self.interface is not None:
1977
2477
if SO_BINDTODEVICE is None:
1978
logger.error("SO_BINDTODEVICE does not exist;"
1979
" cannot bind to interface %s",
1983
self.socket.setsockopt(socket.SOL_SOCKET,
1985
str(self.interface + '\0'))
1986
except socket.error as error:
1987
if error.errno == errno.EPERM:
1988
logger.error("No permission to bind to"
1989
" interface %s", self.interface)
1990
elif error.errno == errno.ENOPROTOOPT:
1991
logger.error("SO_BINDTODEVICE not available;"
1992
" cannot bind to interface %s",
1994
elif error.errno == errno.ENODEV:
1995
logger.error("Interface %s does not exist,"
1996
" cannot bind", self.interface)
2478
# Fall back to a hard-coded value which seems to be
2480
logger.warning("SO_BINDTODEVICE not found, trying 25")
2481
SO_BINDTODEVICE = 25
2483
self.socket.setsockopt(
2484
socket.SOL_SOCKET, SO_BINDTODEVICE,
2485
(self.interface + "\0").encode("utf-8"))
2486
except socket.error as error:
2487
if error.errno == errno.EPERM:
2488
logger.error("No permission to bind to"
2489
" interface %s", self.interface)
2490
elif error.errno == errno.ENOPROTOOPT:
2491
logger.error("SO_BINDTODEVICE not available;"
2492
" cannot bind to interface %s",
2494
elif error.errno == errno.ENODEV:
2495
logger.error("Interface %s does not exist,"
2496
" cannot bind", self.interface)
1999
2499
# Only bind(2) the socket if we really need to.
2000
2500
if self.server_address[0] or self.server_address[1]:
2001
2501
if not self.server_address[0]:
2002
2502
if self.address_family == socket.AF_INET6:
2003
any_address = "::" # in6addr_any
2503
any_address = "::" # in6addr_any
2005
any_address = "0.0.0.0" # INADDR_ANY
2505
any_address = "0.0.0.0" # INADDR_ANY
2006
2506
self.server_address = (any_address,
2007
2507
self.server_address[1])
2008
2508
elif not self.server_address[1]:
2009
self.server_address = (self.server_address[0],
2509
self.server_address = (self.server_address[0], 0)
2011
2510
# if self.interface:
2012
2511
# self.server_address = (self.server_address[0],
2389
2899
server_settings["socket"] = os.dup(server_settings
2391
2901
del server_config
2393
2903
# Override the settings from the config file with command line
2394
2904
# options, if set.
2395
2905
for option in ("interface", "address", "port", "debug",
2396
"priority", "servicename", "configdir",
2397
"use_dbus", "use_ipv6", "debuglevel", "restore",
2398
"statedir", "socket", "foreground"):
2906
"priority", "servicename", "configdir", "use_dbus",
2907
"use_ipv6", "debuglevel", "restore", "statedir",
2908
"socket", "foreground", "zeroconf"):
2399
2909
value = getattr(options, option)
2400
2910
if value is not None:
2401
2911
server_settings[option] = value
2403
2913
# Force all strings to be unicode
2404
2914
for option in server_settings.keys():
2405
if type(server_settings[option]) is str:
2406
server_settings[option] = unicode(server_settings[option])
2915
if isinstance(server_settings[option], bytes):
2916
server_settings[option] = (server_settings[option]
2407
2918
# Force all boolean options to be boolean
2408
2919
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2920
"foreground", "zeroconf"):
2410
2921
server_settings[option] = bool(server_settings[option])
2411
2922
# Debug implies foreground
2412
2923
if server_settings["debug"]:
2413
2924
server_settings["foreground"] = True
2414
2925
# Now we have our good server settings in "server_settings"
2416
2927
##################################################################
2929
if (not server_settings["zeroconf"]
2930
and not (server_settings["port"]
2931
or server_settings["socket"] != "")):
2932
parser.error("Needs port or socket to work without Zeroconf")
2418
2934
# For convenience
2419
2935
debug = server_settings["debug"]
2420
2936
debuglevel = server_settings["debuglevel"]
2433
2950
level = getattr(logging, debuglevel.upper())
2434
2951
initlogger(debug, level)
2436
2953
if server_settings["servicename"] != "Mandos":
2437
syslogger.setFormatter(logging.Formatter
2438
('Mandos ({0}) [%(process)d]:'
2439
' %(levelname)s: %(message)s'
2440
.format(server_settings
2954
syslogger.setFormatter(
2955
logging.Formatter('Mandos ({}) [%(process)d]:'
2956
' %(levelname)s: %(message)s'.format(
2957
server_settings["servicename"])))
2443
2959
# Parse config file with clients
2444
2960
client_config = configparser.SafeConfigParser(Client
2445
2961
.client_defaults)
2446
2962
client_config.read(os.path.join(server_settings["configdir"],
2447
2963
"clients.conf"))
2449
2965
global mandos_dbus_service
2450
2966
mandos_dbus_service = None
2452
tcp_server = MandosServer((server_settings["address"],
2453
server_settings["port"]),
2455
interface=(server_settings["interface"]
2459
server_settings["priority"],
2461
socketfd=(server_settings["socket"]
2969
if server_settings["socket"] != "":
2970
socketfd = server_settings["socket"]
2971
tcp_server = MandosServer(
2972
(server_settings["address"], server_settings["port"]),
2974
interface=(server_settings["interface"] or None),
2976
gnutls_priority=server_settings["priority"],
2463
2979
if not foreground:
2464
2980
pidfilename = "/run/mandos.pid"
2465
2981
if not os.path.isdir("/run/."):
2466
2982
pidfilename = "/var/run/mandos.pid"
2469
pidfile = open(pidfilename, "w")
2985
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2470
2986
except IOError as e:
2471
2987
logger.error("Could not open file %r", pidfilename,
2474
for name in ("_mandos", "mandos", "nobody"):
2990
for name, group in (("_mandos", "_mandos"),
2991
("mandos", "mandos"),
2992
("nobody", "nogroup")):
2476
2994
uid = pwd.getpwnam(name).pw_uid
2477
gid = pwd.getpwnam(name).pw_gid
2995
gid = pwd.getpwnam(group).pw_gid
2479
2997
except KeyError:
3006
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2487
3008
except OSError as error:
3009
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3010
.format(uid, gid, os.strerror(error.errno)))
2488
3011
if error.errno != errno.EPERM:
2492
3015
# Enable all possible GnuTLS debugging
2494
3017
# "Use a log level over 10 to enable all debugging options."
2495
3018
# - GnuTLS manual
2496
gnutls.library.functions.gnutls_global_set_log_level(11)
2498
@gnutls.library.types.gnutls_log_func
3019
gnutls.global_set_log_level(11)
2499
3022
def debug_gnutls(level, string):
2500
3023
logger.debug("GnuTLS: %s", string[:-1])
2502
(gnutls.library.functions
2503
.gnutls_global_set_log_function(debug_gnutls))
3025
gnutls.global_set_log_function(debug_gnutls)
2505
3027
# Redirect stdin so all checkers get /dev/null
2506
3028
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2507
3029
os.dup2(null, sys.stdin.fileno())
2511
3033
# Need to fork before connecting to D-Bus
2512
3034
if not foreground:
2513
3035
# Close all input and output, do double fork, etc.
2516
# multiprocessing will use threads, so before we use gobject we
2517
# need to inform gobject that threads will be used.
2518
gobject.threads_init()
3038
# multiprocessing will use threads, so before we use GLib we need
3039
# to inform GLib that threads will be used.
2520
3042
global main_loop
2521
3043
# From the Avahi example code
2522
3044
DBusGMainLoop(set_as_default=True)
2523
main_loop = gobject.MainLoop()
3045
main_loop = GLib.MainLoop()
2524
3046
bus = dbus.SystemBus()
2525
3047
# End of Avahi example code
2528
3050
bus_name = dbus.service.BusName("se.recompile.Mandos",
2529
bus, do_not_queue=True)
2530
old_bus_name = (dbus.service.BusName
2531
("se.bsnet.fukt.Mandos", bus,
2533
except dbus.exceptions.NameExistsException as e:
3053
old_bus_name = dbus.service.BusName(
3054
"se.bsnet.fukt.Mandos", bus,
3056
except dbus.exceptions.DBusException as e:
2534
3057
logger.error("Disabling D-Bus:", exc_info=e)
2535
3058
use_dbus = False
2536
3059
server_settings["use_dbus"] = False
2537
3060
tcp_server.use_dbus = False
2538
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2539
service = AvahiServiceToSyslog(name =
2540
server_settings["servicename"],
2541
servicetype = "_mandos._tcp",
2542
protocol = protocol, bus = bus)
2543
if server_settings["interface"]:
2544
service.interface = (if_nametoindex
2545
(str(server_settings["interface"])))
3062
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3063
service = AvahiServiceToSyslog(
3064
name=server_settings["servicename"],
3065
servicetype="_mandos._tcp",
3068
if server_settings["interface"]:
3069
service.interface = if_nametoindex(
3070
server_settings["interface"].encode("utf-8"))
2547
3072
global multiprocessing_manager
2548
3073
multiprocessing_manager = multiprocessing.Manager()
2550
3075
client_class = Client
2552
client_class = functools.partial(ClientDBus, bus = bus)
3077
client_class = functools.partial(ClientDBus, bus=bus)
2554
3079
client_settings = Client.config_parser(client_config)
2555
3080
old_client_settings = {}
2556
3081
clients_data = {}
2558
3083
# This is used to redirect stdout and stderr for checker processes
2560
wnull = open(os.devnull, "w") # A writable /dev/null
3085
wnull = open(os.devnull, "w") # A writable /dev/null
2561
3086
# Only used if server is running in foreground but not in debug
2563
3088
if debug or not foreground:
2566
3091
# Get client data and settings from last running state.
2567
3092
if server_settings["restore"]:
2569
3094
with open(stored_state_path, "rb") as stored_state:
2570
clients_data, old_client_settings = (pickle.load
3095
if sys.version_info.major == 2:
3096
clients_data, old_client_settings = pickle.load(
3099
bytes_clients_data, bytes_old_client_settings = (
3100
pickle.load(stored_state, encoding="bytes"))
3101
# Fix bytes to strings
3104
clients_data = {(key.decode("utf-8")
3105
if isinstance(key, bytes)
3108
bytes_clients_data.items()}
3109
del bytes_clients_data
3110
for key in clients_data:
3111
value = {(k.decode("utf-8")
3112
if isinstance(k, bytes) else k): v
3114
clients_data[key].items()}
3115
clients_data[key] = value
3117
value["client_structure"] = [
3119
if isinstance(s, bytes)
3121
value["client_structure"]]
3123
for k in ("name", "host"):
3124
if isinstance(value[k], bytes):
3125
value[k] = value[k].decode("utf-8")
3126
# old_client_settings
3128
old_client_settings = {
3129
(key.decode("utf-8")
3130
if isinstance(key, bytes)
3133
bytes_old_client_settings.items()}
3134
del bytes_old_client_settings
3136
for value in old_client_settings.values():
3137
if isinstance(value["host"], bytes):
3138
value["host"] = (value["host"]
2572
3140
os.remove(stored_state_path)
2573
3141
except IOError as e:
2574
3142
if e.errno == errno.ENOENT:
2575
logger.warning("Could not load persistent state: {0}"
2576
.format(os.strerror(e.errno)))
3143
logger.warning("Could not load persistent state:"
3144
" {}".format(os.strerror(e.errno)))
2578
3146
logger.critical("Could not load persistent state:",
2581
3149
except EOFError as e:
2582
3150
logger.warning("Could not load persistent state: "
2583
"EOFError:", exc_info=e)
2585
3154
with PGPEngine() as pgp:
2586
for client_name, client in clients_data.iteritems():
3155
for client_name, client in clients_data.items():
2587
3156
# Skip removed clients
2588
3157
if client_name not in client_settings:
2591
3160
# Decide which value to use after restoring saved state.
2592
3161
# We have three different values: Old config file,
2593
3162
# new config file, and saved state.
2651
3220
for client_name in (set(client_settings)
2652
3221
- set(old_client_settings)):
2653
3222
clients_data[client_name] = client_settings[client_name]
2655
3224
# Create all client objects
2656
for client_name, client in clients_data.iteritems():
3225
for client_name, client in clients_data.items():
2657
3226
tcp_server.clients[client_name] = client_class(
2658
name = client_name, settings = client,
2659
server_settings = server_settings)
3229
server_settings=server_settings)
2661
3231
if not tcp_server.clients:
2662
3232
logger.warning("No clients defined")
2664
3234
if not foreground:
2665
3235
if pidfile is not None:
2669
pidfile.write(str(pid) + "\n".encode("utf-8"))
3239
print(pid, file=pidfile)
2670
3240
except IOError:
2671
3241
logger.error("Could not write to file %r with PID %d",
2672
3242
pidfilename, pid)
2674
3244
del pidfilename
2676
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2677
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3246
for termsig in (signal.SIGHUP, signal.SIGTERM):
3247
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3248
lambda: main_loop.quit() and False)
2680
@alternate_dbus_interfaces({"se.recompile.Mandos":
2681
"se.bsnet.fukt.Mandos"})
2682
class MandosDBusService(DBusObjectWithProperties):
3252
@alternate_dbus_interfaces(
3253
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3254
class MandosDBusService(DBusObjectWithObjectManager):
2683
3255
"""A D-Bus proxy object"""
2684
3257
def __init__(self):
2685
3258
dbus.service.Object.__init__(self, bus, "/")
2686
3260
_interface = "se.recompile.Mandos"
2688
@dbus_interface_annotations(_interface)
2690
return { "org.freedesktop.DBus.Property"
2691
".EmitsChangedSignal":
2694
3262
@dbus.service.signal(_interface, signature="o")
2695
3263
def ClientAdded(self, objpath):
2699
3267
@dbus.service.signal(_interface, signature="ss")
2700
3268
def ClientNotFound(self, fingerprint, address):
3272
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2704
3274
@dbus.service.signal(_interface, signature="os")
2705
3275
def ClientRemoved(self, objpath, name):
3279
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2709
3281
@dbus.service.method(_interface, out_signature="ao")
2710
3282
def GetAllClients(self):
2712
return dbus.Array(c.dbus_object_path
2714
tcp_server.clients.itervalues())
3284
return dbus.Array(c.dbus_object_path for c in
3285
tcp_server.clients.values())
3287
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2716
3289
@dbus.service.method(_interface,
2717
3290
out_signature="a{oa{sv}}")
2718
3291
def GetAllClientsWithProperties(self):
2720
3293
return dbus.Dictionary(
2721
((c.dbus_object_path, c.GetAll(""))
2722
for c in tcp_server.clients.itervalues()),
3294
{c.dbus_object_path: c.GetAll(
3295
"se.recompile.Mandos.Client")
3296
for c in tcp_server.clients.values()},
2723
3297
signature="oa{sv}")
2725
3299
@dbus.service.method(_interface, in_signature="o")
2726
3300
def RemoveClient(self, object_path):
2728
for c in tcp_server.clients.itervalues():
3302
for c in tcp_server.clients.values():
2729
3303
if c.dbus_object_path == object_path:
2730
3304
del tcp_server.clients[c.name]
2731
3305
c.remove_from_connection()
2732
# Don't signal anything except ClientRemoved
3306
# Don't signal the disabling
2733
3307
c.disable(quiet=True)
2735
self.ClientRemoved(object_path, c.name)
3308
# Emit D-Bus signal for removal
3309
self.client_removed_signal(c)
2737
3311
raise KeyError(object_path)
3315
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3316
out_signature="a{oa{sa{sv}}}")
3317
def GetManagedObjects(self):
3319
return dbus.Dictionary(
3320
{client.dbus_object_path:
3322
{interface: client.GetAll(interface)
3324
client._get_all_interface_names()})
3325
for client in tcp_server.clients.values()})
3327
def client_added_signal(self, client):
3328
"""Send the new standard signal and the old signal"""
3330
# New standard signal
3331
self.InterfacesAdded(
3332
client.dbus_object_path,
3334
{interface: client.GetAll(interface)
3336
client._get_all_interface_names()}))
3338
self.ClientAdded(client.dbus_object_path)
3340
def client_removed_signal(self, client):
3341
"""Send the new standard signal and the old signal"""
3343
# New standard signal
3344
self.InterfacesRemoved(
3345
client.dbus_object_path,
3346
client._get_all_interface_names())
3348
self.ClientRemoved(client.dbus_object_path,
2741
3351
mandos_dbus_service = MandosDBusService()
3353
# Save modules to variables to exempt the modules from being
3354
# unloaded before the function registered with atexit() is run.
3355
mp = multiprocessing
2744
3359
"Cleanup function; run on exit"
2747
multiprocessing.active_children()
3363
mp.active_children()
2749
3365
if not (tcp_server.clients or client_settings):
2752
3368
# Store client before exiting. Secrets are encrypted with key
2753
3369
# based on what config file has. If config file is
2754
3370
# removed/edited, old secret will thus be unrecovable.
2756
3372
with PGPEngine() as pgp:
2757
for client in tcp_server.clients.itervalues():
3373
for client in tcp_server.clients.values():
2758
3374
key = client_settings[client.name]["secret"]
2759
3375
client.encrypted_secret = pgp.encrypt(client.secret,
2761
3377
client_dict = {}
2763
3379
# A list of attributes that can not be pickled
2765
exclude = set(("bus", "changedstate", "secret",
2766
"checker", "server_settings"))
2767
for name, typ in (inspect.getmembers
2768
(dbus.service.Object)):
3381
exclude = {"bus", "changedstate", "secret",
3382
"checker", "server_settings"}
3383
for name, typ in inspect.getmembers(dbus.service
2769
3385
exclude.add(name)
2771
3387
client_dict["encrypted_secret"] = (client
2772
3388
.encrypted_secret)
2773
3389
for attr in client.client_structure:
2774
3390
if attr not in exclude:
2775
3391
client_dict[attr] = getattr(client, attr)
2777
3393
clients[client.name] = client_dict
2778
3394
del client_settings[client.name]["secret"]
2781
with (tempfile.NamedTemporaryFile
2782
(mode='wb', suffix=".pickle", prefix='clients-',
2783
dir=os.path.dirname(stored_state_path),
2784
delete=False)) as stored_state:
2785
pickle.dump((clients, client_settings), stored_state)
2786
tempname=stored_state.name
3397
with tempfile.NamedTemporaryFile(
3401
dir=os.path.dirname(stored_state_path),
3402
delete=False) as stored_state:
3403
pickle.dump((clients, client_settings), stored_state,
3405
tempname = stored_state.name
2787
3406
os.rename(tempname, stored_state_path)
2788
3407
except (IOError, OSError) as e: