70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
82
74
import dbus.service
84
from gi.repository import GLib
85
77
from dbus.mainloop.glib import DBusGMainLoop
88
80
import xml.dom.minidom
91
if sys.version_info.major == 2:
94
# Try to find the value of SO_BINDTODEVICE:
96
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
97
# newer, and it is also the most natural place for it:
98
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
99
85
except AttributeError:
101
# This is where SO_BINDTODEVICE was up to and including Python
103
87
from IN import SO_BINDTODEVICE
104
88
except ImportError:
105
# In Python 2.7 it seems to have been removed entirely.
106
# Try running the C preprocessor:
108
cc = subprocess.Popen(["cc", "--language=c", "-E",
110
stdin=subprocess.PIPE,
111
stdout=subprocess.PIPE)
112
stdout = cc.communicate(
113
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
114
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
115
except (OSError, ValueError, IndexError):
117
SO_BINDTODEVICE = None
119
if sys.version_info.major == 2:
122
if sys.version_info < (3, 2):
123
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
126
92
stored_state_file = "clients.pickle"
128
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
132
if_nametoindex = ctypes.cdll.LoadLibrary(
133
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
134
103
except (OSError, AttributeError):
136
104
def if_nametoindex(interface):
137
105
"Get an interface index the hard way, i.e. using fcntl()"
138
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
139
107
with contextlib.closing(socket.socket()) as s:
140
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
141
struct.pack(b"16s16x", interface))
142
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
143
113
return interface_index
146
def copy_function(func):
147
"""Make a copy of a function"""
148
if sys.version_info.major == 2:
149
return types.FunctionType(func.func_code,
155
return types.FunctionType(func.__code__,
162
116
def initlogger(debug, level=logging.WARNING):
163
117
"""init logger and add loglevel"""
166
syslogger = (logging.handlers.SysLogHandler(
167
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
169
119
syslogger.setFormatter(logging.Formatter
170
120
('Mandos [%(process)d]: %(levelname)s:'
172
122
logger.addHandler(syslogger)
175
125
console = logging.StreamHandler()
176
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
233
169
os.rmdir(self.tempdir)
234
170
self.tempdir = None
236
172
def password_encode(self, password):
237
173
# Passphrase can not be empty and can not contain newlines or
238
174
# NUL bytes. So we prefix it and hex encode it.
239
encoded = b"mandos" + binascii.hexlify(password)
240
if len(encoded) > 2048:
241
# GnuPG can't handle long passwords, so encode differently
242
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
243
.replace(b"\n", b"\\n")
244
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
247
177
def encrypt(self, data, password):
248
178
passphrase = self.password_encode(password)
249
with tempfile.NamedTemporaryFile(
250
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
251
181
passfile.write(passphrase)
253
proc = subprocess.Popen([self.gpg, '--symmetric',
183
proc = subprocess.Popen(['gpg', '--symmetric',
254
184
'--passphrase-file',
256
186
+ self.gnupgargs,
257
stdin=subprocess.PIPE,
258
stdout=subprocess.PIPE,
259
stderr=subprocess.PIPE)
260
ciphertext, err = proc.communicate(input=data)
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
261
191
if proc.returncode != 0:
262
192
raise PGPError(err)
263
193
return ciphertext
265
195
def decrypt(self, data, password):
266
196
passphrase = self.password_encode(password)
267
with tempfile.NamedTemporaryFile(
268
dir=self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
269
199
passfile.write(passphrase)
271
proc = subprocess.Popen([self.gpg, '--decrypt',
201
proc = subprocess.Popen(['gpg', '--decrypt',
272
202
'--passphrase-file',
274
204
+ self.gnupgargs,
275
stdin=subprocess.PIPE,
276
stdout=subprocess.PIPE,
277
stderr=subprocess.PIPE)
278
decrypted_plaintext, err = proc.communicate(input=data)
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
279
210
if proc.returncode != 0:
280
211
raise PGPError(err)
281
212
return decrypted_plaintext
284
# Pretend that we have an Avahi module
286
"""This isn't so much a class as it is a module-like namespace."""
287
IF_UNSPEC = -1 # avahi-common/address.h
288
PROTO_UNSPEC = -1 # avahi-common/address.h
289
PROTO_INET = 0 # avahi-common/address.h
290
PROTO_INET6 = 1 # avahi-common/address.h
291
DBUS_NAME = "org.freedesktop.Avahi"
292
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
293
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
294
DBUS_PATH_SERVER = "/"
297
def string_array_to_txt_array(t):
298
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
299
for s in t), signature="ay")
300
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
301
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
302
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
303
SERVER_INVALID = 0 # avahi-common/defs.h
304
SERVER_REGISTERING = 1 # avahi-common/defs.h
305
SERVER_RUNNING = 2 # avahi-common/defs.h
306
SERVER_COLLISION = 3 # avahi-common/defs.h
307
SERVER_FAILURE = 4 # avahi-common/defs.h
310
215
class AvahiError(Exception):
311
216
def __init__(self, value, *args, **kwargs):
312
217
self.value = value
313
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
317
222
class AvahiServiceError(AvahiError):
321
225
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
326
230
"""An Avahi (Zeroconf) service.
329
233
interface: integer; avahi.IF_UNSPEC or an interface index.
330
234
Used to optionally bind to the specified interface.
495
377
follow_name_owner_changes=True),
496
378
avahi.DBUS_INTERFACE_SERVER)
497
379
self.server.connect_to_signal("StateChanged",
498
self.server_state_changed)
380
self.server_state_changed)
499
381
self.server_state_changed(self.server.GetState())
502
384
class AvahiServiceToSyslog(AvahiService):
503
def rename(self, *args, **kwargs):
504
386
"""Add the new name to the syslog messages"""
505
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
506
syslogger.setFormatter(logging.Formatter(
507
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
512
# Pretend that we have a GnuTLS module
514
"""This isn't so much a class as it is a module-like namespace."""
516
library = ctypes.util.find_library("gnutls")
518
library = ctypes.util.find_library("gnutls-deb0")
519
_library = ctypes.cdll.LoadLibrary(library)
522
# Unless otherwise indicated, the constants and types below are
523
# all from the gnutls/gnutls.h C header file.
534
E_NO_CERTIFICATE_FOUND = -49
539
KEYID_USE_SHA256 = 1 # gnutls/x509.h
540
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
543
class session_int(ctypes.Structure):
545
session_t = ctypes.POINTER(session_int)
547
class certificate_credentials_st(ctypes.Structure):
549
certificate_credentials_t = ctypes.POINTER(
550
certificate_credentials_st)
551
certificate_type_t = ctypes.c_int
553
class datum_t(ctypes.Structure):
554
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
555
('size', ctypes.c_uint)]
557
class openpgp_crt_int(ctypes.Structure):
559
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
560
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
561
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
562
credentials_type_t = ctypes.c_int
563
transport_ptr_t = ctypes.c_void_p
564
close_request_t = ctypes.c_int
567
class Error(Exception):
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):
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)
593
def __init__(self, socket, credentials=None):
594
self._c_object = gnutls.session_t()
595
gnutls_flags = gnutls.CLIENT
596
if gnutls.check_version(b"3.5.6"):
597
gnutls_flags |= gnutls.NO_TICKETS
599
gnutls_flags |= gnutls.ENABLE_RAWPK
600
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
602
gnutls.set_default_priority(self._c_object)
603
gnutls.transport_set_ptr(self._c_object, socket.fileno())
604
gnutls.handshake_set_private_extensions(self._c_object,
607
if credentials is None:
608
credentials = gnutls.Credentials()
609
gnutls.credentials_set(self._c_object, credentials.type,
610
ctypes.cast(credentials._c_object,
612
self.credentials = credentials
615
gnutls.deinit(self._c_object)
618
return gnutls.handshake(self._c_object)
620
def send(self, data):
624
data_len -= gnutls.record_send(self._c_object,
629
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
631
# Error handling functions
632
def _error_code(result):
633
"""A function to raise exceptions on errors, suitable
634
for the 'restype' attribute on ctypes functions"""
637
if result == gnutls.E_NO_CERTIFICATE_FOUND:
638
raise gnutls.CertificateSecurityError(code=result)
639
raise gnutls.Error(code=result)
641
def _retry_on_error(result, func, arguments):
642
"""A function to retry on some errors, suitable
643
for the 'errcheck' attribute on ctypes functions"""
645
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
646
return _error_code(result)
647
result = func(*arguments)
650
# Unless otherwise indicated, the function declarations below are
651
# all from the gnutls/gnutls.h C header file.
654
priority_set_direct = _library.gnutls_priority_set_direct
655
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
656
ctypes.POINTER(ctypes.c_char_p)]
657
priority_set_direct.restype = _error_code
659
init = _library.gnutls_init
660
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
661
init.restype = _error_code
663
set_default_priority = _library.gnutls_set_default_priority
664
set_default_priority.argtypes = [session_t]
665
set_default_priority.restype = _error_code
667
record_send = _library.gnutls_record_send
668
record_send.argtypes = [session_t, ctypes.c_void_p,
670
record_send.restype = ctypes.c_ssize_t
671
record_send.errcheck = _retry_on_error
673
certificate_allocate_credentials = (
674
_library.gnutls_certificate_allocate_credentials)
675
certificate_allocate_credentials.argtypes = [
676
ctypes.POINTER(certificate_credentials_t)]
677
certificate_allocate_credentials.restype = _error_code
679
certificate_free_credentials = (
680
_library.gnutls_certificate_free_credentials)
681
certificate_free_credentials.argtypes = [
682
certificate_credentials_t]
683
certificate_free_credentials.restype = None
685
handshake_set_private_extensions = (
686
_library.gnutls_handshake_set_private_extensions)
687
handshake_set_private_extensions.argtypes = [session_t,
689
handshake_set_private_extensions.restype = None
691
credentials_set = _library.gnutls_credentials_set
692
credentials_set.argtypes = [session_t, credentials_type_t,
694
credentials_set.restype = _error_code
696
strerror = _library.gnutls_strerror
697
strerror.argtypes = [ctypes.c_int]
698
strerror.restype = ctypes.c_char_p
700
certificate_type_get = _library.gnutls_certificate_type_get
701
certificate_type_get.argtypes = [session_t]
702
certificate_type_get.restype = _error_code
704
certificate_get_peers = _library.gnutls_certificate_get_peers
705
certificate_get_peers.argtypes = [session_t,
706
ctypes.POINTER(ctypes.c_uint)]
707
certificate_get_peers.restype = ctypes.POINTER(datum_t)
709
global_set_log_level = _library.gnutls_global_set_log_level
710
global_set_log_level.argtypes = [ctypes.c_int]
711
global_set_log_level.restype = None
713
global_set_log_function = _library.gnutls_global_set_log_function
714
global_set_log_function.argtypes = [log_func]
715
global_set_log_function.restype = None
717
deinit = _library.gnutls_deinit
718
deinit.argtypes = [session_t]
719
deinit.restype = None
721
handshake = _library.gnutls_handshake
722
handshake.argtypes = [session_t]
723
handshake.restype = _error_code
724
handshake.errcheck = _retry_on_error
726
transport_set_ptr = _library.gnutls_transport_set_ptr
727
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
728
transport_set_ptr.restype = None
730
bye = _library.gnutls_bye
731
bye.argtypes = [session_t, close_request_t]
732
bye.restype = _error_code
733
bye.errcheck = _retry_on_error
735
check_version = _library.gnutls_check_version
736
check_version.argtypes = [ctypes.c_char_p]
737
check_version.restype = ctypes.c_char_p
739
_need_version = b"3.3.0"
740
if check_version(_need_version) is None:
741
raise self.Error("Needs GnuTLS {} or later"
742
.format(_need_version))
744
_tls_rawpk_version = b"3.6.6"
745
has_rawpk = bool(check_version(_tls_rawpk_version))
749
class pubkey_st(ctypes.Structure):
751
pubkey_t = ctypes.POINTER(pubkey_st)
753
x509_crt_fmt_t = ctypes.c_int
755
# All the function declarations below are from gnutls/abstract.h
756
pubkey_init = _library.gnutls_pubkey_init
757
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
758
pubkey_init.restype = _error_code
760
pubkey_import = _library.gnutls_pubkey_import
761
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
763
pubkey_import.restype = _error_code
765
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
766
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
767
ctypes.POINTER(ctypes.c_ubyte),
768
ctypes.POINTER(ctypes.c_size_t)]
769
pubkey_get_key_id.restype = _error_code
771
pubkey_deinit = _library.gnutls_pubkey_deinit
772
pubkey_deinit.argtypes = [pubkey_t]
773
pubkey_deinit.restype = None
775
# All the function declarations below are from gnutls/openpgp.h
777
openpgp_crt_init = _library.gnutls_openpgp_crt_init
778
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
779
openpgp_crt_init.restype = _error_code
781
openpgp_crt_import = _library.gnutls_openpgp_crt_import
782
openpgp_crt_import.argtypes = [openpgp_crt_t,
783
ctypes.POINTER(datum_t),
785
openpgp_crt_import.restype = _error_code
787
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
788
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
789
ctypes.POINTER(ctypes.c_uint)]
790
openpgp_crt_verify_self.restype = _error_code
792
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
793
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
794
openpgp_crt_deinit.restype = None
796
openpgp_crt_get_fingerprint = (
797
_library.gnutls_openpgp_crt_get_fingerprint)
798
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
802
openpgp_crt_get_fingerprint.restype = _error_code
804
if check_version(b"3.6.4"):
805
certificate_type_get2 = _library.gnutls_certificate_type_get2
806
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
807
certificate_type_get2.restype = _error_code
809
# Remove non-public functions
810
del _error_code, _retry_on_error
813
def call_pipe(connection, # : multiprocessing.Connection
814
func, *args, **kwargs):
815
"""This function is meant to be called by multiprocessing.Process
817
This function runs func(*args, **kwargs), and writes the resulting
818
return value on the provided multiprocessing.Connection.
820
connection.send(func(*args, **kwargs))
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
402
class Client(object):
825
403
"""A representation of a client host served by this server.
828
406
approved: bool(); 'None' if not yet approved/disapproved
829
407
approval_delay: datetime.timedelta(); Time to wait for approval
830
408
approval_duration: datetime.timedelta(); Duration of one approval
831
checker: multiprocessing.Process(); a running checker process used
832
to see if the client lives. 'None' if no process is
834
checker_callback_tag: a GLib event source tag, or None
409
checker: subprocess.Popen(); a running checker process used
410
to see if the client lives.
411
'None' if no process is running.
412
checker_callback_tag: a gobject event source tag, or None
835
413
checker_command: string; External command which is run to check
836
414
if client lives. %() expansions are done at
837
415
runtime with vars(self) as dict, so that for
838
416
instance %(name)s can be used in the command.
839
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
840
418
created: datetime.datetime(); (UTC) object creation
841
419
client_structure: Object describing what attributes a client has
842
420
and is used for storing the client at exit
843
421
current_checker_command: string; current running checker_command
844
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
846
424
fingerprint: string (40 or 32 hexadecimal digits); used to
847
uniquely identify an OpenPGP client
848
key_id: string (64 hexadecimal digits); used to uniquely identify
849
a client using raw public keys
425
uniquely identify the client
850
426
host: string; available for use by the checker command
851
427
interval: datetime.timedelta(); How often to start a new checker
852
428
last_approval_request: datetime.datetime(); (UTC) or None
1009
595
logger.info("Disabling client %s", self.name)
1010
596
if getattr(self, "disable_initiator_tag", None) is not None:
1011
GLib.source_remove(self.disable_initiator_tag)
597
gobject.source_remove(self.disable_initiator_tag)
1012
598
self.disable_initiator_tag = None
1013
599
self.expires = None
1014
600
if getattr(self, "checker_initiator_tag", None) is not None:
1015
GLib.source_remove(self.checker_initiator_tag)
601
gobject.source_remove(self.checker_initiator_tag)
1016
602
self.checker_initiator_tag = None
1017
603
self.stop_checker()
1018
604
self.enabled = False
1020
606
self.send_changedstate()
1021
# Do not run this again if called by a GLib.timeout_add
607
# Do not run this again if called by a gobject.timeout_add
1024
610
def __del__(self):
1027
613
def init_checker(self):
1028
614
# Schedule a new checker to be started an 'interval' from now,
1029
615
# and every interval from then on.
1030
616
if self.checker_initiator_tag is not None:
1031
GLib.source_remove(self.checker_initiator_tag)
1032
self.checker_initiator_tag = GLib.timeout_add(
1033
int(self.interval.total_seconds() * 1000),
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
1035
621
# Schedule a disable() when 'timeout' has passed
1036
622
if self.disable_initiator_tag is not None:
1037
GLib.source_remove(self.disable_initiator_tag)
1038
self.disable_initiator_tag = GLib.timeout_add(
1039
int(self.timeout.total_seconds() * 1000), self.disable)
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
1040
627
# Also start a new checker *right now*.
1041
628
self.start_checker()
1043
def checker_callback(self, source, condition, connection,
630
def checker_callback(self, pid, condition, command):
1045
631
"""The checker has completed, so take appropriate actions."""
1046
# Read return code from connection (see call_pipe)
1047
returncode = connection.recv()
1050
632
self.checker_callback_tag = None
1051
633
self.checker = None
1054
self.last_checker_status = returncode
1055
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1056
636
if self.last_checker_status == 0:
1057
637
logger.info("Checker for %(name)s succeeded",
1059
639
self.checked_ok()
1061
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
1063
644
self.last_checker_status = -1
1064
self.last_checker_signal = -returncode
1065
645
logger.warning("Checker for %(name)s crashed?",
1069
648
def checked_ok(self):
1070
649
"""Assert that the client has been seen, alive and well."""
1071
650
self.last_checked_ok = datetime.datetime.utcnow()
1072
651
self.last_checker_status = 0
1073
self.last_checker_signal = None
1074
652
self.bump_timeout()
1076
654
def bump_timeout(self, timeout=None):
1077
655
"""Bump up the timeout for this client."""
1078
656
if timeout is None:
1079
657
timeout = self.timeout
1080
658
if self.disable_initiator_tag is not None:
1081
GLib.source_remove(self.disable_initiator_tag)
659
gobject.source_remove(self.disable_initiator_tag)
1082
660
self.disable_initiator_tag = None
1083
661
if getattr(self, "enabled", False):
1084
self.disable_initiator_tag = GLib.timeout_add(
1085
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1086
665
self.expires = datetime.datetime.utcnow() + timeout
1088
667
def need_approval(self):
1089
668
self.last_approval_request = datetime.datetime.utcnow()
1091
670
def start_checker(self):
1092
671
"""Start a new checker subprocess if one is not running.
1094
673
If a checker already exists, leave it running and do
1096
675
# The reason for not killing a running checker is that if we
1101
680
# checkers alone, the checker would have to take more time
1102
681
# than 'timeout' for the client to be disabled, which is as it
1105
if self.checker is not None and not self.checker.is_alive():
1106
logger.warning("Checker was not alive; joining")
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
1109
697
# Start a new checker if needed
1110
698
if self.checker is None:
1111
699
# Escape attributes for the shell
1113
attr: re.escape(str(getattr(self, attr)))
1114
for attr in self.runtime_expansions}
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1116
705
command = self.checker_command % escaped_attrs
1117
706
except TypeError as error:
1118
707
logger.error('Could not format string "%s"',
1119
self.checker_command,
708
self.checker_command, exc_info=error)
709
return True # Try again later
710
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
1121
return True # Try again later
1122
self.current_checker_command = command
1123
logger.info("Starting checker %r for %s", command,
1125
# We don't need to redirect stdout and stderr, since
1126
# in normal mode, that is already done by daemon(),
1127
# and in debug mode we don't want to. (Stdin is
1128
# always replaced by /dev/null.)
1129
# The exception is when not debugging but nevertheless
1130
# running in the foreground; use the previously
1132
popen_args = {"close_fds": True,
1135
if (not self.server_settings["debug"]
1136
and self.server_settings["foreground"]):
1137
popen_args.update({"stdout": wnull,
1139
pipe = multiprocessing.Pipe(duplex=False)
1140
self.checker = multiprocessing.Process(
1142
args=(pipe[1], subprocess.call, command),
1144
self.checker.start()
1145
self.checker_callback_tag = GLib.io_add_watch(
1146
pipe[0].fileno(), GLib.IO_IN,
1147
self.checker_callback, pipe[0], command)
1148
# Re-run this periodically if run by GLib.timeout_add
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
752
# Re-run this periodically if run by gobject.timeout_add
1151
755
def stop_checker(self):
1152
756
"""Force the checker process, if any, to stop."""
1153
757
if self.checker_callback_tag:
1154
GLib.source_remove(self.checker_callback_tag)
758
gobject.source_remove(self.checker_callback_tag)
1155
759
self.checker_callback_tag = None
1156
760
if getattr(self, "checker", None) is None:
1158
762
logger.debug("Stopping checker for %(name)s", vars(self))
1159
self.checker.terminate()
764
self.checker.terminate()
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
1160
771
self.checker = None
1163
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1167
776
"""Decorators for marking methods of a DBusObjectWithProperties to
1168
777
become properties on the D-Bus.
1170
779
The decorated method will be called with no arguments by "Get"
1171
780
and with one argument by "Set".
1173
782
The parameters, where they are supported, are the same as
1174
783
dbus.service.method, except there is only "signature", since the
1175
784
type from Get() and the type sent to Set() is the same.
1258
class DBusObjectWithAnnotations(dbus.service.Object):
1259
"""A D-Bus object with annotations.
1261
Classes inheriting from this can use the dbus_annotations
1262
decorator to add annotations to methods or signals.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1266
869
def _is_dbus_thing(thing):
1267
870
"""Returns a function testing if an attribute is a D-Bus thing
1269
872
If called like _is_dbus_thing("method") it returns a function
1270
873
suitable for use as predicate to inspect.getmembers().
1272
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1275
878
def _get_all_dbus_things(self, thing):
1276
879
"""Returns a generator of (name, attribute) pairs
1278
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
1279
883
athing.__get__(self))
1280
884
for cls in self.__class__.__mro__
1281
885
for name, athing in
1282
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1284
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1286
path_keyword='object_path',
1287
connection_keyword='connection')
1288
def Introspect(self, object_path, connection):
1289
"""Overloading of standard D-Bus method.
1291
Inserts annotation tags on methods and signals.
1293
xmlstring = dbus.service.Object.Introspect(self, object_path,
1296
document = xml.dom.minidom.parseString(xmlstring)
1298
for if_tag in document.getElementsByTagName("interface"):
1299
# Add annotation tags
1300
for typ in ("method", "signal"):
1301
for tag in if_tag.getElementsByTagName(typ):
1303
for name, prop in (self.
1304
_get_all_dbus_things(typ)):
1305
if (name == tag.getAttribute("name")
1306
and prop._dbus_interface
1307
== if_tag.getAttribute("name")):
1308
annots.update(getattr(
1309
prop, "_dbus_annotations", {}))
1310
for name, value in annots.items():
1311
ann_tag = document.createElement(
1313
ann_tag.setAttribute("name", name)
1314
ann_tag.setAttribute("value", value)
1315
tag.appendChild(ann_tag)
1316
# Add interface annotation tags
1317
for annotation, value in dict(
1318
itertools.chain.from_iterable(
1319
annotations().items()
1320
for name, annotations
1321
in self._get_all_dbus_things("interface")
1322
if name == if_tag.getAttribute("name")
1324
ann_tag = document.createElement("annotation")
1325
ann_tag.setAttribute("name", annotation)
1326
ann_tag.setAttribute("value", value)
1327
if_tag.appendChild(ann_tag)
1328
# Fix argument name for the Introspect method itself
1329
if (if_tag.getAttribute("name")
1330
== dbus.INTROSPECTABLE_IFACE):
1331
for cn in if_tag.getElementsByTagName("method"):
1332
if cn.getAttribute("name") == "Introspect":
1333
for arg in cn.getElementsByTagName("arg"):
1334
if (arg.getAttribute("direction")
1336
arg.setAttribute("name",
1338
xmlstring = document.toxml("utf-8")
1340
except (AttributeError, xml.dom.DOMException,
1341
xml.parsers.expat.ExpatError) as error:
1342
logger.error("Failed to override Introspection method",
1347
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1348
"""A D-Bus object with properties.
1350
Classes inheriting from this can use the dbus_service_property
1351
decorator to expose methods as D-Bus properties. It exposes the
1352
standard Get(), Set(), and GetAll() methods on the D-Bus.
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1355
889
def _get_dbus_property(self, interface_name, property_name):
1356
890
"""Returns a bound method if one exists which is a D-Bus
1357
891
property with the specified name and interface.
1359
for cls in self.__class__.__mro__:
1360
for name, value in inspect.getmembers(
1361
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1362
897
if (value._dbus_name == property_name
1363
898
and value._dbus_interface == interface_name):
1364
899
return value.__get__(self)
1366
901
# No such property
1367
raise DBusPropertyNotFound("{}:{}.{}".format(
1368
self.dbus_object_path, interface_name, property_name))
1371
def _get_all_interface_names(cls):
1372
"""Get a sequence of all interfaces supported by an object"""
1373
return (name for name in set(getattr(getattr(x, attr),
1374
"_dbus_interface", None)
1375
for x in (inspect.getmro(cls))
1377
if name is not None)
1379
@dbus.service.method(dbus.PROPERTIES_IFACE,
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1381
907
out_signature="v")
1382
908
def Get(self, interface_name, property_name):
1383
909
"""Standard D-Bus property Get() method, see D-Bus standard.
1512
1039
return xmlstring
1516
dbus.OBJECT_MANAGER_IFACE
1517
except AttributeError:
1518
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1521
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1522
"""A D-Bus object with an ObjectManager.
1524
Classes inheriting from this exposes the standard
1525
GetManagedObjects call and the InterfacesAdded and
1526
InterfacesRemoved signals on the standard
1527
"org.freedesktop.DBus.ObjectManager" interface.
1529
Note: No signals are sent automatically; they must be sent
1532
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1533
out_signature="a{oa{sa{sv}}}")
1534
def GetManagedObjects(self):
1535
"""This function must be overridden"""
1536
raise NotImplementedError()
1538
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1539
signature="oa{sa{sv}}")
1540
def InterfacesAdded(self, object_path, interfaces_and_properties):
1543
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1544
def InterfacesRemoved(self, object_path, interfaces):
1547
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1549
path_keyword='object_path',
1550
connection_keyword='connection')
1551
def Introspect(self, object_path, connection):
1552
"""Overloading of standard D-Bus method.
1554
Override return argument name of GetManagedObjects to be
1555
"objpath_interfaces_and_properties"
1557
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1561
document = xml.dom.minidom.parseString(xmlstring)
1563
for if_tag in document.getElementsByTagName("interface"):
1564
# Fix argument name for the GetManagedObjects method
1565
if (if_tag.getAttribute("name")
1566
== dbus.OBJECT_MANAGER_IFACE):
1567
for cn in if_tag.getElementsByTagName("method"):
1568
if (cn.getAttribute("name")
1569
== "GetManagedObjects"):
1570
for arg in cn.getElementsByTagName("arg"):
1571
if (arg.getAttribute("direction")
1575
"objpath_interfaces"
1577
xmlstring = document.toxml("utf-8")
1579
except (AttributeError, xml.dom.DOMException,
1580
xml.parsers.expat.ExpatError) as error:
1581
logger.error("Failed to override Introspection method",
1586
1042
def datetime_to_dbus(dt, variant_level=0):
1587
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1589
return dbus.String("", variant_level=variant_level)
1590
return dbus.String(dt.isoformat(), variant_level=variant_level)
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1593
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1954
1403
server to mandos-client
1958
1407
# Rejected - signal
1959
1408
@dbus.service.signal(_interface, signature="s")
1960
1409
def Rejected(self, reason):
1964
1413
# NeedApproval - signal
1965
1414
@dbus.service.signal(_interface, signature="tb")
1966
1415
def NeedApproval(self, timeout, default):
1968
1417
return self.need_approval()
1972
1421
# Approve - method
1973
1422
@dbus.service.method(_interface, in_signature="b")
1974
1423
def Approve(self, value):
1975
1424
self.approve(value)
1977
1426
# CheckedOK - method
1978
1427
@dbus.service.method(_interface)
1979
1428
def CheckedOK(self):
1980
1429
self.checked_ok()
1982
1431
# Enable - method
1983
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1984
1432
@dbus.service.method(_interface)
1985
1433
def Enable(self):
1989
1437
# StartChecker - method
1990
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1991
1438
@dbus.service.method(_interface)
1992
1439
def StartChecker(self):
1994
1441
self.start_checker()
1996
1443
# Disable - method
1997
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1998
1444
@dbus.service.method(_interface)
1999
1445
def Disable(self):
2003
1449
# StopChecker - method
2004
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2005
1450
@dbus.service.method(_interface)
2006
1451
def StopChecker(self):
2007
1452
self.stop_checker()
2011
1456
# ApprovalPending - property
2012
1457
@dbus_service_property(_interface, signature="b", access="read")
2013
1458
def ApprovalPending_dbus_property(self):
2014
1459
return dbus.Boolean(bool(self.approvals_pending))
2016
1461
# ApprovedByDefault - property
2017
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2019
1463
access="readwrite")
2020
1464
def ApprovedByDefault_dbus_property(self, value=None):
2021
1465
if value is None: # get
2022
1466
return dbus.Boolean(self.approved_by_default)
2023
1467
self.approved_by_default = bool(value)
2025
1469
# ApprovalDelay - property
2026
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
2028
1471
access="readwrite")
2029
1472
def ApprovalDelay_dbus_property(self, value=None):
2030
1473
if value is None: # get
2031
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
2033
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2035
1477
# ApprovalDuration - property
2036
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
2038
1479
access="readwrite")
2039
1480
def ApprovalDuration_dbus_property(self, value=None):
2040
1481
if value is None: # get
2041
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
2043
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2045
1486
# Name - property
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2048
1487
@dbus_service_property(_interface, signature="s", access="read")
2049
1488
def Name_dbus_property(self):
2050
1489
return dbus.String(self.name)
2054
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
@dbus_service_property(_interface, signature="s", access="read")
2056
def KeyID_dbus_property(self):
2057
return dbus.String(self.key_id)
2059
1491
# Fingerprint - property
2061
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2062
1492
@dbus_service_property(_interface, signature="s", access="read")
2063
1493
def Fingerprint_dbus_property(self):
2064
1494
return dbus.String(self.fingerprint)
2066
1496
# Host - property
2067
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
2069
1498
access="readwrite")
2070
1499
def Host_dbus_property(self, value=None):
2071
1500
if value is None: # get
2072
1501
return dbus.String(self.host)
2073
self.host = str(value)
1502
self.host = unicode(value)
2075
1504
# Created - property
2077
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2078
1505
@dbus_service_property(_interface, signature="s", access="read")
2079
1506
def Created_dbus_property(self):
2080
1507
return datetime_to_dbus(self.created)
2082
1509
# LastEnabled - property
2083
1510
@dbus_service_property(_interface, signature="s", access="read")
2084
1511
def LastEnabled_dbus_property(self):
2085
1512
return datetime_to_dbus(self.last_enabled)
2087
1514
# Enabled - property
2088
@dbus_service_property(_interface,
1515
@dbus_service_property(_interface, signature="b",
2090
1516
access="readwrite")
2091
1517
def Enabled_dbus_property(self, value=None):
2092
1518
if value is None: # get
2141
1566
if (getattr(self, "disable_initiator_tag", None)
2144
GLib.source_remove(self.disable_initiator_tag)
2145
self.disable_initiator_tag = GLib.timeout_add(
2146
int((self.expires - now).total_seconds() * 1000),
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2149
1575
# ExtendedTimeout - property
2150
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
2152
1577
access="readwrite")
2153
1578
def ExtendedTimeout_dbus_property(self, value=None):
2154
1579
if value is None: # get
2155
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2157
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2159
1583
# Interval - property
2160
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2162
1585
access="readwrite")
2163
1586
def Interval_dbus_property(self, value=None):
2164
1587
if value is None: # get
2165
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
2166
1589
self.interval = datetime.timedelta(0, 0, 0, value)
2167
1590
if getattr(self, "checker_initiator_tag", None) is None:
2169
1592
if self.enabled:
2170
1593
# Reschedule checker run
2171
GLib.source_remove(self.checker_initiator_tag)
2172
self.checker_initiator_tag = GLib.timeout_add(
2173
value, self.start_checker)
2174
self.start_checker() # Start one now, too
1594
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
2176
1599
# Checker - property
2177
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
2179
1601
access="readwrite")
2180
1602
def Checker_dbus_property(self, value=None):
2181
1603
if value is None: # get
2182
1604
return dbus.String(self.checker_command)
2183
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
2185
1607
# CheckerRunning - property
2186
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
2188
1609
access="readwrite")
2189
1610
def CheckerRunning_dbus_property(self, value=None):
2190
1611
if value is None: # get
2247
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
2248
1659
"""A class to handle client connections.
2250
1661
Instantiated once for each connection to handle it.
2251
1662
Note: This will run in its own forked process."""
2253
1664
def handle(self):
2254
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
2255
1666
logger.info("TCP connection from: %s",
2256
str(self.client_address))
1667
unicode(self.client_address))
2257
1668
logger.debug("Pipe FD: %d",
2258
1669
self.server.child_pipe.fileno())
2260
session = gnutls.ClientSession(self.request)
2262
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2263
# "+AES-256-CBC", "+SHA1",
2264
# "+COMP-NULL", "+CTYPE-OPENPGP",
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1676
# Note: gnutls.connection.X509Credentials is really a
1677
# generic GnuTLS certificate credentials object so long as
1678
# no X.509 keys are added to it. Therefore, we can use it
1679
# here despite using OpenPGP certificates.
1681
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1682
# "+AES-256-CBC", "+SHA1",
1683
# "+COMP-NULL", "+CTYPE-OPENPGP",
2266
1685
# Use a fallback default, since this MUST be set.
2267
1686
priority = self.server.gnutls_priority
2268
1687
if priority is None:
2269
1688
priority = "NORMAL"
2270
gnutls.priority_set_direct(session._c_object,
2271
priority.encode("utf-8"),
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2274
1693
# Start communication using the Mandos protocol
2275
1694
# Get protocol number
2276
1695
line = self.request.makefile().readline()
2277
1696
logger.debug("Protocol version: %r", line)
2279
1698
if int(line.strip().split()[0]) > 1:
2280
raise RuntimeError(line)
2281
1700
except (ValueError, IndexError, RuntimeError) as error:
2282
1701
logger.error("Unknown protocol version: %s", error)
2285
1704
# Start GnuTLS connection
2287
1706
session.handshake()
2288
except gnutls.Error as error:
1707
except gnutls.errors.GNUTLSError as error:
2289
1708
logger.warning("Handshake failed: %s", error)
2290
1709
# Do not run session.bye() here: the session is not
2291
1710
# established. Just abandon the request.
2293
1712
logger.debug("Handshake succeeded")
2295
1714
approval_required = False
2297
if gnutls.has_rawpk:
2300
key_id = self.key_id(
2301
self.peer_certificate(session))
2302
except (TypeError, gnutls.Error) as error:
2303
logger.warning("Bad certificate: %s", error)
2305
logger.debug("Key ID: %s", key_id)
2310
fpr = self.fingerprint(
2311
self.peer_certificate(session))
2312
except (TypeError, gnutls.Error) as error:
2313
logger.warning("Bad certificate: %s", error)
2315
logger.debug("Fingerprint: %s", fpr)
2318
client = ProxyClient(child_pipe, key_id, fpr,
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
1721
logger.warning("Bad certificate: %s", error)
1723
logger.debug("Fingerprint: %s", fpr)
1726
client = ProxyClient(child_pipe, fpr,
2319
1727
self.client_address)
2320
1728
except KeyError:
2323
1731
if client.approval_delay:
2324
1732
delay = client.approval_delay
2325
1733
client.approvals_pending += 1
2326
1734
approval_required = True
2329
1737
if not client.enabled:
2330
1738
logger.info("Client %s is disabled",
2332
1740
if self.server.use_dbus:
2333
1741
# Emit D-Bus signal
2334
1742
client.Rejected("Disabled")
2337
1745
if client.approved or not client.approval_delay:
2338
# We are approved or approval is disabled
1746
#We are approved or approval is disabled
2340
1748
elif client.approved is None:
2341
1749
logger.info("Client %s needs approval",
2374
1784
delay -= time2 - time
2377
session.send(client.secret)
2378
except gnutls.Error as error:
2379
logger.warning("gnutls send failed",
1787
while sent_size < len(client.secret):
1789
sent = session.send(client.secret[sent_size:])
1790
except gnutls.errors.GNUTLSError as error:
1791
logger.warning("gnutls send failed",
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
2383
1799
logger.info("Sending secret to %s", client.name)
2384
1800
# bump the timeout using extended_timeout
2385
1801
client.bump_timeout(client.extended_timeout)
2386
1802
if self.server.use_dbus:
2387
1803
# Emit D-Bus signal
2388
1804
client.GotSecret()
2391
1807
if approval_required:
2392
1808
client.approvals_pending -= 1
2395
except gnutls.Error as error:
1811
except gnutls.errors.GNUTLSError as error:
2396
1812
logger.warning("GnuTLS bye failed",
2397
1813
exc_info=error)
2400
1816
def peer_certificate(session):
2401
"Return the peer's certificate as a bytestring"
2403
cert_type = gnutls.certificate_type_get2(session._c_object,
2405
except AttributeError:
2406
cert_type = gnutls.certificate_type_get(session._c_object)
2407
if gnutls.has_rawpk:
2408
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2410
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2411
# If not a valid certificate type...
2412
if cert_type not in valid_cert_types:
2413
logger.info("Cert type %r not in %r", cert_type,
2415
# ...return invalid data
1817
"Return the peer's OpenPGP certificate as a bytestring"
1818
# If not an OpenPGP certificate...
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1821
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1822
# ...do the normal thing
1823
return session.peer_certificate
2417
1824
list_size = ctypes.c_uint(1)
2418
cert_list = (gnutls.certificate_get_peers
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2419
1827
(session._c_object, ctypes.byref(list_size)))
2420
1828
if not bool(cert_list) and list_size.value != 0:
2421
raise gnutls.Error("error getting peer certificate")
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2422
1831
if list_size.value == 0:
2424
1833
cert = cert_list[0]
2425
1834
return ctypes.string_at(cert.data, cert.size)
2428
def key_id(certificate):
2429
"Convert a certificate bytestring to a hexdigit key ID"
2430
# New GnuTLS "datum" with the public key
2431
datum = gnutls.datum_t(
2432
ctypes.cast(ctypes.c_char_p(certificate),
2433
ctypes.POINTER(ctypes.c_ubyte)),
2434
ctypes.c_uint(len(certificate)))
2435
# XXX all these need to be created in the gnutls "module"
2436
# New empty GnuTLS certificate
2437
pubkey = gnutls.pubkey_t()
2438
gnutls.pubkey_init(ctypes.byref(pubkey))
2439
# Import the raw public key into the certificate
2440
gnutls.pubkey_import(pubkey,
2441
ctypes.byref(datum),
2442
gnutls.X509_FMT_DER)
2443
# New buffer for the key ID
2444
buf = ctypes.create_string_buffer(32)
2445
buf_len = ctypes.c_size_t(len(buf))
2446
# Get the key ID from the raw public key into the buffer
2447
gnutls.pubkey_get_key_id(pubkey,
2448
gnutls.KEYID_USE_SHA256,
2449
ctypes.cast(ctypes.byref(buf),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.byref(buf_len))
2452
# Deinit the certificate
2453
gnutls.pubkey_deinit(pubkey)
2455
# Convert the buffer to a Python bytestring
2456
key_id = ctypes.string_at(buf, buf_len.value)
2457
# Convert the bytestring to hexadecimal notation
2458
hex_key_id = binascii.hexlify(key_id).upper()
2462
1837
def fingerprint(openpgp):
2463
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2464
1839
# New GnuTLS "datum" with the OpenPGP public key
2465
datum = gnutls.datum_t(
2466
ctypes.cast(ctypes.c_char_p(openpgp),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2469
1845
# New empty GnuTLS certificate
2470
crt = gnutls.openpgp_crt_t()
2471
gnutls.openpgp_crt_init(ctypes.byref(crt))
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2472
1849
# Import the OpenPGP public key into the certificate
2473
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2474
gnutls.OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2475
1854
# Verify the self signature in the key
2476
1855
crtverify = ctypes.c_uint()
2477
gnutls.openpgp_crt_verify_self(crt, 0,
2478
ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2479
1859
if crtverify.value != 0:
2480
gnutls.openpgp_crt_deinit(crt)
2481
raise gnutls.CertificateSecurityError(code
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2483
1863
# New buffer for the fingerprint
2484
1864
buf = ctypes.create_string_buffer(20)
2485
1865
buf_len = ctypes.c_size_t()
2486
1866
# Get the fingerprint from the certificate into the buffer
2487
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2488
ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2489
1870
# Deinit the certificate
2490
gnutls.openpgp_crt_deinit(crt)
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2491
1872
# Convert the buffer to a Python bytestring
2492
1873
fpr = ctypes.string_at(buf, buf_len.value)
2493
1874
# Convert the bytestring to hexadecimal notation
2582
1957
# socket_wrapper(), if socketfd was set.
2583
1958
socketserver.TCPServer.__init__(self, server_address,
2584
1959
RequestHandlerClass)
2586
1961
def server_bind(self):
2587
1962
"""This overrides the normal server_bind() function
2588
1963
to bind to an interface if one was specified, and also NOT to
2589
1964
bind to an address or port if they were not specified."""
2590
global SO_BINDTODEVICE
2591
1965
if self.interface is not None:
2592
1966
if SO_BINDTODEVICE is None:
2593
# Fall back to a hard-coded value which seems to be
2595
logger.warning("SO_BINDTODEVICE not found, trying 25")
2596
SO_BINDTODEVICE = 25
2598
self.socket.setsockopt(
2599
socket.SOL_SOCKET, SO_BINDTODEVICE,
2600
(self.interface + "\0").encode("utf-8"))
2601
except socket.error as error:
2602
if error.errno == errno.EPERM:
2603
logger.error("No permission to bind to"
2604
" interface %s", self.interface)
2605
elif error.errno == errno.ENOPROTOOPT:
2606
logger.error("SO_BINDTODEVICE not available;"
2607
" cannot bind to interface %s",
2609
elif error.errno == errno.ENODEV:
2610
logger.error("Interface %s does not exist,"
2611
" cannot bind", self.interface)
1967
logger.error("SO_BINDTODEVICE does not exist;"
1968
" cannot bind to interface %s",
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
1975
except socket.error as error:
1976
if error.errno == errno.EPERM:
1977
logger.error("No permission to bind to"
1978
" interface %s", self.interface)
1979
elif error.errno == errno.ENOPROTOOPT:
1980
logger.error("SO_BINDTODEVICE not available;"
1981
" cannot bind to interface %s",
1983
elif error.errno == errno.ENODEV:
1984
logger.error("Interface %s does not exist,"
1985
" cannot bind", self.interface)
2614
1988
# Only bind(2) the socket if we really need to.
2615
1989
if self.server_address[0] or self.server_address[1]:
2616
if self.server_address[1]:
2617
self.allow_reuse_address = True
2618
1990
if not self.server_address[0]:
2619
1991
if self.address_family == socket.AF_INET6:
2620
any_address = "::" # in6addr_any
1992
any_address = "::" # in6addr_any
2622
any_address = "0.0.0.0" # INADDR_ANY
1994
any_address = "0.0.0.0" # INADDR_ANY
2623
1995
self.server_address = (any_address,
2624
1996
self.server_address[1])
2625
1997
elif not self.server_address[1]:
2626
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2627
2000
# if self.interface:
2628
2001
# self.server_address = (self.server_address[0],
2659
2027
self.gnutls_priority = gnutls_priority
2660
2028
IPv6_TCPServer.__init__(self, server_address,
2661
2029
RequestHandlerClass,
2662
interface=interface,
2030
interface = interface,
2031
use_ipv6 = use_ipv6,
2032
socketfd = socketfd)
2666
2033
def server_activate(self):
2667
2034
if self.enabled:
2668
2035
return socketserver.TCPServer.server_activate(self)
2670
2037
def enable(self):
2671
2038
self.enabled = True
2673
2040
def add_pipe(self, parent_pipe, proc):
2674
2041
# Call "handle_ipc" for both data and EOF events
2676
parent_pipe.fileno(),
2677
GLib.IO_IN | GLib.IO_HUP,
2678
functools.partial(self.handle_ipc,
2679
parent_pipe=parent_pipe,
2682
def handle_ipc(self, source, condition,
2685
client_object=None):
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
functools.partial(self.handle_ipc,
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2686
2051
# error, or the other end of multiprocessing.Pipe has closed
2687
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2688
2053
# Wait for other process to exit
2692
2057
# Read a request from the child
2693
2058
request = parent_pipe.recv()
2694
2059
command = request[0]
2696
2061
if command == 'init':
2697
key_id = request[1].decode("ascii")
2698
fpr = request[2].decode("ascii")
2699
address = request[3]
2701
for c in self.clients.values():
2702
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2704
if key_id and c.key_id == key_id:
2707
if fpr and c.fingerprint == fpr:
2063
address = request[2]
2065
for c in self.clients.itervalues():
2066
if c.fingerprint == fpr:
2711
logger.info("Client not found for key ID: %s, address"
2712
": %s", key_id or fpr, address)
2070
logger.info("Client not found for fingerprint: %s, ad"
2071
"dress: %s", fpr, address)
2713
2072
if self.use_dbus:
2714
2073
# Emit D-Bus signal
2715
mandos_dbus_service.ClientNotFound(key_id or fpr,
2074
mandos_dbus_service.ClientNotFound(fpr,
2717
2076
parent_pipe.send(False)
2721
parent_pipe.fileno(),
2722
GLib.IO_IN | GLib.IO_HUP,
2723
functools.partial(self.handle_ipc,
2724
parent_pipe=parent_pipe,
2726
client_object=client))
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2727
2087
parent_pipe.send(True)
2728
2088
# remove the old hook in favor of the new above hook on
3134
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3136
2474
except OSError as error:
3137
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3138
.format(uid, gid, os.strerror(error.errno)))
3139
2475
if error.errno != errno.EPERM:
3143
2479
# Enable all possible GnuTLS debugging
3145
2481
# "Use a log level over 10 to enable all debugging options."
3146
2482
# - GnuTLS manual
3147
gnutls.global_set_log_level(11)
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3150
2486
def debug_gnutls(level, string):
3151
2487
logger.debug("GnuTLS: %s", string[:-1])
3153
gnutls.global_set_log_function(debug_gnutls)
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3155
2492
# Redirect stdin so all checkers get /dev/null
3156
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3157
2494
os.dup2(null, sys.stdin.fileno())
3161
2498
# Need to fork before connecting to D-Bus
3162
2499
if not foreground:
3163
2500
# Close all input and output, do double fork, etc.
3166
if gi.version_info < (3, 10, 2):
3167
# multiprocessing will use threads, so before we use GLib we
3168
# need to inform GLib that threads will be used.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
3171
2507
global main_loop
3172
2508
# From the Avahi example code
3173
2509
DBusGMainLoop(set_as_default=True)
3174
main_loop = GLib.MainLoop()
2510
main_loop = gobject.MainLoop()
3175
2511
bus = dbus.SystemBus()
3176
2512
# End of Avahi example code
3179
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
3182
old_bus_name = dbus.service.BusName(
3183
"se.bsnet.fukt.Mandos", bus,
3185
except dbus.exceptions.DBusException as e:
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
3186
2521
logger.error("Disabling D-Bus:", exc_info=e)
3187
2522
use_dbus = False
3188
2523
server_settings["use_dbus"] = False
3189
2524
tcp_server.use_dbus = False
3191
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3192
service = AvahiServiceToSyslog(
3193
name=server_settings["servicename"],
3194
servicetype="_mandos._tcp",
3197
if server_settings["interface"]:
3198
service.interface = if_nametoindex(
3199
server_settings["interface"].encode("utf-8"))
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
3201
2534
global multiprocessing_manager
3202
2535
multiprocessing_manager = multiprocessing.Manager()
3204
2537
client_class = Client
3206
client_class = functools.partial(ClientDBus, bus=bus)
2539
client_class = functools.partial(ClientDBus, bus = bus)
3208
2541
client_settings = Client.config_parser(client_config)
3209
2542
old_client_settings = {}
3210
2543
clients_data = {}
3212
2545
# This is used to redirect stdout and stderr for checker processes
3214
wnull = open(os.devnull, "w") # A writable /dev/null
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3215
2548
# Only used if server is running in foreground but not in debug
3217
2550
if debug or not foreground:
3220
2553
# Get client data and settings from last running state.
3221
2554
if server_settings["restore"]:
3223
2556
with open(stored_state_path, "rb") as stored_state:
3224
if sys.version_info.major == 2:
3225
clients_data, old_client_settings = pickle.load(
3228
bytes_clients_data, bytes_old_client_settings = (
3229
pickle.load(stored_state, encoding="bytes"))
3230
# Fix bytes to strings
3233
clients_data = {(key.decode("utf-8")
3234
if isinstance(key, bytes)
3237
bytes_clients_data.items()}
3238
del bytes_clients_data
3239
for key in clients_data:
3240
value = {(k.decode("utf-8")
3241
if isinstance(k, bytes) else k): v
3243
clients_data[key].items()}
3244
clients_data[key] = value
3246
value["client_structure"] = [
3248
if isinstance(s, bytes)
3250
value["client_structure"]]
3252
for k in ("name", "host"):
3253
if isinstance(value[k], bytes):
3254
value[k] = value[k].decode("utf-8")
3255
if "key_id" not in value:
3256
value["key_id"] = ""
3257
elif "fingerprint" not in value:
3258
value["fingerprint"] = ""
3259
# old_client_settings
3261
old_client_settings = {
3262
(key.decode("utf-8")
3263
if isinstance(key, bytes)
3266
bytes_old_client_settings.items()}
3267
del bytes_old_client_settings
3269
for value in old_client_settings.values():
3270
if isinstance(value["host"], bytes):
3271
value["host"] = (value["host"]
2557
clients_data, old_client_settings = (pickle.load
3273
2559
os.remove(stored_state_path)
3274
2560
except IOError as e:
3275
2561
if e.errno == errno.ENOENT:
3276
logger.warning("Could not load persistent state:"
3277
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3279
2565
logger.critical("Could not load persistent state:",
3282
2568
except EOFError as e:
3283
2569
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
3287
2572
with PGPEngine() as pgp:
3288
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
3289
2574
# Skip removed clients
3290
2575
if client_name not in client_settings:
3293
2578
# Decide which value to use after restoring saved state.
3294
2579
# We have three different values: Old config file,
3295
2580
# new config file, and saved state.
3353
2638
for client_name in (set(client_settings)
3354
2639
- set(old_client_settings)):
3355
2640
clients_data[client_name] = client_settings[client_name]
3357
2642
# Create all client objects
3358
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
3359
2644
tcp_server.clients[client_name] = client_class(
3362
server_settings=server_settings)
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3364
2648
if not tcp_server.clients:
3365
2649
logger.warning("No clients defined")
3367
2651
if not foreground:
3368
2652
if pidfile is not None:
3372
print(pid, file=pidfile)
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3373
2657
except IOError:
3374
2658
logger.error("Could not write to file %r with PID %d",
3375
2659
pidfilename, pid)
3377
2661
del pidfilename
3379
for termsig in (signal.SIGHUP, signal.SIGTERM):
3380
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3381
lambda: main_loop.quit() and False)
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3385
@alternate_dbus_interfaces(
3386
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3387
class MandosDBusService(DBusObjectWithObjectManager):
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3388
2670
"""A D-Bus proxy object"""
3390
2671
def __init__(self):
3391
2672
dbus.service.Object.__init__(self, bus, "/")
3393
2673
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
3395
2681
@dbus.service.signal(_interface, signature="o")
3396
2682
def ClientAdded(self, objpath):
3400
2686
@dbus.service.signal(_interface, signature="ss")
3401
def ClientNotFound(self, key_id, address):
2687
def ClientNotFound(self, fingerprint, address):
3405
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3407
2691
@dbus.service.signal(_interface, signature="os")
3408
2692
def ClientRemoved(self, objpath, name):
3412
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3414
2696
@dbus.service.method(_interface, out_signature="ao")
3415
2697
def GetAllClients(self):
3417
return dbus.Array(c.dbus_object_path for c in
3418
tcp_server.clients.values())
3420
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3422
2703
@dbus.service.method(_interface,
3423
2704
out_signature="a{oa{sv}}")
3424
2705
def GetAllClientsWithProperties(self):
3426
2707
return dbus.Dictionary(
3427
{c.dbus_object_path: c.GetAll(
3428
"se.recompile.Mandos.Client")
3429
for c in tcp_server.clients.values()},
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3430
2710
signature="oa{sv}")
3432
2712
@dbus.service.method(_interface, in_signature="o")
3433
2713
def RemoveClient(self, object_path):
3435
for c in tcp_server.clients.values():
2715
for c in tcp_server.clients.itervalues():
3436
2716
if c.dbus_object_path == object_path:
3437
2717
del tcp_server.clients[c.name]
3438
2718
c.remove_from_connection()
3439
# Don't signal the disabling
2719
# Don't signal anything except ClientRemoved
3440
2720
c.disable(quiet=True)
3441
# Emit D-Bus signal for removal
3442
self.client_removed_signal(c)
2722
self.ClientRemoved(object_path, c.name)
3444
2724
raise KeyError(object_path)
3448
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3449
out_signature="a{oa{sa{sv}}}")
3450
def GetManagedObjects(self):
3452
return dbus.Dictionary(
3453
{client.dbus_object_path:
3455
{interface: client.GetAll(interface)
3457
client._get_all_interface_names()})
3458
for client in tcp_server.clients.values()})
3460
def client_added_signal(self, client):
3461
"""Send the new standard signal and the old signal"""
3463
# New standard signal
3464
self.InterfacesAdded(
3465
client.dbus_object_path,
3467
{interface: client.GetAll(interface)
3469
client._get_all_interface_names()}))
3471
self.ClientAdded(client.dbus_object_path)
3473
def client_removed_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesRemoved(
3478
client.dbus_object_path,
3479
client._get_all_interface_names())
3481
self.ClientRemoved(client.dbus_object_path,
3484
2728
mandos_dbus_service = MandosDBusService()
3486
# Save modules to variables to exempt the modules from being
3487
# unloaded before the function registered with atexit() is run.
3488
mp = multiprocessing
3492
2731
"Cleanup function; run on exit"
3496
mp.active_children()
2734
multiprocessing.active_children()
3498
2736
if not (tcp_server.clients or client_settings):
3501
2739
# Store client before exiting. Secrets are encrypted with key
3502
2740
# based on what config file has. If config file is
3503
2741
# removed/edited, old secret will thus be unrecovable.
3505
2743
with PGPEngine() as pgp:
3506
for client in tcp_server.clients.values():
2744
for client in tcp_server.clients.itervalues():
3507
2745
key = client_settings[client.name]["secret"]
3508
2746
client.encrypted_secret = pgp.encrypt(client.secret,
3510
2748
client_dict = {}
3512
2750
# A list of attributes that can not be pickled
3514
exclude = {"bus", "changedstate", "secret",
3515
"checker", "server_settings"}
3516
for name, typ in inspect.getmembers(dbus.service
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3518
2756
exclude.add(name)
3520
2758
client_dict["encrypted_secret"] = (client
3521
2759
.encrypted_secret)
3522
2760
for attr in client.client_structure:
3523
2761
if attr not in exclude:
3524
2762
client_dict[attr] = getattr(client, attr)
3526
2764
clients[client.name] = client_dict
3527
2765
del client_settings[client.name]["secret"]
3530
with tempfile.NamedTemporaryFile(
3534
dir=os.path.dirname(stored_state_path),
3535
delete=False) as stored_state:
3536
pickle.dump((clients, client_settings), stored_state,
3538
tempname = stored_state.name
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2772
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
3539
2774
os.rename(tempname, stored_state_path)
3540
2775
except (IOError, OSError) as e: