2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 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
40
import SocketServer as socketserver
82
78
import dbus.service
83
from gi.repository import GLib
82
from gi.repository import GObject as gobject
84
84
from dbus.mainloop.glib import DBusGMainLoop
87
87
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
91
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
92
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
94
from IN import SO_BINDTODEVICE
100
95
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
96
SO_BINDTODEVICE = None
115
98
if sys.version_info.major == 2:
119
102
stored_state_file = "clients.pickle"
121
104
logger = logging.getLogger()
182
149
class PGPEngine(object):
183
150
"""A simple class for OpenPGP symmetric encryption & decryption"""
185
152
def __init__(self):
186
153
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
189
output = subprocess.check_output(["gpgconf"])
190
for line in output.splitlines():
191
name, text, path = line.split(b":")
196
if e.errno != errno.ENOENT:
198
154
self.gnupgargs = ['--batch',
199
'--homedir', self.tempdir,
155
'--home', self.tempdir,
202
# Only GPG version 1 has the --no-use-agent option.
203
if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
204
self.gnupgargs.append("--no-use-agent")
206
160
def __enter__(self):
209
163
def __exit__(self, exc_type, exc_value, traceback):
213
167
def __del__(self):
216
170
def _cleanup(self):
217
171
if self.tempdir is not None:
218
172
# Delete contents of tempdir
219
173
for root, dirs, files in os.walk(self.tempdir,
221
175
for filename in files:
222
176
os.remove(os.path.join(root, filename))
223
177
for dirname in dirs:
236
190
.replace(b"\n", b"\\n")
237
191
.replace(b"\0", b"\\x00"))
240
194
def encrypt(self, data, password):
241
195
passphrase = self.password_encode(password)
242
196
with tempfile.NamedTemporaryFile(
243
197
dir=self.tempdir) as passfile:
244
198
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
200
proc = subprocess.Popen(['gpg', '--symmetric',
247
201
'--passphrase-file',
249
203
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
204
stdin = subprocess.PIPE,
205
stdout = subprocess.PIPE,
206
stderr = subprocess.PIPE)
207
ciphertext, err = proc.communicate(input = data)
254
208
if proc.returncode != 0:
255
209
raise PGPError(err)
256
210
return ciphertext
258
212
def decrypt(self, data, password):
259
213
passphrase = self.password_encode(password)
260
214
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
215
dir = self.tempdir) as passfile:
262
216
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
218
proc = subprocess.Popen(['gpg', '--decrypt',
265
219
'--passphrase-file',
267
221
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
222
stdin = subprocess.PIPE,
223
stdout = subprocess.PIPE,
224
stderr = subprocess.PIPE)
225
decrypted_plaintext, err = proc.communicate(input = data)
272
226
if proc.returncode != 0:
273
227
raise PGPError(err)
274
228
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
304
231
class AvahiError(Exception):
305
232
def __init__(self, value, *args, **kwargs):
306
233
self.value = value
496
423
class AvahiServiceToSyslog(AvahiService):
497
424
def rename(self, *args, **kwargs):
498
425
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
426
ret = AvahiService.rename(self, *args, **kwargs)
500
427
syslogger.setFormatter(logging.Formatter(
501
428
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
502
429
.format(self.name)))
506
432
# Pretend that we have a GnuTLS module
507
433
class GnuTLS(object):
508
434
"""This isn't so much a class as it is a module-like namespace.
509
435
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
437
_library = ctypes.cdll.LoadLibrary(
438
ctypes.util.find_library("gnutls"))
439
_need_version = "3.3.0"
518
440
def __init__(self):
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
441
# Need to use class name "GnuTLS" here, since this method is
442
# called before the assignment to the "gnutls" global variable
444
if GnuTLS.check_version(self._need_version) is None:
445
raise GnuTLS.Error("Needs GnuTLS {} or later"
446
.format(self._need_version))
525
448
# Unless otherwise indicated, the constants and types below are
526
449
# all from the gnutls/gnutls.h C header file.
535
456
CRD_CERTIFICATE = 1
536
457
E_NO_CERTIFICATE_FOUND = -49
537
458
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
461
class session_int(ctypes.Structure):
542
463
session_t = ctypes.POINTER(session_int)
544
464
class certificate_credentials_st(ctypes.Structure):
546
466
certificate_credentials_t = ctypes.POINTER(
547
467
certificate_credentials_st)
548
468
certificate_type_t = ctypes.c_int
550
469
class datum_t(ctypes.Structure):
551
470
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
471
('size', ctypes.c_uint)]
554
472
class openpgp_crt_int(ctypes.Structure):
556
474
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
475
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
476
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
477
credentials_type_t = ctypes.c_int #
560
478
transport_ptr_t = ctypes.c_void_p
561
479
close_request_t = ctypes.c_int
564
482
class Error(Exception):
565
483
# We need to use the class name "GnuTLS" here, since this
566
484
# exception might be raised from within GnuTLS.__init__,
567
485
# which is called before the assignment to the "gnutls"
568
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
486
# global variable happens.
487
def __init__(self, message = None, code = None, args=()):
570
488
# Default usage is by a message string, but if a return
571
489
# code is passed, convert it to a string with
572
490
# gnutls.strerror()
574
491
if message is None and code is not None:
575
492
message = GnuTLS.strerror(code)
576
493
return super(GnuTLS.Error, self).__init__(
579
496
class CertificateSecurityError(Error):
583
500
class Credentials(object):
584
501
def __init__(self):
605
522
ctypes.cast(credentials._c_object,
606
523
ctypes.c_void_p))
607
524
self.credentials = credentials
609
526
def __del__(self):
610
527
gnutls.deinit(self._c_object)
612
529
def handshake(self):
613
530
return gnutls.handshake(self._c_object)
615
532
def send(self, data):
616
533
data = bytes(data)
619
data_len -= gnutls.record_send(self._c_object,
536
return gnutls.record_send(self._c_object, data, len(data))
624
539
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
626
# Error handling functions
541
# Error handling function
627
542
def _error_code(result):
628
543
"""A function to raise exceptions on errors, suitable
629
544
for the 'restype' attribute on ctypes functions"""
632
547
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
636
def _retry_on_error(result, func, arguments):
637
"""A function to retry on some errors, suitable
638
for the 'errcheck' attribute on ctypes functions"""
640
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
641
return _error_code(result)
642
result = func(*arguments)
548
raise gnutls.CertificateSecurityError(code = result)
549
raise gnutls.Error(code = result)
645
551
# Unless otherwise indicated, the function declarations below are
646
552
# all from the gnutls/gnutls.h C header file.
649
555
priority_set_direct = _library.gnutls_priority_set_direct
650
556
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
557
ctypes.POINTER(ctypes.c_char_p)]
652
558
priority_set_direct.restype = _error_code
654
560
init = _library.gnutls_init
655
561
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
562
init.restype = _error_code
658
564
set_default_priority = _library.gnutls_set_default_priority
659
565
set_default_priority.argtypes = [session_t]
660
566
set_default_priority.restype = _error_code
662
568
record_send = _library.gnutls_record_send
663
569
record_send.argtypes = [session_t, ctypes.c_void_p,
665
571
record_send.restype = ctypes.c_ssize_t
666
record_send.errcheck = _retry_on_error
668
573
certificate_allocate_credentials = (
669
574
_library.gnutls_certificate_allocate_credentials)
670
575
certificate_allocate_credentials.argtypes = [
671
576
ctypes.POINTER(certificate_credentials_t)]
672
577
certificate_allocate_credentials.restype = _error_code
674
579
certificate_free_credentials = (
675
580
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
581
certificate_free_credentials.argtypes = [certificate_credentials_t]
678
582
certificate_free_credentials.restype = None
680
584
handshake_set_private_extensions = (
681
585
_library.gnutls_handshake_set_private_extensions)
682
586
handshake_set_private_extensions.argtypes = [session_t,
684
588
handshake_set_private_extensions.restype = None
686
590
credentials_set = _library.gnutls_credentials_set
687
591
credentials_set.argtypes = [session_t, credentials_type_t,
689
593
credentials_set.restype = _error_code
691
595
strerror = _library.gnutls_strerror
692
596
strerror.argtypes = [ctypes.c_int]
693
597
strerror.restype = ctypes.c_char_p
695
599
certificate_type_get = _library.gnutls_certificate_type_get
696
600
certificate_type_get.argtypes = [session_t]
697
601
certificate_type_get.restype = _error_code
699
603
certificate_get_peers = _library.gnutls_certificate_get_peers
700
604
certificate_get_peers.argtypes = [session_t,
701
605
ctypes.POINTER(ctypes.c_uint)]
702
606
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
608
global_set_log_level = _library.gnutls_global_set_log_level
705
609
global_set_log_level.argtypes = [ctypes.c_int]
706
610
global_set_log_level.restype = None
708
612
global_set_log_function = _library.gnutls_global_set_log_function
709
613
global_set_log_function.argtypes = [log_func]
710
614
global_set_log_function.restype = None
712
616
deinit = _library.gnutls_deinit
713
617
deinit.argtypes = [session_t]
714
618
deinit.restype = None
716
620
handshake = _library.gnutls_handshake
717
621
handshake.argtypes = [session_t]
718
622
handshake.restype = _error_code
719
handshake.errcheck = _retry_on_error
721
624
transport_set_ptr = _library.gnutls_transport_set_ptr
722
625
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
626
transport_set_ptr.restype = None
725
628
bye = _library.gnutls_bye
726
629
bye.argtypes = [session_t, close_request_t]
727
630
bye.restype = _error_code
728
bye.errcheck = _retry_on_error
730
632
check_version = _library.gnutls_check_version
731
633
check_version.argtypes = [ctypes.c_char_p]
732
634
check_version.restype = ctypes.c_char_p
734
636
# All the function declarations below are from gnutls/openpgp.h
736
638
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
639
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
640
openpgp_crt_init.restype = _error_code
740
642
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
643
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
644
ctypes.POINTER(datum_t),
743
645
openpgp_crt_fmt_t]
744
646
openpgp_crt_import.restype = _error_code
746
648
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
649
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
650
ctypes.POINTER(ctypes.c_uint)]
749
651
openpgp_crt_verify_self.restype = _error_code
751
653
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
654
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
655
openpgp_crt_deinit.restype = None
755
657
openpgp_crt_get_fingerprint = (
756
658
_library.gnutls_openpgp_crt_get_fingerprint)
757
659
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
787
687
checker: subprocess.Popen(); a running checker process used
788
688
to see if the client lives.
789
689
'None' if no process is running.
790
checker_callback_tag: a GLib event source tag, or None
690
checker_callback_tag: a gobject event source tag, or None
791
691
checker_command: string; External command which is run to check
792
692
if client lives. %() expansions are done at
793
693
runtime with vars(self) as dict, so that for
794
694
instance %(name)s can be used in the command.
795
checker_initiator_tag: a GLib event source tag, or None
695
checker_initiator_tag: a gobject event source tag, or None
796
696
created: datetime.datetime(); (UTC) object creation
797
697
client_structure: Object describing what attributes a client has
798
698
and is used for storing the client at exit
799
699
current_checker_command: string; current running checker_command
800
disable_initiator_tag: a GLib event source tag, or None
700
disable_initiator_tag: a gobject event source tag, or None
802
702
fingerprint: string (40 or 32 hexadecimal digits); used to
803
703
uniquely identify the client
960
858
logger.info("Disabling client %s", self.name)
961
859
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
860
gobject.source_remove(self.disable_initiator_tag)
963
861
self.disable_initiator_tag = None
964
862
self.expires = None
965
863
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
864
gobject.source_remove(self.checker_initiator_tag)
967
865
self.checker_initiator_tag = None
968
866
self.stop_checker()
969
867
self.enabled = False
971
869
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
870
# Do not run this again if called by a gobject.timeout_add
975
873
def __del__(self):
978
876
def init_checker(self):
979
877
# Schedule a new checker to be started an 'interval' from now,
980
878
# and every interval from then on.
981
879
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
880
gobject.source_remove(self.checker_initiator_tag)
881
self.checker_initiator_tag = gobject.timeout_add(
984
882
int(self.interval.total_seconds() * 1000),
985
883
self.start_checker)
986
884
# Schedule a disable() when 'timeout' has passed
987
885
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
886
gobject.source_remove(self.disable_initiator_tag)
887
self.disable_initiator_tag = gobject.timeout_add(
990
888
int(self.timeout.total_seconds() * 1000), self.disable)
991
889
# Also start a new checker *right now*.
992
890
self.start_checker()
994
892
def checker_callback(self, source, condition, connection,
996
894
"""The checker has completed, so take appropriate actions."""
1015
913
logger.warning("Checker for %(name)s crashed?",
1019
917
def checked_ok(self):
1020
918
"""Assert that the client has been seen, alive and well."""
1021
919
self.last_checked_ok = datetime.datetime.utcnow()
1022
920
self.last_checker_status = 0
1023
921
self.last_checker_signal = None
1024
922
self.bump_timeout()
1026
924
def bump_timeout(self, timeout=None):
1027
925
"""Bump up the timeout for this client."""
1028
926
if timeout is None:
1029
927
timeout = self.timeout
1030
928
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
929
gobject.source_remove(self.disable_initiator_tag)
1032
930
self.disable_initiator_tag = None
1033
931
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
932
self.disable_initiator_tag = gobject.timeout_add(
1035
933
int(timeout.total_seconds() * 1000), self.disable)
1036
934
self.expires = datetime.datetime.utcnow() + timeout
1038
936
def need_approval(self):
1039
937
self.last_approval_request = datetime.datetime.utcnow()
1041
939
def start_checker(self):
1042
940
"""Start a new checker subprocess if one is not running.
1044
942
If a checker already exists, leave it running and do
1046
944
# The reason for not killing a running checker is that if we
1079
977
# The exception is when not debugging but nevertheless
1080
978
# running in the foreground; use the previously
1081
979
# created wnull.
1082
popen_args = {"close_fds": True,
980
popen_args = { "close_fds": True,
1085
983
if (not self.server_settings["debug"]
1086
984
and self.server_settings["foreground"]):
1087
985
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
987
pipe = multiprocessing.Pipe(duplex = False)
1090
988
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
990
args = (pipe[1], subprocess.call, command),
1094
992
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
993
self.checker_callback_tag = gobject.io_add_watch(
994
pipe[0].fileno(), gobject.IO_IN,
1097
995
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
996
# Re-run this periodically if run by gobject.timeout_add
1101
999
def stop_checker(self):
1102
1000
"""Force the checker process, if any, to stop."""
1103
1001
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
1002
gobject.source_remove(self.checker_callback_tag)
1105
1003
self.checker_callback_tag = None
1106
1004
if getattr(self, "checker", None) is None:
1138
1036
func._dbus_name = func.__name__
1139
1037
if func._dbus_name.endswith("_dbus_property"):
1140
1038
func._dbus_name = func._dbus_name[:-14]
1141
func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1039
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1144
1042
return decorator
1147
1045
def dbus_interface_annotations(dbus_interface):
1148
1046
"""Decorator for marking functions returning interface annotations
1152
1050
@dbus_interface_annotations("org.example.Interface")
1153
1051
def _foo(self): # Function name does not matter
1154
1052
return {"org.freedesktop.DBus.Deprecated": "true",
1155
1053
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1159
1057
def decorator(func):
1160
1058
func._dbus_is_interface = True
1161
1059
func._dbus_interface = dbus_interface
1162
1060
func._dbus_name = dbus_interface
1165
1063
return decorator
1168
1066
def dbus_annotations(annotations):
1169
1067
"""Decorator to annotate D-Bus methods, signals or properties
1172
1070
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1173
1071
"org.freedesktop.DBus.Property."
1174
1072
"EmitsChangedSignal": "false"})
1461
1359
exc_info=error)
1462
1360
return xmlstring
1466
1363
dbus.OBJECT_MANAGER_IFACE
1467
1364
except AttributeError:
1468
1365
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1471
1367
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
1368
"""A D-Bus object with an ObjectManager.
1474
1370
Classes inheriting from this exposes the standard
1475
1371
GetManagedObjects call and the InterfacesAdded and
1476
1372
InterfacesRemoved signals on the standard
1477
1373
"org.freedesktop.DBus.ObjectManager" interface.
1479
1375
Note: No signals are sent automatically; they must be sent
1482
1378
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1379
out_signature = "a{oa{sa{sv}}}")
1484
1380
def GetManagedObjects(self):
1485
1381
"""This function must be overridden"""
1486
1382
raise NotImplementedError()
1488
1384
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1385
signature = "oa{sa{sv}}")
1490
1386
def InterfacesAdded(self, object_path, interfaces_and_properties):
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1389
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1494
1390
def InterfacesRemoved(self, object_path, interfaces):
1497
1393
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1394
out_signature = "s",
1395
path_keyword = 'object_path',
1396
connection_keyword = 'connection')
1501
1397
def Introspect(self, object_path, connection):
1502
1398
"""Overloading of standard D-Bus method.
1504
1400
Override return argument name of GetManagedObjects to be
1505
1401
"objpath_interfaces_and_properties"
1584
1479
interface_names.add(alt_interface)
1585
1480
# Is this a D-Bus signal?
1586
1481
if getattr(attribute, "_dbus_is_signal", False):
1587
# Extract the original non-method undecorated
1588
# function by black magic
1589
1482
if sys.version_info.major == 2:
1483
# Extract the original non-method undecorated
1484
# function by black magic
1590
1485
nonmethod_func = (dict(
1591
1486
zip(attribute.func_code.co_freevars,
1592
1487
attribute.__closure__))
1593
1488
["func"].cell_contents)
1595
nonmethod_func = (dict(
1596
zip(attribute.__code__.co_freevars,
1597
attribute.__closure__))
1598
["func"].cell_contents)
1490
nonmethod_func = attribute
1599
1491
# Create a new, but exactly alike, function
1600
1492
# object, and decorate it to be a new D-Bus signal
1601
1493
# with the alternate D-Bus interface name
1602
new_function = copy_function(nonmethod_func)
1494
if sys.version_info.major == 2:
1495
new_function = types.FunctionType(
1496
nonmethod_func.func_code,
1497
nonmethod_func.func_globals,
1498
nonmethod_func.func_name,
1499
nonmethod_func.func_defaults,
1500
nonmethod_func.func_closure)
1502
new_function = types.FunctionType(
1503
nonmethod_func.__code__,
1504
nonmethod_func.__globals__,
1505
nonmethod_func.__name__,
1506
nonmethod_func.__defaults__,
1507
nonmethod_func.__closure__)
1603
1508
new_function = (dbus.service.signal(
1605
1510
attribute._dbus_signature)(new_function))
1769
1681
dbus_value = transform_func(
1770
1682
type_func(value),
1771
variant_level=variant_level)
1683
variant_level = variant_level)
1772
1684
self.PropertyChanged(dbus.String(dbus_name),
1774
1686
self.PropertiesChanged(
1776
dbus.Dictionary({dbus.String(dbus_name):
1688
dbus.Dictionary({ dbus.String(dbus_name):
1779
1691
setattr(self, attrname, value)
1781
1693
return property(lambda self: getattr(self, attrname), setter)
1783
1695
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1784
1696
approvals_pending = notifychangeproperty(dbus.Boolean,
1785
1697
"ApprovalPending",
1787
1699
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1788
1700
last_enabled = notifychangeproperty(datetime_to_dbus,
1790
1702
checker = notifychangeproperty(
1791
1703
dbus.Boolean, "CheckerRunning",
1792
type_func=lambda checker: checker is not None)
1704
type_func = lambda checker: checker is not None)
1793
1705
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1794
1706
"LastCheckedOK")
1795
1707
last_checker_status = notifychangeproperty(dbus.Int16,
1800
1712
"ApprovedByDefault")
1801
1713
approval_delay = notifychangeproperty(
1802
1714
dbus.UInt64, "ApprovalDelay",
1803
type_func=lambda td: td.total_seconds() * 1000)
1715
type_func = lambda td: td.total_seconds() * 1000)
1804
1716
approval_duration = notifychangeproperty(
1805
1717
dbus.UInt64, "ApprovalDuration",
1806
type_func=lambda td: td.total_seconds() * 1000)
1718
type_func = lambda td: td.total_seconds() * 1000)
1807
1719
host = notifychangeproperty(dbus.String, "Host")
1808
1720
timeout = notifychangeproperty(
1809
1721
dbus.UInt64, "Timeout",
1810
type_func=lambda td: td.total_seconds() * 1000)
1722
type_func = lambda td: td.total_seconds() * 1000)
1811
1723
extended_timeout = notifychangeproperty(
1812
1724
dbus.UInt64, "ExtendedTimeout",
1813
type_func=lambda td: td.total_seconds() * 1000)
1725
type_func = lambda td: td.total_seconds() * 1000)
1814
1726
interval = notifychangeproperty(
1815
1727
dbus.UInt64, "Interval",
1816
type_func=lambda td: td.total_seconds() * 1000)
1728
type_func = lambda td: td.total_seconds() * 1000)
1817
1729
checker_command = notifychangeproperty(dbus.String, "Checker")
1818
1730
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1819
1731
invalidate_only=True)
1821
1733
del notifychangeproperty
1823
1735
def __del__(self, *args, **kwargs):
1825
1737
self.remove_from_connection()
1860
1772
# Emit D-Bus signal
1861
1773
self.CheckerStarted(self.current_checker_command)
1864
1776
def _reset_approved(self):
1865
1777
self.approved = None
1868
1780
def approve(self, value=True):
1869
1781
self.approved = value
1870
GLib.timeout_add(int(self.approval_duration.total_seconds()
1871
* 1000), self._reset_approved)
1782
gobject.timeout_add(int(self.approval_duration.total_seconds()
1783
* 1000), self._reset_approved)
1872
1784
self.send_changedstate()
1874
# D-Bus methods, signals & properties
1786
## D-Bus methods, signals & properties
1880
1792
# CheckerCompleted - signal
1881
1793
@dbus.service.signal(_interface, signature="nxs")
1882
1794
def CheckerCompleted(self, exitcode, waitstatus, command):
1886
1798
# CheckerStarted - signal
1887
1799
@dbus.service.signal(_interface, signature="s")
1888
1800
def CheckerStarted(self, command):
1892
1804
# PropertyChanged - signal
1893
1805
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1894
1806
@dbus.service.signal(_interface, signature="sv")
1895
1807
def PropertyChanged(self, property, value):
1899
1811
# GotSecret - signal
1900
1812
@dbus.service.signal(_interface)
1901
1813
def GotSecret(self):
1904
1816
server to mandos-client
1908
1820
# Rejected - signal
1909
1821
@dbus.service.signal(_interface, signature="s")
1910
1822
def Rejected(self, reason):
1914
1826
# NeedApproval - signal
1915
1827
@dbus.service.signal(_interface, signature="tb")
1916
1828
def NeedApproval(self, timeout, default):
1918
1830
return self.need_approval()
1922
1834
# Approve - method
1923
1835
@dbus.service.method(_interface, in_signature="b")
1924
1836
def Approve(self, value):
1925
1837
self.approve(value)
1927
1839
# CheckedOK - method
1928
1840
@dbus.service.method(_interface)
1929
1841
def CheckedOK(self):
1930
1842
self.checked_ok()
1932
1844
# Enable - method
1933
1845
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1934
1846
@dbus.service.method(_interface)
1935
1847
def Enable(self):
1939
1851
# StartChecker - method
1940
1852
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1941
1853
@dbus.service.method(_interface)
1942
1854
def StartChecker(self):
1944
1856
self.start_checker()
1946
1858
# Disable - method
1947
1859
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1948
1860
@dbus.service.method(_interface)
1949
1861
def Disable(self):
1953
1865
# StopChecker - method
1954
1866
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1955
1867
@dbus.service.method(_interface)
1956
1868
def StopChecker(self):
1957
1869
self.stop_checker()
1961
1873
# ApprovalPending - property
1962
1874
@dbus_service_property(_interface, signature="b", access="read")
1963
1875
def ApprovalPending_dbus_property(self):
1964
1876
return dbus.Boolean(bool(self.approvals_pending))
1966
1878
# ApprovedByDefault - property
1967
1879
@dbus_service_property(_interface,
2190
2102
class ClientHandler(socketserver.BaseRequestHandler, object):
2191
2103
"""A class to handle client connections.
2193
2105
Instantiated once for each connection to handle it.
2194
2106
Note: This will run in its own forked process."""
2196
2108
def handle(self):
2197
2109
with contextlib.closing(self.server.child_pipe) as child_pipe:
2198
2110
logger.info("TCP connection from: %s",
2199
2111
str(self.client_address))
2200
2112
logger.debug("Pipe FD: %d",
2201
2113
self.server.child_pipe.fileno())
2203
2115
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
2117
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2118
# "+AES-256-CBC", "+SHA1",
2119
# "+COMP-NULL", "+CTYPE-OPENPGP",
2209
2121
# Use a fallback default, since this MUST be set.
2210
2122
priority = self.server.gnutls_priority
2211
2123
if priority is None:
2212
2124
priority = "NORMAL"
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
2125
gnutls.priority_set_direct(session._c_object, priority,
2217
2128
# Start communication using the Mandos protocol
2218
2129
# Get protocol number
2219
2130
line = self.request.makefile().readline()
2384
2301
class MultiprocessingMixIn(object):
2385
2302
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2387
2304
def sub_process_main(self, request, address):
2389
2306
self.finish_request(request, address)
2390
2307
except Exception:
2391
2308
self.handle_error(request, address)
2392
2309
self.close_request(request)
2394
2311
def process_request(self, request, address):
2395
2312
"""Start a new process to process the request."""
2396
proc = multiprocessing.Process(target=self.sub_process_main,
2397
args=(request, address))
2313
proc = multiprocessing.Process(target = self.sub_process_main,
2314
args = (request, address))
2402
2319
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2403
2320
""" adds a pipe to the MixIn """
2405
2322
def process_request(self, request, client_address):
2406
2323
"""Overrides and wraps the original process_request().
2408
2325
This function creates a new pipe in self.pipe
2410
2327
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2412
2329
proc = MultiprocessingMixIn.process_request(self, request,
2413
2330
client_address)
2414
2331
self.child_pipe.close()
2415
2332
self.add_pipe(parent_pipe, proc)
2417
2334
def add_pipe(self, parent_pipe, proc):
2418
2335
"""Dummy function; override as necessary"""
2419
2336
raise NotImplementedError()
2468
2384
# socket_wrapper(), if socketfd was set.
2469
2385
socketserver.TCPServer.__init__(self, server_address,
2470
2386
RequestHandlerClass)
2472
2388
def server_bind(self):
2473
2389
"""This overrides the normal server_bind() function
2474
2390
to bind to an interface if one was specified, and also NOT to
2475
2391
bind to an address or port if they were not specified."""
2476
global SO_BINDTODEVICE
2477
2392
if self.interface is not None:
2478
2393
if SO_BINDTODEVICE is None:
2479
# Fall back to a hard-coded value which seems to be
2481
logger.warning("SO_BINDTODEVICE not found, trying 25")
2482
SO_BINDTODEVICE = 25
2484
self.socket.setsockopt(
2485
socket.SOL_SOCKET, SO_BINDTODEVICE,
2486
(self.interface + "\0").encode("utf-8"))
2487
except socket.error as error:
2488
if error.errno == errno.EPERM:
2489
logger.error("No permission to bind to"
2490
" interface %s", self.interface)
2491
elif error.errno == errno.ENOPROTOOPT:
2492
logger.error("SO_BINDTODEVICE not available;"
2493
" cannot bind to interface %s",
2495
elif error.errno == errno.ENODEV:
2496
logger.error("Interface %s does not exist,"
2497
" cannot bind", self.interface)
2394
logger.error("SO_BINDTODEVICE does not exist;"
2395
" cannot bind to interface %s",
2399
self.socket.setsockopt(
2400
socket.SOL_SOCKET, SO_BINDTODEVICE,
2401
(self.interface + "\0").encode("utf-8"))
2402
except socket.error as error:
2403
if error.errno == errno.EPERM:
2404
logger.error("No permission to bind to"
2405
" interface %s", self.interface)
2406
elif error.errno == errno.ENOPROTOOPT:
2407
logger.error("SO_BINDTODEVICE not available;"
2408
" cannot bind to interface %s",
2410
elif error.errno == errno.ENODEV:
2411
logger.error("Interface %s does not exist,"
2412
" cannot bind", self.interface)
2500
2415
# Only bind(2) the socket if we really need to.
2501
2416
if self.server_address[0] or self.server_address[1]:
2502
2417
if not self.server_address[0]:
2503
2418
if self.address_family == socket.AF_INET6:
2504
any_address = "::" # in6addr_any
2419
any_address = "::" # in6addr_any
2506
any_address = "0.0.0.0" # INADDR_ANY
2421
any_address = "0.0.0.0" # INADDR_ANY
2507
2422
self.server_address = (any_address,
2508
2423
self.server_address[1])
2509
2424
elif not self.server_address[1]:
2543
2458
self.gnutls_priority = gnutls_priority
2544
2459
IPv6_TCPServer.__init__(self, server_address,
2545
2460
RequestHandlerClass,
2546
interface=interface,
2461
interface = interface,
2462
use_ipv6 = use_ipv6,
2463
socketfd = socketfd)
2550
2465
def server_activate(self):
2551
2466
if self.enabled:
2552
2467
return socketserver.TCPServer.server_activate(self)
2554
2469
def enable(self):
2555
2470
self.enabled = True
2557
2472
def add_pipe(self, parent_pipe, proc):
2558
2473
# Call "handle_ipc" for both data and EOF events
2474
gobject.io_add_watch(
2560
2475
parent_pipe.fileno(),
2561
GLib.IO_IN | GLib.IO_HUP,
2476
gobject.IO_IN | gobject.IO_HUP,
2562
2477
functools.partial(self.handle_ipc,
2563
parent_pipe=parent_pipe,
2478
parent_pipe = parent_pipe,
2566
2481
def handle_ipc(self, source, condition,
2567
2482
parent_pipe=None,
2569
2484
client_object=None):
2570
2485
# error, or the other end of multiprocessing.Pipe has closed
2571
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2486
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2572
2487
# Wait for other process to exit
2576
2491
# Read a request from the child
2577
2492
request = parent_pipe.recv()
2578
2493
command = request[0]
2580
2495
if command == 'init':
2581
fpr = request[1].decode("ascii")
2582
2497
address = request[2]
2584
for c in self.clients.values():
2499
for c in self.clients.itervalues():
2585
2500
if c.fingerprint == fpr:
3008
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3010
2916
except OSError as error:
3011
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3012
.format(uid, gid, os.strerror(error.errno)))
3013
2917
if error.errno != errno.EPERM:
3017
2921
# Enable all possible GnuTLS debugging
3019
2923
# "Use a log level over 10 to enable all debugging options."
3020
2924
# - GnuTLS manual
3021
2925
gnutls.global_set_log_level(11)
3023
2927
@gnutls.log_func
3024
2928
def debug_gnutls(level, string):
3025
2929
logger.debug("GnuTLS: %s", string[:-1])
3027
2931
gnutls.global_set_log_function(debug_gnutls)
3029
2933
# Redirect stdin so all checkers get /dev/null
3030
2934
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3031
2935
os.dup2(null, sys.stdin.fileno())
3035
2939
# Need to fork before connecting to D-Bus
3036
2940
if not foreground:
3037
2941
# Close all input and output, do double fork, etc.
3040
# multiprocessing will use threads, so before we use GLib we need
3041
# to inform GLib that threads will be used.
2944
# multiprocessing will use threads, so before we use gobject we
2945
# need to inform gobject that threads will be used.
2946
gobject.threads_init()
3044
2948
global main_loop
3045
2949
# From the Avahi example code
3046
2950
DBusGMainLoop(set_as_default=True)
3047
main_loop = GLib.MainLoop()
2951
main_loop = gobject.MainLoop()
3048
2952
bus = dbus.SystemBus()
3049
2953
# End of Avahi example code
3064
2968
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3065
2969
service = AvahiServiceToSyslog(
3066
name=server_settings["servicename"],
3067
servicetype="_mandos._tcp",
2970
name = server_settings["servicename"],
2971
servicetype = "_mandos._tcp",
2972
protocol = protocol,
3070
2974
if server_settings["interface"]:
3071
2975
service.interface = if_nametoindex(
3072
2976
server_settings["interface"].encode("utf-8"))
3074
2978
global multiprocessing_manager
3075
2979
multiprocessing_manager = multiprocessing.Manager()
3077
2981
client_class = Client
3079
client_class = functools.partial(ClientDBus, bus=bus)
2983
client_class = functools.partial(ClientDBus, bus = bus)
3081
2985
client_settings = Client.config_parser(client_config)
3082
2986
old_client_settings = {}
3083
2987
clients_data = {}
3085
2989
# This is used to redirect stdout and stderr for checker processes
3087
wnull = open(os.devnull, "w") # A writable /dev/null
2991
wnull = open(os.devnull, "w") # A writable /dev/null
3088
2992
# Only used if server is running in foreground but not in debug
3090
2994
if debug or not foreground:
3093
2997
# Get client data and settings from last running state.
3094
2998
if server_settings["restore"]:
3096
3000
with open(stored_state_path, "rb") as stored_state:
3097
if sys.version_info.major == 2:
3098
clients_data, old_client_settings = pickle.load(
3101
bytes_clients_data, bytes_old_client_settings = (
3102
pickle.load(stored_state, encoding="bytes"))
3103
# Fix bytes to strings
3106
clients_data = {(key.decode("utf-8")
3107
if isinstance(key, bytes)
3110
bytes_clients_data.items()}
3111
del bytes_clients_data
3112
for key in clients_data:
3113
value = {(k.decode("utf-8")
3114
if isinstance(k, bytes) else k): v
3116
clients_data[key].items()}
3117
clients_data[key] = value
3119
value["client_structure"] = [
3121
if isinstance(s, bytes)
3123
value["client_structure"]]
3125
for k in ("name", "host"):
3126
if isinstance(value[k], bytes):
3127
value[k] = value[k].decode("utf-8")
3128
# old_client_settings
3130
old_client_settings = {
3131
(key.decode("utf-8")
3132
if isinstance(key, bytes)
3135
bytes_old_client_settings.items()}
3136
del bytes_old_client_settings
3138
for value in old_client_settings.values():
3139
if isinstance(value["host"], bytes):
3140
value["host"] = (value["host"]
3001
clients_data, old_client_settings = pickle.load(
3142
3003
os.remove(stored_state_path)
3143
3004
except IOError as e:
3144
3005
if e.errno == errno.ENOENT:
3244
3105
pidfilename, pid)
3246
3107
del pidfilename
3248
for termsig in (signal.SIGHUP, signal.SIGTERM):
3249
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3250
lambda: main_loop.quit() and False)
3109
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
3110
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3254
3114
@alternate_dbus_interfaces(
3255
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3115
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3256
3116
class MandosDBusService(DBusObjectWithObjectManager):
3257
3117
"""A D-Bus proxy object"""
3259
3119
def __init__(self):
3260
3120
dbus.service.Object.__init__(self, bus, "/")
3262
3122
_interface = "se.recompile.Mandos"
3264
3124
@dbus.service.signal(_interface, signature="o")
3265
3125
def ClientAdded(self, objpath):
3269
3129
@dbus.service.signal(_interface, signature="ss")
3270
3130
def ClientNotFound(self, fingerprint, address):
3274
3134
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3276
3136
@dbus.service.signal(_interface, signature="os")
3277
3137
def ClientRemoved(self, objpath, name):
3281
3141
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3283
3143
@dbus.service.method(_interface, out_signature="ao")
3284
3144
def GetAllClients(self):
3286
3146
return dbus.Array(c.dbus_object_path for c in
3287
tcp_server.clients.values())
3147
tcp_server.clients.itervalues())
3289
3149
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3291
3151
@dbus.service.method(_interface,
3350
3210
self.ClientRemoved(client.dbus_object_path,
3353
3213
mandos_dbus_service = MandosDBusService()
3355
# Save modules to variables to exempt the modules from being
3356
# unloaded before the function registered with atexit() is run.
3357
mp = multiprocessing
3361
3216
"Cleanup function; run on exit"
3363
3218
service.cleanup()
3365
mp.active_children()
3220
multiprocessing.active_children()
3367
3222
if not (tcp_server.clients or client_settings):
3370
3225
# Store client before exiting. Secrets are encrypted with key
3371
3226
# based on what config file has. If config file is
3372
3227
# removed/edited, old secret will thus be unrecovable.
3374
3229
with PGPEngine() as pgp:
3375
for client in tcp_server.clients.values():
3230
for client in tcp_server.clients.itervalues():
3376
3231
key = client_settings[client.name]["secret"]
3377
3232
client.encrypted_secret = pgp.encrypt(client.secret,
3379
3234
client_dict = {}
3381
3236
# A list of attributes that can not be pickled
3383
exclude = {"bus", "changedstate", "secret",
3384
"checker", "server_settings"}
3238
exclude = { "bus", "changedstate", "secret",
3239
"checker", "server_settings" }
3385
3240
for name, typ in inspect.getmembers(dbus.service
3387
3242
exclude.add(name)
3389
3244
client_dict["encrypted_secret"] = (client
3390
3245
.encrypted_secret)
3391
3246
for attr in client.client_structure:
3392
3247
if attr not in exclude:
3393
3248
client_dict[attr] = getattr(client, attr)
3395
3250
clients[client.name] = client_dict
3396
3251
del client_settings[client.name]["secret"]
3399
3254
with tempfile.NamedTemporaryFile(