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
# Try to find the value of SO_BINDTODEVICE:
93
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
94
# newer, and it is also the most natural place for it:
95
85
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
96
86
except AttributeError:
98
# This is where SO_BINDTODEVICE was up to and including Python
100
88
from IN import SO_BINDTODEVICE
101
89
except ImportError:
102
# In Python 2.7 it seems to have been removed entirely.
103
# Try running the C preprocessor:
105
cc = subprocess.Popen(["cc", "--language=c", "-E",
107
stdin=subprocess.PIPE,
108
stdout=subprocess.PIPE)
109
stdout = cc.communicate(
110
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
111
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
112
except (OSError, ValueError, IndexError):
114
SO_BINDTODEVICE = None
116
if sys.version_info.major == 2:
119
if sys.version_info < (3, 2):
120
configparser.Configparser = configparser.SafeConfigParser
90
SO_BINDTODEVICE = None
123
93
stored_state_file = "clients.pickle"
125
95
logger = logging.getLogger()
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
129
if_nametoindex = ctypes.cdll.LoadLibrary(
130
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
131
104
except (OSError, AttributeError):
133
105
def if_nametoindex(interface):
134
106
"Get an interface index the hard way, i.e. using fcntl()"
135
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
136
108
with contextlib.closing(socket.socket()) as s:
137
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
138
struct.pack(b"16s16x", interface))
139
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
struct.pack(str("16s16x"),
112
interface_index = struct.unpack(str("I"),
140
114
return interface_index
143
def copy_function(func):
144
"""Make a copy of a function"""
145
if sys.version_info.major == 2:
146
return types.FunctionType(func.func_code,
152
return types.FunctionType(func.__code__,
159
117
def initlogger(debug, level=logging.WARNING):
160
118
"""init logger and add loglevel"""
163
syslogger = (logging.handlers.SysLogHandler(
164
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
166
120
syslogger.setFormatter(logging.Formatter
167
121
('Mandos [%(process)d]: %(levelname)s:'
169
123
logger.addHandler(syslogger)
172
126
console = logging.StreamHandler()
173
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
230
172
os.rmdir(self.tempdir)
231
173
self.tempdir = None
233
175
def password_encode(self, password):
234
176
# Passphrase can not be empty and can not contain newlines or
235
177
# NUL bytes. So we prefix it and hex encode it.
236
encoded = b"mandos" + binascii.hexlify(password)
237
if len(encoded) > 2048:
238
# GnuPG can't handle long passwords, so encode differently
239
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
240
.replace(b"\n", b"\\n")
241
.replace(b"\0", b"\\x00"))
178
return b"mandos" + binascii.hexlify(password)
244
180
def encrypt(self, data, password):
245
passphrase = self.password_encode(password)
246
with tempfile.NamedTemporaryFile(
247
dir=self.tempdir) as passfile:
248
passfile.write(passphrase)
250
proc = subprocess.Popen([self.gpg, '--symmetric',
254
stdin=subprocess.PIPE,
255
stdout=subprocess.PIPE,
256
stderr=subprocess.PIPE)
257
ciphertext, err = proc.communicate(input=data)
258
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
260
195
return ciphertext
262
197
def decrypt(self, data, password):
263
passphrase = self.password_encode(password)
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
266
passfile.write(passphrase)
268
proc = subprocess.Popen([self.gpg, '--decrypt',
272
stdin=subprocess.PIPE,
273
stdout=subprocess.PIPE,
274
stderr=subprocess.PIPE)
275
decrypted_plaintext, err = proc.communicate(input=data)
276
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
278
212
return decrypted_plaintext
281
# Pretend that we have an Avahi module
283
"""This isn't so much a class as it is a module-like namespace."""
284
IF_UNSPEC = -1 # avahi-common/address.h
285
PROTO_UNSPEC = -1 # avahi-common/address.h
286
PROTO_INET = 0 # avahi-common/address.h
287
PROTO_INET6 = 1 # avahi-common/address.h
288
DBUS_NAME = "org.freedesktop.Avahi"
289
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
290
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
291
DBUS_PATH_SERVER = "/"
294
def string_array_to_txt_array(t):
295
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
296
for s in t), signature="ay")
297
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
298
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
299
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
300
SERVER_INVALID = 0 # avahi-common/defs.h
301
SERVER_REGISTERING = 1 # avahi-common/defs.h
302
SERVER_RUNNING = 2 # avahi-common/defs.h
303
SERVER_COLLISION = 3 # avahi-common/defs.h
304
SERVER_FAILURE = 4 # avahi-common/defs.h
307
215
class AvahiError(Exception):
308
216
def __init__(self, value, *args, **kwargs):
309
217
self.value = value
310
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))
314
222
class AvahiServiceError(AvahiError):
318
225
class AvahiGroupError(AvahiError):
322
229
class AvahiService(object):
323
230
"""An Avahi (Zeroconf) service.
326
233
interface: integer; avahi.IF_UNSPEC or an interface index.
327
234
Used to optionally bind to the specified interface.
328
235
name: string; Example: 'Mandos'
329
236
type: string; Example: '_mandos._tcp'.
330
See <https://www.iana.org/assignments/service-names-port-numbers>
237
See <http://www.dns-sd.org/ServiceTypes.html>
331
238
port: integer; what port to announce
332
239
TXT: list of strings; TXT record for the service
333
240
domain: string; Domain to publish on, default to .local if empty.
492
377
follow_name_owner_changes=True),
493
378
avahi.DBUS_INTERFACE_SERVER)
494
379
self.server.connect_to_signal("StateChanged",
495
self.server_state_changed)
380
self.server_state_changed)
496
381
self.server_state_changed(self.server.GetState())
499
384
class AvahiServiceToSyslog(AvahiService):
500
def rename(self, *args, **kwargs):
501
386
"""Add the new name to the syslog messages"""
502
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
503
syslogger.setFormatter(logging.Formatter(
504
'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'
509
# Pretend that we have a GnuTLS module
510
class gnutls(object):
511
"""This isn't so much a class as it is a module-like namespace."""
513
library = ctypes.util.find_library("gnutls")
515
library = ctypes.util.find_library("gnutls-deb0")
516
_library = ctypes.cdll.LoadLibrary(library)
519
# Unless otherwise indicated, the constants and types below are
520
# all from the gnutls/gnutls.h C header file.
531
E_NO_CERTIFICATE_FOUND = -49
536
KEYID_USE_SHA256 = 1 # gnutls/x509.h
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
def __init__(self, message=None, code=None, args=()):
566
# Default usage is by a message string, but if a return
567
# code is passed, convert it to a string with
570
if message is None and code is not None:
571
message = gnutls.strerror(code)
572
return super(gnutls.Error, self).__init__(
575
class CertificateSecurityError(Error):
579
class Credentials(object):
581
self._c_object = gnutls.certificate_credentials_t()
582
gnutls.certificate_allocate_credentials(
583
ctypes.byref(self._c_object))
584
self.type = gnutls.CRD_CERTIFICATE
587
gnutls.certificate_free_credentials(self._c_object)
589
class ClientSession(object):
590
def __init__(self, socket, credentials=None):
591
self._c_object = gnutls.session_t()
592
gnutls_flags = gnutls.CLIENT
593
if gnutls.check_version(b"3.5.6"):
594
gnutls_flags |= gnutls.NO_TICKETS
596
gnutls_flags |= gnutls.ENABLE_RAWPK
597
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
599
gnutls.set_default_priority(self._c_object)
600
gnutls.transport_set_ptr(self._c_object, socket.fileno())
601
gnutls.handshake_set_private_extensions(self._c_object,
604
if credentials is None:
605
credentials = gnutls.Credentials()
606
gnutls.credentials_set(self._c_object, credentials.type,
607
ctypes.cast(credentials._c_object,
609
self.credentials = credentials
612
gnutls.deinit(self._c_object)
615
return gnutls.handshake(self._c_object)
617
def send(self, data):
621
data_len -= gnutls.record_send(self._c_object,
626
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
628
# Error handling functions
629
def _error_code(result):
630
"""A function to raise exceptions on errors, suitable
631
for the 'restype' attribute on ctypes functions"""
634
if result == gnutls.E_NO_CERTIFICATE_FOUND:
635
raise gnutls.CertificateSecurityError(code=result)
636
raise gnutls.Error(code=result)
638
def _retry_on_error(result, func, arguments):
639
"""A function to retry on some errors, suitable
640
for the 'errcheck' attribute on ctypes functions"""
642
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
643
return _error_code(result)
644
result = func(*arguments)
647
# Unless otherwise indicated, the function declarations below are
648
# all from the gnutls/gnutls.h C header file.
651
priority_set_direct = _library.gnutls_priority_set_direct
652
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
653
ctypes.POINTER(ctypes.c_char_p)]
654
priority_set_direct.restype = _error_code
656
init = _library.gnutls_init
657
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
658
init.restype = _error_code
660
set_default_priority = _library.gnutls_set_default_priority
661
set_default_priority.argtypes = [session_t]
662
set_default_priority.restype = _error_code
664
record_send = _library.gnutls_record_send
665
record_send.argtypes = [session_t, ctypes.c_void_p,
667
record_send.restype = ctypes.c_ssize_t
668
record_send.errcheck = _retry_on_error
670
certificate_allocate_credentials = (
671
_library.gnutls_certificate_allocate_credentials)
672
certificate_allocate_credentials.argtypes = [
673
ctypes.POINTER(certificate_credentials_t)]
674
certificate_allocate_credentials.restype = _error_code
676
certificate_free_credentials = (
677
_library.gnutls_certificate_free_credentials)
678
certificate_free_credentials.argtypes = [
679
certificate_credentials_t]
680
certificate_free_credentials.restype = None
682
handshake_set_private_extensions = (
683
_library.gnutls_handshake_set_private_extensions)
684
handshake_set_private_extensions.argtypes = [session_t,
686
handshake_set_private_extensions.restype = None
688
credentials_set = _library.gnutls_credentials_set
689
credentials_set.argtypes = [session_t, credentials_type_t,
691
credentials_set.restype = _error_code
693
strerror = _library.gnutls_strerror
694
strerror.argtypes = [ctypes.c_int]
695
strerror.restype = ctypes.c_char_p
697
certificate_type_get = _library.gnutls_certificate_type_get
698
certificate_type_get.argtypes = [session_t]
699
certificate_type_get.restype = _error_code
701
certificate_get_peers = _library.gnutls_certificate_get_peers
702
certificate_get_peers.argtypes = [session_t,
703
ctypes.POINTER(ctypes.c_uint)]
704
certificate_get_peers.restype = ctypes.POINTER(datum_t)
706
global_set_log_level = _library.gnutls_global_set_log_level
707
global_set_log_level.argtypes = [ctypes.c_int]
708
global_set_log_level.restype = None
710
global_set_log_function = _library.gnutls_global_set_log_function
711
global_set_log_function.argtypes = [log_func]
712
global_set_log_function.restype = None
714
deinit = _library.gnutls_deinit
715
deinit.argtypes = [session_t]
716
deinit.restype = None
718
handshake = _library.gnutls_handshake
719
handshake.argtypes = [session_t]
720
handshake.restype = _error_code
721
handshake.errcheck = _retry_on_error
723
transport_set_ptr = _library.gnutls_transport_set_ptr
724
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
725
transport_set_ptr.restype = None
727
bye = _library.gnutls_bye
728
bye.argtypes = [session_t, close_request_t]
729
bye.restype = _error_code
730
bye.errcheck = _retry_on_error
732
check_version = _library.gnutls_check_version
733
check_version.argtypes = [ctypes.c_char_p]
734
check_version.restype = ctypes.c_char_p
736
_need_version = b"3.3.0"
737
if check_version(_need_version) is None:
738
raise self.Error("Needs GnuTLS {} or later"
739
.format(_need_version))
741
_tls_rawpk_version = b"3.6.6"
742
has_rawpk = bool(check_version(_tls_rawpk_version))
746
class pubkey_st(ctypes.Structure):
748
pubkey_t = ctypes.POINTER(pubkey_st)
750
x509_crt_fmt_t = ctypes.c_int
752
# All the function declarations below are from gnutls/abstract.h
753
pubkey_init = _library.gnutls_pubkey_init
754
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
755
pubkey_init.restype = _error_code
757
pubkey_import = _library.gnutls_pubkey_import
758
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
760
pubkey_import.restype = _error_code
762
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
763
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
764
ctypes.POINTER(ctypes.c_ubyte),
765
ctypes.POINTER(ctypes.c_size_t)]
766
pubkey_get_key_id.restype = _error_code
768
pubkey_deinit = _library.gnutls_pubkey_deinit
769
pubkey_deinit.argtypes = [pubkey_t]
770
pubkey_deinit.restype = None
772
# All the function declarations below are from gnutls/openpgp.h
774
openpgp_crt_init = _library.gnutls_openpgp_crt_init
775
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
776
openpgp_crt_init.restype = _error_code
778
openpgp_crt_import = _library.gnutls_openpgp_crt_import
779
openpgp_crt_import.argtypes = [openpgp_crt_t,
780
ctypes.POINTER(datum_t),
782
openpgp_crt_import.restype = _error_code
784
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
785
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
786
ctypes.POINTER(ctypes.c_uint)]
787
openpgp_crt_verify_self.restype = _error_code
789
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
790
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
791
openpgp_crt_deinit.restype = None
793
openpgp_crt_get_fingerprint = (
794
_library.gnutls_openpgp_crt_get_fingerprint)
795
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
799
openpgp_crt_get_fingerprint.restype = _error_code
801
if check_version(b"3.6.4"):
802
certificate_type_get2 = _library.gnutls_certificate_type_get2
803
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
804
certificate_type_get2.restype = _error_code
806
# Remove non-public functions
807
del _error_code, _retry_on_error
810
def call_pipe(connection, # : multiprocessing.Connection
811
func, *args, **kwargs):
812
"""This function is meant to be called by multiprocessing.Process
814
This function runs func(*args, **kwargs), and writes the resulting
815
return value on the provided multiprocessing.Connection.
817
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))
821
402
class Client(object):
822
403
"""A representation of a client host served by this server.
825
406
approved: bool(); 'None' if not yet approved/disapproved
826
407
approval_delay: datetime.timedelta(); Time to wait for approval
827
408
approval_duration: datetime.timedelta(); Duration of one approval
828
checker: multiprocessing.Process(); a running checker process used
829
to see if the client lives. 'None' if no process is
831
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
832
413
checker_command: string; External command which is run to check
833
414
if client lives. %() expansions are done at
834
415
runtime with vars(self) as dict, so that for
835
416
instance %(name)s can be used in the command.
836
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
837
418
created: datetime.datetime(); (UTC) object creation
838
419
client_structure: Object describing what attributes a client has
839
420
and is used for storing the client at exit
840
421
current_checker_command: string; current running checker_command
841
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
843
424
fingerprint: string (40 or 32 hexadecimal digits); used to
844
uniquely identify an OpenPGP client
845
key_id: string (64 hexadecimal digits); used to uniquely identify
846
a client using raw public keys
425
uniquely identify the client
847
426
host: string; available for use by the checker command
848
427
interval: datetime.timedelta(); How often to start a new checker
849
428
last_approval_request: datetime.datetime(); (UTC) or None
1006
591
logger.info("Disabling client %s", self.name)
1007
592
if getattr(self, "disable_initiator_tag", None) is not None:
1008
GLib.source_remove(self.disable_initiator_tag)
593
gobject.source_remove(self.disable_initiator_tag)
1009
594
self.disable_initiator_tag = None
1010
595
self.expires = None
1011
596
if getattr(self, "checker_initiator_tag", None) is not None:
1012
GLib.source_remove(self.checker_initiator_tag)
597
gobject.source_remove(self.checker_initiator_tag)
1013
598
self.checker_initiator_tag = None
1014
599
self.stop_checker()
1015
600
self.enabled = False
1017
602
self.send_changedstate()
1018
# 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
1021
606
def __del__(self):
1024
609
def init_checker(self):
1025
610
# Schedule a new checker to be started an 'interval' from now,
1026
611
# and every interval from then on.
1027
612
if self.checker_initiator_tag is not None:
1028
GLib.source_remove(self.checker_initiator_tag)
1029
self.checker_initiator_tag = GLib.timeout_add(
1030
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(),
1032
617
# Schedule a disable() when 'timeout' has passed
1033
618
if self.disable_initiator_tag is not None:
1034
GLib.source_remove(self.disable_initiator_tag)
1035
self.disable_initiator_tag = GLib.timeout_add(
1036
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(),
1037
623
# Also start a new checker *right now*.
1038
624
self.start_checker()
1040
def checker_callback(self, source, condition, connection,
626
def checker_callback(self, pid, condition, command):
1042
627
"""The checker has completed, so take appropriate actions."""
1043
# Read return code from connection (see call_pipe)
1044
returncode = connection.recv()
1047
628
self.checker_callback_tag = None
1048
629
self.checker = None
1051
self.last_checker_status = returncode
1052
self.last_checker_signal = None
630
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
1053
632
if self.last_checker_status == 0:
1054
633
logger.info("Checker for %(name)s succeeded",
1056
635
self.checked_ok()
1058
logger.info("Checker for %(name)s failed", vars(self))
637
logger.info("Checker for %(name)s failed",
1060
640
self.last_checker_status = -1
1061
self.last_checker_signal = -returncode
1062
641
logger.warning("Checker for %(name)s crashed?",
1066
644
def checked_ok(self):
1067
645
"""Assert that the client has been seen, alive and well."""
1068
646
self.last_checked_ok = datetime.datetime.utcnow()
1069
647
self.last_checker_status = 0
1070
self.last_checker_signal = None
1071
648
self.bump_timeout()
1073
650
def bump_timeout(self, timeout=None):
1074
651
"""Bump up the timeout for this client."""
1075
652
if timeout is None:
1076
653
timeout = self.timeout
1077
654
if self.disable_initiator_tag is not None:
1078
GLib.source_remove(self.disable_initiator_tag)
655
gobject.source_remove(self.disable_initiator_tag)
1079
656
self.disable_initiator_tag = None
1080
657
if getattr(self, "enabled", False):
1081
self.disable_initiator_tag = GLib.timeout_add(
1082
int(timeout.total_seconds() * 1000), self.disable)
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
1083
661
self.expires = datetime.datetime.utcnow() + timeout
1085
663
def need_approval(self):
1086
664
self.last_approval_request = datetime.datetime.utcnow()
1088
666
def start_checker(self):
1089
667
"""Start a new checker subprocess if one is not running.
1091
669
If a checker already exists, leave it running and do
1093
671
# The reason for not killing a running checker is that if we
1098
676
# checkers alone, the checker would have to take more time
1099
677
# than 'timeout' for the client to be disabled, which is as it
1102
if self.checker is not None and not self.checker.is_alive():
1103
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)
1106
693
# Start a new checker if needed
1107
694
if self.checker is None:
1108
695
# Escape attributes for the shell
1110
attr: re.escape(str(getattr(self, attr)))
1111
for attr in self.runtime_expansions}
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
1113
701
command = self.checker_command % escaped_attrs
1114
702
except TypeError as error:
1115
703
logger.error('Could not format string "%s"',
1116
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",
1118
return True # Try again later
1119
self.current_checker_command = command
1120
logger.info("Starting checker %r for %s", command,
1122
# We don't need to redirect stdout and stderr, since
1123
# in normal mode, that is already done by daemon(),
1124
# and in debug mode we don't want to. (Stdin is
1125
# always replaced by /dev/null.)
1126
# The exception is when not debugging but nevertheless
1127
# running in the foreground; use the previously
1129
popen_args = {"close_fds": True,
1132
if (not self.server_settings["debug"]
1133
and self.server_settings["foreground"]):
1134
popen_args.update({"stdout": wnull,
1136
pipe = multiprocessing.Pipe(duplex=False)
1137
self.checker = multiprocessing.Process(
1139
args=(pipe[1], subprocess.call, command),
1141
self.checker.start()
1142
self.checker_callback_tag = GLib.io_add_watch(
1143
pipe[0].fileno(), GLib.IO_IN,
1144
self.checker_callback, pipe[0], command)
1145
# 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
1148
733
def stop_checker(self):
1149
734
"""Force the checker process, if any, to stop."""
1150
735
if self.checker_callback_tag:
1151
GLib.source_remove(self.checker_callback_tag)
736
gobject.source_remove(self.checker_callback_tag)
1152
737
self.checker_callback_tag = None
1153
738
if getattr(self, "checker", None) is None:
1155
740
logger.debug("Stopping checker for %(name)s", vars(self))
1156
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
1157
749
self.checker = None
1160
def dbus_service_property(dbus_interface,
752
def dbus_service_property(dbus_interface, signature="v",
753
access="readwrite", byte_arrays=False):
1164
754
"""Decorators for marking methods of a DBusObjectWithProperties to
1165
755
become properties on the D-Bus.
1167
757
The decorated method will be called with no arguments by "Get"
1168
758
and with one argument by "Set".
1170
760
The parameters, where they are supported, are the same as
1171
761
dbus.service.method, except there is only "signature", since the
1172
762
type from Get() and the type sent to Set() is the same.
1255
class DBusObjectWithAnnotations(dbus.service.Object):
1256
"""A D-Bus object with annotations.
1258
Classes inheriting from this can use the dbus_annotations
1259
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.
1263
847
def _is_dbus_thing(thing):
1264
848
"""Returns a function testing if an attribute is a D-Bus thing
1266
850
If called like _is_dbus_thing("method") it returns a function
1267
851
suitable for use as predicate to inspect.getmembers().
1269
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
853
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1272
856
def _get_all_dbus_things(self, thing):
1273
857
"""Returns a generator of (name, attribute) pairs
1275
return ((getattr(athing.__get__(self), "_dbus_name", name),
859
return ((getattr(athing.__get__(self), "_dbus_name",
1276
861
athing.__get__(self))
1277
862
for cls in self.__class__.__mro__
1278
863
for name, athing in
1279
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1281
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1283
path_keyword='object_path',
1284
connection_keyword='connection')
1285
def Introspect(self, object_path, connection):
1286
"""Overloading of standard D-Bus method.
1288
Inserts annotation tags on methods and signals.
1290
xmlstring = dbus.service.Object.Introspect(self, object_path,
1293
document = xml.dom.minidom.parseString(xmlstring)
1295
for if_tag in document.getElementsByTagName("interface"):
1296
# Add annotation tags
1297
for typ in ("method", "signal"):
1298
for tag in if_tag.getElementsByTagName(typ):
1300
for name, prop in (self.
1301
_get_all_dbus_things(typ)):
1302
if (name == tag.getAttribute("name")
1303
and prop._dbus_interface
1304
== if_tag.getAttribute("name")):
1305
annots.update(getattr(
1306
prop, "_dbus_annotations", {}))
1307
for name, value in annots.items():
1308
ann_tag = document.createElement(
1310
ann_tag.setAttribute("name", name)
1311
ann_tag.setAttribute("value", value)
1312
tag.appendChild(ann_tag)
1313
# Add interface annotation tags
1314
for annotation, value in dict(
1315
itertools.chain.from_iterable(
1316
annotations().items()
1317
for name, annotations
1318
in self._get_all_dbus_things("interface")
1319
if name == if_tag.getAttribute("name")
1321
ann_tag = document.createElement("annotation")
1322
ann_tag.setAttribute("name", annotation)
1323
ann_tag.setAttribute("value", value)
1324
if_tag.appendChild(ann_tag)
1325
# Fix argument name for the Introspect method itself
1326
if (if_tag.getAttribute("name")
1327
== dbus.INTROSPECTABLE_IFACE):
1328
for cn in if_tag.getElementsByTagName("method"):
1329
if cn.getAttribute("name") == "Introspect":
1330
for arg in cn.getElementsByTagName("arg"):
1331
if (arg.getAttribute("direction")
1333
arg.setAttribute("name",
1335
xmlstring = document.toxml("utf-8")
1337
except (AttributeError, xml.dom.DOMException,
1338
xml.parsers.expat.ExpatError) as error:
1339
logger.error("Failed to override Introspection method",
1344
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1345
"""A D-Bus object with properties.
1347
Classes inheriting from this can use the dbus_service_property
1348
decorator to expose methods as D-Bus properties. It exposes the
1349
standard Get(), Set(), and GetAll() methods on the D-Bus.
864
inspect.getmembers(cls,
865
self._is_dbus_thing(thing)))
1352
867
def _get_dbus_property(self, interface_name, property_name):
1353
868
"""Returns a bound method if one exists which is a D-Bus
1354
869
property with the specified name and interface.
1356
for cls in self.__class__.__mro__:
1357
for name, value in inspect.getmembers(
1358
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"))):
1359
875
if (value._dbus_name == property_name
1360
876
and value._dbus_interface == interface_name):
1361
877
return value.__get__(self)
1363
879
# No such property
1364
raise DBusPropertyNotFound("{}:{}.{}".format(
1365
self.dbus_object_path, interface_name, property_name))
1368
def _get_all_interface_names(cls):
1369
"""Get a sequence of all interfaces supported by an object"""
1370
return (name for name in set(getattr(getattr(x, attr),
1371
"_dbus_interface", None)
1372
for x in (inspect.getmro(cls))
1374
if name is not None)
1376
@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",
1378
885
out_signature="v")
1379
886
def Get(self, interface_name, property_name):
1380
887
"""Standard D-Bus property Get() method, see D-Bus standard.
1509
1017
return xmlstring
1513
dbus.OBJECT_MANAGER_IFACE
1514
except AttributeError:
1515
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1518
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1519
"""A D-Bus object with an ObjectManager.
1521
Classes inheriting from this exposes the standard
1522
GetManagedObjects call and the InterfacesAdded and
1523
InterfacesRemoved signals on the standard
1524
"org.freedesktop.DBus.ObjectManager" interface.
1526
Note: No signals are sent automatically; they must be sent
1529
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1530
out_signature="a{oa{sa{sv}}}")
1531
def GetManagedObjects(self):
1532
"""This function must be overridden"""
1533
raise NotImplementedError()
1535
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1536
signature="oa{sa{sv}}")
1537
def InterfacesAdded(self, object_path, interfaces_and_properties):
1540
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1541
def InterfacesRemoved(self, object_path, interfaces):
1544
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1546
path_keyword='object_path',
1547
connection_keyword='connection')
1548
def Introspect(self, object_path, connection):
1549
"""Overloading of standard D-Bus method.
1551
Override return argument name of GetManagedObjects to be
1552
"objpath_interfaces_and_properties"
1554
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1558
document = xml.dom.minidom.parseString(xmlstring)
1560
for if_tag in document.getElementsByTagName("interface"):
1561
# Fix argument name for the GetManagedObjects method
1562
if (if_tag.getAttribute("name")
1563
== dbus.OBJECT_MANAGER_IFACE):
1564
for cn in if_tag.getElementsByTagName("method"):
1565
if (cn.getAttribute("name")
1566
== "GetManagedObjects"):
1567
for arg in cn.getElementsByTagName("arg"):
1568
if (arg.getAttribute("direction")
1572
"objpath_interfaces"
1574
xmlstring = document.toxml("utf-8")
1576
except (AttributeError, xml.dom.DOMException,
1577
xml.parsers.expat.ExpatError) as error:
1578
logger.error("Failed to override Introspection method",
1583
1020
def datetime_to_dbus(dt, variant_level=0):
1584
1021
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1586
return dbus.String("", variant_level=variant_level)
1587
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)
1590
1028
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1951
1381
server to mandos-client
1955
1385
# Rejected - signal
1956
1386
@dbus.service.signal(_interface, signature="s")
1957
1387
def Rejected(self, reason):
1961
1391
# NeedApproval - signal
1962
1392
@dbus.service.signal(_interface, signature="tb")
1963
1393
def NeedApproval(self, timeout, default):
1965
1395
return self.need_approval()
1969
1399
# Approve - method
1970
1400
@dbus.service.method(_interface, in_signature="b")
1971
1401
def Approve(self, value):
1972
1402
self.approve(value)
1974
1404
# CheckedOK - method
1975
1405
@dbus.service.method(_interface)
1976
1406
def CheckedOK(self):
1977
1407
self.checked_ok()
1979
1409
# Enable - method
1980
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1981
1410
@dbus.service.method(_interface)
1982
1411
def Enable(self):
1986
1415
# StartChecker - method
1987
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1988
1416
@dbus.service.method(_interface)
1989
1417
def StartChecker(self):
1991
1419
self.start_checker()
1993
1421
# Disable - method
1994
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1995
1422
@dbus.service.method(_interface)
1996
1423
def Disable(self):
2000
1427
# StopChecker - method
2001
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2002
1428
@dbus.service.method(_interface)
2003
1429
def StopChecker(self):
2004
1430
self.stop_checker()
2008
1434
# ApprovalPending - property
2009
1435
@dbus_service_property(_interface, signature="b", access="read")
2010
1436
def ApprovalPending_dbus_property(self):
2011
1437
return dbus.Boolean(bool(self.approvals_pending))
2013
1439
# ApprovedByDefault - property
2014
@dbus_service_property(_interface,
1440
@dbus_service_property(_interface, signature="b",
2016
1441
access="readwrite")
2017
1442
def ApprovedByDefault_dbus_property(self, value=None):
2018
1443
if value is None: # get
2019
1444
return dbus.Boolean(self.approved_by_default)
2020
1445
self.approved_by_default = bool(value)
2022
1447
# ApprovalDelay - property
2023
@dbus_service_property(_interface,
1448
@dbus_service_property(_interface, signature="t",
2025
1449
access="readwrite")
2026
1450
def ApprovalDelay_dbus_property(self, value=None):
2027
1451
if value is None: # get
2028
return dbus.UInt64(self.approval_delay.total_seconds()
1452
return dbus.UInt64(self.approval_delay_milliseconds())
2030
1453
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2032
1455
# ApprovalDuration - property
2033
@dbus_service_property(_interface,
1456
@dbus_service_property(_interface, signature="t",
2035
1457
access="readwrite")
2036
1458
def ApprovalDuration_dbus_property(self, value=None):
2037
1459
if value is None: # get
2038
return dbus.UInt64(self.approval_duration.total_seconds()
1460
return dbus.UInt64(timedelta_to_milliseconds(
1461
self.approval_duration))
2040
1462
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2042
1464
# Name - property
2044
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2045
1465
@dbus_service_property(_interface, signature="s", access="read")
2046
1466
def Name_dbus_property(self):
2047
1467
return dbus.String(self.name)
2051
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2052
@dbus_service_property(_interface, signature="s", access="read")
2053
def KeyID_dbus_property(self):
2054
return dbus.String(self.key_id)
2056
1469
# Fingerprint - property
2058
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2059
1470
@dbus_service_property(_interface, signature="s", access="read")
2060
1471
def Fingerprint_dbus_property(self):
2061
1472
return dbus.String(self.fingerprint)
2063
1474
# Host - property
2064
@dbus_service_property(_interface,
1475
@dbus_service_property(_interface, signature="s",
2066
1476
access="readwrite")
2067
1477
def Host_dbus_property(self, value=None):
2068
1478
if value is None: # get
2069
1479
return dbus.String(self.host)
2070
self.host = str(value)
1480
self.host = unicode(value)
2072
1482
# Created - property
2074
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2075
1483
@dbus_service_property(_interface, signature="s", access="read")
2076
1484
def Created_dbus_property(self):
2077
1485
return datetime_to_dbus(self.created)
2079
1487
# LastEnabled - property
2080
1488
@dbus_service_property(_interface, signature="s", access="read")
2081
1489
def LastEnabled_dbus_property(self):
2082
1490
return datetime_to_dbus(self.last_enabled)
2084
1492
# Enabled - property
2085
@dbus_service_property(_interface,
1493
@dbus_service_property(_interface, signature="b",
2087
1494
access="readwrite")
2088
1495
def Enabled_dbus_property(self, value=None):
2089
1496
if value is None: # get
2138
1544
if (getattr(self, "disable_initiator_tag", None)
2141
GLib.source_remove(self.disable_initiator_tag)
2142
self.disable_initiator_tag = GLib.timeout_add(
2143
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),
2146
1553
# ExtendedTimeout - property
2147
@dbus_service_property(_interface,
1554
@dbus_service_property(_interface, signature="t",
2149
1555
access="readwrite")
2150
1556
def ExtendedTimeout_dbus_property(self, value=None):
2151
1557
if value is None: # get
2152
return dbus.UInt64(self.extended_timeout.total_seconds()
1558
return dbus.UInt64(self.extended_timeout_milliseconds())
2154
1559
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2156
1561
# Interval - property
2157
@dbus_service_property(_interface,
1562
@dbus_service_property(_interface, signature="t",
2159
1563
access="readwrite")
2160
1564
def Interval_dbus_property(self, value=None):
2161
1565
if value is None: # get
2162
return dbus.UInt64(self.interval.total_seconds() * 1000)
1566
return dbus.UInt64(self.interval_milliseconds())
2163
1567
self.interval = datetime.timedelta(0, 0, 0, value)
2164
1568
if getattr(self, "checker_initiator_tag", None) is None:
2166
1570
if self.enabled:
2167
1571
# Reschedule checker run
2168
GLib.source_remove(self.checker_initiator_tag)
2169
self.checker_initiator_tag = GLib.timeout_add(
2170
value, self.start_checker)
2171
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
2173
1577
# Checker - property
2174
@dbus_service_property(_interface,
1578
@dbus_service_property(_interface, signature="s",
2176
1579
access="readwrite")
2177
1580
def Checker_dbus_property(self, value=None):
2178
1581
if value is None: # get
2179
1582
return dbus.String(self.checker_command)
2180
self.checker_command = str(value)
1583
self.checker_command = unicode(value)
2182
1585
# CheckerRunning - property
2183
@dbus_service_property(_interface,
1586
@dbus_service_property(_interface, signature="b",
2185
1587
access="readwrite")
2186
1588
def CheckerRunning_dbus_property(self, value=None):
2187
1589
if value is None: # get
2244
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
2245
1637
"""A class to handle client connections.
2247
1639
Instantiated once for each connection to handle it.
2248
1640
Note: This will run in its own forked process."""
2250
1642
def handle(self):
2251
1643
with contextlib.closing(self.server.child_pipe) as child_pipe:
2252
1644
logger.info("TCP connection from: %s",
2253
str(self.client_address))
1645
unicode(self.client_address))
2254
1646
logger.debug("Pipe FD: %d",
2255
1647
self.server.child_pipe.fileno())
2257
session = gnutls.ClientSession(self.request)
2259
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2260
# "+AES-256-CBC", "+SHA1",
2261
# "+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",
2263
1663
# Use a fallback default, since this MUST be set.
2264
1664
priority = self.server.gnutls_priority
2265
1665
if priority is None:
2266
1666
priority = "NORMAL"
2267
gnutls.priority_set_direct(session._c_object,
2268
priority.encode("utf-8"),
1667
(gnutls.library.functions
1668
.gnutls_priority_set_direct(session._c_object,
2271
1671
# Start communication using the Mandos protocol
2272
1672
# Get protocol number
2273
1673
line = self.request.makefile().readline()
2274
1674
logger.debug("Protocol version: %r", line)
2276
1676
if int(line.strip().split()[0]) > 1:
2277
raise RuntimeError(line)
2278
1678
except (ValueError, IndexError, RuntimeError) as error:
2279
1679
logger.error("Unknown protocol version: %s", error)
2282
1682
# Start GnuTLS connection
2284
1684
session.handshake()
2285
except gnutls.Error as error:
1685
except gnutls.errors.GNUTLSError as error:
2286
1686
logger.warning("Handshake failed: %s", error)
2287
1687
# Do not run session.bye() here: the session is not
2288
1688
# established. Just abandon the request.
2290
1690
logger.debug("Handshake succeeded")
2292
1692
approval_required = False
2294
if gnutls.has_rawpk:
2297
key_id = self.key_id(
2298
self.peer_certificate(session))
2299
except (TypeError, gnutls.Error) as error:
2300
logger.warning("Bad certificate: %s", error)
2302
logger.debug("Key ID: %s", key_id)
2307
fpr = self.fingerprint(
2308
self.peer_certificate(session))
2309
except (TypeError, gnutls.Error) as error:
2310
logger.warning("Bad certificate: %s", error)
2312
logger.debug("Fingerprint: %s", fpr)
2315
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,
2316
1705
self.client_address)
2317
1706
except KeyError:
2320
1709
if client.approval_delay:
2321
1710
delay = client.approval_delay
2322
1711
client.approvals_pending += 1
2323
1712
approval_required = True
2326
1715
if not client.enabled:
2327
1716
logger.info("Client %s is disabled",
2329
1718
if self.server.use_dbus:
2330
1719
# Emit D-Bus signal
2331
1720
client.Rejected("Disabled")
2334
1723
if client.approved or not client.approval_delay:
2335
# We are approved or approval is disabled
1724
#We are approved or approval is disabled
2337
1726
elif client.approved is None:
2338
1727
logger.info("Client %s needs approval",
2371
1762
delay -= time2 - time
2374
session.send(client.secret)
2375
except gnutls.Error as error:
2376
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))
2380
1777
logger.info("Sending secret to %s", client.name)
2381
1778
# bump the timeout using extended_timeout
2382
1779
client.bump_timeout(client.extended_timeout)
2383
1780
if self.server.use_dbus:
2384
1781
# Emit D-Bus signal
2385
1782
client.GotSecret()
2388
1785
if approval_required:
2389
1786
client.approvals_pending -= 1
2392
except gnutls.Error as error:
1789
except gnutls.errors.GNUTLSError as error:
2393
1790
logger.warning("GnuTLS bye failed",
2394
1791
exc_info=error)
2397
1794
def peer_certificate(session):
2398
"Return the peer's certificate as a bytestring"
2400
cert_type = gnutls.certificate_type_get2(session._c_object,
2402
except AttributeError:
2403
cert_type = gnutls.certificate_type_get(session._c_object)
2404
if gnutls.has_rawpk:
2405
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2407
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2408
# If not a valid certificate type...
2409
if cert_type not in valid_cert_types:
2410
logger.info("Cert type %r not in %r", cert_type,
2412
# ...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
2414
1802
list_size = ctypes.c_uint(1)
2415
cert_list = (gnutls.certificate_get_peers
1803
cert_list = (gnutls.library.functions
1804
.gnutls_certificate_get_peers
2416
1805
(session._c_object, ctypes.byref(list_size)))
2417
1806
if not bool(cert_list) and list_size.value != 0:
2418
raise gnutls.Error("error getting peer certificate")
1807
raise gnutls.errors.GNUTLSError("error getting peer"
2419
1809
if list_size.value == 0:
2421
1811
cert = cert_list[0]
2422
1812
return ctypes.string_at(cert.data, cert.size)
2425
def key_id(certificate):
2426
"Convert a certificate bytestring to a hexdigit key ID"
2427
# New GnuTLS "datum" with the public key
2428
datum = gnutls.datum_t(
2429
ctypes.cast(ctypes.c_char_p(certificate),
2430
ctypes.POINTER(ctypes.c_ubyte)),
2431
ctypes.c_uint(len(certificate)))
2432
# XXX all these need to be created in the gnutls "module"
2433
# New empty GnuTLS certificate
2434
pubkey = gnutls.pubkey_t()
2435
gnutls.pubkey_init(ctypes.byref(pubkey))
2436
# Import the raw public key into the certificate
2437
gnutls.pubkey_import(pubkey,
2438
ctypes.byref(datum),
2439
gnutls.X509_FMT_DER)
2440
# New buffer for the key ID
2441
buf = ctypes.create_string_buffer(32)
2442
buf_len = ctypes.c_size_t(len(buf))
2443
# Get the key ID from the raw public key into the buffer
2444
gnutls.pubkey_get_key_id(pubkey,
2445
gnutls.KEYID_USE_SHA256,
2446
ctypes.cast(ctypes.byref(buf),
2447
ctypes.POINTER(ctypes.c_ubyte)),
2448
ctypes.byref(buf_len))
2449
# Deinit the certificate
2450
gnutls.pubkey_deinit(pubkey)
2452
# Convert the buffer to a Python bytestring
2453
key_id = ctypes.string_at(buf, buf_len.value)
2454
# Convert the bytestring to hexadecimal notation
2455
hex_key_id = binascii.hexlify(key_id).upper()
2459
1815
def fingerprint(openpgp):
2460
1816
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2461
1817
# New GnuTLS "datum" with the OpenPGP public key
2462
datum = gnutls.datum_t(
2463
ctypes.cast(ctypes.c_char_p(openpgp),
2464
ctypes.POINTER(ctypes.c_ubyte)),
2465
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))))
2466
1823
# New empty GnuTLS certificate
2467
crt = gnutls.openpgp_crt_t()
2468
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)))
2469
1827
# Import the OpenPGP public key into the certificate
2470
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2471
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))
2472
1832
# Verify the self signature in the key
2473
1833
crtverify = ctypes.c_uint()
2474
gnutls.openpgp_crt_verify_self(crt, 0,
2475
ctypes.byref(crtverify))
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_verify_self(crt, 0,
1836
ctypes.byref(crtverify)))
2476
1837
if crtverify.value != 0:
2477
gnutls.openpgp_crt_deinit(crt)
2478
raise gnutls.CertificateSecurityError(code
1838
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1839
raise (gnutls.errors.CertificateSecurityError
2480
1841
# New buffer for the fingerprint
2481
1842
buf = ctypes.create_string_buffer(20)
2482
1843
buf_len = ctypes.c_size_t()
2483
1844
# Get the fingerprint from the certificate into the buffer
2484
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2485
ctypes.byref(buf_len))
1845
(gnutls.library.functions
1846
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1847
ctypes.byref(buf_len)))
2486
1848
# Deinit the certificate
2487
gnutls.openpgp_crt_deinit(crt)
1849
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2488
1850
# Convert the buffer to a Python bytestring
2489
1851
fpr = ctypes.string_at(buf, buf_len.value)
2490
1852
# Convert the bytestring to hexadecimal notation
2579
1935
# socket_wrapper(), if socketfd was set.
2580
1936
socketserver.TCPServer.__init__(self, server_address,
2581
1937
RequestHandlerClass)
2583
1939
def server_bind(self):
2584
1940
"""This overrides the normal server_bind() function
2585
1941
to bind to an interface if one was specified, and also NOT to
2586
1942
bind to an address or port if they were not specified."""
2587
global SO_BINDTODEVICE
2588
1943
if self.interface is not None:
2589
1944
if SO_BINDTODEVICE is None:
2590
# Fall back to a hard-coded value which seems to be
2592
logger.warning("SO_BINDTODEVICE not found, trying 25")
2593
SO_BINDTODEVICE = 25
2595
self.socket.setsockopt(
2596
socket.SOL_SOCKET, SO_BINDTODEVICE,
2597
(self.interface + "\0").encode("utf-8"))
2598
except socket.error as error:
2599
if error.errno == errno.EPERM:
2600
logger.error("No permission to bind to"
2601
" interface %s", self.interface)
2602
elif error.errno == errno.ENOPROTOOPT:
2603
logger.error("SO_BINDTODEVICE not available;"
2604
" cannot bind to interface %s",
2606
elif error.errno == errno.ENODEV:
2607
logger.error("Interface %s does not exist,"
2608
" 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)
2611
1966
# Only bind(2) the socket if we really need to.
2612
1967
if self.server_address[0] or self.server_address[1]:
2613
if self.server_address[1]:
2614
self.allow_reuse_address = True
2615
1968
if not self.server_address[0]:
2616
1969
if self.address_family == socket.AF_INET6:
2617
any_address = "::" # in6addr_any
1970
any_address = "::" # in6addr_any
2619
any_address = "0.0.0.0" # INADDR_ANY
1972
any_address = socket.INADDR_ANY
2620
1973
self.server_address = (any_address,
2621
1974
self.server_address[1])
2622
1975
elif not self.server_address[1]:
2623
self.server_address = (self.server_address[0], 0)
1976
self.server_address = (self.server_address[0],
2624
1978
# if self.interface:
2625
1979
# self.server_address = (self.server_address[0],
2656
2005
self.gnutls_priority = gnutls_priority
2657
2006
IPv6_TCPServer.__init__(self, server_address,
2658
2007
RequestHandlerClass,
2659
interface=interface,
2008
interface = interface,
2009
use_ipv6 = use_ipv6,
2010
socketfd = socketfd)
2663
2011
def server_activate(self):
2664
2012
if self.enabled:
2665
2013
return socketserver.TCPServer.server_activate(self)
2667
2015
def enable(self):
2668
2016
self.enabled = True
2670
2018
def add_pipe(self, parent_pipe, proc):
2671
2019
# Call "handle_ipc" for both data and EOF events
2673
parent_pipe.fileno(),
2674
GLib.IO_IN | GLib.IO_HUP,
2675
functools.partial(self.handle_ipc,
2676
parent_pipe=parent_pipe,
2679
def handle_ipc(self, source, condition,
2682
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):
2683
2029
# error, or the other end of multiprocessing.Pipe has closed
2684
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2030
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2685
2031
# Wait for other process to exit
2689
2035
# Read a request from the child
2690
2036
request = parent_pipe.recv()
2691
2037
command = request[0]
2693
2039
if command == 'init':
2694
key_id = request[1].decode("ascii")
2695
fpr = request[2].decode("ascii")
2696
address = request[3]
2698
for c in self.clients.values():
2699
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2701
if key_id and c.key_id == key_id:
2704
if fpr and c.fingerprint == fpr:
2041
address = request[2]
2043
for c in self.clients.itervalues():
2044
if c.fingerprint == fpr:
2708
logger.info("Client not found for key ID: %s, address"
2709
": %s", key_id or fpr, address)
2048
logger.info("Client not found for fingerprint: %s, ad"
2049
"dress: %s", fpr, address)
2710
2050
if self.use_dbus:
2711
2051
# Emit D-Bus signal
2712
mandos_dbus_service.ClientNotFound(key_id or fpr,
2052
mandos_dbus_service.ClientNotFound(fpr,
2714
2054
parent_pipe.send(False)
2718
parent_pipe.fileno(),
2719
GLib.IO_IN | GLib.IO_HUP,
2720
functools.partial(self.handle_ipc,
2721
parent_pipe=parent_pipe,
2723
client_object=client))
2057
gobject.io_add_watch(parent_pipe.fileno(),
2058
gobject.IO_IN | gobject.IO_HUP,
2059
functools.partial(self.handle_ipc,
2724
2065
parent_pipe.send(True)
2725
2066
# remove the old hook in favor of the new above hook on
2953
2294
parser.add_argument("--no-dbus", action="store_false",
2954
2295
dest="use_dbus", help="Do not provide D-Bus"
2955
" system bus interface", default=None)
2296
" system bus interface")
2956
2297
parser.add_argument("--no-ipv6", action="store_false",
2957
dest="use_ipv6", help="Do not use IPv6",
2298
dest="use_ipv6", help="Do not use IPv6")
2959
2299
parser.add_argument("--no-restore", action="store_false",
2960
2300
dest="restore", help="Do not restore stored"
2961
" state", default=None)
2962
2302
parser.add_argument("--socket", type=int,
2963
2303
help="Specify a file descriptor to a network"
2964
2304
" socket to use instead of creating one")
2965
2305
parser.add_argument("--statedir", metavar="DIR",
2966
2306
help="Directory to save/restore state in")
2967
2307
parser.add_argument("--foreground", action="store_true",
2968
help="Run in foreground", default=None)
2969
parser.add_argument("--no-zeroconf", action="store_false",
2970
dest="zeroconf", help="Do not use Zeroconf",
2308
help="Run in foreground")
2973
2310
options = parser.parse_args()
2975
2312
if options.check:
2977
fail_count, test_count = doctest.testmod()
2978
sys.exit(os.EX_OK if fail_count == 0 else 1)
2980
2317
# Default values for config file for server-global settings
2981
if gnutls.has_rawpk:
2982
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2983
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2985
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2986
":+SIGN-DSA-SHA256")
2987
server_defaults = {"interface": "",
2991
"priority": priority,
2992
"servicename": "Mandos",
2998
"statedir": "/var/lib/mandos",
2999
"foreground": "False",
2318
server_defaults = { "interface": "",
2323
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2324
"servicename": "Mandos",
2330
"statedir": "/var/lib/mandos",
2331
"foreground": "False",
3004
2334
# Parse config file for server-global settings
3005
server_config = configparser.ConfigParser(server_defaults)
2335
server_config = configparser.SafeConfigParser(server_defaults)
3006
2336
del server_defaults
3007
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3008
# Convert the ConfigParser object to a dict
2337
server_config.read(os.path.join(options.configdir,
2339
# Convert the SafeConfigParser object to a dict
3009
2340
server_settings = server_config.defaults()
3010
2341
# Use the appropriate methods on the non-string config options
3011
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3012
"foreground", "zeroconf"):
2342
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3013
2343
server_settings[option] = server_config.getboolean("DEFAULT",
3015
2345
if server_settings["port"]:
3131
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3133
2447
except OSError as error:
3134
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3135
.format(uid, gid, os.strerror(error.errno)))
3136
2448
if error.errno != errno.EPERM:
3140
2452
# Enable all possible GnuTLS debugging
3142
2454
# "Use a log level over 10 to enable all debugging options."
3143
2455
# - GnuTLS manual
3144
gnutls.global_set_log_level(11)
2456
gnutls.library.functions.gnutls_global_set_log_level(11)
2458
@gnutls.library.types.gnutls_log_func
3147
2459
def debug_gnutls(level, string):
3148
2460
logger.debug("GnuTLS: %s", string[:-1])
3150
gnutls.global_set_log_function(debug_gnutls)
2462
(gnutls.library.functions
2463
.gnutls_global_set_log_function(debug_gnutls))
3152
2465
# Redirect stdin so all checkers get /dev/null
3153
2466
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3154
2467
os.dup2(null, sys.stdin.fileno())
3158
2471
# Need to fork before connecting to D-Bus
3159
2472
if not foreground:
3160
2473
# Close all input and output, do double fork, etc.
3163
if gi.version_info < (3, 10, 2):
3164
# multiprocessing will use threads, so before we use GLib we
3165
# need 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()
3168
2480
global main_loop
3169
2481
# From the Avahi example code
3170
2482
DBusGMainLoop(set_as_default=True)
3171
main_loop = GLib.MainLoop()
2483
main_loop = gobject.MainLoop()
3172
2484
bus = dbus.SystemBus()
3173
2485
# End of Avahi example code
3176
2488
bus_name = dbus.service.BusName("se.recompile.Mandos",
3179
old_bus_name = dbus.service.BusName(
3180
"se.bsnet.fukt.Mandos", bus,
3182
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:
3183
2494
logger.error("Disabling D-Bus:", exc_info=e)
3184
2495
use_dbus = False
3185
2496
server_settings["use_dbus"] = False
3186
2497
tcp_server.use_dbus = False
3188
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3189
service = AvahiServiceToSyslog(
3190
name=server_settings["servicename"],
3191
servicetype="_mandos._tcp",
3194
if server_settings["interface"]:
3195
service.interface = if_nametoindex(
3196
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"])))
3198
2507
global multiprocessing_manager
3199
2508
multiprocessing_manager = multiprocessing.Manager()
3201
2510
client_class = Client
3203
client_class = functools.partial(ClientDBus, bus=bus)
2512
client_class = functools.partial(ClientDBus, bus = bus)
3205
2514
client_settings = Client.config_parser(client_config)
3206
2515
old_client_settings = {}
3207
2516
clients_data = {}
3209
# This is used to redirect stdout and stderr for checker processes
3211
wnull = open(os.devnull, "w") # A writable /dev/null
3212
# Only used if server is running in foreground but not in debug
3214
if debug or not foreground:
3217
2518
# Get client data and settings from last running state.
3218
2519
if server_settings["restore"]:
3220
2521
with open(stored_state_path, "rb") as stored_state:
3221
if sys.version_info.major == 2:
3222
clients_data, old_client_settings = pickle.load(
3225
bytes_clients_data, bytes_old_client_settings = (
3226
pickle.load(stored_state, encoding="bytes"))
3227
# Fix bytes to strings
3230
clients_data = {(key.decode("utf-8")
3231
if isinstance(key, bytes)
3234
bytes_clients_data.items()}
3235
del bytes_clients_data
3236
for key in clients_data:
3237
value = {(k.decode("utf-8")
3238
if isinstance(k, bytes) else k): v
3240
clients_data[key].items()}
3241
clients_data[key] = value
3243
value["client_structure"] = [
3245
if isinstance(s, bytes)
3247
value["client_structure"]]
3249
for k in ("name", "host"):
3250
if isinstance(value[k], bytes):
3251
value[k] = value[k].decode("utf-8")
3252
if "key_id" not in value:
3253
value["key_id"] = ""
3254
elif "fingerprint" not in value:
3255
value["fingerprint"] = ""
3256
# old_client_settings
3258
old_client_settings = {
3259
(key.decode("utf-8")
3260
if isinstance(key, bytes)
3263
bytes_old_client_settings.items()}
3264
del bytes_old_client_settings
3266
for value in old_client_settings.values():
3267
if isinstance(value["host"], bytes):
3268
value["host"] = (value["host"]
2522
clients_data, old_client_settings = (pickle.load
3270
2524
os.remove(stored_state_path)
3271
2525
except IOError as e:
3272
2526
if e.errno == errno.ENOENT:
3273
logger.warning("Could not load persistent state:"
3274
" {}".format(os.strerror(e.errno)))
2527
logger.warning("Could not load persistent state: {0}"
2528
.format(os.strerror(e.errno)))
3276
2530
logger.critical("Could not load persistent state:",
3279
2533
except EOFError as e:
3280
2534
logger.warning("Could not load persistent state: "
2535
"EOFError:", exc_info=e)
3284
2537
with PGPEngine() as pgp:
3285
for client_name, client in clients_data.items():
3286
# Skip removed clients
3287
if client_name not in client_settings:
2538
for client_name, client in clients_data.iteritems():
3290
2539
# Decide which value to use after restoring saved state.
3291
2540
# We have three different values: Old config file,
3292
2541
# new config file, and saved state.
3350
2599
for client_name in (set(client_settings)
3351
2600
- set(old_client_settings)):
3352
2601
clients_data[client_name] = client_settings[client_name]
3354
2603
# Create all client objects
3355
for client_name, client in clients_data.items():
2604
for client_name, client in clients_data.iteritems():
3356
2605
tcp_server.clients[client_name] = client_class(
3359
server_settings=server_settings)
2606
name = client_name, settings = client)
3361
2608
if not tcp_server.clients:
3362
2609
logger.warning("No clients defined")
3364
2611
if not foreground:
3365
2612
if pidfile is not None:
3369
print(pid, file=pidfile)
2616
pidfile.write(str(pid) + "\n".encode("utf-8"))
3370
2617
except IOError:
3371
2618
logger.error("Could not write to file %r with PID %d",
3372
2619
pidfilename, pid)
3374
2621
del pidfilename
3376
for termsig in (signal.SIGHUP, signal.SIGTERM):
3377
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3378
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())
3382
@alternate_dbus_interfaces(
3383
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3384
class MandosDBusService(DBusObjectWithObjectManager):
2627
@alternate_dbus_interfaces({"se.recompile.Mandos":
2628
"se.bsnet.fukt.Mandos"})
2629
class MandosDBusService(DBusObjectWithProperties):
3385
2630
"""A D-Bus proxy object"""
3387
2631
def __init__(self):
3388
2632
dbus.service.Object.__init__(self, bus, "/")
3390
2633
_interface = "se.recompile.Mandos"
2635
@dbus_interface_annotations(_interface)
2637
return { "org.freedesktop.DBus.Property"
2638
".EmitsChangedSignal":
3392
2641
@dbus.service.signal(_interface, signature="o")
3393
2642
def ClientAdded(self, objpath):
3397
2646
@dbus.service.signal(_interface, signature="ss")
3398
def ClientNotFound(self, key_id, address):
2647
def ClientNotFound(self, fingerprint, address):
3402
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3404
2651
@dbus.service.signal(_interface, signature="os")
3405
2652
def ClientRemoved(self, objpath, name):
3409
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3411
2656
@dbus.service.method(_interface, out_signature="ao")
3412
2657
def GetAllClients(self):
3414
return dbus.Array(c.dbus_object_path for c in
3415
tcp_server.clients.values())
3417
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2659
return dbus.Array(c.dbus_object_path
2661
tcp_server.clients.itervalues())
3419
2663
@dbus.service.method(_interface,
3420
2664
out_signature="a{oa{sv}}")
3421
2665
def GetAllClientsWithProperties(self):
3423
2667
return dbus.Dictionary(
3424
{c.dbus_object_path: c.GetAll(
3425
"se.recompile.Mandos.Client")
3426
for c in tcp_server.clients.values()},
2668
((c.dbus_object_path, c.GetAll(""))
2669
for c in tcp_server.clients.itervalues()),
3427
2670
signature="oa{sv}")
3429
2672
@dbus.service.method(_interface, in_signature="o")
3430
2673
def RemoveClient(self, object_path):
3432
for c in tcp_server.clients.values():
2675
for c in tcp_server.clients.itervalues():
3433
2676
if c.dbus_object_path == object_path:
3434
2677
del tcp_server.clients[c.name]
3435
2678
c.remove_from_connection()
3436
# Don't signal the disabling
2679
# Don't signal anything except ClientRemoved
3437
2680
c.disable(quiet=True)
3438
# Emit D-Bus signal for removal
3439
self.client_removed_signal(c)
2682
self.ClientRemoved(object_path, c.name)
3441
2684
raise KeyError(object_path)
3445
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3446
out_signature="a{oa{sa{sv}}}")
3447
def GetManagedObjects(self):
3449
return dbus.Dictionary(
3450
{client.dbus_object_path:
3452
{interface: client.GetAll(interface)
3454
client._get_all_interface_names()})
3455
for client in tcp_server.clients.values()})
3457
def client_added_signal(self, client):
3458
"""Send the new standard signal and the old signal"""
3460
# New standard signal
3461
self.InterfacesAdded(
3462
client.dbus_object_path,
3464
{interface: client.GetAll(interface)
3466
client._get_all_interface_names()}))
3468
self.ClientAdded(client.dbus_object_path)
3470
def client_removed_signal(self, client):
3471
"""Send the new standard signal and the old signal"""
3473
# New standard signal
3474
self.InterfacesRemoved(
3475
client.dbus_object_path,
3476
client._get_all_interface_names())
3478
self.ClientRemoved(client.dbus_object_path,
3481
2688
mandos_dbus_service = MandosDBusService()
3483
# Save modules to variables to exempt the modules from being
3484
# unloaded before the function registered with atexit() is run.
3485
mp = multiprocessing
3489
2691
"Cleanup function; run on exit"
3493
mp.active_children()
2694
multiprocessing.active_children()
3495
2695
if not (tcp_server.clients or client_settings):
3498
2698
# Store client before exiting. Secrets are encrypted with key
3499
2699
# based on what config file has. If config file is
3500
2700
# removed/edited, old secret will thus be unrecovable.
3502
2702
with PGPEngine() as pgp:
3503
for client in tcp_server.clients.values():
2703
for client in tcp_server.clients.itervalues():
3504
2704
key = client_settings[client.name]["secret"]
3505
2705
client.encrypted_secret = pgp.encrypt(client.secret,
3507
2707
client_dict = {}
3509
2709
# A list of attributes that can not be pickled
3511
exclude = {"bus", "changedstate", "secret",
3512
"checker", "server_settings"}
3513
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)):
3515
2715
exclude.add(name)
3517
2717
client_dict["encrypted_secret"] = (client
3518
2718
.encrypted_secret)
3519
2719
for attr in client.client_structure:
3520
2720
if attr not in exclude:
3521
2721
client_dict[attr] = getattr(client, attr)
3523
2723
clients[client.name] = client_dict
3524
2724
del client_settings[client.name]["secret"]
3527
with tempfile.NamedTemporaryFile(
3531
dir=os.path.dirname(stored_state_path),
3532
delete=False) as stored_state:
3533
pickle.dump((clients, client_settings), stored_state,
3535
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
3536
2733
os.rename(tempname, stored_state_path)
3537
2734
except (IOError, OSError) as e: