70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
82
74
import dbus.service
83
from gi.repository import GLib
84
77
from dbus.mainloop.glib import DBusGMainLoop
87
80
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
85
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
86
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
88
from IN import SO_BINDTODEVICE
100
89
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
115
if sys.version_info.major == 2:
90
SO_BINDTODEVICE = None
119
93
stored_state_file = "clients.pickle"
121
95
logger = logging.getLogger()
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
127
104
except (OSError, AttributeError):
129
105
def if_nametoindex(interface):
130
106
"Get an interface index the hard way, i.e. using fcntl()"
131
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
108
with contextlib.closing(socket.socket()) as s:
133
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
struct.pack(str("16s16x"),
112
interface_index = struct.unpack(str("I"),
136
114
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
117
def initlogger(debug, level=logging.WARNING):
156
118
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
120
syslogger.setFormatter(logging.Formatter
163
121
('Mandos [%(process)d]: %(levelname)s:'
165
123
logger.addHandler(syslogger)
168
126
console = logging.StreamHandler()
169
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
172
os.rmdir(self.tempdir)
227
173
self.tempdir = None
229
175
def password_encode(self, password):
230
176
# Passphrase can not be empty and can not contain newlines or
231
177
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
178
return b"mandos" + binascii.hexlify(password)
240
180
def encrypt(self, data, password):
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
194
self.gnupg.passphrase = None
256
195
return ciphertext
258
197
def decrypt(self, data, password):
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
211
self.gnupg.passphrase = None
274
212
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
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(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
303
215
class AvahiError(Exception):
304
216
def __init__(self, value, *args, **kwargs):
305
217
self.value = value
306
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))
310
222
class AvahiServiceError(AvahiError):
314
225
class AvahiGroupError(AvahiError):
318
229
class AvahiService(object):
319
230
"""An Avahi (Zeroconf) service.
322
233
interface: integer; avahi.IF_UNSPEC or an interface index.
323
234
Used to optionally bind to the specified interface.
324
235
name: string; Example: 'Mandos'
325
236
type: string; Example: '_mandos._tcp'.
326
See <https://www.iana.org/assignments/service-names-port-numbers>
237
See <http://www.dns-sd.org/ServiceTypes.html>
327
238
port: integer; what port to announce
328
239
TXT: list of strings; TXT record for the service
329
240
domain: string; Domain to publish on, default to .local if empty.
488
377
follow_name_owner_changes=True),
489
378
avahi.DBUS_INTERFACE_SERVER)
490
379
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
380
self.server_state_changed)
492
381
self.server_state_changed(self.server.GetState())
495
384
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
386
"""Add the new name to the syslog messages"""
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'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'
505
# Pretend that we have a GnuTLS module
506
class gnutls(object):
507
"""This isn't so much a class as it is a module-like namespace."""
509
library = ctypes.util.find_library("gnutls")
511
library = ctypes.util.find_library("gnutls-deb0")
512
_library = ctypes.cdll.LoadLibrary(library)
515
# Unless otherwise indicated, the constants and types below are
516
# all from the gnutls/gnutls.h C header file.
527
E_NO_CERTIFICATE_FOUND = -49
532
KEYID_USE_SHA256 = 1 # gnutls/x509.h
533
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
536
class session_int(ctypes.Structure):
538
session_t = ctypes.POINTER(session_int)
540
class certificate_credentials_st(ctypes.Structure):
542
certificate_credentials_t = ctypes.POINTER(
543
certificate_credentials_st)
544
certificate_type_t = ctypes.c_int
546
class datum_t(ctypes.Structure):
547
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
('size', ctypes.c_uint)]
550
class openpgp_crt_int(ctypes.Structure):
552
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
554
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
555
credentials_type_t = ctypes.c_int
556
transport_ptr_t = ctypes.c_void_p
557
close_request_t = ctypes.c_int
560
class Error(Exception):
561
def __init__(self, message=None, code=None, args=()):
562
# Default usage is by a message string, but if a return
563
# code is passed, convert it to a string with
566
if message is None and code is not None:
567
message = gnutls.strerror(code)
568
return super(gnutls.Error, self).__init__(
571
class CertificateSecurityError(Error):
575
class Credentials(object):
577
self._c_object = gnutls.certificate_credentials_t()
578
gnutls.certificate_allocate_credentials(
579
ctypes.byref(self._c_object))
580
self.type = gnutls.CRD_CERTIFICATE
583
gnutls.certificate_free_credentials(self._c_object)
585
class ClientSession(object):
586
def __init__(self, socket, credentials=None):
587
self._c_object = gnutls.session_t()
588
gnutls_flags = gnutls.CLIENT
589
if gnutls.check_version(b"3.5.6"):
590
gnutls_flags |= gnutls.NO_TICKETS
592
gnutls_flags |= gnutls.ENABLE_RAWPK
593
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
595
gnutls.set_default_priority(self._c_object)
596
gnutls.transport_set_ptr(self._c_object, socket.fileno())
597
gnutls.handshake_set_private_extensions(self._c_object,
600
if credentials is None:
601
credentials = gnutls.Credentials()
602
gnutls.credentials_set(self._c_object, credentials.type,
603
ctypes.cast(credentials._c_object,
605
self.credentials = credentials
608
gnutls.deinit(self._c_object)
611
return gnutls.handshake(self._c_object)
613
def send(self, data):
617
data_len -= gnutls.record_send(self._c_object,
622
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
624
# Error handling functions
625
def _error_code(result):
626
"""A function to raise exceptions on errors, suitable
627
for the 'restype' attribute on ctypes functions"""
630
if result == gnutls.E_NO_CERTIFICATE_FOUND:
631
raise gnutls.CertificateSecurityError(code=result)
632
raise gnutls.Error(code=result)
634
def _retry_on_error(result, func, arguments):
635
"""A function to retry on some errors, suitable
636
for the 'errcheck' attribute on ctypes functions"""
638
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
639
return _error_code(result)
640
result = func(*arguments)
643
# Unless otherwise indicated, the function declarations below are
644
# all from the gnutls/gnutls.h C header file.
647
priority_set_direct = _library.gnutls_priority_set_direct
648
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
649
ctypes.POINTER(ctypes.c_char_p)]
650
priority_set_direct.restype = _error_code
652
init = _library.gnutls_init
653
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
654
init.restype = _error_code
656
set_default_priority = _library.gnutls_set_default_priority
657
set_default_priority.argtypes = [session_t]
658
set_default_priority.restype = _error_code
660
record_send = _library.gnutls_record_send
661
record_send.argtypes = [session_t, ctypes.c_void_p,
663
record_send.restype = ctypes.c_ssize_t
664
record_send.errcheck = _retry_on_error
666
certificate_allocate_credentials = (
667
_library.gnutls_certificate_allocate_credentials)
668
certificate_allocate_credentials.argtypes = [
669
ctypes.POINTER(certificate_credentials_t)]
670
certificate_allocate_credentials.restype = _error_code
672
certificate_free_credentials = (
673
_library.gnutls_certificate_free_credentials)
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
676
certificate_free_credentials.restype = None
678
handshake_set_private_extensions = (
679
_library.gnutls_handshake_set_private_extensions)
680
handshake_set_private_extensions.argtypes = [session_t,
682
handshake_set_private_extensions.restype = None
684
credentials_set = _library.gnutls_credentials_set
685
credentials_set.argtypes = [session_t, credentials_type_t,
687
credentials_set.restype = _error_code
689
strerror = _library.gnutls_strerror
690
strerror.argtypes = [ctypes.c_int]
691
strerror.restype = ctypes.c_char_p
693
certificate_type_get = _library.gnutls_certificate_type_get
694
certificate_type_get.argtypes = [session_t]
695
certificate_type_get.restype = _error_code
697
certificate_get_peers = _library.gnutls_certificate_get_peers
698
certificate_get_peers.argtypes = [session_t,
699
ctypes.POINTER(ctypes.c_uint)]
700
certificate_get_peers.restype = ctypes.POINTER(datum_t)
702
global_set_log_level = _library.gnutls_global_set_log_level
703
global_set_log_level.argtypes = [ctypes.c_int]
704
global_set_log_level.restype = None
706
global_set_log_function = _library.gnutls_global_set_log_function
707
global_set_log_function.argtypes = [log_func]
708
global_set_log_function.restype = None
710
deinit = _library.gnutls_deinit
711
deinit.argtypes = [session_t]
712
deinit.restype = None
714
handshake = _library.gnutls_handshake
715
handshake.argtypes = [session_t]
716
handshake.restype = _error_code
717
handshake.errcheck = _retry_on_error
719
transport_set_ptr = _library.gnutls_transport_set_ptr
720
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
721
transport_set_ptr.restype = None
723
bye = _library.gnutls_bye
724
bye.argtypes = [session_t, close_request_t]
725
bye.restype = _error_code
726
bye.errcheck = _retry_on_error
728
check_version = _library.gnutls_check_version
729
check_version.argtypes = [ctypes.c_char_p]
730
check_version.restype = ctypes.c_char_p
732
_need_version = b"3.3.0"
733
if check_version(_need_version) is None:
734
raise self.Error("Needs GnuTLS {} or later"
735
.format(_need_version))
737
_tls_rawpk_version = b"3.6.6"
738
has_rawpk = bool(check_version(_tls_rawpk_version))
742
class pubkey_st(ctypes.Structure):
744
pubkey_t = ctypes.POINTER(pubkey_st)
746
x509_crt_fmt_t = ctypes.c_int
748
# All the function declarations below are from gnutls/abstract.h
749
pubkey_init = _library.gnutls_pubkey_init
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
751
pubkey_init.restype = _error_code
753
pubkey_import = _library.gnutls_pubkey_import
754
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
756
pubkey_import.restype = _error_code
758
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
759
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
760
ctypes.POINTER(ctypes.c_ubyte),
761
ctypes.POINTER(ctypes.c_size_t)]
762
pubkey_get_key_id.restype = _error_code
764
pubkey_deinit = _library.gnutls_pubkey_deinit
765
pubkey_deinit.argtypes = [pubkey_t]
766
pubkey_deinit.restype = None
768
# All the function declarations below are from gnutls/openpgp.h
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
772
openpgp_crt_init.restype = _error_code
774
openpgp_crt_import = _library.gnutls_openpgp_crt_import
775
openpgp_crt_import.argtypes = [openpgp_crt_t,
776
ctypes.POINTER(datum_t),
778
openpgp_crt_import.restype = _error_code
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
783
openpgp_crt_verify_self.restype = _error_code
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
786
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
787
openpgp_crt_deinit.restype = None
789
openpgp_crt_get_fingerprint = (
790
_library.gnutls_openpgp_crt_get_fingerprint)
791
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
795
openpgp_crt_get_fingerprint.restype = _error_code
797
if check_version(b"3.6.4"):
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
certificate_type_get2.restype = _error_code
802
# Remove non-public functions
803
del _error_code, _retry_on_error
806
def call_pipe(connection, # : multiprocessing.Connection
807
func, *args, **kwargs):
808
"""This function is meant to be called by multiprocessing.Process
810
This function runs func(*args, **kwargs), and writes the resulting
811
return value on the provided multiprocessing.Connection.
813
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))
817
402
class Client(object):
818
403
"""A representation of a client host served by this server.
821
406
approved: bool(); 'None' if not yet approved/disapproved
822
407
approval_delay: datetime.timedelta(); Time to wait for approval
823
408
approval_duration: datetime.timedelta(); Duration of one approval
824
checker: multiprocessing.Process(); a running checker process used
825
to see if the client lives. 'None' if no process is
827
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
828
413
checker_command: string; External command which is run to check
829
414
if client lives. %() expansions are done at
830
415
runtime with vars(self) as dict, so that for
831
416
instance %(name)s can be used in the command.
832
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
833
418
created: datetime.datetime(); (UTC) object creation
834
419
client_structure: Object describing what attributes a client has
835
420
and is used for storing the client at exit
836
421
current_checker_command: string; current running checker_command
837
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
839
424
fingerprint: string (40 or 32 hexadecimal digits); used to
840
uniquely identify an OpenPGP client
841
key_id: string (64 hexadecimal digits); used to uniquely identify
842
a client using raw public keys
425
uniquely identify the client
843
426
host: string; available for use by the checker command
844
427
interval: datetime.timedelta(); How often to start a new checker
845
428
last_approval_request: datetime.datetime(); (UTC) or None
1002
591
logger.info("Disabling client %s", self.name)
1003
592
if getattr(self, "disable_initiator_tag", None) is not None:
1004
GLib.source_remove(self.disable_initiator_tag)
593
gobject.source_remove(self.disable_initiator_tag)
1005
594
self.disable_initiator_tag = None
1006
595
self.expires = None
1007
596
if getattr(self, "checker_initiator_tag", None) is not None:
1008
GLib.source_remove(self.checker_initiator_tag)
597
gobject.source_remove(self.checker_initiator_tag)
1009
598
self.checker_initiator_tag = None
1010
599
self.stop_checker()
1011
600
self.enabled = False
1013
602
self.send_changedstate()
1014
# Do not run this again if called by a GLib.timeout_add
603
# Do not run this again if called by a gobject.timeout_add
1017
606
def __del__(self):
1020
609
def init_checker(self):
1021
610
# Schedule a new checker to be started an 'interval' from now,
1022
611
# and every interval from then on.
1023
612
if self.checker_initiator_tag is not None:
1024
GLib.source_remove(self.checker_initiator_tag)
1025
self.checker_initiator_tag = GLib.timeout_add(
1026
int(self.interval.total_seconds() * 1000),
613
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
1028
617
# Schedule a disable() when 'timeout' has passed
1029
618
if self.disable_initiator_tag is not None:
1030
GLib.source_remove(self.disable_initiator_tag)
1031
self.disable_initiator_tag = GLib.timeout_add(
1032
int(self.timeout.total_seconds() * 1000), self.disable)
619
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
1033
623
# Also start a new checker *right now*.
1034
624
self.start_checker()
1036
def checker_callback(self, source, condition, connection,
626
def checker_callback(self, pid, condition, command):
1038
627
"""The checker has completed, so take appropriate actions."""
1039
# Read return code from connection (see call_pipe)
1040
returncode = connection.recv()
1043
628
self.checker_callback_tag = None
1044
629
self.checker = None
1047
self.last_checker_status = returncode
1048
self.last_checker_signal = None
630
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
1049
632
if self.last_checker_status == 0:
1050
633
logger.info("Checker for %(name)s succeeded",
1052
635
self.checked_ok()
1054
logger.info("Checker for %(name)s failed", vars(self))
637
logger.info("Checker for %(name)s failed",
1056
640
self.last_checker_status = -1
1057
self.last_checker_signal = -returncode
1058
641
logger.warning("Checker for %(name)s crashed?",
1062
644
def checked_ok(self):
1063
645
"""Assert that the client has been seen, alive and well."""
1064
646
self.last_checked_ok = datetime.datetime.utcnow()
1065
647
self.last_checker_status = 0
1066
self.last_checker_signal = None
1067
648
self.bump_timeout()
1069
650
def bump_timeout(self, timeout=None):
1070
651
"""Bump up the timeout for this client."""
1071
652
if timeout is None:
1072
653
timeout = self.timeout
1073
654
if self.disable_initiator_tag is not None:
1074
GLib.source_remove(self.disable_initiator_tag)
655
gobject.source_remove(self.disable_initiator_tag)
1075
656
self.disable_initiator_tag = None
1076
657
if getattr(self, "enabled", False):
1077
self.disable_initiator_tag = GLib.timeout_add(
1078
int(timeout.total_seconds() * 1000), self.disable)
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
1079
661
self.expires = datetime.datetime.utcnow() + timeout
1081
663
def need_approval(self):
1082
664
self.last_approval_request = datetime.datetime.utcnow()
1084
666
def start_checker(self):
1085
667
"""Start a new checker subprocess if one is not running.
1087
669
If a checker already exists, leave it running and do
1089
671
# The reason for not killing a running checker is that if we
1094
676
# checkers alone, the checker would have to take more time
1095
677
# than 'timeout' for the client to be disabled, which is as it
1098
if self.checker is not None and not self.checker.is_alive():
1099
logger.warning("Checker was not alive; joining")
680
# If a checker exists, make sure it is not a zombie
682
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
683
except (AttributeError, OSError) as error:
684
if (isinstance(error, OSError)
685
and error.errno != errno.ECHILD):
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
1102
693
# Start a new checker if needed
1103
694
if self.checker is None:
1104
695
# Escape attributes for the shell
1106
attr: re.escape(str(getattr(self, attr)))
1107
for attr in self.runtime_expansions}
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
1109
701
command = self.checker_command % escaped_attrs
1110
702
except TypeError as error:
1111
703
logger.error('Could not format string "%s"',
1112
self.checker_command,
704
self.checker_command, exc_info=error)
705
return True # Try again later
706
self.current_checker_command = command
708
logger.info("Starting checker %r for %s",
710
# We don't need to redirect stdout and stderr, since
711
# in normal mode, that is already done by daemon(),
712
# and in debug mode we don't want to. (Stdin is
713
# always replaced by /dev/null.)
714
self.checker = subprocess.Popen(command,
717
except OSError as error:
718
logger.error("Failed to start subprocess",
1114
return True # Try again later
1115
self.current_checker_command = command
1116
logger.info("Starting checker %r for %s", command,
1118
# We don't need to redirect stdout and stderr, since
1119
# in normal mode, that is already done by daemon(),
1120
# and in debug mode we don't want to. (Stdin is
1121
# always replaced by /dev/null.)
1122
# The exception is when not debugging but nevertheless
1123
# running in the foreground; use the previously
1125
popen_args = {"close_fds": True,
1128
if (not self.server_settings["debug"]
1129
and self.server_settings["foreground"]):
1130
popen_args.update({"stdout": wnull,
1132
pipe = multiprocessing.Pipe(duplex=False)
1133
self.checker = multiprocessing.Process(
1135
args=(pipe[1], subprocess.call, command),
1137
self.checker.start()
1138
self.checker_callback_tag = GLib.io_add_watch(
1139
pipe[0].fileno(), GLib.IO_IN,
1140
self.checker_callback, pipe[0], command)
1141
# Re-run this periodically if run by GLib.timeout_add
720
self.checker_callback_tag = (gobject.child_watch_add
722
self.checker_callback,
724
# The checker may have completed before the gobject
725
# watch was added. Check for this.
726
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
728
gobject.source_remove(self.checker_callback_tag)
729
self.checker_callback(pid, status, command)
730
# Re-run this periodically if run by gobject.timeout_add
1144
733
def stop_checker(self):
1145
734
"""Force the checker process, if any, to stop."""
1146
735
if self.checker_callback_tag:
1147
GLib.source_remove(self.checker_callback_tag)
736
gobject.source_remove(self.checker_callback_tag)
1148
737
self.checker_callback_tag = None
1149
738
if getattr(self, "checker", None) is None:
1151
740
logger.debug("Stopping checker for %(name)s", vars(self))
1152
self.checker.terminate()
742
self.checker.terminate()
744
#if self.checker.poll() is None:
745
# self.checker.kill()
746
except OSError as error:
747
if error.errno != errno.ESRCH: # No such process
1153
749
self.checker = None
1156
def dbus_service_property(dbus_interface,
752
def dbus_service_property(dbus_interface, signature="v",
753
access="readwrite", byte_arrays=False):
1160
754
"""Decorators for marking methods of a DBusObjectWithProperties to
1161
755
become properties on the D-Bus.
1163
757
The decorated method will be called with no arguments by "Get"
1164
758
and with one argument by "Set".
1166
760
The parameters, where they are supported, are the same as
1167
761
dbus.service.method, except there is only "signature", since the
1168
762
type from Get() and the type sent to Set() is the same.
1251
class DBusObjectWithAnnotations(dbus.service.Object):
1252
"""A D-Bus object with annotations.
1254
Classes inheriting from this can use the dbus_annotations
1255
decorator to add annotations to methods or signals.
838
class DBusObjectWithProperties(dbus.service.Object):
839
"""A D-Bus object with properties.
841
Classes inheriting from this can use the dbus_service_property
842
decorator to expose methods as D-Bus properties. It exposes the
843
standard Get(), Set(), and GetAll() methods on the D-Bus.
1259
847
def _is_dbus_thing(thing):
1260
848
"""Returns a function testing if an attribute is a D-Bus thing
1262
850
If called like _is_dbus_thing("method") it returns a function
1263
851
suitable for use as predicate to inspect.getmembers().
1265
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
853
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1268
856
def _get_all_dbus_things(self, thing):
1269
857
"""Returns a generator of (name, attribute) pairs
1271
return ((getattr(athing.__get__(self), "_dbus_name", name),
859
return ((getattr(athing.__get__(self), "_dbus_name",
1272
861
athing.__get__(self))
1273
862
for cls in self.__class__.__mro__
1274
863
for name, athing in
1275
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1277
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1279
path_keyword='object_path',
1280
connection_keyword='connection')
1281
def Introspect(self, object_path, connection):
1282
"""Overloading of standard D-Bus method.
1284
Inserts annotation tags on methods and signals.
1286
xmlstring = dbus.service.Object.Introspect(self, object_path,
1289
document = xml.dom.minidom.parseString(xmlstring)
1291
for if_tag in document.getElementsByTagName("interface"):
1292
# Add annotation tags
1293
for typ in ("method", "signal"):
1294
for tag in if_tag.getElementsByTagName(typ):
1296
for name, prop in (self.
1297
_get_all_dbus_things(typ)):
1298
if (name == tag.getAttribute("name")
1299
and prop._dbus_interface
1300
== if_tag.getAttribute("name")):
1301
annots.update(getattr(
1302
prop, "_dbus_annotations", {}))
1303
for name, value in annots.items():
1304
ann_tag = document.createElement(
1306
ann_tag.setAttribute("name", name)
1307
ann_tag.setAttribute("value", value)
1308
tag.appendChild(ann_tag)
1309
# Add interface annotation tags
1310
for annotation, value in dict(
1311
itertools.chain.from_iterable(
1312
annotations().items()
1313
for name, annotations
1314
in self._get_all_dbus_things("interface")
1315
if name == if_tag.getAttribute("name")
1317
ann_tag = document.createElement("annotation")
1318
ann_tag.setAttribute("name", annotation)
1319
ann_tag.setAttribute("value", value)
1320
if_tag.appendChild(ann_tag)
1321
# Fix argument name for the Introspect method itself
1322
if (if_tag.getAttribute("name")
1323
== dbus.INTROSPECTABLE_IFACE):
1324
for cn in if_tag.getElementsByTagName("method"):
1325
if cn.getAttribute("name") == "Introspect":
1326
for arg in cn.getElementsByTagName("arg"):
1327
if (arg.getAttribute("direction")
1329
arg.setAttribute("name",
1331
xmlstring = document.toxml("utf-8")
1333
except (AttributeError, xml.dom.DOMException,
1334
xml.parsers.expat.ExpatError) as error:
1335
logger.error("Failed to override Introspection method",
1340
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1341
"""A D-Bus object with properties.
1343
Classes inheriting from this can use the dbus_service_property
1344
decorator to expose methods as D-Bus properties. It exposes the
1345
standard Get(), Set(), and GetAll() methods on the D-Bus.
864
inspect.getmembers(cls,
865
self._is_dbus_thing(thing)))
1348
867
def _get_dbus_property(self, interface_name, property_name):
1349
868
"""Returns a bound method if one exists which is a D-Bus
1350
869
property with the specified name and interface.
1352
for cls in self.__class__.__mro__:
1353
for name, value in inspect.getmembers(
1354
cls, self._is_dbus_thing("property")):
871
for cls in self.__class__.__mro__:
872
for name, value in (inspect.getmembers
874
self._is_dbus_thing("property"))):
1355
875
if (value._dbus_name == property_name
1356
876
and value._dbus_interface == interface_name):
1357
877
return value.__get__(self)
1359
879
# No such property
1360
raise DBusPropertyNotFound("{}:{}.{}".format(
1361
self.dbus_object_path, interface_name, property_name))
1364
def _get_all_interface_names(cls):
1365
"""Get a sequence of all interfaces supported by an object"""
1366
return (name for name in set(getattr(getattr(x, attr),
1367
"_dbus_interface", None)
1368
for x in (inspect.getmro(cls))
1370
if name is not None)
1372
@dbus.service.method(dbus.PROPERTIES_IFACE,
880
raise DBusPropertyNotFound(self.dbus_object_path + ":"
881
+ interface_name + "."
884
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1374
885
out_signature="v")
1375
886
def Get(self, interface_name, property_name):
1376
887
"""Standard D-Bus property Get() method, see D-Bus standard.
1505
1017
return xmlstring
1509
dbus.OBJECT_MANAGER_IFACE
1510
except AttributeError:
1511
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1514
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1515
"""A D-Bus object with an ObjectManager.
1517
Classes inheriting from this exposes the standard
1518
GetManagedObjects call and the InterfacesAdded and
1519
InterfacesRemoved signals on the standard
1520
"org.freedesktop.DBus.ObjectManager" interface.
1522
Note: No signals are sent automatically; they must be sent
1525
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1526
out_signature="a{oa{sa{sv}}}")
1527
def GetManagedObjects(self):
1528
"""This function must be overridden"""
1529
raise NotImplementedError()
1531
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1532
signature="oa{sa{sv}}")
1533
def InterfacesAdded(self, object_path, interfaces_and_properties):
1536
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1537
def InterfacesRemoved(self, object_path, interfaces):
1540
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1542
path_keyword='object_path',
1543
connection_keyword='connection')
1544
def Introspect(self, object_path, connection):
1545
"""Overloading of standard D-Bus method.
1547
Override return argument name of GetManagedObjects to be
1548
"objpath_interfaces_and_properties"
1550
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1554
document = xml.dom.minidom.parseString(xmlstring)
1556
for if_tag in document.getElementsByTagName("interface"):
1557
# Fix argument name for the GetManagedObjects method
1558
if (if_tag.getAttribute("name")
1559
== dbus.OBJECT_MANAGER_IFACE):
1560
for cn in if_tag.getElementsByTagName("method"):
1561
if (cn.getAttribute("name")
1562
== "GetManagedObjects"):
1563
for arg in cn.getElementsByTagName("arg"):
1564
if (arg.getAttribute("direction")
1568
"objpath_interfaces"
1570
xmlstring = document.toxml("utf-8")
1572
except (AttributeError, xml.dom.DOMException,
1573
xml.parsers.expat.ExpatError) as error:
1574
logger.error("Failed to override Introspection method",
1579
1020
def datetime_to_dbus(dt, variant_level=0):
1580
1021
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1582
return dbus.String("", variant_level=variant_level)
1583
return dbus.String(dt.isoformat(), variant_level=variant_level)
1023
return dbus.String("", variant_level = variant_level)
1024
return dbus.String(dt.isoformat(),
1025
variant_level=variant_level)
1586
1028
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1947
1381
server to mandos-client
1951
1385
# Rejected - signal
1952
1386
@dbus.service.signal(_interface, signature="s")
1953
1387
def Rejected(self, reason):
1957
1391
# NeedApproval - signal
1958
1392
@dbus.service.signal(_interface, signature="tb")
1959
1393
def NeedApproval(self, timeout, default):
1961
1395
return self.need_approval()
1965
1399
# Approve - method
1966
1400
@dbus.service.method(_interface, in_signature="b")
1967
1401
def Approve(self, value):
1968
1402
self.approve(value)
1970
1404
# CheckedOK - method
1971
1405
@dbus.service.method(_interface)
1972
1406
def CheckedOK(self):
1973
1407
self.checked_ok()
1975
1409
# Enable - method
1976
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1977
1410
@dbus.service.method(_interface)
1978
1411
def Enable(self):
1982
1415
# StartChecker - method
1983
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1984
1416
@dbus.service.method(_interface)
1985
1417
def StartChecker(self):
1987
1419
self.start_checker()
1989
1421
# Disable - method
1990
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1991
1422
@dbus.service.method(_interface)
1992
1423
def Disable(self):
1996
1427
# StopChecker - method
1997
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1998
1428
@dbus.service.method(_interface)
1999
1429
def StopChecker(self):
2000
1430
self.stop_checker()
2004
1434
# ApprovalPending - property
2005
1435
@dbus_service_property(_interface, signature="b", access="read")
2006
1436
def ApprovalPending_dbus_property(self):
2007
1437
return dbus.Boolean(bool(self.approvals_pending))
2009
1439
# ApprovedByDefault - property
2010
@dbus_service_property(_interface,
1440
@dbus_service_property(_interface, signature="b",
2012
1441
access="readwrite")
2013
1442
def ApprovedByDefault_dbus_property(self, value=None):
2014
1443
if value is None: # get
2015
1444
return dbus.Boolean(self.approved_by_default)
2016
1445
self.approved_by_default = bool(value)
2018
1447
# ApprovalDelay - property
2019
@dbus_service_property(_interface,
1448
@dbus_service_property(_interface, signature="t",
2021
1449
access="readwrite")
2022
1450
def ApprovalDelay_dbus_property(self, value=None):
2023
1451
if value is None: # get
2024
return dbus.UInt64(self.approval_delay.total_seconds()
1452
return dbus.UInt64(self.approval_delay_milliseconds())
2026
1453
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2028
1455
# ApprovalDuration - property
2029
@dbus_service_property(_interface,
1456
@dbus_service_property(_interface, signature="t",
2031
1457
access="readwrite")
2032
1458
def ApprovalDuration_dbus_property(self, value=None):
2033
1459
if value is None: # get
2034
return dbus.UInt64(self.approval_duration.total_seconds()
1460
return dbus.UInt64(timedelta_to_milliseconds(
1461
self.approval_duration))
2036
1462
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2038
1464
# Name - property
2040
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2041
1465
@dbus_service_property(_interface, signature="s", access="read")
2042
1466
def Name_dbus_property(self):
2043
1467
return dbus.String(self.name)
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2048
@dbus_service_property(_interface, signature="s", access="read")
2049
def KeyID_dbus_property(self):
2050
return dbus.String(self.key_id)
2052
1469
# Fingerprint - property
2054
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
1470
@dbus_service_property(_interface, signature="s", access="read")
2056
1471
def Fingerprint_dbus_property(self):
2057
1472
return dbus.String(self.fingerprint)
2059
1474
# Host - property
2060
@dbus_service_property(_interface,
1475
@dbus_service_property(_interface, signature="s",
2062
1476
access="readwrite")
2063
1477
def Host_dbus_property(self, value=None):
2064
1478
if value is None: # get
2065
1479
return dbus.String(self.host)
2066
self.host = str(value)
1480
self.host = unicode(value)
2068
1482
# Created - property
2070
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2071
1483
@dbus_service_property(_interface, signature="s", access="read")
2072
1484
def Created_dbus_property(self):
2073
1485
return datetime_to_dbus(self.created)
2075
1487
# LastEnabled - property
2076
1488
@dbus_service_property(_interface, signature="s", access="read")
2077
1489
def LastEnabled_dbus_property(self):
2078
1490
return datetime_to_dbus(self.last_enabled)
2080
1492
# Enabled - property
2081
@dbus_service_property(_interface,
1493
@dbus_service_property(_interface, signature="b",
2083
1494
access="readwrite")
2084
1495
def Enabled_dbus_property(self, value=None):
2085
1496
if value is None: # get
2134
1544
if (getattr(self, "disable_initiator_tag", None)
2137
GLib.source_remove(self.disable_initiator_tag)
2138
self.disable_initiator_tag = GLib.timeout_add(
2139
int((self.expires - now).total_seconds() * 1000),
1547
gobject.source_remove(self.disable_initiator_tag)
1548
self.disable_initiator_tag = (
1549
gobject.timeout_add(
1550
timedelta_to_milliseconds(self.expires - now),
2142
1553
# ExtendedTimeout - property
2143
@dbus_service_property(_interface,
1554
@dbus_service_property(_interface, signature="t",
2145
1555
access="readwrite")
2146
1556
def ExtendedTimeout_dbus_property(self, value=None):
2147
1557
if value is None: # get
2148
return dbus.UInt64(self.extended_timeout.total_seconds()
1558
return dbus.UInt64(self.extended_timeout_milliseconds())
2150
1559
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2152
1561
# Interval - property
2153
@dbus_service_property(_interface,
1562
@dbus_service_property(_interface, signature="t",
2155
1563
access="readwrite")
2156
1564
def Interval_dbus_property(self, value=None):
2157
1565
if value is None: # get
2158
return dbus.UInt64(self.interval.total_seconds() * 1000)
1566
return dbus.UInt64(self.interval_milliseconds())
2159
1567
self.interval = datetime.timedelta(0, 0, 0, value)
2160
1568
if getattr(self, "checker_initiator_tag", None) is None:
2162
1570
if self.enabled:
2163
1571
# Reschedule checker run
2164
GLib.source_remove(self.checker_initiator_tag)
2165
self.checker_initiator_tag = GLib.timeout_add(
2166
value, self.start_checker)
2167
self.start_checker() # Start one now, too
1572
gobject.source_remove(self.checker_initiator_tag)
1573
self.checker_initiator_tag = (gobject.timeout_add
1574
(value, self.start_checker))
1575
self.start_checker() # Start one now, too
2169
1577
# Checker - property
2170
@dbus_service_property(_interface,
1578
@dbus_service_property(_interface, signature="s",
2172
1579
access="readwrite")
2173
1580
def Checker_dbus_property(self, value=None):
2174
1581
if value is None: # get
2175
1582
return dbus.String(self.checker_command)
2176
self.checker_command = str(value)
1583
self.checker_command = unicode(value)
2178
1585
# CheckerRunning - property
2179
@dbus_service_property(_interface,
1586
@dbus_service_property(_interface, signature="b",
2181
1587
access="readwrite")
2182
1588
def CheckerRunning_dbus_property(self, value=None):
2183
1589
if value is None: # get
2240
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
2241
1637
"""A class to handle client connections.
2243
1639
Instantiated once for each connection to handle it.
2244
1640
Note: This will run in its own forked process."""
2246
1642
def handle(self):
2247
1643
with contextlib.closing(self.server.child_pipe) as child_pipe:
2248
1644
logger.info("TCP connection from: %s",
2249
str(self.client_address))
1645
unicode(self.client_address))
2250
1646
logger.debug("Pipe FD: %d",
2251
1647
self.server.child_pipe.fileno())
2253
session = gnutls.ClientSession(self.request)
2255
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2256
# "+AES-256-CBC", "+SHA1",
2257
# "+COMP-NULL", "+CTYPE-OPENPGP",
1649
session = (gnutls.connection
1650
.ClientSession(self.request,
1652
.X509Credentials()))
1654
# Note: gnutls.connection.X509Credentials is really a
1655
# generic GnuTLS certificate credentials object so long as
1656
# no X.509 keys are added to it. Therefore, we can use it
1657
# here despite using OpenPGP certificates.
1659
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1660
# "+AES-256-CBC", "+SHA1",
1661
# "+COMP-NULL", "+CTYPE-OPENPGP",
2259
1663
# Use a fallback default, since this MUST be set.
2260
1664
priority = self.server.gnutls_priority
2261
1665
if priority is None:
2262
1666
priority = "NORMAL"
2263
gnutls.priority_set_direct(session._c_object,
2264
priority.encode("utf-8"),
1667
(gnutls.library.functions
1668
.gnutls_priority_set_direct(session._c_object,
2267
1671
# Start communication using the Mandos protocol
2268
1672
# Get protocol number
2269
1673
line = self.request.makefile().readline()
2270
1674
logger.debug("Protocol version: %r", line)
2272
1676
if int(line.strip().split()[0]) > 1:
2273
raise RuntimeError(line)
2274
1678
except (ValueError, IndexError, RuntimeError) as error:
2275
1679
logger.error("Unknown protocol version: %s", error)
2278
1682
# Start GnuTLS connection
2280
1684
session.handshake()
2281
except gnutls.Error as error:
1685
except gnutls.errors.GNUTLSError as error:
2282
1686
logger.warning("Handshake failed: %s", error)
2283
1687
# Do not run session.bye() here: the session is not
2284
1688
# established. Just abandon the request.
2286
1690
logger.debug("Handshake succeeded")
2288
1692
approval_required = False
2290
if gnutls.has_rawpk:
2293
key_id = self.key_id(
2294
self.peer_certificate(session))
2295
except (TypeError, gnutls.Error) as error:
2296
logger.warning("Bad certificate: %s", error)
2298
logger.debug("Key ID: %s", key_id)
2303
fpr = self.fingerprint(
2304
self.peer_certificate(session))
2305
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2308
logger.debug("Fingerprint: %s", fpr)
2311
client = ProxyClient(child_pipe, key_id, fpr,
1695
fpr = self.fingerprint(self.peer_certificate
1698
gnutls.errors.GNUTLSError) as error:
1699
logger.warning("Bad certificate: %s", error)
1701
logger.debug("Fingerprint: %s", fpr)
1704
client = ProxyClient(child_pipe, fpr,
2312
1705
self.client_address)
2313
1706
except KeyError:
2316
1709
if client.approval_delay:
2317
1710
delay = client.approval_delay
2318
1711
client.approvals_pending += 1
2319
1712
approval_required = True
2322
1715
if not client.enabled:
2323
1716
logger.info("Client %s is disabled",
2325
1718
if self.server.use_dbus:
2326
1719
# Emit D-Bus signal
2327
1720
client.Rejected("Disabled")
2330
1723
if client.approved or not client.approval_delay:
2331
# We are approved or approval is disabled
1724
#We are approved or approval is disabled
2333
1726
elif client.approved is None:
2334
1727
logger.info("Client %s needs approval",
2367
1762
delay -= time2 - time
2370
session.send(client.secret)
2371
except gnutls.Error as error:
2372
logger.warning("gnutls send failed",
1765
while sent_size < len(client.secret):
1767
sent = session.send(client.secret[sent_size:])
1768
except gnutls.errors.GNUTLSError as error:
1769
logger.warning("gnutls send failed",
1772
logger.debug("Sent: %d, remaining: %d",
1773
sent, len(client.secret)
1774
- (sent_size + sent))
2376
1777
logger.info("Sending secret to %s", client.name)
2377
1778
# bump the timeout using extended_timeout
2378
1779
client.bump_timeout(client.extended_timeout)
2379
1780
if self.server.use_dbus:
2380
1781
# Emit D-Bus signal
2381
1782
client.GotSecret()
2384
1785
if approval_required:
2385
1786
client.approvals_pending -= 1
2388
except gnutls.Error as error:
1789
except gnutls.errors.GNUTLSError as error:
2389
1790
logger.warning("GnuTLS bye failed",
2390
1791
exc_info=error)
2393
1794
def peer_certificate(session):
2394
"Return the peer's certificate as a bytestring"
2396
cert_type = gnutls.certificate_type_get2(session._c_object,
2398
except AttributeError:
2399
cert_type = gnutls.certificate_type_get(session._c_object)
2400
if gnutls.has_rawpk:
2401
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2403
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2404
# If not a valid certificate type...
2405
if cert_type not in valid_cert_types:
2406
logger.info("Cert type %r not in %r", cert_type,
2408
# ...return invalid data
1795
"Return the peer's OpenPGP certificate as a bytestring"
1796
# If not an OpenPGP certificate...
1797
if (gnutls.library.functions
1798
.gnutls_certificate_type_get(session._c_object)
1799
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1800
# ...do the normal thing
1801
return session.peer_certificate
2410
1802
list_size = ctypes.c_uint(1)
2411
cert_list = (gnutls.certificate_get_peers
1803
cert_list = (gnutls.library.functions
1804
.gnutls_certificate_get_peers
2412
1805
(session._c_object, ctypes.byref(list_size)))
2413
1806
if not bool(cert_list) and list_size.value != 0:
2414
raise gnutls.Error("error getting peer certificate")
1807
raise gnutls.errors.GNUTLSError("error getting peer"
2415
1809
if list_size.value == 0:
2417
1811
cert = cert_list[0]
2418
1812
return ctypes.string_at(cert.data, cert.size)
2421
def key_id(certificate):
2422
"Convert a certificate bytestring to a hexdigit key ID"
2423
# New GnuTLS "datum" with the public key
2424
datum = gnutls.datum_t(
2425
ctypes.cast(ctypes.c_char_p(certificate),
2426
ctypes.POINTER(ctypes.c_ubyte)),
2427
ctypes.c_uint(len(certificate)))
2428
# XXX all these need to be created in the gnutls "module"
2429
# New empty GnuTLS certificate
2430
pubkey = gnutls.pubkey_t()
2431
gnutls.pubkey_init(ctypes.byref(pubkey))
2432
# Import the raw public key into the certificate
2433
gnutls.pubkey_import(pubkey,
2434
ctypes.byref(datum),
2435
gnutls.X509_FMT_DER)
2436
# New buffer for the key ID
2437
buf = ctypes.create_string_buffer(32)
2438
buf_len = ctypes.c_size_t(len(buf))
2439
# Get the key ID from the raw public key into the buffer
2440
gnutls.pubkey_get_key_id(pubkey,
2441
gnutls.KEYID_USE_SHA256,
2442
ctypes.cast(ctypes.byref(buf),
2443
ctypes.POINTER(ctypes.c_ubyte)),
2444
ctypes.byref(buf_len))
2445
# Deinit the certificate
2446
gnutls.pubkey_deinit(pubkey)
2448
# Convert the buffer to a Python bytestring
2449
key_id = ctypes.string_at(buf, buf_len.value)
2450
# Convert the bytestring to hexadecimal notation
2451
hex_key_id = binascii.hexlify(key_id).upper()
2455
1815
def fingerprint(openpgp):
2456
1816
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2457
1817
# New GnuTLS "datum" with the OpenPGP public key
2458
datum = gnutls.datum_t(
2459
ctypes.cast(ctypes.c_char_p(openpgp),
2460
ctypes.POINTER(ctypes.c_ubyte)),
2461
ctypes.c_uint(len(openpgp)))
1818
datum = (gnutls.library.types
1819
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1822
ctypes.c_uint(len(openpgp))))
2462
1823
# New empty GnuTLS certificate
2463
crt = gnutls.openpgp_crt_t()
2464
gnutls.openpgp_crt_init(ctypes.byref(crt))
1824
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1825
(gnutls.library.functions
1826
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2465
1827
# Import the OpenPGP public key into the certificate
2466
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2467
gnutls.OPENPGP_FMT_RAW)
1828
(gnutls.library.functions
1829
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1830
gnutls.library.constants
1831
.GNUTLS_OPENPGP_FMT_RAW))
2468
1832
# Verify the self signature in the key
2469
1833
crtverify = ctypes.c_uint()
2470
gnutls.openpgp_crt_verify_self(crt, 0,
2471
ctypes.byref(crtverify))
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_verify_self(crt, 0,
1836
ctypes.byref(crtverify)))
2472
1837
if crtverify.value != 0:
2473
gnutls.openpgp_crt_deinit(crt)
2474
raise gnutls.CertificateSecurityError(code
1838
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1839
raise (gnutls.errors.CertificateSecurityError
2476
1841
# New buffer for the fingerprint
2477
1842
buf = ctypes.create_string_buffer(20)
2478
1843
buf_len = ctypes.c_size_t()
2479
1844
# Get the fingerprint from the certificate into the buffer
2480
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2481
ctypes.byref(buf_len))
1845
(gnutls.library.functions
1846
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1847
ctypes.byref(buf_len)))
2482
1848
# Deinit the certificate
2483
gnutls.openpgp_crt_deinit(crt)
1849
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2484
1850
# Convert the buffer to a Python bytestring
2485
1851
fpr = ctypes.string_at(buf, buf_len.value)
2486
1852
# Convert the bytestring to hexadecimal notation
2575
1935
# socket_wrapper(), if socketfd was set.
2576
1936
socketserver.TCPServer.__init__(self, server_address,
2577
1937
RequestHandlerClass)
2579
1939
def server_bind(self):
2580
1940
"""This overrides the normal server_bind() function
2581
1941
to bind to an interface if one was specified, and also NOT to
2582
1942
bind to an address or port if they were not specified."""
2583
global SO_BINDTODEVICE
2584
1943
if self.interface is not None:
2585
1944
if SO_BINDTODEVICE is None:
2586
# Fall back to a hard-coded value which seems to be
2588
logger.warning("SO_BINDTODEVICE not found, trying 25")
2589
SO_BINDTODEVICE = 25
2591
self.socket.setsockopt(
2592
socket.SOL_SOCKET, SO_BINDTODEVICE,
2593
(self.interface + "\0").encode("utf-8"))
2594
except socket.error as error:
2595
if error.errno == errno.EPERM:
2596
logger.error("No permission to bind to"
2597
" interface %s", self.interface)
2598
elif error.errno == errno.ENOPROTOOPT:
2599
logger.error("SO_BINDTODEVICE not available;"
2600
" cannot bind to interface %s",
2602
elif error.errno == errno.ENODEV:
2603
logger.error("Interface %s does not exist,"
2604
" cannot bind", self.interface)
1945
logger.error("SO_BINDTODEVICE does not exist;"
1946
" cannot bind to interface %s",
1950
self.socket.setsockopt(socket.SOL_SOCKET,
1952
str(self.interface + '\0'))
1953
except socket.error as error:
1954
if error.errno == errno.EPERM:
1955
logger.error("No permission to bind to"
1956
" interface %s", self.interface)
1957
elif error.errno == errno.ENOPROTOOPT:
1958
logger.error("SO_BINDTODEVICE not available;"
1959
" cannot bind to interface %s",
1961
elif error.errno == errno.ENODEV:
1962
logger.error("Interface %s does not exist,"
1963
" cannot bind", self.interface)
2607
1966
# Only bind(2) the socket if we really need to.
2608
1967
if self.server_address[0] or self.server_address[1]:
2609
if self.server_address[1]:
2610
self.allow_reuse_address = True
2611
1968
if not self.server_address[0]:
2612
1969
if self.address_family == socket.AF_INET6:
2613
any_address = "::" # in6addr_any
1970
any_address = "::" # in6addr_any
2615
any_address = "0.0.0.0" # INADDR_ANY
1972
any_address = socket.INADDR_ANY
2616
1973
self.server_address = (any_address,
2617
1974
self.server_address[1])
2618
1975
elif not self.server_address[1]:
2619
self.server_address = (self.server_address[0], 0)
1976
self.server_address = (self.server_address[0],
2620
1978
# if self.interface:
2621
1979
# self.server_address = (self.server_address[0],
2652
2005
self.gnutls_priority = gnutls_priority
2653
2006
IPv6_TCPServer.__init__(self, server_address,
2654
2007
RequestHandlerClass,
2655
interface=interface,
2008
interface = interface,
2009
use_ipv6 = use_ipv6,
2010
socketfd = socketfd)
2659
2011
def server_activate(self):
2660
2012
if self.enabled:
2661
2013
return socketserver.TCPServer.server_activate(self)
2663
2015
def enable(self):
2664
2016
self.enabled = True
2666
2018
def add_pipe(self, parent_pipe, proc):
2667
2019
# Call "handle_ipc" for both data and EOF events
2669
parent_pipe.fileno(),
2670
GLib.IO_IN | GLib.IO_HUP,
2671
functools.partial(self.handle_ipc,
2672
parent_pipe=parent_pipe,
2675
def handle_ipc(self, source, condition,
2678
client_object=None):
2020
gobject.io_add_watch(parent_pipe.fileno(),
2021
gobject.IO_IN | gobject.IO_HUP,
2022
functools.partial(self.handle_ipc,
2027
def handle_ipc(self, source, condition, parent_pipe=None,
2028
proc = None, client_object=None):
2679
2029
# error, or the other end of multiprocessing.Pipe has closed
2680
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2030
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2681
2031
# Wait for other process to exit
2685
2035
# Read a request from the child
2686
2036
request = parent_pipe.recv()
2687
2037
command = request[0]
2689
2039
if command == 'init':
2690
key_id = request[1].decode("ascii")
2691
fpr = request[2].decode("ascii")
2692
address = request[3]
2694
for c in self.clients.values():
2695
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2697
if key_id and c.key_id == key_id:
2700
if fpr and c.fingerprint == fpr:
2041
address = request[2]
2043
for c in self.clients.itervalues():
2044
if c.fingerprint == fpr:
2704
logger.info("Client not found for key ID: %s, address"
2705
": %s", key_id or fpr, address)
2048
logger.info("Client not found for fingerprint: %s, ad"
2049
"dress: %s", fpr, address)
2706
2050
if self.use_dbus:
2707
2051
# Emit D-Bus signal
2708
mandos_dbus_service.ClientNotFound(key_id or fpr,
2052
mandos_dbus_service.ClientNotFound(fpr,
2710
2054
parent_pipe.send(False)
2714
parent_pipe.fileno(),
2715
GLib.IO_IN | GLib.IO_HUP,
2716
functools.partial(self.handle_ipc,
2717
parent_pipe=parent_pipe,
2719
client_object=client))
2057
gobject.io_add_watch(parent_pipe.fileno(),
2058
gobject.IO_IN | gobject.IO_HUP,
2059
functools.partial(self.handle_ipc,
2720
2065
parent_pipe.send(True)
2721
2066
# remove the old hook in favor of the new above hook on
2949
2294
parser.add_argument("--no-dbus", action="store_false",
2950
2295
dest="use_dbus", help="Do not provide D-Bus"
2951
" system bus interface", default=None)
2296
" system bus interface")
2952
2297
parser.add_argument("--no-ipv6", action="store_false",
2953
dest="use_ipv6", help="Do not use IPv6",
2298
dest="use_ipv6", help="Do not use IPv6")
2955
2299
parser.add_argument("--no-restore", action="store_false",
2956
2300
dest="restore", help="Do not restore stored"
2957
" state", default=None)
2958
2302
parser.add_argument("--socket", type=int,
2959
2303
help="Specify a file descriptor to a network"
2960
2304
" socket to use instead of creating one")
2961
2305
parser.add_argument("--statedir", metavar="DIR",
2962
2306
help="Directory to save/restore state in")
2963
2307
parser.add_argument("--foreground", action="store_true",
2964
help="Run in foreground", default=None)
2965
parser.add_argument("--no-zeroconf", action="store_false",
2966
dest="zeroconf", help="Do not use Zeroconf",
2308
help="Run in foreground")
2969
2310
options = parser.parse_args()
2971
2312
if options.check:
2973
fail_count, test_count = doctest.testmod()
2974
sys.exit(os.EX_OK if fail_count == 0 else 1)
2976
2317
# Default values for config file for server-global settings
2977
if gnutls.has_rawpk:
2978
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2979
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2981
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2982
":+SIGN-DSA-SHA256")
2983
server_defaults = {"interface": "",
2987
"priority": priority,
2988
"servicename": "Mandos",
2994
"statedir": "/var/lib/mandos",
2995
"foreground": "False",
2318
server_defaults = { "interface": "",
2323
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2324
"servicename": "Mandos",
2330
"statedir": "/var/lib/mandos",
2331
"foreground": "False",
3000
2334
# Parse config file for server-global settings
3001
2335
server_config = configparser.SafeConfigParser(server_defaults)
3002
2336
del server_defaults
3003
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2337
server_config.read(os.path.join(options.configdir,
3004
2339
# Convert the SafeConfigParser object to a dict
3005
2340
server_settings = server_config.defaults()
3006
2341
# Use the appropriate methods on the non-string config options
3007
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3008
"foreground", "zeroconf"):
2342
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3009
2343
server_settings[option] = server_config.getboolean("DEFAULT",
3011
2345
if server_settings["port"]:
3128
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3130
2447
except OSError as error:
3131
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3132
.format(uid, gid, os.strerror(error.errno)))
3133
2448
if error.errno != errno.EPERM:
3137
2452
# Enable all possible GnuTLS debugging
3139
2454
# "Use a log level over 10 to enable all debugging options."
3140
2455
# - GnuTLS manual
3141
gnutls.global_set_log_level(11)
2456
gnutls.library.functions.gnutls_global_set_log_level(11)
2458
@gnutls.library.types.gnutls_log_func
3144
2459
def debug_gnutls(level, string):
3145
2460
logger.debug("GnuTLS: %s", string[:-1])
3147
gnutls.global_set_log_function(debug_gnutls)
2462
(gnutls.library.functions
2463
.gnutls_global_set_log_function(debug_gnutls))
3149
2465
# Redirect stdin so all checkers get /dev/null
3150
2466
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3151
2467
os.dup2(null, sys.stdin.fileno())
3155
2471
# Need to fork before connecting to D-Bus
3156
2472
if not foreground:
3157
2473
# Close all input and output, do double fork, etc.
3160
# multiprocessing will use threads, so before we use GLib we need
3161
# to inform GLib that threads will be used.
2476
# multiprocessing will use threads, so before we use gobject we
2477
# need to inform gobject that threads will be used.
2478
gobject.threads_init()
3164
2480
global main_loop
3165
2481
# From the Avahi example code
3166
2482
DBusGMainLoop(set_as_default=True)
3167
main_loop = GLib.MainLoop()
2483
main_loop = gobject.MainLoop()
3168
2484
bus = dbus.SystemBus()
3169
2485
# End of Avahi example code
3172
2488
bus_name = dbus.service.BusName("se.recompile.Mandos",
3175
old_bus_name = dbus.service.BusName(
3176
"se.bsnet.fukt.Mandos", bus,
3178
except dbus.exceptions.DBusException as e:
2489
bus, do_not_queue=True)
2490
old_bus_name = (dbus.service.BusName
2491
("se.bsnet.fukt.Mandos", bus,
2493
except dbus.exceptions.NameExistsException as e:
3179
2494
logger.error("Disabling D-Bus:", exc_info=e)
3180
2495
use_dbus = False
3181
2496
server_settings["use_dbus"] = False
3182
2497
tcp_server.use_dbus = False
3184
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3185
service = AvahiServiceToSyslog(
3186
name=server_settings["servicename"],
3187
servicetype="_mandos._tcp",
3190
if server_settings["interface"]:
3191
service.interface = if_nametoindex(
3192
server_settings["interface"].encode("utf-8"))
2498
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2499
service = AvahiServiceToSyslog(name =
2500
server_settings["servicename"],
2501
servicetype = "_mandos._tcp",
2502
protocol = protocol, bus = bus)
2503
if server_settings["interface"]:
2504
service.interface = (if_nametoindex
2505
(str(server_settings["interface"])))
3194
2507
global multiprocessing_manager
3195
2508
multiprocessing_manager = multiprocessing.Manager()
3197
2510
client_class = Client
3199
client_class = functools.partial(ClientDBus, bus=bus)
2512
client_class = functools.partial(ClientDBus, bus = bus)
3201
2514
client_settings = Client.config_parser(client_config)
3202
2515
old_client_settings = {}
3203
2516
clients_data = {}
3205
# This is used to redirect stdout and stderr for checker processes
3207
wnull = open(os.devnull, "w") # A writable /dev/null
3208
# Only used if server is running in foreground but not in debug
3210
if debug or not foreground:
3213
2518
# Get client data and settings from last running state.
3214
2519
if server_settings["restore"]:
3216
2521
with open(stored_state_path, "rb") as stored_state:
3217
if sys.version_info.major == 2:
3218
clients_data, old_client_settings = pickle.load(
3221
bytes_clients_data, bytes_old_client_settings = (
3222
pickle.load(stored_state, encoding="bytes"))
3223
# Fix bytes to strings
3226
clients_data = {(key.decode("utf-8")
3227
if isinstance(key, bytes)
3230
bytes_clients_data.items()}
3231
del bytes_clients_data
3232
for key in clients_data:
3233
value = {(k.decode("utf-8")
3234
if isinstance(k, bytes) else k): v
3236
clients_data[key].items()}
3237
clients_data[key] = value
3239
value["client_structure"] = [
3241
if isinstance(s, bytes)
3243
value["client_structure"]]
3245
for k in ("name", "host"):
3246
if isinstance(value[k], bytes):
3247
value[k] = value[k].decode("utf-8")
3248
if "key_id" not in value:
3249
value["key_id"] = ""
3250
elif "fingerprint" not in value:
3251
value["fingerprint"] = ""
3252
# old_client_settings
3254
old_client_settings = {
3255
(key.decode("utf-8")
3256
if isinstance(key, bytes)
3259
bytes_old_client_settings.items()}
3260
del bytes_old_client_settings
3262
for value in old_client_settings.values():
3263
if isinstance(value["host"], bytes):
3264
value["host"] = (value["host"]
2522
clients_data, old_client_settings = (pickle.load
3266
2524
os.remove(stored_state_path)
3267
2525
except IOError as e:
3268
2526
if e.errno == errno.ENOENT:
3269
logger.warning("Could not load persistent state:"
3270
" {}".format(os.strerror(e.errno)))
2527
logger.warning("Could not load persistent state: {0}"
2528
.format(os.strerror(e.errno)))
3272
2530
logger.critical("Could not load persistent state:",
3275
2533
except EOFError as e:
3276
2534
logger.warning("Could not load persistent state: "
2535
"EOFError:", exc_info=e)
3280
2537
with PGPEngine() as pgp:
3281
for client_name, client in clients_data.items():
3282
# Skip removed clients
3283
if client_name not in client_settings:
2538
for client_name, client in clients_data.iteritems():
3286
2539
# Decide which value to use after restoring saved state.
3287
2540
# We have three different values: Old config file,
3288
2541
# new config file, and saved state.
3346
2599
for client_name in (set(client_settings)
3347
2600
- set(old_client_settings)):
3348
2601
clients_data[client_name] = client_settings[client_name]
3350
2603
# Create all client objects
3351
for client_name, client in clients_data.items():
2604
for client_name, client in clients_data.iteritems():
3352
2605
tcp_server.clients[client_name] = client_class(
3355
server_settings=server_settings)
2606
name = client_name, settings = client)
3357
2608
if not tcp_server.clients:
3358
2609
logger.warning("No clients defined")
3360
2611
if not foreground:
3361
2612
if pidfile is not None:
3365
print(pid, file=pidfile)
2616
pidfile.write(str(pid) + "\n".encode("utf-8"))
3366
2617
except IOError:
3367
2618
logger.error("Could not write to file %r with PID %d",
3368
2619
pidfilename, pid)
3370
2621
del pidfilename
3372
for termsig in (signal.SIGHUP, signal.SIGTERM):
3373
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3374
lambda: main_loop.quit() and False)
2623
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2624
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3378
@alternate_dbus_interfaces(
3379
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3380
class MandosDBusService(DBusObjectWithObjectManager):
2627
@alternate_dbus_interfaces({"se.recompile.Mandos":
2628
"se.bsnet.fukt.Mandos"})
2629
class MandosDBusService(DBusObjectWithProperties):
3381
2630
"""A D-Bus proxy object"""
3383
2631
def __init__(self):
3384
2632
dbus.service.Object.__init__(self, bus, "/")
3386
2633
_interface = "se.recompile.Mandos"
2635
@dbus_interface_annotations(_interface)
2637
return { "org.freedesktop.DBus.Property"
2638
".EmitsChangedSignal":
3388
2641
@dbus.service.signal(_interface, signature="o")
3389
2642
def ClientAdded(self, objpath):
3393
2646
@dbus.service.signal(_interface, signature="ss")
3394
def ClientNotFound(self, key_id, address):
2647
def ClientNotFound(self, fingerprint, address):
3398
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3400
2651
@dbus.service.signal(_interface, signature="os")
3401
2652
def ClientRemoved(self, objpath, name):
3405
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3407
2656
@dbus.service.method(_interface, out_signature="ao")
3408
2657
def GetAllClients(self):
3410
return dbus.Array(c.dbus_object_path for c in
3411
tcp_server.clients.values())
3413
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2659
return dbus.Array(c.dbus_object_path
2661
tcp_server.clients.itervalues())
3415
2663
@dbus.service.method(_interface,
3416
2664
out_signature="a{oa{sv}}")
3417
2665
def GetAllClientsWithProperties(self):
3419
2667
return dbus.Dictionary(
3420
{c.dbus_object_path: c.GetAll(
3421
"se.recompile.Mandos.Client")
3422
for c in tcp_server.clients.values()},
2668
((c.dbus_object_path, c.GetAll(""))
2669
for c in tcp_server.clients.itervalues()),
3423
2670
signature="oa{sv}")
3425
2672
@dbus.service.method(_interface, in_signature="o")
3426
2673
def RemoveClient(self, object_path):
3428
for c in tcp_server.clients.values():
2675
for c in tcp_server.clients.itervalues():
3429
2676
if c.dbus_object_path == object_path:
3430
2677
del tcp_server.clients[c.name]
3431
2678
c.remove_from_connection()
3432
# Don't signal the disabling
2679
# Don't signal anything except ClientRemoved
3433
2680
c.disable(quiet=True)
3434
# Emit D-Bus signal for removal
3435
self.client_removed_signal(c)
2682
self.ClientRemoved(object_path, c.name)
3437
2684
raise KeyError(object_path)
3441
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3442
out_signature="a{oa{sa{sv}}}")
3443
def GetManagedObjects(self):
3445
return dbus.Dictionary(
3446
{client.dbus_object_path:
3448
{interface: client.GetAll(interface)
3450
client._get_all_interface_names()})
3451
for client in tcp_server.clients.values()})
3453
def client_added_signal(self, client):
3454
"""Send the new standard signal and the old signal"""
3456
# New standard signal
3457
self.InterfacesAdded(
3458
client.dbus_object_path,
3460
{interface: client.GetAll(interface)
3462
client._get_all_interface_names()}))
3464
self.ClientAdded(client.dbus_object_path)
3466
def client_removed_signal(self, client):
3467
"""Send the new standard signal and the old signal"""
3469
# New standard signal
3470
self.InterfacesRemoved(
3471
client.dbus_object_path,
3472
client._get_all_interface_names())
3474
self.ClientRemoved(client.dbus_object_path,
3477
2688
mandos_dbus_service = MandosDBusService()
3479
# Save modules to variables to exempt the modules from being
3480
# unloaded before the function registered with atexit() is run.
3481
mp = multiprocessing
3485
2691
"Cleanup function; run on exit"
3489
mp.active_children()
2694
multiprocessing.active_children()
3491
2695
if not (tcp_server.clients or client_settings):
3494
2698
# Store client before exiting. Secrets are encrypted with key
3495
2699
# based on what config file has. If config file is
3496
2700
# removed/edited, old secret will thus be unrecovable.
3498
2702
with PGPEngine() as pgp:
3499
for client in tcp_server.clients.values():
2703
for client in tcp_server.clients.itervalues():
3500
2704
key = client_settings[client.name]["secret"]
3501
2705
client.encrypted_secret = pgp.encrypt(client.secret,
3503
2707
client_dict = {}
3505
2709
# A list of attributes that can not be pickled
3507
exclude = {"bus", "changedstate", "secret",
3508
"checker", "server_settings"}
3509
for name, typ in inspect.getmembers(dbus.service
2711
exclude = set(("bus", "changedstate", "secret",
2713
for name, typ in (inspect.getmembers
2714
(dbus.service.Object)):
3511
2715
exclude.add(name)
3513
2717
client_dict["encrypted_secret"] = (client
3514
2718
.encrypted_secret)
3515
2719
for attr in client.client_structure:
3516
2720
if attr not in exclude:
3517
2721
client_dict[attr] = getattr(client, attr)
3519
2723
clients[client.name] = client_dict
3520
2724
del client_settings[client.name]["secret"]
3523
with tempfile.NamedTemporaryFile(
3527
dir=os.path.dirname(stored_state_path),
3528
delete=False) as stored_state:
3529
pickle.dump((clients, client_settings), stored_state,
3531
tempname = stored_state.name
2727
with (tempfile.NamedTemporaryFile
2728
(mode='wb', suffix=".pickle", prefix='clients-',
2729
dir=os.path.dirname(stored_state_path),
2730
delete=False)) as stored_state:
2731
pickle.dump((clients, client_settings), stored_state)
2732
tempname=stored_state.name
3532
2733
os.rename(tempname, stored_state_path)
3533
2734
except (IOError, OSError) as e: