70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
82
71
import dbus.service
84
from gi.repository import GLib
85
74
from dbus.mainloop.glib import DBusGMainLoop
88
77
import xml.dom.minidom
91
if sys.version_info.major == 2:
94
# Try to find the value of SO_BINDTODEVICE:
96
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
97
# newer, and it is also the most natural place for it:
98
82
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
99
83
except AttributeError:
101
# This is where SO_BINDTODEVICE was up to and including Python
103
85
from IN import SO_BINDTODEVICE
104
86
except ImportError:
105
# In Python 2.7 it seems to have been removed entirely.
106
# Try running the C preprocessor:
108
cc = subprocess.Popen(["cc", "--language=c", "-E",
110
stdin=subprocess.PIPE,
111
stdout=subprocess.PIPE)
112
stdout = cc.communicate(
113
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
114
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
115
except (OSError, ValueError, IndexError):
117
SO_BINDTODEVICE = None
119
if sys.version_info.major == 2:
122
if sys.version_info < (3, 2):
123
configparser.Configparser = configparser.SafeConfigParser
87
SO_BINDTODEVICE = None
126
90
stored_state_file = "clients.pickle"
128
92
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
132
if_nametoindex = ctypes.cdll.LoadLibrary(
133
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
134
101
except (OSError, AttributeError):
136
102
def if_nametoindex(interface):
137
103
"Get an interface index the hard way, i.e. using fcntl()"
138
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
139
105
with contextlib.closing(socket.socket()) as s:
140
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
141
struct.pack(b"16s16x", interface))
142
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
143
111
return interface_index
146
def copy_function(func):
147
"""Make a copy of a function"""
148
if sys.version_info.major == 2:
149
return types.FunctionType(func.func_code,
155
return types.FunctionType(func.__code__,
162
114
def initlogger(debug, level=logging.WARNING):
163
115
"""init logger and add loglevel"""
166
syslogger = (logging.handlers.SysLogHandler(
167
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
169
117
syslogger.setFormatter(logging.Formatter
170
118
('Mandos [%(process)d]: %(levelname)s:'
172
120
logger.addHandler(syslogger)
175
123
console = logging.StreamHandler()
176
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
233
169
os.rmdir(self.tempdir)
234
170
self.tempdir = None
236
172
def password_encode(self, password):
237
173
# Passphrase can not be empty and can not contain newlines or
238
174
# NUL bytes. So we prefix it and hex encode it.
239
encoded = b"mandos" + binascii.hexlify(password)
240
if len(encoded) > 2048:
241
# GnuPG can't handle long passwords, so encode differently
242
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
243
.replace(b"\n", b"\\n")
244
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
247
177
def encrypt(self, data, password):
248
passphrase = self.password_encode(password)
249
with tempfile.NamedTemporaryFile(
250
dir=self.tempdir) as passfile:
251
passfile.write(passphrase)
253
proc = subprocess.Popen([self.gpg, '--symmetric',
257
stdin=subprocess.PIPE,
258
stdout=subprocess.PIPE,
259
stderr=subprocess.PIPE)
260
ciphertext, err = proc.communicate(input=data)
261
if proc.returncode != 0:
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
263
192
return ciphertext
265
194
def decrypt(self, data, password):
266
passphrase = self.password_encode(password)
267
with tempfile.NamedTemporaryFile(
268
dir=self.tempdir) as passfile:
269
passfile.write(passphrase)
271
proc = subprocess.Popen([self.gpg, '--decrypt',
275
stdin=subprocess.PIPE,
276
stdout=subprocess.PIPE,
277
stderr=subprocess.PIPE)
278
decrypted_plaintext, err = proc.communicate(input=data)
279
if proc.returncode != 0:
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
281
209
return decrypted_plaintext
284
# Pretend that we have an Avahi module
286
"""This isn't so much a class as it is a module-like namespace."""
287
IF_UNSPEC = -1 # avahi-common/address.h
288
PROTO_UNSPEC = -1 # avahi-common/address.h
289
PROTO_INET = 0 # avahi-common/address.h
290
PROTO_INET6 = 1 # avahi-common/address.h
291
DBUS_NAME = "org.freedesktop.Avahi"
292
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
293
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
294
DBUS_PATH_SERVER = "/"
297
def string_array_to_txt_array(t):
298
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
299
for s in t), signature="ay")
300
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
301
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
302
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
303
SERVER_INVALID = 0 # avahi-common/defs.h
304
SERVER_REGISTERING = 1 # avahi-common/defs.h
305
SERVER_RUNNING = 2 # avahi-common/defs.h
306
SERVER_COLLISION = 3 # avahi-common/defs.h
307
SERVER_FAILURE = 4 # avahi-common/defs.h
310
212
class AvahiError(Exception):
311
213
def __init__(self, value, *args, **kwargs):
312
214
self.value = value
313
return super(AvahiError, self).__init__(value, *args,
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
317
219
class AvahiServiceError(AvahiError):
321
222
class AvahiGroupError(AvahiError):
226
class AvahiService(object):
326
227
"""An Avahi (Zeroconf) service.
329
230
interface: integer; avahi.IF_UNSPEC or an interface index.
330
231
Used to optionally bind to the specified interface.
331
232
name: string; Example: 'Mandos'
332
233
type: string; Example: '_mandos._tcp'.
333
See <https://www.iana.org/assignments/service-names-port-numbers>
234
See <http://www.dns-sd.org/ServiceTypes.html>
334
235
port: integer; what port to announce
335
236
TXT: list of strings; TXT record for the service
336
237
domain: string; Domain to publish on, default to .local if empty.
495
374
follow_name_owner_changes=True),
496
375
avahi.DBUS_INTERFACE_SERVER)
497
376
self.server.connect_to_signal("StateChanged",
498
self.server_state_changed)
377
self.server_state_changed)
499
378
self.server_state_changed(self.server.GetState())
502
380
class AvahiServiceToSyslog(AvahiService):
503
def rename(self, *args, **kwargs):
504
382
"""Add the new name to the syslog messages"""
505
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
506
syslogger.setFormatter(logging.Formatter(
507
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
383
ret = AvahiService.rename(self)
384
syslogger.setFormatter(logging.Formatter
385
('Mandos ({0}) [%(process)d]:'
386
' %(levelname)s: %(message)s'
512
# Pretend that we have a GnuTLS module
514
"""This isn't so much a class as it is a module-like namespace."""
516
library = ctypes.util.find_library("gnutls")
518
library = ctypes.util.find_library("gnutls-deb0")
519
_library = ctypes.cdll.LoadLibrary(library)
522
# Unless otherwise indicated, the constants and types below are
523
# all from the gnutls/gnutls.h C header file.
534
E_NO_CERTIFICATE_FOUND = -49
539
KEYID_USE_SHA256 = 1 # gnutls/x509.h
540
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
543
class session_int(ctypes.Structure):
545
session_t = ctypes.POINTER(session_int)
547
class certificate_credentials_st(ctypes.Structure):
549
certificate_credentials_t = ctypes.POINTER(
550
certificate_credentials_st)
551
certificate_type_t = ctypes.c_int
553
class datum_t(ctypes.Structure):
554
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
555
('size', ctypes.c_uint)]
557
class openpgp_crt_int(ctypes.Structure):
559
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
560
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
561
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
562
credentials_type_t = ctypes.c_int
563
transport_ptr_t = ctypes.c_void_p
564
close_request_t = ctypes.c_int
567
class Error(Exception):
568
def __init__(self, message=None, code=None, args=()):
569
# Default usage is by a message string, but if a return
570
# code is passed, convert it to a string with
573
if message is None and code is not None:
574
message = gnutls.strerror(code)
575
return super(gnutls.Error, self).__init__(
578
class CertificateSecurityError(Error):
584
self._c_object = gnutls.certificate_credentials_t()
585
gnutls.certificate_allocate_credentials(
586
ctypes.byref(self._c_object))
587
self.type = gnutls.CRD_CERTIFICATE
590
gnutls.certificate_free_credentials(self._c_object)
593
def __init__(self, socket, credentials=None):
594
self._c_object = gnutls.session_t()
595
gnutls_flags = gnutls.CLIENT
596
if gnutls.check_version(b"3.5.6"):
597
gnutls_flags |= gnutls.NO_TICKETS
599
gnutls_flags |= gnutls.ENABLE_RAWPK
600
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
602
gnutls.set_default_priority(self._c_object)
603
gnutls.transport_set_ptr(self._c_object, socket.fileno())
604
gnutls.handshake_set_private_extensions(self._c_object,
607
if credentials is None:
608
credentials = gnutls.Credentials()
609
gnutls.credentials_set(self._c_object, credentials.type,
610
ctypes.cast(credentials._c_object,
612
self.credentials = credentials
615
gnutls.deinit(self._c_object)
618
return gnutls.handshake(self._c_object)
620
def send(self, data):
624
data_len -= gnutls.record_send(self._c_object,
629
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
631
# Error handling functions
632
def _error_code(result):
633
"""A function to raise exceptions on errors, suitable
634
for the 'restype' attribute on ctypes functions"""
637
if result == gnutls.E_NO_CERTIFICATE_FOUND:
638
raise gnutls.CertificateSecurityError(code=result)
639
raise gnutls.Error(code=result)
641
def _retry_on_error(result, func, arguments):
642
"""A function to retry on some errors, suitable
643
for the 'errcheck' attribute on ctypes functions"""
645
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
646
return _error_code(result)
647
result = func(*arguments)
650
# Unless otherwise indicated, the function declarations below are
651
# all from the gnutls/gnutls.h C header file.
654
priority_set_direct = _library.gnutls_priority_set_direct
655
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
656
ctypes.POINTER(ctypes.c_char_p)]
657
priority_set_direct.restype = _error_code
659
init = _library.gnutls_init
660
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
661
init.restype = _error_code
663
set_default_priority = _library.gnutls_set_default_priority
664
set_default_priority.argtypes = [session_t]
665
set_default_priority.restype = _error_code
667
record_send = _library.gnutls_record_send
668
record_send.argtypes = [session_t, ctypes.c_void_p,
670
record_send.restype = ctypes.c_ssize_t
671
record_send.errcheck = _retry_on_error
673
certificate_allocate_credentials = (
674
_library.gnutls_certificate_allocate_credentials)
675
certificate_allocate_credentials.argtypes = [
676
ctypes.POINTER(certificate_credentials_t)]
677
certificate_allocate_credentials.restype = _error_code
679
certificate_free_credentials = (
680
_library.gnutls_certificate_free_credentials)
681
certificate_free_credentials.argtypes = [
682
certificate_credentials_t]
683
certificate_free_credentials.restype = None
685
handshake_set_private_extensions = (
686
_library.gnutls_handshake_set_private_extensions)
687
handshake_set_private_extensions.argtypes = [session_t,
689
handshake_set_private_extensions.restype = None
691
credentials_set = _library.gnutls_credentials_set
692
credentials_set.argtypes = [session_t, credentials_type_t,
694
credentials_set.restype = _error_code
696
strerror = _library.gnutls_strerror
697
strerror.argtypes = [ctypes.c_int]
698
strerror.restype = ctypes.c_char_p
700
certificate_type_get = _library.gnutls_certificate_type_get
701
certificate_type_get.argtypes = [session_t]
702
certificate_type_get.restype = _error_code
704
certificate_get_peers = _library.gnutls_certificate_get_peers
705
certificate_get_peers.argtypes = [session_t,
706
ctypes.POINTER(ctypes.c_uint)]
707
certificate_get_peers.restype = ctypes.POINTER(datum_t)
709
global_set_log_level = _library.gnutls_global_set_log_level
710
global_set_log_level.argtypes = [ctypes.c_int]
711
global_set_log_level.restype = None
713
global_set_log_function = _library.gnutls_global_set_log_function
714
global_set_log_function.argtypes = [log_func]
715
global_set_log_function.restype = None
717
deinit = _library.gnutls_deinit
718
deinit.argtypes = [session_t]
719
deinit.restype = None
721
handshake = _library.gnutls_handshake
722
handshake.argtypes = [session_t]
723
handshake.restype = _error_code
724
handshake.errcheck = _retry_on_error
726
transport_set_ptr = _library.gnutls_transport_set_ptr
727
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
728
transport_set_ptr.restype = None
730
bye = _library.gnutls_bye
731
bye.argtypes = [session_t, close_request_t]
732
bye.restype = _error_code
733
bye.errcheck = _retry_on_error
735
check_version = _library.gnutls_check_version
736
check_version.argtypes = [ctypes.c_char_p]
737
check_version.restype = ctypes.c_char_p
739
_need_version = b"3.3.0"
740
if check_version(_need_version) is None:
741
raise self.Error("Needs GnuTLS {} or later"
742
.format(_need_version))
744
_tls_rawpk_version = b"3.6.6"
745
has_rawpk = bool(check_version(_tls_rawpk_version))
749
class pubkey_st(ctypes.Structure):
751
pubkey_t = ctypes.POINTER(pubkey_st)
753
x509_crt_fmt_t = ctypes.c_int
755
# All the function declarations below are from gnutls/abstract.h
756
pubkey_init = _library.gnutls_pubkey_init
757
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
758
pubkey_init.restype = _error_code
760
pubkey_import = _library.gnutls_pubkey_import
761
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
763
pubkey_import.restype = _error_code
765
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
766
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
767
ctypes.POINTER(ctypes.c_ubyte),
768
ctypes.POINTER(ctypes.c_size_t)]
769
pubkey_get_key_id.restype = _error_code
771
pubkey_deinit = _library.gnutls_pubkey_deinit
772
pubkey_deinit.argtypes = [pubkey_t]
773
pubkey_deinit.restype = None
775
# All the function declarations below are from gnutls/openpgp.h
777
openpgp_crt_init = _library.gnutls_openpgp_crt_init
778
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
779
openpgp_crt_init.restype = _error_code
781
openpgp_crt_import = _library.gnutls_openpgp_crt_import
782
openpgp_crt_import.argtypes = [openpgp_crt_t,
783
ctypes.POINTER(datum_t),
785
openpgp_crt_import.restype = _error_code
787
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
788
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
789
ctypes.POINTER(ctypes.c_uint)]
790
openpgp_crt_verify_self.restype = _error_code
792
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
793
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
794
openpgp_crt_deinit.restype = None
796
openpgp_crt_get_fingerprint = (
797
_library.gnutls_openpgp_crt_get_fingerprint)
798
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
802
openpgp_crt_get_fingerprint.restype = _error_code
804
if check_version(b"3.6.4"):
805
certificate_type_get2 = _library.gnutls_certificate_type_get2
806
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
807
certificate_type_get2.restype = _error_code
809
# Remove non-public functions
810
del _error_code, _retry_on_error
813
def call_pipe(connection, # : multiprocessing.Connection
814
func, *args, **kwargs):
815
"""This function is meant to be called by multiprocessing.Process
817
This function runs func(*args, **kwargs), and writes the resulting
818
return value on the provided multiprocessing.Connection.
820
connection.send(func(*args, **kwargs))
390
def timedelta_to_milliseconds(td):
391
"Convert a datetime.timedelta() to milliseconds"
392
return ((td.days * 24 * 60 * 60 * 1000)
393
+ (td.seconds * 1000)
394
+ (td.microseconds // 1000))
396
class Client(object):
825
397
"""A representation of a client host served by this server.
828
400
approved: bool(); 'None' if not yet approved/disapproved
829
401
approval_delay: datetime.timedelta(); Time to wait for approval
830
402
approval_duration: datetime.timedelta(); Duration of one approval
831
checker: multiprocessing.Process(); a running checker process used
832
to see if the client lives. 'None' if no process is
834
checker_callback_tag: a GLib event source tag, or None
403
checker: subprocess.Popen(); a running checker process used
404
to see if the client lives.
405
'None' if no process is running.
406
checker_callback_tag: a gobject event source tag, or None
835
407
checker_command: string; External command which is run to check
836
408
if client lives. %() expansions are done at
837
409
runtime with vars(self) as dict, so that for
838
410
instance %(name)s can be used in the command.
839
checker_initiator_tag: a GLib event source tag, or None
411
checker_initiator_tag: a gobject event source tag, or None
840
412
created: datetime.datetime(); (UTC) object creation
841
413
client_structure: Object describing what attributes a client has
842
414
and is used for storing the client at exit
843
415
current_checker_command: string; current running checker_command
844
disable_initiator_tag: a GLib event source tag, or None
416
disable_initiator_tag: a gobject event source tag, or None
846
418
fingerprint: string (40 or 32 hexadecimal digits); used to
847
uniquely identify an OpenPGP client
848
key_id: string (64 hexadecimal digits); used to uniquely identify
849
a client using raw public keys
419
uniquely identify the client
850
420
host: string; available for use by the checker command
851
421
interval: datetime.timedelta(); How often to start a new checker
852
422
last_approval_request: datetime.datetime(); (UTC) or None
973
545
self.current_checker_command = None
974
546
self.approved = None
975
547
self.approvals_pending = 0
976
self.changedstate = multiprocessing_manager.Condition(
977
multiprocessing_manager.Lock())
978
self.client_structure = [attr
979
for attr in self.__dict__.keys()
548
self.changedstate = (multiprocessing_manager
549
.Condition(multiprocessing_manager
551
self.client_structure = [attr for attr in
552
self.__dict__.iterkeys()
980
553
if not attr.startswith("_")]
981
554
self.client_structure.append("client_structure")
983
for name, t in inspect.getmembers(
984
type(self), lambda obj: isinstance(obj, property)):
556
for name, t in inspect.getmembers(type(self),
985
560
if not name.startswith("_"):
986
561
self.client_structure.append(name)
988
563
# Send notice to process children that client state has changed
989
564
def send_changedstate(self):
990
565
with self.changedstate:
991
566
self.changedstate.notify_all()
993
568
def enable(self):
994
569
"""Start this client's checker and timeout hooks"""
995
570
if getattr(self, "enabled", False):
996
571
# Already enabled
573
self.send_changedstate()
998
574
self.expires = datetime.datetime.utcnow() + self.timeout
999
575
self.enabled = True
1000
576
self.last_enabled = datetime.datetime.utcnow()
1001
577
self.init_checker()
1002
self.send_changedstate()
1004
579
def disable(self, quiet=True):
1005
580
"""Disable this client."""
1006
581
if not getattr(self, "enabled", False):
584
self.send_changedstate()
1009
586
logger.info("Disabling client %s", self.name)
1010
if getattr(self, "disable_initiator_tag", None) is not None:
1011
GLib.source_remove(self.disable_initiator_tag)
587
if getattr(self, "disable_initiator_tag", False):
588
gobject.source_remove(self.disable_initiator_tag)
1012
589
self.disable_initiator_tag = None
1013
590
self.expires = None
1014
if getattr(self, "checker_initiator_tag", None) is not None:
1015
GLib.source_remove(self.checker_initiator_tag)
591
if getattr(self, "checker_initiator_tag", False):
592
gobject.source_remove(self.checker_initiator_tag)
1016
593
self.checker_initiator_tag = None
1017
594
self.stop_checker()
1018
595
self.enabled = False
1020
self.send_changedstate()
1021
# Do not run this again if called by a GLib.timeout_add
596
# Do not run this again if called by a gobject.timeout_add
1024
599
def __del__(self):
1027
602
def init_checker(self):
1028
603
# Schedule a new checker to be started an 'interval' from now,
1029
604
# and every interval from then on.
1030
if self.checker_initiator_tag is not None:
1031
GLib.source_remove(self.checker_initiator_tag)
1032
self.checker_initiator_tag = GLib.timeout_add(
1033
int(self.interval.total_seconds() * 1000),
605
self.checker_initiator_tag = (gobject.timeout_add
606
(self.interval_milliseconds(),
1035
608
# Schedule a disable() when 'timeout' has passed
1036
if self.disable_initiator_tag is not None:
1037
GLib.source_remove(self.disable_initiator_tag)
1038
self.disable_initiator_tag = GLib.timeout_add(
1039
int(self.timeout.total_seconds() * 1000), self.disable)
609
self.disable_initiator_tag = (gobject.timeout_add
610
(self.timeout_milliseconds(),
1040
612
# Also start a new checker *right now*.
1041
613
self.start_checker()
1043
def checker_callback(self, source, condition, connection,
615
def checker_callback(self, pid, condition, command):
1045
616
"""The checker has completed, so take appropriate actions."""
1046
# Read return code from connection (see call_pipe)
1047
returncode = connection.recv()
1050
617
self.checker_callback_tag = None
1051
618
self.checker = None
1054
self.last_checker_status = returncode
1055
self.last_checker_signal = None
619
if os.WIFEXITED(condition):
620
self.last_checker_status = os.WEXITSTATUS(condition)
1056
621
if self.last_checker_status == 0:
1057
622
logger.info("Checker for %(name)s succeeded",
1059
624
self.checked_ok()
1061
logger.info("Checker for %(name)s failed", vars(self))
626
logger.info("Checker for %(name)s failed",
1063
629
self.last_checker_status = -1
1064
self.last_checker_signal = -returncode
1065
630
logger.warning("Checker for %(name)s crashed?",
1069
633
def checked_ok(self):
1070
634
"""Assert that the client has been seen, alive and well."""
1071
635
self.last_checked_ok = datetime.datetime.utcnow()
1072
636
self.last_checker_status = 0
1073
self.last_checker_signal = None
1074
637
self.bump_timeout()
1076
639
def bump_timeout(self, timeout=None):
1077
640
"""Bump up the timeout for this client."""
1078
641
if timeout is None:
1079
642
timeout = self.timeout
1080
643
if self.disable_initiator_tag is not None:
1081
GLib.source_remove(self.disable_initiator_tag)
1082
self.disable_initiator_tag = None
644
gobject.source_remove(self.disable_initiator_tag)
1083
645
if getattr(self, "enabled", False):
1084
self.disable_initiator_tag = GLib.timeout_add(
1085
int(timeout.total_seconds() * 1000), self.disable)
646
self.disable_initiator_tag = (gobject.timeout_add
647
(timedelta_to_milliseconds
648
(timeout), self.disable))
1086
649
self.expires = datetime.datetime.utcnow() + timeout
1088
651
def need_approval(self):
1089
652
self.last_approval_request = datetime.datetime.utcnow()
1091
654
def start_checker(self):
1092
655
"""Start a new checker subprocess if one is not running.
1094
657
If a checker already exists, leave it running and do
1096
659
# The reason for not killing a running checker is that if we
1097
# did that, and if a checker (for some reason) started running
1098
# slowly and taking more than 'interval' time, then the client
1099
# would inevitably timeout, since no checker would get a
1100
# chance to run to completion. If we instead leave running
660
# did that, then if a checker (for some reason) started
661
# running slowly and taking more than 'interval' time, the
662
# client would inevitably timeout, since no checker would get
663
# a chance to run to completion. If we instead leave running
1101
664
# checkers alone, the checker would have to take more time
1102
665
# than 'timeout' for the client to be disabled, which is as it
1105
if self.checker is not None and not self.checker.is_alive():
1106
logger.warning("Checker was not alive; joining")
668
# If a checker exists, make sure it is not a zombie
670
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
except (AttributeError, OSError) as error:
672
if (isinstance(error, OSError)
673
and error.errno != errno.ECHILD):
677
logger.warning("Checker was a zombie")
678
gobject.source_remove(self.checker_callback_tag)
679
self.checker_callback(pid, status,
680
self.current_checker_command)
1109
681
# Start a new checker if needed
1110
682
if self.checker is None:
1111
# Escape attributes for the shell
1113
attr: re.escape(str(getattr(self, attr)))
1114
for attr in self.runtime_expansions}
1116
command = self.checker_command % escaped_attrs
1117
except TypeError as error:
1118
logger.error('Could not format string "%s"',
1119
self.checker_command,
684
# In case checker_command has exactly one % operator
685
command = self.checker_command % self.host
687
# Escape attributes for the shell
688
escaped_attrs = dict(
690
re.escape(unicode(str(getattr(self, attr, "")),
694
self.runtime_expansions)
697
command = self.checker_command % escaped_attrs
698
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
701
return True # Try again later
702
self.current_checker_command = command
704
logger.info("Starting checker %r for %s",
706
# We don't need to redirect stdout and stderr, since
707
# in normal mode, that is already done by daemon(),
708
# and in debug mode we don't want to. (Stdin is
709
# always replaced by /dev/null.)
710
self.checker = subprocess.Popen(command,
713
self.checker_callback_tag = (gobject.child_watch_add
715
self.checker_callback,
717
# The checker may have completed before the gobject
718
# watch was added. Check for this.
719
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
721
gobject.source_remove(self.checker_callback_tag)
722
self.checker_callback(pid, status, command)
723
except OSError as error:
724
logger.error("Failed to start subprocess",
1121
return True # Try again later
1122
self.current_checker_command = command
1123
logger.info("Starting checker %r for %s", command,
1125
# We don't need to redirect stdout and stderr, since
1126
# in normal mode, that is already done by daemon(),
1127
# and in debug mode we don't want to. (Stdin is
1128
# always replaced by /dev/null.)
1129
# The exception is when not debugging but nevertheless
1130
# running in the foreground; use the previously
1132
popen_args = {"close_fds": True,
1135
if (not self.server_settings["debug"]
1136
and self.server_settings["foreground"]):
1137
popen_args.update({"stdout": wnull,
1139
pipe = multiprocessing.Pipe(duplex=False)
1140
self.checker = multiprocessing.Process(
1142
args=(pipe[1], subprocess.call, command),
1144
self.checker.start()
1145
self.checker_callback_tag = GLib.io_add_watch(
1146
pipe[0].fileno(), GLib.IO_IN,
1147
self.checker_callback, pipe[0], command)
1148
# Re-run this periodically if run by GLib.timeout_add
726
# Re-run this periodically if run by gobject.timeout_add
1151
729
def stop_checker(self):
1152
730
"""Force the checker process, if any, to stop."""
1153
731
if self.checker_callback_tag:
1154
GLib.source_remove(self.checker_callback_tag)
732
gobject.source_remove(self.checker_callback_tag)
1155
733
self.checker_callback_tag = None
1156
734
if getattr(self, "checker", None) is None:
1158
736
logger.debug("Stopping checker for %(name)s", vars(self))
1159
self.checker.terminate()
738
self.checker.terminate()
740
#if self.checker.poll() is None:
741
# self.checker.kill()
742
except OSError as error:
743
if error.errno != errno.ESRCH: # No such process
1160
745
self.checker = None
1163
def dbus_service_property(dbus_interface,
748
def dbus_service_property(dbus_interface, signature="v",
749
access="readwrite", byte_arrays=False):
1167
750
"""Decorators for marking methods of a DBusObjectWithProperties to
1168
751
become properties on the D-Bus.
1170
753
The decorated method will be called with no arguments by "Get"
1171
754
and with one argument by "Set".
1173
756
The parameters, where they are supported, are the same as
1174
757
dbus.service.method, except there is only "signature", since the
1175
758
type from Get() and the type sent to Set() is the same.
1258
class DBusObjectWithAnnotations(dbus.service.Object):
1259
"""A D-Bus object with annotations.
1261
Classes inheriting from this can use the dbus_annotations
1262
decorator to add annotations to methods or signals.
834
class DBusObjectWithProperties(dbus.service.Object):
835
"""A D-Bus object with properties.
837
Classes inheriting from this can use the dbus_service_property
838
decorator to expose methods as D-Bus properties. It exposes the
839
standard Get(), Set(), and GetAll() methods on the D-Bus.
1266
843
def _is_dbus_thing(thing):
1267
844
"""Returns a function testing if an attribute is a D-Bus thing
1269
846
If called like _is_dbus_thing("method") it returns a function
1270
847
suitable for use as predicate to inspect.getmembers().
1272
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1275
852
def _get_all_dbus_things(self, thing):
1276
853
"""Returns a generator of (name, attribute) pairs
1278
return ((getattr(athing.__get__(self), "_dbus_name", name),
855
return ((getattr(athing.__get__(self), "_dbus_name",
1279
857
athing.__get__(self))
1280
858
for cls in self.__class__.__mro__
1281
859
for name, athing in
1282
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1284
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1286
path_keyword='object_path',
1287
connection_keyword='connection')
1288
def Introspect(self, object_path, connection):
1289
"""Overloading of standard D-Bus method.
1291
Inserts annotation tags on methods and signals.
1293
xmlstring = dbus.service.Object.Introspect(self, object_path,
1296
document = xml.dom.minidom.parseString(xmlstring)
1298
for if_tag in document.getElementsByTagName("interface"):
1299
# Add annotation tags
1300
for typ in ("method", "signal"):
1301
for tag in if_tag.getElementsByTagName(typ):
1303
for name, prop in (self.
1304
_get_all_dbus_things(typ)):
1305
if (name == tag.getAttribute("name")
1306
and prop._dbus_interface
1307
== if_tag.getAttribute("name")):
1308
annots.update(getattr(
1309
prop, "_dbus_annotations", {}))
1310
for name, value in annots.items():
1311
ann_tag = document.createElement(
1313
ann_tag.setAttribute("name", name)
1314
ann_tag.setAttribute("value", value)
1315
tag.appendChild(ann_tag)
1316
# Add interface annotation tags
1317
for annotation, value in dict(
1318
itertools.chain.from_iterable(
1319
annotations().items()
1320
for name, annotations
1321
in self._get_all_dbus_things("interface")
1322
if name == if_tag.getAttribute("name")
1324
ann_tag = document.createElement("annotation")
1325
ann_tag.setAttribute("name", annotation)
1326
ann_tag.setAttribute("value", value)
1327
if_tag.appendChild(ann_tag)
1328
# Fix argument name for the Introspect method itself
1329
if (if_tag.getAttribute("name")
1330
== dbus.INTROSPECTABLE_IFACE):
1331
for cn in if_tag.getElementsByTagName("method"):
1332
if cn.getAttribute("name") == "Introspect":
1333
for arg in cn.getElementsByTagName("arg"):
1334
if (arg.getAttribute("direction")
1336
arg.setAttribute("name",
1338
xmlstring = document.toxml("utf-8")
1340
except (AttributeError, xml.dom.DOMException,
1341
xml.parsers.expat.ExpatError) as error:
1342
logger.error("Failed to override Introspection method",
1347
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1348
"""A D-Bus object with properties.
1350
Classes inheriting from this can use the dbus_service_property
1351
decorator to expose methods as D-Bus properties. It exposes the
1352
standard Get(), Set(), and GetAll() methods on the D-Bus.
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
1355
863
def _get_dbus_property(self, interface_name, property_name):
1356
864
"""Returns a bound method if one exists which is a D-Bus
1357
865
property with the specified name and interface.
1359
for cls in self.__class__.__mro__:
1360
for name, value in inspect.getmembers(
1361
cls, self._is_dbus_thing("property")):
867
for cls in self.__class__.__mro__:
868
for name, value in (inspect.getmembers
870
self._is_dbus_thing("property"))):
1362
871
if (value._dbus_name == property_name
1363
872
and value._dbus_interface == interface_name):
1364
873
return value.__get__(self)
1366
875
# No such property
1367
raise DBusPropertyNotFound("{}:{}.{}".format(
1368
self.dbus_object_path, interface_name, property_name))
1371
def _get_all_interface_names(cls):
1372
"""Get a sequence of all interfaces supported by an object"""
1373
return (name for name in set(getattr(getattr(x, attr),
1374
"_dbus_interface", None)
1375
for x in (inspect.getmro(cls))
1377
if name is not None)
1379
@dbus.service.method(dbus.PROPERTIES_IFACE,
876
raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
+ interface_name + "."
880
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1381
881
out_signature="v")
1382
882
def Get(self, interface_name, property_name):
1383
883
"""Standard D-Bus property Get() method, see D-Bus standard.
1512
1013
return xmlstring
1516
dbus.OBJECT_MANAGER_IFACE
1517
except AttributeError:
1518
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1521
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1522
"""A D-Bus object with an ObjectManager.
1524
Classes inheriting from this exposes the standard
1525
GetManagedObjects call and the InterfacesAdded and
1526
InterfacesRemoved signals on the standard
1527
"org.freedesktop.DBus.ObjectManager" interface.
1529
Note: No signals are sent automatically; they must be sent
1532
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1533
out_signature="a{oa{sa{sv}}}")
1534
def GetManagedObjects(self):
1535
"""This function must be overridden"""
1536
raise NotImplementedError()
1538
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1539
signature="oa{sa{sv}}")
1540
def InterfacesAdded(self, object_path, interfaces_and_properties):
1543
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1544
def InterfacesRemoved(self, object_path, interfaces):
1547
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1549
path_keyword='object_path',
1550
connection_keyword='connection')
1551
def Introspect(self, object_path, connection):
1552
"""Overloading of standard D-Bus method.
1554
Override return argument name of GetManagedObjects to be
1555
"objpath_interfaces_and_properties"
1557
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1561
document = xml.dom.minidom.parseString(xmlstring)
1563
for if_tag in document.getElementsByTagName("interface"):
1564
# Fix argument name for the GetManagedObjects method
1565
if (if_tag.getAttribute("name")
1566
== dbus.OBJECT_MANAGER_IFACE):
1567
for cn in if_tag.getElementsByTagName("method"):
1568
if (cn.getAttribute("name")
1569
== "GetManagedObjects"):
1570
for arg in cn.getElementsByTagName("arg"):
1571
if (arg.getAttribute("direction")
1575
"objpath_interfaces"
1577
xmlstring = document.toxml("utf-8")
1579
except (AttributeError, xml.dom.DOMException,
1580
xml.parsers.expat.ExpatError) as error:
1581
logger.error("Failed to override Introspection method",
1586
def datetime_to_dbus(dt, variant_level=0):
1016
def datetime_to_dbus (dt, variant_level=0):
1587
1017
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1589
return dbus.String("", variant_level=variant_level)
1590
return dbus.String(dt.isoformat(), variant_level=variant_level)
1593
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1594
"""A class decorator; applied to a subclass of
1595
dbus.service.Object, it will add alternate D-Bus attributes with
1596
interface names according to the "alt_interface_names" mapping.
1599
@alternate_dbus_interfaces({"org.example.Interface":
1600
"net.example.AlternateInterface"})
1601
class SampleDBusObject(dbus.service.Object):
1602
@dbus.service.method("org.example.Interface")
1603
def SampleDBusMethod():
1606
The above "SampleDBusMethod" on "SampleDBusObject" will be
1607
reachable via two interfaces: "org.example.Interface" and
1608
"net.example.AlternateInterface", the latter of which will have
1609
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1610
"true", unless "deprecate" is passed with a False value.
1612
This works for methods and signals, and also for D-Bus properties
1613
(from DBusObjectWithProperties) and interfaces (from the
1614
dbus_interface_annotations decorator).
1019
return dbus.String("", variant_level = variant_level)
1020
return dbus.String(dt.isoformat(),
1021
variant_level=variant_level)
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1026
"""Applied to an empty subclass of a D-Bus object, this metaclass
1027
will add additional D-Bus attributes matching a certain pattern.
1618
for orig_interface_name, alt_interface_name in (
1619
alt_interface_names.items()):
1621
interface_names = set()
1622
# Go though all attributes of the class
1623
for attrname, attribute in inspect.getmembers(cls):
1029
def __new__(mcs, name, bases, attr):
1030
# Go through all the base classes which could have D-Bus
1031
# methods, signals, or properties in them
1032
old_interface_names = []
1033
for base in (b for b in bases
1034
if issubclass(b, dbus.service.Object)):
1035
# Go though all attributes of the base class
1036
for attrname, attribute in inspect.getmembers(base):
1624
1037
# Ignore non-D-Bus attributes, and D-Bus attributes
1625
1038
# with the wrong interface name
1626
1039
if (not hasattr(attribute, "_dbus_interface")
1627
or not attribute._dbus_interface.startswith(
1628
orig_interface_name)):
1040
or not attribute._dbus_interface
1041
.startswith("se.recompile.Mandos")):
1630
1043
# Create an alternate D-Bus interface name based on
1631
1044
# the current name
1632
alt_interface = attribute._dbus_interface.replace(
1633
orig_interface_name, alt_interface_name)
1634
interface_names.add(alt_interface)
1045
alt_interface = (attribute._dbus_interface
1046
.replace("se.recompile.Mandos",
1047
"se.bsnet.fukt.Mandos"))
1048
if alt_interface != attribute._dbus_interface:
1049
old_interface_names.append(alt_interface)
1635
1050
# Is this a D-Bus signal?
1636
1051
if getattr(attribute, "_dbus_is_signal", False):
1637
# Extract the original non-method undecorated
1638
# function by black magic
1639
if sys.version_info.major == 2:
1640
nonmethod_func = (dict(
1052
# Extract the original non-method function by
1054
nonmethod_func = (dict(
1641
1055
zip(attribute.func_code.co_freevars,
1642
attribute.__closure__))
1643
["func"].cell_contents)
1645
nonmethod_func = (dict(
1646
zip(attribute.__code__.co_freevars,
1647
attribute.__closure__))
1648
["func"].cell_contents)
1056
attribute.__closure__))["func"]
1649
1058
# Create a new, but exactly alike, function
1650
1059
# object, and decorate it to be a new D-Bus signal
1651
1060
# with the alternate D-Bus interface name
1652
new_function = copy_function(nonmethod_func)
1653
new_function = (dbus.service.signal(
1655
attribute._dbus_signature)(new_function))
1061
new_function = (dbus.service.signal
1063
attribute._dbus_signature)
1064
(types.FunctionType(
1065
nonmethod_func.func_code,
1066
nonmethod_func.func_globals,
1067
nonmethod_func.func_name,
1068
nonmethod_func.func_defaults,
1069
nonmethod_func.func_closure)))
1656
1070
# Copy annotations, if any
1658
new_function._dbus_annotations = dict(
1659
attribute._dbus_annotations)
1072
new_function._dbus_annotations = (
1073
dict(attribute._dbus_annotations))
1660
1074
except AttributeError:
1663
1076
# Define a creator of a function to call both the
1664
# original and alternate functions, so both the
1665
# original and alternate signals gets sent when
1666
# the function is called
1077
# old and new functions, so both the old and new
1078
# signals gets sent when the function is called
1667
1079
def fixscope(func1, func2):
1668
1080
"""This function is a scope container to pass
1669
1081
func1 and func2 to the "call_both" function
1670
1082
outside of its arguments"""
1672
@functools.wraps(func2)
1673
1083
def call_both(*args, **kwargs):
1674
1084
"""This function will emit two D-Bus
1675
1085
signals by calling func1 and func2"""
1676
1086
func1(*args, **kwargs)
1677
1087
func2(*args, **kwargs)
1678
# Make wrapper function look like a D-Bus
1680
for name, attr in inspect.getmembers(func2):
1681
if name.startswith("_dbus_"):
1682
setattr(call_both, name, attr)
1684
1088
return call_both
1685
1089
# Create the "call_both" function and add it to
1687
attr[attrname] = fixscope(attribute, new_function)
1091
attr[attrname] = fixscope(attribute,
1688
1093
# Is this a D-Bus method?
1689
1094
elif getattr(attribute, "_dbus_is_method", False):
1690
1095
# Create a new, but exactly alike, function
1691
1096
# object. Decorate it to be a new D-Bus method
1692
1097
# with the alternate D-Bus interface name. Add it
1693
1098
# to the class.
1695
dbus.service.method(
1697
attribute._dbus_in_signature,
1698
attribute._dbus_out_signature)
1699
(copy_function(attribute)))
1099
attr[attrname] = (dbus.service.method
1101
attribute._dbus_in_signature,
1102
attribute._dbus_out_signature)
1104
(attribute.func_code,
1105
attribute.func_globals,
1106
attribute.func_name,
1107
attribute.func_defaults,
1108
attribute.func_closure)))
1700
1109
# Copy annotations, if any
1702
attr[attrname]._dbus_annotations = dict(
1703
attribute._dbus_annotations)
1111
attr[attrname]._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1704
1113
except AttributeError:
1706
1115
# Is this a D-Bus property?
1727
1143
# object. Decorate it to be a new D-Bus interface
1728
1144
# with the alternate D-Bus interface name. Add it
1729
1145
# to the class.
1731
dbus_interface_annotations(alt_interface)
1732
(copy_function(attribute)))
1734
# Deprecate all alternate interfaces
1735
iname = "_AlternateDBusNames_interface_annotation{}"
1736
for interface_name in interface_names:
1738
@dbus_interface_annotations(interface_name)
1740
return {"org.freedesktop.DBus.Deprecated":
1742
# Find an unused name
1743
for aname in (iname.format(i)
1744
for i in itertools.count()):
1745
if aname not in attr:
1749
# Replace the class with a new subclass of it with
1750
# methods, signals, etc. as created above.
1751
if sys.version_info.major == 2:
1752
cls = type(b"{}Alternate".format(cls.__name__),
1755
cls = type("{}Alternate".format(cls.__name__),
1762
@alternate_dbus_interfaces({"se.recompile.Mandos":
1763
"se.bsnet.fukt.Mandos"})
1146
attr[attrname] = (dbus_interface_annotations
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1154
# Deprecate all old interfaces
1155
iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
for old_interface_name in old_interface_names:
1157
@dbus_interface_annotations(old_interface_name)
1159
return { "org.freedesktop.DBus.Deprecated": "true" }
1160
# Find an unused name
1161
for aname in (iname.format(i) for i in itertools.count()):
1162
if aname not in attr:
1165
return type.__new__(mcs, name, bases, attr)
1764
1168
class ClientDBus(Client, DBusObjectWithProperties):
1765
1169
"""A Client class using D-Bus
1768
1172
dbus_object_path: dbus.ObjectPath
1769
1173
bus: dbus.SystemBus()
1772
1176
runtime_expansions = (Client.runtime_expansions
1773
+ ("dbus_object_path", ))
1775
_interface = "se.recompile.Mandos.Client"
1177
+ ("dbus_object_path",))
1777
1179
# dbus.service.Object doesn't use super(), so we can't either.
1779
def __init__(self, bus=None, *args, **kwargs):
1181
def __init__(self, bus = None, *args, **kwargs):
1781
1183
Client.__init__(self, *args, **kwargs)
1782
1184
# Only now, when this client is initialized, can it show up on
1784
client_object_name = str(self.name).translate(
1186
client_object_name = unicode(self.name).translate(
1785
1187
{ord("."): ord("_"),
1786
1188
ord("-"): ord("_")})
1787
self.dbus_object_path = dbus.ObjectPath(
1788
"/clients/" + client_object_name)
1189
self.dbus_object_path = (dbus.ObjectPath
1190
("/clients/" + client_object_name))
1789
1191
DBusObjectWithProperties.__init__(self, self.bus,
1790
1192
self.dbus_object_path)
1792
def notifychangeproperty(transform_func, dbus_name,
1793
type_func=lambda x: x,
1795
invalidate_only=False,
1796
_interface=_interface):
1194
def notifychangeproperty(transform_func,
1195
dbus_name, type_func=lambda x: x,
1797
1197
""" Modify a variable so that it's a property which announces
1798
1198
its changes to DBus.
1800
1200
transform_fun: Function that takes a value and a variant_level
1801
1201
and transforms it to a D-Bus type.
1802
1202
dbus_name: D-Bus name of the variable
1954
1350
server to mandos-client
1958
1354
# Rejected - signal
1959
1355
@dbus.service.signal(_interface, signature="s")
1960
1356
def Rejected(self, reason):
1964
1360
# NeedApproval - signal
1965
1361
@dbus.service.signal(_interface, signature="tb")
1966
1362
def NeedApproval(self, timeout, default):
1968
1364
return self.need_approval()
1972
1368
# Approve - method
1973
1369
@dbus.service.method(_interface, in_signature="b")
1974
1370
def Approve(self, value):
1975
1371
self.approve(value)
1977
1373
# CheckedOK - method
1978
1374
@dbus.service.method(_interface)
1979
1375
def CheckedOK(self):
1980
1376
self.checked_ok()
1982
1378
# Enable - method
1983
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1984
1379
@dbus.service.method(_interface)
1985
1380
def Enable(self):
1989
1384
# StartChecker - method
1990
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1991
1385
@dbus.service.method(_interface)
1992
1386
def StartChecker(self):
1994
1388
self.start_checker()
1996
1390
# Disable - method
1997
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1998
1391
@dbus.service.method(_interface)
1999
1392
def Disable(self):
2003
1396
# StopChecker - method
2004
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2005
1397
@dbus.service.method(_interface)
2006
1398
def StopChecker(self):
2007
1399
self.stop_checker()
2011
1403
# ApprovalPending - property
2012
1404
@dbus_service_property(_interface, signature="b", access="read")
2013
1405
def ApprovalPending_dbus_property(self):
2014
1406
return dbus.Boolean(bool(self.approvals_pending))
2016
1408
# ApprovedByDefault - property
2017
@dbus_service_property(_interface,
1409
@dbus_service_property(_interface, signature="b",
2019
1410
access="readwrite")
2020
1411
def ApprovedByDefault_dbus_property(self, value=None):
2021
1412
if value is None: # get
2022
1413
return dbus.Boolean(self.approved_by_default)
2023
1414
self.approved_by_default = bool(value)
2025
1416
# ApprovalDelay - property
2026
@dbus_service_property(_interface,
1417
@dbus_service_property(_interface, signature="t",
2028
1418
access="readwrite")
2029
1419
def ApprovalDelay_dbus_property(self, value=None):
2030
1420
if value is None: # get
2031
return dbus.UInt64(self.approval_delay.total_seconds()
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2033
1422
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2035
1424
# ApprovalDuration - property
2036
@dbus_service_property(_interface,
1425
@dbus_service_property(_interface, signature="t",
2038
1426
access="readwrite")
2039
1427
def ApprovalDuration_dbus_property(self, value=None):
2040
1428
if value is None: # get
2041
return dbus.UInt64(self.approval_duration.total_seconds()
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2043
1431
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2045
1433
# Name - property
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2048
1434
@dbus_service_property(_interface, signature="s", access="read")
2049
1435
def Name_dbus_property(self):
2050
1436
return dbus.String(self.name)
2054
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
@dbus_service_property(_interface, signature="s", access="read")
2056
def KeyID_dbus_property(self):
2057
return dbus.String(self.key_id)
2059
1438
# Fingerprint - property
2061
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2062
1439
@dbus_service_property(_interface, signature="s", access="read")
2063
1440
def Fingerprint_dbus_property(self):
2064
1441
return dbus.String(self.fingerprint)
2066
1443
# Host - property
2067
@dbus_service_property(_interface,
1444
@dbus_service_property(_interface, signature="s",
2069
1445
access="readwrite")
2070
1446
def Host_dbus_property(self, value=None):
2071
1447
if value is None: # get
2072
1448
return dbus.String(self.host)
2073
self.host = str(value)
1449
self.host = unicode(value)
2075
1451
# Created - property
2077
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2078
1452
@dbus_service_property(_interface, signature="s", access="read")
2079
1453
def Created_dbus_property(self):
2080
1454
return datetime_to_dbus(self.created)
2082
1456
# LastEnabled - property
2083
1457
@dbus_service_property(_interface, signature="s", access="read")
2084
1458
def LastEnabled_dbus_property(self):
2085
1459
return datetime_to_dbus(self.last_enabled)
2087
1461
# Enabled - property
2088
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2090
1463
access="readwrite")
2091
1464
def Enabled_dbus_property(self, value=None):
2092
1465
if value is None: # get
2099
1472
# LastCheckedOK - property
2100
@dbus_service_property(_interface,
1473
@dbus_service_property(_interface, signature="s",
2102
1474
access="readwrite")
2103
1475
def LastCheckedOK_dbus_property(self, value=None):
2104
1476
if value is not None:
2105
1477
self.checked_ok()
2107
1479
return datetime_to_dbus(self.last_checked_ok)
2109
1481
# LastCheckerStatus - property
2110
@dbus_service_property(_interface, signature="n", access="read")
1482
@dbus_service_property(_interface, signature="n",
2111
1484
def LastCheckerStatus_dbus_property(self):
2112
1485
return dbus.Int16(self.last_checker_status)
2114
1487
# Expires - property
2115
1488
@dbus_service_property(_interface, signature="s", access="read")
2116
1489
def Expires_dbus_property(self):
2117
1490
return datetime_to_dbus(self.expires)
2119
1492
# LastApprovalRequest - property
2120
1493
@dbus_service_property(_interface, signature="s", access="read")
2121
1494
def LastApprovalRequest_dbus_property(self):
2122
1495
return datetime_to_dbus(self.last_approval_request)
2124
1497
# Timeout - property
2125
@dbus_service_property(_interface,
1498
@dbus_service_property(_interface, signature="t",
2127
1499
access="readwrite")
2128
1500
def Timeout_dbus_property(self, value=None):
2129
1501
if value is None: # get
2130
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2131
old_timeout = self.timeout
1502
return dbus.UInt64(self.timeout_milliseconds())
2132
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
2133
# Reschedule disabling
1504
# Reschedule timeout
2134
1505
if self.enabled:
2135
1506
now = datetime.datetime.utcnow()
2136
self.expires += self.timeout - old_timeout
2137
if self.expires <= now:
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
2138
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
2141
1516
if (getattr(self, "disable_initiator_tag", None)
2144
GLib.source_remove(self.disable_initiator_tag)
2145
self.disable_initiator_tag = GLib.timeout_add(
2146
int((self.expires - now).total_seconds() * 1000),
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2149
1524
# ExtendedTimeout - property
2150
@dbus_service_property(_interface,
1525
@dbus_service_property(_interface, signature="t",
2152
1526
access="readwrite")
2153
1527
def ExtendedTimeout_dbus_property(self, value=None):
2154
1528
if value is None: # get
2155
return dbus.UInt64(self.extended_timeout.total_seconds()
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2157
1530
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2159
1532
# Interval - property
2160
@dbus_service_property(_interface,
1533
@dbus_service_property(_interface, signature="t",
2162
1534
access="readwrite")
2163
1535
def Interval_dbus_property(self, value=None):
2164
1536
if value is None: # get
2165
return dbus.UInt64(self.interval.total_seconds() * 1000)
1537
return dbus.UInt64(self.interval_milliseconds())
2166
1538
self.interval = datetime.timedelta(0, 0, 0, value)
2167
1539
if getattr(self, "checker_initiator_tag", None) is None:
2169
1541
if self.enabled:
2170
1542
# Reschedule checker run
2171
GLib.source_remove(self.checker_initiator_tag)
2172
self.checker_initiator_tag = GLib.timeout_add(
2173
value, self.start_checker)
2174
self.start_checker() # Start one now, too
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
2176
1548
# Checker - property
2177
@dbus_service_property(_interface,
1549
@dbus_service_property(_interface, signature="s",
2179
1550
access="readwrite")
2180
1551
def Checker_dbus_property(self, value=None):
2181
1552
if value is None: # get
2182
1553
return dbus.String(self.checker_command)
2183
self.checker_command = str(value)
1554
self.checker_command = unicode(value)
2185
1556
# CheckerRunning - property
2186
@dbus_service_property(_interface,
1557
@dbus_service_property(_interface, signature="b",
2188
1558
access="readwrite")
2189
1559
def CheckerRunning_dbus_property(self, value=None):
2190
1560
if value is None: # get
2231
1593
if data[0] == 'data':
2233
1595
if data[0] == 'function':
2235
1596
def func(*args, **kwargs):
2236
1597
self._pipe.send(('funcall', name, args, kwargs))
2237
1598
return self._pipe.recv()[1]
2241
1601
def __setattr__(self, name, value):
2242
1602
if name == '_pipe':
2243
1603
return super(ProxyClient, self).__setattr__(name, value)
2244
1604
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
2247
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
2248
1612
"""A class to handle client connections.
2250
1614
Instantiated once for each connection to handle it.
2251
1615
Note: This will run in its own forked process."""
2253
1617
def handle(self):
2254
1618
with contextlib.closing(self.server.child_pipe) as child_pipe:
2255
1619
logger.info("TCP connection from: %s",
2256
str(self.client_address))
1620
unicode(self.client_address))
2257
1621
logger.debug("Pipe FD: %d",
2258
1622
self.server.child_pipe.fileno())
2260
session = gnutls.ClientSession(self.request)
2262
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2263
# "+AES-256-CBC", "+SHA1",
2264
# "+COMP-NULL", "+CTYPE-OPENPGP",
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1627
.X509Credentials()))
1629
# Note: gnutls.connection.X509Credentials is really a
1630
# generic GnuTLS certificate credentials object so long as
1631
# no X.509 keys are added to it. Therefore, we can use it
1632
# here despite using OpenPGP certificates.
1634
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
# "+AES-256-CBC", "+SHA1",
1636
# "+COMP-NULL", "+CTYPE-OPENPGP",
2266
1638
# Use a fallback default, since this MUST be set.
2267
1639
priority = self.server.gnutls_priority
2268
1640
if priority is None:
2269
1641
priority = "NORMAL"
2270
gnutls.priority_set_direct(session._c_object,
2271
priority.encode("utf-8"),
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2274
1646
# Start communication using the Mandos protocol
2275
1647
# Get protocol number
2276
1648
line = self.request.makefile().readline()
2277
1649
logger.debug("Protocol version: %r", line)
2279
1651
if int(line.strip().split()[0]) > 1:
2280
raise RuntimeError(line)
2281
1653
except (ValueError, IndexError, RuntimeError) as error:
2282
1654
logger.error("Unknown protocol version: %s", error)
2285
1657
# Start GnuTLS connection
2287
1659
session.handshake()
2288
except gnutls.Error as error:
1660
except gnutls.errors.GNUTLSError as error:
2289
1661
logger.warning("Handshake failed: %s", error)
2290
1662
# Do not run session.bye() here: the session is not
2291
1663
# established. Just abandon the request.
2293
1665
logger.debug("Handshake succeeded")
2295
1667
approval_required = False
2297
if gnutls.has_rawpk:
2300
key_id = self.key_id(
2301
self.peer_certificate(session))
2302
except (TypeError, gnutls.Error) as error:
2303
logger.warning("Bad certificate: %s", error)
2305
logger.debug("Key ID: %s", key_id)
2310
fpr = self.fingerprint(
2311
self.peer_certificate(session))
2312
except (TypeError, gnutls.Error) as error:
2313
logger.warning("Bad certificate: %s", error)
2315
logger.debug("Fingerprint: %s", fpr)
2318
client = ProxyClient(child_pipe, key_id, fpr,
1670
fpr = self.fingerprint(self.peer_certificate
1673
gnutls.errors.GNUTLSError) as error:
1674
logger.warning("Bad certificate: %s", error)
1676
logger.debug("Fingerprint: %s", fpr)
1679
client = ProxyClient(child_pipe, fpr,
2319
1680
self.client_address)
2320
1681
except KeyError:
2323
1684
if client.approval_delay:
2324
1685
delay = client.approval_delay
2325
1686
client.approvals_pending += 1
2326
1687
approval_required = True
2329
1690
if not client.enabled:
2330
1691
logger.info("Client %s is disabled",
2332
1693
if self.server.use_dbus:
2333
1694
# Emit D-Bus signal
2334
1695
client.Rejected("Disabled")
2337
1698
if client.approved or not client.approval_delay:
2338
# We are approved or approval is disabled
1699
#We are approved or approval is disabled
2340
1701
elif client.approved is None:
2341
1702
logger.info("Client %s needs approval",
2374
1737
delay -= time2 - time
2377
session.send(client.secret)
2378
except gnutls.Error as error:
2379
logger.warning("gnutls send failed",
1740
while sent_size < len(client.secret):
1742
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed",
1747
logger.debug("Sent: %d, remaining: %d",
1748
sent, len(client.secret)
1749
- (sent_size + sent))
2383
1752
logger.info("Sending secret to %s", client.name)
2384
1753
# bump the timeout using extended_timeout
2385
1754
client.bump_timeout(client.extended_timeout)
2386
1755
if self.server.use_dbus:
2387
1756
# Emit D-Bus signal
2388
1757
client.GotSecret()
2391
1760
if approval_required:
2392
1761
client.approvals_pending -= 1
2395
except gnutls.Error as error:
1764
except gnutls.errors.GNUTLSError as error:
2396
1765
logger.warning("GnuTLS bye failed",
2397
1766
exc_info=error)
2400
1769
def peer_certificate(session):
2401
"Return the peer's certificate as a bytestring"
2403
cert_type = gnutls.certificate_type_get2(session._c_object,
2405
except AttributeError:
2406
cert_type = gnutls.certificate_type_get(session._c_object)
2407
if gnutls.has_rawpk:
2408
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2410
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2411
# If not a valid certificate type...
2412
if cert_type not in valid_cert_types:
2413
logger.info("Cert type %r not in %r", cert_type,
2415
# ...return invalid data
1770
"Return the peer's OpenPGP certificate as a bytestring"
1771
# If not an OpenPGP certificate...
1772
if (gnutls.library.functions
1773
.gnutls_certificate_type_get(session._c_object)
1774
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1775
# ...do the normal thing
1776
return session.peer_certificate
2417
1777
list_size = ctypes.c_uint(1)
2418
cert_list = (gnutls.certificate_get_peers
1778
cert_list = (gnutls.library.functions
1779
.gnutls_certificate_get_peers
2419
1780
(session._c_object, ctypes.byref(list_size)))
2420
1781
if not bool(cert_list) and list_size.value != 0:
2421
raise gnutls.Error("error getting peer certificate")
1782
raise gnutls.errors.GNUTLSError("error getting peer"
2422
1784
if list_size.value == 0:
2424
1786
cert = cert_list[0]
2425
1787
return ctypes.string_at(cert.data, cert.size)
2428
def key_id(certificate):
2429
"Convert a certificate bytestring to a hexdigit key ID"
2430
# New GnuTLS "datum" with the public key
2431
datum = gnutls.datum_t(
2432
ctypes.cast(ctypes.c_char_p(certificate),
2433
ctypes.POINTER(ctypes.c_ubyte)),
2434
ctypes.c_uint(len(certificate)))
2435
# XXX all these need to be created in the gnutls "module"
2436
# New empty GnuTLS certificate
2437
pubkey = gnutls.pubkey_t()
2438
gnutls.pubkey_init(ctypes.byref(pubkey))
2439
# Import the raw public key into the certificate
2440
gnutls.pubkey_import(pubkey,
2441
ctypes.byref(datum),
2442
gnutls.X509_FMT_DER)
2443
# New buffer for the key ID
2444
buf = ctypes.create_string_buffer(32)
2445
buf_len = ctypes.c_size_t(len(buf))
2446
# Get the key ID from the raw public key into the buffer
2447
gnutls.pubkey_get_key_id(pubkey,
2448
gnutls.KEYID_USE_SHA256,
2449
ctypes.cast(ctypes.byref(buf),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.byref(buf_len))
2452
# Deinit the certificate
2453
gnutls.pubkey_deinit(pubkey)
2455
# Convert the buffer to a Python bytestring
2456
key_id = ctypes.string_at(buf, buf_len.value)
2457
# Convert the bytestring to hexadecimal notation
2458
hex_key_id = binascii.hexlify(key_id).upper()
2462
1790
def fingerprint(openpgp):
2463
1791
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2464
1792
# New GnuTLS "datum" with the OpenPGP public key
2465
datum = gnutls.datum_t(
2466
ctypes.cast(ctypes.c_char_p(openpgp),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.c_uint(len(openpgp)))
1793
datum = (gnutls.library.types
1794
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1797
ctypes.c_uint(len(openpgp))))
2469
1798
# New empty GnuTLS certificate
2470
crt = gnutls.openpgp_crt_t()
2471
gnutls.openpgp_crt_init(ctypes.byref(crt))
1799
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1800
(gnutls.library.functions
1801
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2472
1802
# Import the OpenPGP public key into the certificate
2473
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2474
gnutls.OPENPGP_FMT_RAW)
1803
(gnutls.library.functions
1804
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1805
gnutls.library.constants
1806
.GNUTLS_OPENPGP_FMT_RAW))
2475
1807
# Verify the self signature in the key
2476
1808
crtverify = ctypes.c_uint()
2477
gnutls.openpgp_crt_verify_self(crt, 0,
2478
ctypes.byref(crtverify))
1809
(gnutls.library.functions
1810
.gnutls_openpgp_crt_verify_self(crt, 0,
1811
ctypes.byref(crtverify)))
2479
1812
if crtverify.value != 0:
2480
gnutls.openpgp_crt_deinit(crt)
2481
raise gnutls.CertificateSecurityError(code
1813
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1814
raise (gnutls.errors.CertificateSecurityError
2483
1816
# New buffer for the fingerprint
2484
1817
buf = ctypes.create_string_buffer(20)
2485
1818
buf_len = ctypes.c_size_t()
2486
1819
# Get the fingerprint from the certificate into the buffer
2487
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2488
ctypes.byref(buf_len))
1820
(gnutls.library.functions
1821
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1822
ctypes.byref(buf_len)))
2489
1823
# Deinit the certificate
2490
gnutls.openpgp_crt_deinit(crt)
1824
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2491
1825
# Convert the buffer to a Python bytestring
2492
1826
fpr = ctypes.string_at(buf, buf_len.value)
2493
1827
# Convert the bytestring to hexadecimal notation
2498
class MultiprocessingMixIn:
1832
class MultiprocessingMixIn(object):
2499
1833
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2501
1834
def sub_process_main(self, request, address):
2503
1836
self.finish_request(request, address)
2504
1837
except Exception:
2505
1838
self.handle_error(request, address)
2506
1839
self.close_request(request)
2508
1841
def process_request(self, request, address):
2509
1842
"""Start a new process to process the request."""
2510
proc = multiprocessing.Process(target=self.sub_process_main,
2511
args=(request, address))
1843
proc = multiprocessing.Process(target = self.sub_process_main,
2516
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1850
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2517
1851
""" adds a pipe to the MixIn """
2519
1852
def process_request(self, request, client_address):
2520
1853
"""Overrides and wraps the original process_request().
2522
1855
This function creates a new pipe in self.pipe
2524
1857
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2526
1859
proc = MultiprocessingMixIn.process_request(self, request,
2527
1860
client_address)
2528
1861
self.child_pipe.close()
2529
1862
self.add_pipe(parent_pipe, proc)
2531
1864
def add_pipe(self, parent_pipe, proc):
2532
1865
"""Dummy function; override as necessary"""
2533
raise NotImplementedError()
1866
raise NotImplementedError
2536
1869
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2537
socketserver.TCPServer):
1870
socketserver.TCPServer, object):
2538
1871
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2541
1874
enabled: Boolean; whether this server is activated yet
2542
1875
interface: None or a network interface name (string)
2543
1876
use_ipv6: Boolean; to use IPv6 or not
2546
1878
def __init__(self, server_address, RequestHandlerClass,
2550
"""If socketfd is set, use that file descriptor instead of
2551
creating a new one with socket.socket().
1879
interface=None, use_ipv6=True):
2553
1880
self.interface = interface
2555
1882
self.address_family = socket.AF_INET6
2556
if socketfd is not None:
2557
# Save the file descriptor
2558
self.socketfd = socketfd
2559
# Save the original socket.socket() function
2560
self.socket_socket = socket.socket
2562
# To implement --socket, we monkey patch socket.socket.
2564
# (When socketserver.TCPServer is a new-style class, we
2565
# could make self.socket into a property instead of monkey
2566
# patching socket.socket.)
2568
# Create a one-time-only replacement for socket.socket()
2569
@functools.wraps(socket.socket)
2570
def socket_wrapper(*args, **kwargs):
2571
# Restore original function so subsequent calls are
2573
socket.socket = self.socket_socket
2574
del self.socket_socket
2575
# This time only, return a new socket object from the
2576
# saved file descriptor.
2577
return socket.fromfd(self.socketfd, *args, **kwargs)
2578
# Replace socket.socket() function with wrapper
2579
socket.socket = socket_wrapper
2580
# The socketserver.TCPServer.__init__ will call
2581
# socket.socket(), which might be our replacement,
2582
# socket_wrapper(), if socketfd was set.
2583
1883
socketserver.TCPServer.__init__(self, server_address,
2584
1884
RequestHandlerClass)
2586
1885
def server_bind(self):
2587
1886
"""This overrides the normal server_bind() function
2588
1887
to bind to an interface if one was specified, and also NOT to
2589
1888
bind to an address or port if they were not specified."""
2590
global SO_BINDTODEVICE
2591
1889
if self.interface is not None:
2592
1890
if SO_BINDTODEVICE is None:
2593
# Fall back to a hard-coded value which seems to be
2595
logger.warning("SO_BINDTODEVICE not found, trying 25")
2596
SO_BINDTODEVICE = 25
2598
self.socket.setsockopt(
2599
socket.SOL_SOCKET, SO_BINDTODEVICE,
2600
(self.interface + "\0").encode("utf-8"))
2601
except socket.error as error:
2602
if error.errno == errno.EPERM:
2603
logger.error("No permission to bind to"
2604
" interface %s", self.interface)
2605
elif error.errno == errno.ENOPROTOOPT:
2606
logger.error("SO_BINDTODEVICE not available;"
2607
" cannot bind to interface %s",
2609
elif error.errno == errno.ENODEV:
2610
logger.error("Interface %s does not exist,"
2611
" cannot bind", self.interface)
1891
logger.error("SO_BINDTODEVICE does not exist;"
1892
" cannot bind to interface %s",
1896
self.socket.setsockopt(socket.SOL_SOCKET,
1900
except socket.error as error:
1901
if error[0] == errno.EPERM:
1902
logger.error("No permission to"
1903
" bind to interface %s",
1905
elif error[0] == errno.ENOPROTOOPT:
1906
logger.error("SO_BINDTODEVICE not available;"
1907
" cannot bind to interface %s",
2614
1911
# Only bind(2) the socket if we really need to.
2615
1912
if self.server_address[0] or self.server_address[1]:
2616
if self.server_address[1]:
2617
self.allow_reuse_address = True
2618
1913
if not self.server_address[0]:
2619
1914
if self.address_family == socket.AF_INET6:
2620
any_address = "::" # in6addr_any
1915
any_address = "::" # in6addr_any
2622
any_address = "0.0.0.0" # INADDR_ANY
1917
any_address = socket.INADDR_ANY
2623
1918
self.server_address = (any_address,
2624
1919
self.server_address[1])
2625
1920
elif not self.server_address[1]:
2626
self.server_address = (self.server_address[0], 0)
1921
self.server_address = (self.server_address[0],
2627
1923
# if self.interface:
2628
1924
# self.server_address = (self.server_address[0],
2659
1950
self.gnutls_priority = gnutls_priority
2660
1951
IPv6_TCPServer.__init__(self, server_address,
2661
1952
RequestHandlerClass,
2662
interface=interface,
1953
interface = interface,
1954
use_ipv6 = use_ipv6)
2666
1955
def server_activate(self):
2667
1956
if self.enabled:
2668
1957
return socketserver.TCPServer.server_activate(self)
2670
1959
def enable(self):
2671
1960
self.enabled = True
2673
1962
def add_pipe(self, parent_pipe, proc):
2674
1963
# Call "handle_ipc" for both data and EOF events
2676
parent_pipe.fileno(),
2677
GLib.IO_IN | GLib.IO_HUP,
2678
functools.partial(self.handle_ipc,
2679
parent_pipe=parent_pipe,
2682
def handle_ipc(self, source, condition,
2685
client_object=None):
1964
gobject.io_add_watch(parent_pipe.fileno(),
1965
gobject.IO_IN | gobject.IO_HUP,
1966
functools.partial(self.handle_ipc,
1971
def handle_ipc(self, source, condition, parent_pipe=None,
1972
proc = None, client_object=None):
1974
gobject.IO_IN: "IN", # There is data to read.
1975
gobject.IO_OUT: "OUT", # Data can be written (without
1977
gobject.IO_PRI: "PRI", # There is urgent data to read.
1978
gobject.IO_ERR: "ERR", # Error condition.
1979
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1980
# broken, usually for pipes and
1983
conditions_string = ' | '.join(name
1985
condition_names.iteritems()
1986
if cond & condition)
2686
1987
# error, or the other end of multiprocessing.Pipe has closed
2687
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1988
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2688
1989
# Wait for other process to exit
2692
1993
# Read a request from the child
2693
1994
request = parent_pipe.recv()
2694
1995
command = request[0]
2696
1997
if command == 'init':
2697
key_id = request[1].decode("ascii")
2698
fpr = request[2].decode("ascii")
2699
address = request[3]
2701
for c in self.clients.values():
2702
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2704
if key_id and c.key_id == key_id:
2707
if fpr and c.fingerprint == fpr:
1999
address = request[2]
2001
for c in self.clients.itervalues():
2002
if c.fingerprint == fpr:
2711
logger.info("Client not found for key ID: %s, address"
2712
": %s", key_id or fpr, address)
2006
logger.info("Client not found for fingerprint: %s, ad"
2007
"dress: %s", fpr, address)
2713
2008
if self.use_dbus:
2714
2009
# Emit D-Bus signal
2715
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
mandos_dbus_service.ClientNotFound(fpr,
2717
2012
parent_pipe.send(False)
2721
parent_pipe.fileno(),
2722
GLib.IO_IN | GLib.IO_HUP,
2723
functools.partial(self.handle_ipc,
2724
parent_pipe=parent_pipe,
2726
client_object=client))
2015
gobject.io_add_watch(parent_pipe.fileno(),
2016
gobject.IO_IN | gobject.IO_HUP,
2017
functools.partial(self.handle_ipc,
2727
2023
parent_pipe.send(True)
2728
2024
# remove the old hook in favor of the new above hook on
2732
2028
funcname = request[1]
2733
2029
args = request[2]
2734
2030
kwargs = request[3]
2736
2032
parent_pipe.send(('data', getattr(client_object,
2737
2033
funcname)(*args,
2740
2036
if command == 'getattr':
2741
2037
attrname = request[1]
2742
if isinstance(client_object.__getattribute__(attrname),
2743
collections.Callable):
2744
parent_pipe.send(('function', ))
2038
if callable(client_object.__getattribute__(attrname)):
2039
parent_pipe.send(('function',))
2747
'data', client_object.__getattribute__(attrname)))
2041
parent_pipe.send(('data', client_object
2042
.__getattribute__(attrname)))
2749
2044
if command == 'setattr':
2750
2045
attrname = request[1]
2751
2046
value = request[2]
2752
2047
setattr(client_object, attrname, value)
2757
def rfc3339_duration_to_delta(duration):
2758
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2760
>>> rfc3339_duration_to_delta("P7D")
2761
datetime.timedelta(7)
2762
>>> rfc3339_duration_to_delta("PT60S")
2763
datetime.timedelta(0, 60)
2764
>>> rfc3339_duration_to_delta("PT60M")
2765
datetime.timedelta(0, 3600)
2766
>>> rfc3339_duration_to_delta("PT24H")
2767
datetime.timedelta(1)
2768
>>> rfc3339_duration_to_delta("P1W")
2769
datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT5M30S")
2771
datetime.timedelta(0, 330)
2772
>>> rfc3339_duration_to_delta("P1DT3M20S")
2773
datetime.timedelta(1, 200)
2776
# Parsing an RFC 3339 duration with regular expressions is not
2777
# possible - there would have to be multiple places for the same
2778
# values, like seconds. The current code, while more esoteric, is
2779
# cleaner without depending on a parsing library. If Python had a
2780
# built-in library for parsing we would use it, but we'd like to
2781
# avoid excessive use of external libraries.
2783
# New type for defining tokens, syntax, and semantics all-in-one
2784
Token = collections.namedtuple("Token", (
2785
"regexp", # To match token; if "value" is not None, must have
2786
# a "group" containing digits
2787
"value", # datetime.timedelta or None
2788
"followers")) # Tokens valid after this token
2789
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2790
# the "duration" ABNF definition in RFC 3339, Appendix A.
2791
token_end = Token(re.compile(r"$"), None, frozenset())
2792
token_second = Token(re.compile(r"(\d+)S"),
2793
datetime.timedelta(seconds=1),
2794
frozenset((token_end, )))
2795
token_minute = Token(re.compile(r"(\d+)M"),
2796
datetime.timedelta(minutes=1),
2797
frozenset((token_second, token_end)))
2798
token_hour = Token(re.compile(r"(\d+)H"),
2799
datetime.timedelta(hours=1),
2800
frozenset((token_minute, token_end)))
2801
token_time = Token(re.compile(r"T"),
2803
frozenset((token_hour, token_minute,
2805
token_day = Token(re.compile(r"(\d+)D"),
2806
datetime.timedelta(days=1),
2807
frozenset((token_time, token_end)))
2808
token_month = Token(re.compile(r"(\d+)M"),
2809
datetime.timedelta(weeks=4),
2810
frozenset((token_day, token_end)))
2811
token_year = Token(re.compile(r"(\d+)Y"),
2812
datetime.timedelta(weeks=52),
2813
frozenset((token_month, token_end)))
2814
token_week = Token(re.compile(r"(\d+)W"),
2815
datetime.timedelta(weeks=1),
2816
frozenset((token_end, )))
2817
token_duration = Token(re.compile(r"P"), None,
2818
frozenset((token_year, token_month,
2819
token_day, token_time,
2821
# Define starting values:
2823
value = datetime.timedelta()
2825
# Following valid tokens
2826
followers = frozenset((token_duration, ))
2827
# String left to parse
2829
# Loop until end token is found
2830
while found_token is not token_end:
2831
# Search for any currently valid tokens
2832
for token in followers:
2833
match = token.regexp.match(s)
2834
if match is not None:
2836
if token.value is not None:
2837
# Value found, parse digits
2838
factor = int(match.group(1), 10)
2839
# Add to value so far
2840
value += factor * token.value
2841
# Strip token from string
2842
s = token.regexp.sub("", s, 1)
2845
# Set valid next tokens
2846
followers = found_token.followers
2849
# No currently valid tokens were found
2850
raise ValueError("Invalid RFC 3339 duration: {!r}"
2856
2052
def string_to_delta(interval):
2857
2053
"""Parse a string and return a datetime.timedelta
2859
2055
>>> string_to_delta('7d')
2860
2056
datetime.timedelta(7)
2861
2057
>>> string_to_delta('60s')
2956
2147
parser.add_argument("--no-dbus", action="store_false",
2957
2148
dest="use_dbus", help="Do not provide D-Bus"
2958
" system bus interface", default=None)
2149
" system bus interface")
2959
2150
parser.add_argument("--no-ipv6", action="store_false",
2960
dest="use_ipv6", help="Do not use IPv6",
2151
dest="use_ipv6", help="Do not use IPv6")
2962
2152
parser.add_argument("--no-restore", action="store_false",
2963
2153
dest="restore", help="Do not restore stored"
2964
" state", default=None)
2965
parser.add_argument("--socket", type=int,
2966
help="Specify a file descriptor to a network"
2967
" socket to use instead of creating one")
2968
2155
parser.add_argument("--statedir", metavar="DIR",
2969
2156
help="Directory to save/restore state in")
2970
parser.add_argument("--foreground", action="store_true",
2971
help="Run in foreground", default=None)
2972
parser.add_argument("--no-zeroconf", action="store_false",
2973
dest="zeroconf", help="Do not use Zeroconf",
2976
2158
options = parser.parse_args()
2978
2160
if options.check:
2980
fail_count, test_count = doctest.testmod()
2981
sys.exit(os.EX_OK if fail_count == 0 else 1)
2983
2165
# Default values for config file for server-global settings
2984
if gnutls.has_rawpk:
2985
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2986
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2988
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2989
":+SIGN-DSA-SHA256")
2990
server_defaults = {"interface": "",
2994
"priority": priority,
2995
"servicename": "Mandos",
3001
"statedir": "/var/lib/mandos",
3002
"foreground": "False",
2166
server_defaults = { "interface": "",
2171
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2172
"servicename": "Mandos",
2177
"statedir": "/var/lib/mandos"
3007
2180
# Parse config file for server-global settings
3008
server_config = configparser.ConfigParser(server_defaults)
2181
server_config = configparser.SafeConfigParser(server_defaults)
3009
2182
del server_defaults
3010
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3011
# Convert the ConfigParser object to a dict
2183
server_config.read(os.path.join(options.configdir,
2185
# Convert the SafeConfigParser object to a dict
3012
2186
server_settings = server_config.defaults()
3013
2187
# Use the appropriate methods on the non-string config options
3014
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3015
"foreground", "zeroconf"):
2188
for option in ("debug", "use_dbus", "use_ipv6"):
3016
2189
server_settings[option] = server_config.getboolean("DEFAULT",
3018
2191
if server_settings["port"]:
3019
2192
server_settings["port"] = server_config.getint("DEFAULT",
3021
if server_settings["socket"]:
3022
server_settings["socket"] = server_config.getint("DEFAULT",
3024
# Later, stdin will, and stdout and stderr might, be dup'ed
3025
# over with an opened os.devnull. But we don't want this to
3026
# happen with a supplied network socket.
3027
if 0 <= server_settings["socket"] <= 2:
3028
server_settings["socket"] = os.dup(server_settings
3030
2194
del server_config
3032
2196
# Override the settings from the config file with command line
3033
2197
# options, if set.
3034
2198
for option in ("interface", "address", "port", "debug",
3035
"priority", "servicename", "configdir", "use_dbus",
3036
"use_ipv6", "debuglevel", "restore", "statedir",
3037
"socket", "foreground", "zeroconf"):
2199
"priority", "servicename", "configdir",
2200
"use_dbus", "use_ipv6", "debuglevel", "restore",
3038
2202
value = getattr(options, option)
3039
2203
if value is not None:
3040
2204
server_settings[option] = value
3042
2206
# Force all strings to be unicode
3043
2207
for option in server_settings.keys():
3044
if isinstance(server_settings[option], bytes):
3045
server_settings[option] = (server_settings[option]
3047
# Force all boolean options to be boolean
3048
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3049
"foreground", "zeroconf"):
3050
server_settings[option] = bool(server_settings[option])
3051
# Debug implies foreground
3052
if server_settings["debug"]:
3053
server_settings["foreground"] = True
2208
if type(server_settings[option]) is str:
2209
server_settings[option] = unicode(server_settings[option])
3054
2210
# Now we have our good server settings in "server_settings"
3056
2212
##################################################################
3058
if (not server_settings["zeroconf"]
3059
and not (server_settings["port"]
3060
or server_settings["socket"] != "")):
3061
parser.error("Needs port or socket to work without Zeroconf")
3063
2214
# For convenience
3064
2215
debug = server_settings["debug"]
3065
2216
debuglevel = server_settings["debuglevel"]
3134
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3136
2277
except OSError as error:
3137
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3138
.format(uid, gid, os.strerror(error.errno)))
3139
if error.errno != errno.EPERM:
2278
if error[0] != errno.EPERM:
3143
2282
# Enable all possible GnuTLS debugging
3145
2284
# "Use a log level over 10 to enable all debugging options."
3146
2285
# - GnuTLS manual
3147
gnutls.global_set_log_level(11)
2286
gnutls.library.functions.gnutls_global_set_log_level(11)
2288
@gnutls.library.types.gnutls_log_func
3150
2289
def debug_gnutls(level, string):
3151
2290
logger.debug("GnuTLS: %s", string[:-1])
3153
gnutls.global_set_log_function(debug_gnutls)
2292
(gnutls.library.functions
2293
.gnutls_global_set_log_function(debug_gnutls))
3155
2295
# Redirect stdin so all checkers get /dev/null
3156
2296
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3157
2297
os.dup2(null, sys.stdin.fileno())
3161
2301
# Need to fork before connecting to D-Bus
3163
2303
# Close all input and output, do double fork, etc.
3166
if gi.version_info < (3, 10, 2):
3167
# multiprocessing will use threads, so before we use GLib we
3168
# need to inform GLib that threads will be used.
2306
gobject.threads_init()
3171
2308
global main_loop
3172
2309
# From the Avahi example code
3173
2310
DBusGMainLoop(set_as_default=True)
3174
main_loop = GLib.MainLoop()
2311
main_loop = gobject.MainLoop()
3175
2312
bus = dbus.SystemBus()
3176
2313
# End of Avahi example code
3179
2316
bus_name = dbus.service.BusName("se.recompile.Mandos",
3182
old_bus_name = dbus.service.BusName(
3183
"se.bsnet.fukt.Mandos", bus,
3185
except dbus.exceptions.DBusException as e:
2317
bus, do_not_queue=True)
2318
old_bus_name = (dbus.service.BusName
2319
("se.bsnet.fukt.Mandos", bus,
2321
except dbus.exceptions.NameExistsException as e:
3186
2322
logger.error("Disabling D-Bus:", exc_info=e)
3187
2323
use_dbus = False
3188
2324
server_settings["use_dbus"] = False
3189
2325
tcp_server.use_dbus = False
3191
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3192
service = AvahiServiceToSyslog(
3193
name=server_settings["servicename"],
3194
servicetype="_mandos._tcp",
3197
if server_settings["interface"]:
3198
service.interface = if_nametoindex(
3199
server_settings["interface"].encode("utf-8"))
2326
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2327
service = AvahiServiceToSyslog(name =
2328
server_settings["servicename"],
2329
servicetype = "_mandos._tcp",
2330
protocol = protocol, bus = bus)
2331
if server_settings["interface"]:
2332
service.interface = (if_nametoindex
2333
(str(server_settings["interface"])))
3201
2335
global multiprocessing_manager
3202
2336
multiprocessing_manager = multiprocessing.Manager()
3204
2338
client_class = Client
3206
client_class = functools.partial(ClientDBus, bus=bus)
2340
client_class = functools.partial(ClientDBusTransitional,
3208
2343
client_settings = Client.config_parser(client_config)
3209
2344
old_client_settings = {}
3210
2345
clients_data = {}
3212
# This is used to redirect stdout and stderr for checker processes
3214
wnull = open(os.devnull, "w") # A writable /dev/null
3215
# Only used if server is running in foreground but not in debug
3217
if debug or not foreground:
3220
2347
# Get client data and settings from last running state.
3221
2348
if server_settings["restore"]:
3223
2350
with open(stored_state_path, "rb") as stored_state:
3224
if sys.version_info.major == 2:
3225
clients_data, old_client_settings = pickle.load(
3228
bytes_clients_data, bytes_old_client_settings = (
3229
pickle.load(stored_state, encoding="bytes"))
3230
# Fix bytes to strings
3233
clients_data = {(key.decode("utf-8")
3234
if isinstance(key, bytes)
3237
bytes_clients_data.items()}
3238
del bytes_clients_data
3239
for key in clients_data:
3240
value = {(k.decode("utf-8")
3241
if isinstance(k, bytes) else k): v
3243
clients_data[key].items()}
3244
clients_data[key] = value
3246
value["client_structure"] = [
3248
if isinstance(s, bytes)
3250
value["client_structure"]]
3252
for k in ("name", "host"):
3253
if isinstance(value[k], bytes):
3254
value[k] = value[k].decode("utf-8")
3255
if "key_id" not in value:
3256
value["key_id"] = ""
3257
elif "fingerprint" not in value:
3258
value["fingerprint"] = ""
3259
# old_client_settings
3261
old_client_settings = {
3262
(key.decode("utf-8")
3263
if isinstance(key, bytes)
3266
bytes_old_client_settings.items()}
3267
del bytes_old_client_settings
3269
for value in old_client_settings.values():
3270
if isinstance(value["host"], bytes):
3271
value["host"] = (value["host"]
2351
clients_data, old_client_settings = (pickle.load
3273
2353
os.remove(stored_state_path)
3274
2354
except IOError as e:
3275
2355
if e.errno == errno.ENOENT:
3276
logger.warning("Could not load persistent state:"
3277
" {}".format(os.strerror(e.errno)))
2356
logger.warning("Could not load persistent state: {0}"
2357
.format(os.strerror(e.errno)))
3279
2359
logger.critical("Could not load persistent state:",
3282
2362
except EOFError as e:
3283
2363
logger.warning("Could not load persistent state: "
2364
"EOFError:", exc_info=e)
3287
2366
with PGPEngine() as pgp:
3288
for client_name, client in clients_data.items():
3289
# Skip removed clients
3290
if client_name not in client_settings:
2367
for client_name, client in clients_data.iteritems():
3293
2368
# Decide which value to use after restoring saved state.
3294
2369
# We have three different values: Old config file,
3295
2370
# new config file, and saved state.
3353
2428
for client_name in (set(client_settings)
3354
2429
- set(old_client_settings)):
3355
2430
clients_data[client_name] = client_settings[client_name]
3357
2432
# Create all client objects
3358
for client_name, client in clients_data.items():
2433
for client_name, client in clients_data.iteritems():
3359
2434
tcp_server.clients[client_name] = client_class(
3362
server_settings=server_settings)
2435
name = client_name, settings = client)
3364
2437
if not tcp_server.clients:
3365
2438
logger.warning("No clients defined")
3368
if pidfile is not None:
3372
print(pid, file=pidfile)
3374
logger.error("Could not write to file %r with PID %d",
2444
pidfile.write(str(pid) + "\n".encode("utf-8"))
2447
logger.error("Could not write to file %r with PID %d",
2450
# "pidfile" was never created
3377
2452
del pidfilename
3379
for termsig in (signal.SIGHUP, signal.SIGTERM):
3380
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3381
lambda: main_loop.quit() and False)
2453
signal.signal(signal.SIGINT, signal.SIG_IGN)
2455
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2456
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3385
@alternate_dbus_interfaces(
3386
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3387
class MandosDBusService(DBusObjectWithObjectManager):
2459
class MandosDBusService(DBusObjectWithProperties):
3388
2460
"""A D-Bus proxy object"""
3390
2461
def __init__(self):
3391
2462
dbus.service.Object.__init__(self, bus, "/")
3393
2463
_interface = "se.recompile.Mandos"
2465
@dbus_interface_annotations(_interface)
2467
return { "org.freedesktop.DBus.Property"
2468
".EmitsChangedSignal":
3395
2471
@dbus.service.signal(_interface, signature="o")
3396
2472
def ClientAdded(self, objpath):
3400
2476
@dbus.service.signal(_interface, signature="ss")
3401
def ClientNotFound(self, key_id, address):
2477
def ClientNotFound(self, fingerprint, address):
3405
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3407
2481
@dbus.service.signal(_interface, signature="os")
3408
2482
def ClientRemoved(self, objpath, name):
3412
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3414
2486
@dbus.service.method(_interface, out_signature="ao")
3415
2487
def GetAllClients(self):
3417
return dbus.Array(c.dbus_object_path for c in
3418
tcp_server.clients.values())
3420
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2489
return dbus.Array(c.dbus_object_path
2491
tcp_server.clients.itervalues())
3422
2493
@dbus.service.method(_interface,
3423
2494
out_signature="a{oa{sv}}")
3424
2495
def GetAllClientsWithProperties(self):
3426
2497
return dbus.Dictionary(
3427
{c.dbus_object_path: c.GetAll(
3428
"se.recompile.Mandos.Client")
3429
for c in tcp_server.clients.values()},
2498
((c.dbus_object_path, c.GetAll(""))
2499
for c in tcp_server.clients.itervalues()),
3430
2500
signature="oa{sv}")
3432
2502
@dbus.service.method(_interface, in_signature="o")
3433
2503
def RemoveClient(self, object_path):
3435
for c in tcp_server.clients.values():
2505
for c in tcp_server.clients.itervalues():
3436
2506
if c.dbus_object_path == object_path:
3437
2507
del tcp_server.clients[c.name]
3438
2508
c.remove_from_connection()
3439
# Don't signal the disabling
2509
# Don't signal anything except ClientRemoved
3440
2510
c.disable(quiet=True)
3441
# Emit D-Bus signal for removal
3442
self.client_removed_signal(c)
2512
self.ClientRemoved(object_path, c.name)
3444
2514
raise KeyError(object_path)
3448
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3449
out_signature="a{oa{sa{sv}}}")
3450
def GetManagedObjects(self):
3452
return dbus.Dictionary(
3453
{client.dbus_object_path:
3455
{interface: client.GetAll(interface)
3457
client._get_all_interface_names()})
3458
for client in tcp_server.clients.values()})
3460
def client_added_signal(self, client):
3461
"""Send the new standard signal and the old signal"""
3463
# New standard signal
3464
self.InterfacesAdded(
3465
client.dbus_object_path,
3467
{interface: client.GetAll(interface)
3469
client._get_all_interface_names()}))
3471
self.ClientAdded(client.dbus_object_path)
3473
def client_removed_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesRemoved(
3478
client.dbus_object_path,
3479
client._get_all_interface_names())
3481
self.ClientRemoved(client.dbus_object_path,
3484
mandos_dbus_service = MandosDBusService()
3486
# Save modules to variables to exempt the modules from being
3487
# unloaded before the function registered with atexit() is run.
3488
mp = multiprocessing
2518
class MandosDBusServiceTransitional(MandosDBusService):
2519
__metaclass__ = AlternateDBusNamesMetaclass
2520
mandos_dbus_service = MandosDBusServiceTransitional()
3492
2523
"Cleanup function; run on exit"
3496
mp.active_children()
2526
multiprocessing.active_children()
3498
2527
if not (tcp_server.clients or client_settings):
3501
2530
# Store client before exiting. Secrets are encrypted with key
3502
2531
# based on what config file has. If config file is
3503
2532
# removed/edited, old secret will thus be unrecovable.
3505
2534
with PGPEngine() as pgp:
3506
for client in tcp_server.clients.values():
2535
for client in tcp_server.clients.itervalues():
3507
2536
key = client_settings[client.name]["secret"]
3508
2537
client.encrypted_secret = pgp.encrypt(client.secret,
3510
2539
client_dict = {}
3512
2541
# A list of attributes that can not be pickled
3514
exclude = {"bus", "changedstate", "secret",
3515
"checker", "server_settings"}
3516
for name, typ in inspect.getmembers(dbus.service
2543
exclude = set(("bus", "changedstate", "secret",
2545
for name, typ in (inspect.getmembers
2546
(dbus.service.Object)):
3518
2547
exclude.add(name)
3520
2549
client_dict["encrypted_secret"] = (client
3521
2550
.encrypted_secret)
3522
2551
for attr in client.client_structure:
3523
2552
if attr not in exclude:
3524
2553
client_dict[attr] = getattr(client, attr)
3526
2555
clients[client.name] = client_dict
3527
2556
del client_settings[client.name]["secret"]
3530
with tempfile.NamedTemporaryFile(
3534
dir=os.path.dirname(stored_state_path),
3535
delete=False) as stored_state:
3536
pickle.dump((clients, client_settings), stored_state,
3538
tempname = stored_state.name
2559
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2562
(stored_state_path))
2563
with os.fdopen(tempfd, "wb") as stored_state:
2564
pickle.dump((clients, client_settings), stored_state)
3539
2565
os.rename(tempname, stored_state_path)
3540
2566
except (IOError, OSError) as e: