70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
82
70
import dbus.service
83
from gi.repository import GLib
84
73
from dbus.mainloop.glib import DBusGMainLoop
87
76
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
81
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
82
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
84
from IN import SO_BINDTODEVICE
100
85
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
86
SO_BINDTODEVICE = None
119
89
stored_state_file = "clients.pickle"
121
91
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
127
100
except (OSError, AttributeError):
129
101
def if_nametoindex(interface):
130
102
"Get an interface index the hard way, i.e. using fcntl()"
131
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
104
with contextlib.closing(socket.socket()) as s:
133
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
136
110
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
113
def initlogger(debug, level=logging.WARNING):
156
114
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
116
syslogger.setFormatter(logging.Formatter
163
117
('Mandos [%(process)d]: %(levelname)s:'
165
119
logger.addHandler(syslogger)
168
122
console = logging.StreamHandler()
169
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
168
os.rmdir(self.tempdir)
227
169
self.tempdir = None
229
171
def password_encode(self, password):
230
172
# Passphrase can not be empty and can not contain newlines or
231
173
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
174
return b"mandos" + binascii.hexlify(password)
240
176
def encrypt(self, data, password):
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
256
191
return ciphertext
258
193
def decrypt(self, data, password):
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
274
208
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
304
212
class AvahiError(Exception):
305
213
def __init__(self, value, *args, **kwargs):
306
214
self.value = value
307
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))
311
219
class AvahiServiceError(AvahiError):
315
222
class AvahiGroupError(AvahiError):
319
226
class AvahiService(object):
320
227
"""An Avahi (Zeroconf) service.
323
230
interface: integer; avahi.IF_UNSPEC or an interface index.
324
231
Used to optionally bind to the specified interface.
325
232
name: string; Example: 'Mandos'
326
233
type: string; Example: '_mandos._tcp'.
327
See <https://www.iana.org/assignments/service-names-port-numbers>
234
See <http://www.dns-sd.org/ServiceTypes.html>
328
235
port: integer; what port to announce
329
236
TXT: list of strings; TXT record for the service
330
237
domain: string; Domain to publish on, default to .local if empty.
489
366
follow_name_owner_changes=True),
490
367
avahi.DBUS_INTERFACE_SERVER)
491
368
self.server.connect_to_signal("StateChanged",
492
self.server_state_changed)
369
self.server_state_changed)
493
370
self.server_state_changed(self.server.GetState())
496
372
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
498
374
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
506
# Pretend that we have a GnuTLS module
507
class GnuTLS(object):
508
"""This isn't so much a class as it is a module-like namespace.
509
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
525
# Unless otherwise indicated, the constants and types below are
526
# all from the gnutls/gnutls.h C header file.
536
E_NO_CERTIFICATE_FOUND = -49
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
# We need to use the class name "GnuTLS" here, since this
566
# exception might be raised from within GnuTLS.__init__,
567
# which is called before the assignment to the "gnutls"
568
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
570
# Default usage is by a message string, but if a return
571
# code is passed, convert it to a string with
574
if message is None and code is not None:
575
message = GnuTLS.strerror(code)
576
return super(GnuTLS.Error, self).__init__(
579
class CertificateSecurityError(Error):
583
class Credentials(object):
585
self._c_object = gnutls.certificate_credentials_t()
586
gnutls.certificate_allocate_credentials(
587
ctypes.byref(self._c_object))
588
self.type = gnutls.CRD_CERTIFICATE
591
gnutls.certificate_free_credentials(self._c_object)
593
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
595
self._c_object = gnutls.session_t()
596
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
gnutls.set_default_priority(self._c_object)
598
gnutls.transport_set_ptr(self._c_object, socket.fileno())
599
gnutls.handshake_set_private_extensions(self._c_object,
602
if credentials is None:
603
credentials = gnutls.Credentials()
604
gnutls.credentials_set(self._c_object, credentials.type,
605
ctypes.cast(credentials._c_object,
607
self.credentials = credentials
610
gnutls.deinit(self._c_object)
613
return gnutls.handshake(self._c_object)
615
def send(self, data):
619
data_len -= gnutls.record_send(self._c_object,
624
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
626
# Error handling functions
627
def _error_code(result):
628
"""A function to raise exceptions on errors, suitable
629
for the 'restype' attribute on ctypes functions"""
632
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
636
def _retry_on_error(result, func, arguments):
637
"""A function to retry on some errors, suitable
638
for the 'errcheck' attribute on ctypes functions"""
640
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
641
return _error_code(result)
642
result = func(*arguments)
645
# Unless otherwise indicated, the function declarations below are
646
# all from the gnutls/gnutls.h C header file.
649
priority_set_direct = _library.gnutls_priority_set_direct
650
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
ctypes.POINTER(ctypes.c_char_p)]
652
priority_set_direct.restype = _error_code
654
init = _library.gnutls_init
655
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
init.restype = _error_code
658
set_default_priority = _library.gnutls_set_default_priority
659
set_default_priority.argtypes = [session_t]
660
set_default_priority.restype = _error_code
662
record_send = _library.gnutls_record_send
663
record_send.argtypes = [session_t, ctypes.c_void_p,
665
record_send.restype = ctypes.c_ssize_t
666
record_send.errcheck = _retry_on_error
668
certificate_allocate_credentials = (
669
_library.gnutls_certificate_allocate_credentials)
670
certificate_allocate_credentials.argtypes = [
671
ctypes.POINTER(certificate_credentials_t)]
672
certificate_allocate_credentials.restype = _error_code
674
certificate_free_credentials = (
675
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
678
certificate_free_credentials.restype = None
680
handshake_set_private_extensions = (
681
_library.gnutls_handshake_set_private_extensions)
682
handshake_set_private_extensions.argtypes = [session_t,
684
handshake_set_private_extensions.restype = None
686
credentials_set = _library.gnutls_credentials_set
687
credentials_set.argtypes = [session_t, credentials_type_t,
689
credentials_set.restype = _error_code
691
strerror = _library.gnutls_strerror
692
strerror.argtypes = [ctypes.c_int]
693
strerror.restype = ctypes.c_char_p
695
certificate_type_get = _library.gnutls_certificate_type_get
696
certificate_type_get.argtypes = [session_t]
697
certificate_type_get.restype = _error_code
699
certificate_get_peers = _library.gnutls_certificate_get_peers
700
certificate_get_peers.argtypes = [session_t,
701
ctypes.POINTER(ctypes.c_uint)]
702
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
global_set_log_level = _library.gnutls_global_set_log_level
705
global_set_log_level.argtypes = [ctypes.c_int]
706
global_set_log_level.restype = None
708
global_set_log_function = _library.gnutls_global_set_log_function
709
global_set_log_function.argtypes = [log_func]
710
global_set_log_function.restype = None
712
deinit = _library.gnutls_deinit
713
deinit.argtypes = [session_t]
714
deinit.restype = None
716
handshake = _library.gnutls_handshake
717
handshake.argtypes = [session_t]
718
handshake.restype = _error_code
719
handshake.errcheck = _retry_on_error
721
transport_set_ptr = _library.gnutls_transport_set_ptr
722
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
transport_set_ptr.restype = None
725
bye = _library.gnutls_bye
726
bye.argtypes = [session_t, close_request_t]
727
bye.restype = _error_code
728
bye.errcheck = _retry_on_error
730
check_version = _library.gnutls_check_version
731
check_version.argtypes = [ctypes.c_char_p]
732
check_version.restype = ctypes.c_char_p
734
# All the function declarations below are from gnutls/openpgp.h
736
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
openpgp_crt_init.restype = _error_code
740
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
ctypes.POINTER(datum_t),
744
openpgp_crt_import.restype = _error_code
746
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
ctypes.POINTER(ctypes.c_uint)]
749
openpgp_crt_verify_self.restype = _error_code
751
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
openpgp_crt_deinit.restype = None
755
openpgp_crt_get_fingerprint = (
756
_library.gnutls_openpgp_crt_get_fingerprint)
757
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
761
openpgp_crt_get_fingerprint.restype = _error_code
763
# Remove non-public functions
764
del _error_code, _retry_on_error
765
# Create the global "gnutls" object, simulating a module
769
def call_pipe(connection, # : multiprocessing.Connection
770
func, *args, **kwargs):
771
"""This function is meant to be called by multiprocessing.Process
773
This function runs func(*args, **kwargs), and writes the resulting
774
return value on the provided multiprocessing.Connection.
776
connection.send(func(*args, **kwargs))
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
780
388
class Client(object):
781
389
"""A representation of a client host served by this server.
784
392
approved: bool(); 'None' if not yet approved/disapproved
785
393
approval_delay: datetime.timedelta(); Time to wait for approval
924
541
self.current_checker_command = None
925
542
self.approved = None
926
543
self.approvals_pending = 0
927
self.changedstate = multiprocessing_manager.Condition(
928
multiprocessing_manager.Lock())
929
self.client_structure = [attr
930
for attr in self.__dict__.keys()
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
931
549
if not attr.startswith("_")]
932
550
self.client_structure.append("client_structure")
934
for name, t in inspect.getmembers(
935
type(self), lambda obj: isinstance(obj, property)):
552
for name, t in inspect.getmembers(type(self),
936
556
if not name.startswith("_"):
937
557
self.client_structure.append(name)
939
559
# Send notice to process children that client state has changed
940
560
def send_changedstate(self):
941
561
with self.changedstate:
942
562
self.changedstate.notify_all()
944
564
def enable(self):
945
565
"""Start this client's checker and timeout hooks"""
946
566
if getattr(self, "enabled", False):
947
567
# Already enabled
569
self.send_changedstate()
949
570
self.expires = datetime.datetime.utcnow() + self.timeout
950
571
self.enabled = True
951
572
self.last_enabled = datetime.datetime.utcnow()
952
573
self.init_checker()
953
self.send_changedstate()
955
575
def disable(self, quiet=True):
956
576
"""Disable this client."""
957
577
if not getattr(self, "enabled", False):
580
self.send_changedstate()
960
582
logger.info("Disabling client %s", self.name)
961
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
583
if getattr(self, "disable_initiator_tag", False):
584
gobject.source_remove(self.disable_initiator_tag)
963
585
self.disable_initiator_tag = None
964
586
self.expires = None
965
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
587
if getattr(self, "checker_initiator_tag", False):
588
gobject.source_remove(self.checker_initiator_tag)
967
589
self.checker_initiator_tag = None
968
590
self.stop_checker()
969
591
self.enabled = False
971
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
592
# Do not run this again if called by a gobject.timeout_add
975
595
def __del__(self):
978
598
def init_checker(self):
979
599
# Schedule a new checker to be started an 'interval' from now,
980
600
# and every interval from then on.
981
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
986
604
# Schedule a disable() when 'timeout' has passed
987
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
990
int(self.timeout.total_seconds() * 1000), self.disable)
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
991
608
# Also start a new checker *right now*.
992
609
self.start_checker()
994
def checker_callback(self, source, condition, connection,
611
def checker_callback(self, pid, condition, command):
996
612
"""The checker has completed, so take appropriate actions."""
997
613
self.checker_callback_tag = None
998
614
self.checker = None
999
# Read return code from connection (see call_pipe)
1000
returncode = connection.recv()
1004
self.last_checker_status = returncode
1005
self.last_checker_signal = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
1006
617
if self.last_checker_status == 0:
1007
618
logger.info("Checker for %(name)s succeeded",
1009
620
self.checked_ok()
1011
logger.info("Checker for %(name)s failed", vars(self))
622
logger.info("Checker for %(name)s failed",
1013
625
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
1015
626
logger.warning("Checker for %(name)s crashed?",
1019
def checked_ok(self):
1020
"""Assert that the client has been seen, alive and well."""
1021
self.last_checked_ok = datetime.datetime.utcnow()
1022
self.last_checker_status = 0
1023
self.last_checker_signal = None
1026
def bump_timeout(self, timeout=None):
1027
"""Bump up the timeout for this client."""
629
def checked_ok(self, timeout=None):
630
"""Bump up the timeout for this client.
632
This should only be called when the client has been seen,
1028
635
if timeout is None:
1029
636
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
1030
638
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
1032
self.disable_initiator_tag = None
639
gobject.source_remove(self.disable_initiator_tag)
1033
640
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
1036
644
self.expires = datetime.datetime.utcnow() + timeout
1038
646
def need_approval(self):
1039
647
self.last_approval_request = datetime.datetime.utcnow()
1041
649
def start_checker(self):
1042
650
"""Start a new checker subprocess if one is not running.
1044
652
If a checker already exists, leave it running and do
1046
654
# The reason for not killing a running checker is that if we
1047
# did that, and if a checker (for some reason) started running
1048
# slowly and taking more than 'interval' time, then the client
1049
# would inevitably timeout, since no checker would get a
1050
# chance to run to completion. If we instead leave running
655
# did that, then if a checker (for some reason) started
656
# running slowly and taking more than 'interval' time, the
657
# client would inevitably timeout, since no checker would get
658
# a chance to run to completion. If we instead leave running
1051
659
# checkers alone, the checker would have to take more time
1052
660
# than 'timeout' for the client to be disabled, which is as it
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
663
# If a checker exists, make sure it is not a zombie
665
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
except (AttributeError, OSError) as error:
667
if (isinstance(error, OSError)
668
and error.errno != errno.ECHILD):
672
logger.warning("Checker was a zombie")
673
gobject.source_remove(self.checker_callback_tag)
674
self.checker_callback(pid, status,
675
self.current_checker_command)
1059
676
# Start a new checker if needed
1060
677
if self.checker is None:
1061
# Escape attributes for the shell
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
1066
command = self.checker_command % escaped_attrs
1067
except TypeError as error:
1068
logger.error('Could not format string "%s"',
1069
self.checker_command,
1071
return True # Try again later
679
# In case checker_command has exactly one % operator
680
command = self.checker_command % self.host
682
# Escape attributes for the shell
683
escaped_attrs = dict(
685
re.escape(unicode(str(getattr(self, attr, "")),
689
self.runtime_expansions)
692
command = self.checker_command % escaped_attrs
693
except TypeError as error:
694
logger.error('Could not format string "%s":'
695
' %s', self.checker_command, error)
696
return True # Try again later
1072
697
self.current_checker_command = command
1073
logger.info("Starting checker %r for %s", command,
1075
# We don't need to redirect stdout and stderr, since
1076
# in normal mode, that is already done by daemon(),
1077
# and in debug mode we don't want to. (Stdin is
1078
# always replaced by /dev/null.)
1079
# The exception is when not debugging but nevertheless
1080
# running in the foreground; use the previously
1082
popen_args = {"close_fds": True,
1085
if (not self.server_settings["debug"]
1086
and self.server_settings["foreground"]):
1087
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
1090
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
1094
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1097
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
699
logger.info("Starting checker %r for %s",
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
self.checker = subprocess.Popen(command,
708
self.checker_callback_tag = (gobject.child_watch_add
710
self.checker_callback,
712
# The checker may have completed before the gobject
713
# watch was added. Check for this.
714
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
716
gobject.source_remove(self.checker_callback_tag)
717
self.checker_callback(pid, status, command)
718
except OSError as error:
719
logger.error("Failed to start subprocess: %s",
721
# Re-run this periodically if run by gobject.timeout_add
1101
724
def stop_checker(self):
1102
725
"""Force the checker process, if any, to stop."""
1103
726
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
727
gobject.source_remove(self.checker_callback_tag)
1105
728
self.checker_callback_tag = None
1106
729
if getattr(self, "checker", None) is None:
1108
731
logger.debug("Stopping checker for %(name)s", vars(self))
1109
self.checker.terminate()
733
os.kill(self.checker.pid, signal.SIGTERM)
735
#if self.checker.poll() is None:
736
# os.kill(self.checker.pid, signal.SIGKILL)
737
except OSError as error:
738
if error.errno != errno.ESRCH: # No such process
1110
740
self.checker = None
1113
def dbus_service_property(dbus_interface,
743
def dbus_service_property(dbus_interface, signature="v",
744
access="readwrite", byte_arrays=False):
1117
745
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
746
become properties on the D-Bus.
1120
748
The decorated method will be called with no arguments by "Get"
1121
749
and with one argument by "Set".
1123
751
The parameters, where they are supported, are the same as
1124
752
dbus.service.method, except there is only "signature", since the
1125
753
type from Get() and the type sent to Set() is the same.
1208
class DBusObjectWithAnnotations(dbus.service.Object):
1209
"""A D-Bus object with annotations.
1211
Classes inheriting from this can use the dbus_annotations
1212
decorator to add annotations to methods or signals.
1216
def _is_dbus_thing(thing):
1217
"""Returns a function testing if an attribute is a D-Bus thing
1219
If called like _is_dbus_thing("method") it returns a function
1220
suitable for use as predicate to inspect.getmembers().
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1225
def _get_all_dbus_things(self, thing):
1226
"""Returns a generator of (name, attribute) pairs
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
1229
athing.__get__(self))
1230
for cls in self.__class__.__mro__
1232
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1234
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1238
def Introspect(self, object_path, connection):
1239
"""Overloading of standard D-Bus method.
1241
Inserts annotation tags on methods and signals.
1243
xmlstring = dbus.service.Object.Introspect(self, object_path,
1246
document = xml.dom.minidom.parseString(xmlstring)
1248
for if_tag in document.getElementsByTagName("interface"):
1249
# Add annotation tags
1250
for typ in ("method", "signal"):
1251
for tag in if_tag.getElementsByTagName(typ):
1253
for name, prop in (self.
1254
_get_all_dbus_things(typ)):
1255
if (name == tag.getAttribute("name")
1256
and prop._dbus_interface
1257
== if_tag.getAttribute("name")):
1258
annots.update(getattr(
1259
prop, "_dbus_annotations", {}))
1260
for name, value in annots.items():
1261
ann_tag = document.createElement(
1263
ann_tag.setAttribute("name", name)
1264
ann_tag.setAttribute("value", value)
1265
tag.appendChild(ann_tag)
1266
# Add interface annotation tags
1267
for annotation, value in dict(
1268
itertools.chain.from_iterable(
1269
annotations().items()
1270
for name, annotations
1271
in self._get_all_dbus_things("interface")
1272
if name == if_tag.getAttribute("name")
1274
ann_tag = document.createElement("annotation")
1275
ann_tag.setAttribute("name", annotation)
1276
ann_tag.setAttribute("value", value)
1277
if_tag.appendChild(ann_tag)
1278
# Fix argument name for the Introspect method itself
1279
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1281
for cn in if_tag.getElementsByTagName("method"):
1282
if cn.getAttribute("name") == "Introspect":
1283
for arg in cn.getElementsByTagName("arg"):
1284
if (arg.getAttribute("direction")
1286
arg.setAttribute("name",
1288
xmlstring = document.toxml("utf-8")
1290
except (AttributeError, xml.dom.DOMException,
1291
xml.parsers.expat.ExpatError) as error:
1292
logger.error("Failed to override Introspection method",
1297
class DBusObjectWithProperties(DBusObjectWithAnnotations):
792
class DBusObjectWithProperties(dbus.service.Object):
1298
793
"""A D-Bus object with properties.
1300
795
Classes inheriting from this can use the dbus_service_property
1301
796
decorator to expose methods as D-Bus properties. It exposes the
1302
797
standard Get(), Set(), and GetAll() methods on the D-Bus.
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
804
def _get_all_dbus_properties(self):
805
"""Returns a generator of (name, attribute) pairs
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
for cls in self.__class__.__mro__
810
inspect.getmembers(cls, self._is_dbus_property))
1305
812
def _get_dbus_property(self, interface_name, property_name):
1306
813
"""Returns a bound method if one exists which is a D-Bus
1307
814
property with the specified name and interface.
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
1312
819
if (value._dbus_name == property_name
1313
820
and value._dbus_interface == interface_name):
1314
821
return value.__get__(self)
1316
823
# No such property
1317
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
self.dbus_object_path, interface_name, property_name))
1321
def _get_all_interface_names(cls):
1322
"""Get a sequence of all interfaces supported by an object"""
1323
return (name for name in set(getattr(getattr(x, attr),
1324
"_dbus_interface", None)
1325
for x in (inspect.getmro(cls))
1327
if name is not None)
1329
@dbus.service.method(dbus.PROPERTIES_IFACE,
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1331
829
out_signature="v")
1332
830
def Get(self, interface_name, property_name):
1333
831
"""Standard D-Bus property Get() method, see D-Bus standard.
1380
875
if not hasattr(value, "variant_level"):
1381
876
properties[name] = value
1383
properties[name] = type(value)(
1384
value, variant_level=value.variant_level + 1)
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
1385
880
return dbus.Dictionary(properties, signature="sv")
1387
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1388
def PropertiesChanged(self, interface_name, changed_properties,
1389
invalidated_properties):
1390
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1395
882
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1396
883
out_signature="s",
1397
884
path_keyword='object_path',
1398
885
connection_keyword='connection')
1399
886
def Introspect(self, object_path, connection):
1400
"""Overloading of standard D-Bus method.
1402
Inserts property tags and interface annotation tags.
887
"""Standard D-Bus method, overloaded to insert property tags.
1404
xmlstring = DBusObjectWithAnnotations.Introspect(self,
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
1408
892
document = xml.dom.minidom.parseString(xmlstring)
1410
893
def make_tag(document, name, prop):
1411
894
e = document.createElement("property")
1412
895
e.setAttribute("name", name)
1413
896
e.setAttribute("type", prop._dbus_signature)
1414
897
e.setAttribute("access", prop._dbus_access)
1417
899
for if_tag in document.getElementsByTagName("interface"):
1419
900
for tag in (make_tag(document, name, prop)
1421
in self._get_all_dbus_things("property")
902
in self._get_all_dbus_properties()
1422
903
if prop._dbus_interface
1423
904
== if_tag.getAttribute("name")):
1424
905
if_tag.appendChild(tag)
1425
# Add annotation tags for properties
1426
for tag in if_tag.getElementsByTagName("property"):
1428
for name, prop in self._get_all_dbus_things(
1430
if (name == tag.getAttribute("name")
1431
and prop._dbus_interface
1432
== if_tag.getAttribute("name")):
1433
annots.update(getattr(
1434
prop, "_dbus_annotations", {}))
1435
for name, value in annots.items():
1436
ann_tag = document.createElement(
1438
ann_tag.setAttribute("name", name)
1439
ann_tag.setAttribute("value", value)
1440
tag.appendChild(ann_tag)
1441
906
# Add the names to the return values for the
1442
907
# "org.freedesktop.DBus.Properties" methods
1443
908
if (if_tag.getAttribute("name")
1458
923
except (AttributeError, xml.dom.DOMException,
1459
924
xml.parsers.expat.ExpatError) as error:
1460
925
logger.error("Failed to override Introspection method",
1466
dbus.OBJECT_MANAGER_IFACE
1467
except AttributeError:
1468
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1471
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
"""A D-Bus object with an ObjectManager.
1474
Classes inheriting from this exposes the standard
1475
GetManagedObjects call and the InterfacesAdded and
1476
InterfacesRemoved signals on the standard
1477
"org.freedesktop.DBus.ObjectManager" interface.
1479
Note: No signals are sent automatically; they must be sent
1482
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1484
def GetManagedObjects(self):
1485
"""This function must be overridden"""
1486
raise NotImplementedError()
1488
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1490
def InterfacesAdded(self, object_path, interfaces_and_properties):
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1494
def InterfacesRemoved(self, object_path, interfaces):
1497
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1501
def Introspect(self, object_path, connection):
1502
"""Overloading of standard D-Bus method.
1504
Override return argument name of GetManagedObjects to be
1505
"objpath_interfaces_and_properties"
1507
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1511
document = xml.dom.minidom.parseString(xmlstring)
1513
for if_tag in document.getElementsByTagName("interface"):
1514
# Fix argument name for the GetManagedObjects method
1515
if (if_tag.getAttribute("name")
1516
== dbus.OBJECT_MANAGER_IFACE):
1517
for cn in if_tag.getElementsByTagName("method"):
1518
if (cn.getAttribute("name")
1519
== "GetManagedObjects"):
1520
for arg in cn.getElementsByTagName("arg"):
1521
if (arg.getAttribute("direction")
1525
"objpath_interfaces"
1527
xmlstring = document.toxml("utf-8")
1529
except (AttributeError, xml.dom.DOMException,
1530
xml.parsers.expat.ExpatError) as error:
1531
logger.error("Failed to override Introspection method",
1536
def datetime_to_dbus(dt, variant_level=0):
930
def datetime_to_dbus (dt, variant_level=0):
1537
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1539
return dbus.String("", variant_level=variant_level)
1540
return dbus.String(dt.isoformat(), variant_level=variant_level)
1543
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1544
"""A class decorator; applied to a subclass of
1545
dbus.service.Object, it will add alternate D-Bus attributes with
1546
interface names according to the "alt_interface_names" mapping.
1549
@alternate_dbus_interfaces({"org.example.Interface":
1550
"net.example.AlternateInterface"})
1551
class SampleDBusObject(dbus.service.Object):
1552
@dbus.service.method("org.example.Interface")
1553
def SampleDBusMethod():
1556
The above "SampleDBusMethod" on "SampleDBusObject" will be
1557
reachable via two interfaces: "org.example.Interface" and
1558
"net.example.AlternateInterface", the latter of which will have
1559
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1560
"true", unless "deprecate" is passed with a False value.
1562
This works for methods and signals, and also for D-Bus properties
1563
(from DBusObjectWithProperties) and interfaces (from the
1564
dbus_interface_annotations decorator).
933
return dbus.String("", variant_level = variant_level)
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
1568
for orig_interface_name, alt_interface_name in (
1569
alt_interface_names.items()):
1571
interface_names = set()
1572
# Go though all attributes of the class
1573
for attrname, attribute in inspect.getmembers(cls):
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
1574
950
# Ignore non-D-Bus attributes, and D-Bus attributes
1575
951
# with the wrong interface name
1576
952
if (not hasattr(attribute, "_dbus_interface")
1577
or not attribute._dbus_interface.startswith(
1578
orig_interface_name)):
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1580
956
# Create an alternate D-Bus interface name based on
1581
957
# the current name
1582
alt_interface = attribute._dbus_interface.replace(
1583
orig_interface_name, alt_interface_name)
1584
interface_names.add(alt_interface)
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1585
961
# Is this a D-Bus signal?
1586
962
if getattr(attribute, "_dbus_is_signal", False):
1587
# Extract the original non-method undecorated
1588
# function by black magic
1589
if sys.version_info.major == 2:
1590
nonmethod_func = (dict(
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
1591
966
zip(attribute.func_code.co_freevars,
1592
attribute.__closure__))
1593
["func"].cell_contents)
1595
nonmethod_func = (dict(
1596
zip(attribute.__code__.co_freevars,
1597
attribute.__closure__))
1598
["func"].cell_contents)
967
attribute.__closure__))["func"]
1599
969
# Create a new, but exactly alike, function
1600
970
# object, and decorate it to be a new D-Bus signal
1601
971
# with the alternate D-Bus interface name
1602
new_function = copy_function(nonmethod_func)
1603
new_function = (dbus.service.signal(
1605
attribute._dbus_signature)(new_function))
1606
# Copy annotations, if any
1608
new_function._dbus_annotations = dict(
1609
attribute._dbus_annotations)
1610
except AttributeError:
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
1613
981
# Define a creator of a function to call both the
1614
# original and alternate functions, so both the
1615
# original and alternate signals gets sent when
1616
# the function is called
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1617
984
def fixscope(func1, func2):
1618
985
"""This function is a scope container to pass
1619
986
func1 and func2 to the "call_both" function
1620
987
outside of its arguments"""
1622
@functools.wraps(func2)
1623
988
def call_both(*args, **kwargs):
1624
989
"""This function will emit two D-Bus
1625
990
signals by calling func1 and func2"""
1626
991
func1(*args, **kwargs)
1627
992
func2(*args, **kwargs)
1628
# Make wrapper function look like a D-Bus
1630
for name, attr in inspect.getmembers(func2):
1631
if name.startswith("_dbus_"):
1632
setattr(call_both, name, attr)
1634
993
return call_both
1635
994
# Create the "call_both" function and add it to
1637
attr[attrname] = fixscope(attribute, new_function)
996
attr[attrname] = fixscope(attribute,
1638
998
# Is this a D-Bus method?
1639
999
elif getattr(attribute, "_dbus_is_method", False):
1640
1000
# Create a new, but exactly alike, function
1641
1001
# object. Decorate it to be a new D-Bus method
1642
1002
# with the alternate D-Bus interface name. Add it
1643
1003
# to the class.
1645
dbus.service.method(
1647
attribute._dbus_in_signature,
1648
attribute._dbus_out_signature)
1649
(copy_function(attribute)))
1650
# Copy annotations, if any
1652
attr[attrname]._dbus_annotations = dict(
1653
attribute._dbus_annotations)
1654
except AttributeError:
1004
attr[attrname] = (dbus.service.method
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1656
1014
# Is this a D-Bus property?
1657
1015
elif getattr(attribute, "_dbus_is_property", False):
1658
1016
# Create a new, but exactly alike, function
1659
1017
# object, and decorate it to be a new D-Bus
1660
1018
# property with the alternate D-Bus interface
1661
1019
# name. Add it to the class.
1662
attr[attrname] = (dbus_service_property(
1663
alt_interface, attribute._dbus_signature,
1664
attribute._dbus_access,
1665
attribute._dbus_get_args_options
1667
(copy_function(attribute)))
1668
# Copy annotations, if any
1670
attr[attrname]._dbus_annotations = dict(
1671
attribute._dbus_annotations)
1672
except AttributeError:
1674
# Is this a D-Bus interface?
1675
elif getattr(attribute, "_dbus_is_interface", False):
1676
# Create a new, but exactly alike, function
1677
# object. Decorate it to be a new D-Bus interface
1678
# with the alternate D-Bus interface name. Add it
1681
dbus_interface_annotations(alt_interface)
1682
(copy_function(attribute)))
1684
# Deprecate all alternate interfaces
1685
iname = "_AlternateDBusNames_interface_annotation{}"
1686
for interface_name in interface_names:
1688
@dbus_interface_annotations(interface_name)
1690
return {"org.freedesktop.DBus.Deprecated":
1692
# Find an unused name
1693
for aname in (iname.format(i)
1694
for i in itertools.count()):
1695
if aname not in attr:
1699
# Replace the class with a new subclass of it with
1700
# methods, signals, etc. as created above.
1701
if sys.version_info.major == 2:
1702
cls = type(b"{}Alternate".format(cls.__name__),
1705
cls = type("{}Alternate".format(cls.__name__),
1712
@alternate_dbus_interfaces({"se.recompile.Mandos":
1713
"se.bsnet.fukt.Mandos"})
1020
attr[attrname] = (dbus_service_property
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1025
._dbus_get_args_options
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1714
1036
class ClientDBus(Client, DBusObjectWithProperties):
1715
1037
"""A Client class using D-Bus
1718
1040
dbus_object_path: dbus.ObjectPath
1719
1041
bus: dbus.SystemBus()
1722
1044
runtime_expansions = (Client.runtime_expansions
1723
+ ("dbus_object_path", ))
1725
_interface = "se.recompile.Mandos.Client"
1045
+ ("dbus_object_path",))
1727
1047
# dbus.service.Object doesn't use super(), so we can't either.
1729
def __init__(self, bus=None, *args, **kwargs):
1049
def __init__(self, bus = None, *args, **kwargs):
1731
1051
Client.__init__(self, *args, **kwargs)
1732
1052
# Only now, when this client is initialized, can it show up on
1734
client_object_name = str(self.name).translate(
1054
client_object_name = unicode(self.name).translate(
1735
1055
{ord("."): ord("_"),
1736
1056
ord("-"): ord("_")})
1737
self.dbus_object_path = dbus.ObjectPath(
1738
"/clients/" + client_object_name)
1057
self.dbus_object_path = (dbus.ObjectPath
1058
("/clients/" + client_object_name))
1739
1059
DBusObjectWithProperties.__init__(self, self.bus,
1740
1060
self.dbus_object_path)
1742
def notifychangeproperty(transform_func, dbus_name,
1743
type_func=lambda x: x,
1745
invalidate_only=False,
1746
_interface=_interface):
1062
def notifychangeproperty(transform_func,
1063
dbus_name, type_func=lambda x: x,
1747
1065
""" Modify a variable so that it's a property which announces
1748
1066
its changes to DBus.
1750
1068
transform_fun: Function that takes a value and a variant_level
1751
1069
and transforms it to a D-Bus type.
1752
1070
dbus_name: D-Bus name of the variable
1754
1072
to the D-Bus. Default: no transform
1755
1073
variant_level: D-Bus variant level. Default: 1
1757
attrname = "_{}".format(dbus_name)
1075
attrname = "_{0}".format(dbus_name)
1759
1076
def setter(self, value):
1760
1077
if hasattr(self, "dbus_object_path"):
1761
1078
if (not hasattr(self, attrname) or
1762
1079
type_func(getattr(self, attrname, None))
1763
1080
!= type_func(value)):
1765
self.PropertiesChanged(
1766
_interface, dbus.Dictionary(),
1767
dbus.Array((dbus_name, )))
1769
dbus_value = transform_func(
1771
variant_level=variant_level)
1772
self.PropertyChanged(dbus.String(dbus_name),
1774
self.PropertiesChanged(
1776
dbus.Dictionary({dbus.String(dbus_name):
1081
dbus_value = transform_func(type_func(value),
1084
self.PropertyChanged(dbus.String(dbus_name),
1779
1086
setattr(self, attrname, value)
1781
1088
return property(lambda self: getattr(self, attrname), setter)
1783
1091
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1784
1092
approvals_pending = notifychangeproperty(dbus.Boolean,
1785
1093
"ApprovalPending",
1787
1095
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1788
1096
last_enabled = notifychangeproperty(datetime_to_dbus,
1790
checker = notifychangeproperty(
1791
dbus.Boolean, "CheckerRunning",
1792
type_func=lambda checker: checker is not None)
1098
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1099
type_func = lambda checker:
1100
checker is not None)
1793
1101
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1794
1102
"LastCheckedOK")
1795
last_checker_status = notifychangeproperty(dbus.Int16,
1796
"LastCheckerStatus")
1797
1103
last_approval_request = notifychangeproperty(
1798
1104
datetime_to_dbus, "LastApprovalRequest")
1799
1105
approved_by_default = notifychangeproperty(dbus.Boolean,
1800
1106
"ApprovedByDefault")
1801
approval_delay = notifychangeproperty(
1802
dbus.UInt64, "ApprovalDelay",
1803
type_func=lambda td: td.total_seconds() * 1000)
1107
approval_delay = notifychangeproperty(dbus.UInt64,
1110
timedelta_to_milliseconds)
1804
1111
approval_duration = notifychangeproperty(
1805
1112
dbus.UInt64, "ApprovalDuration",
1806
type_func=lambda td: td.total_seconds() * 1000)
1113
type_func = timedelta_to_milliseconds)
1807
1114
host = notifychangeproperty(dbus.String, "Host")
1808
timeout = notifychangeproperty(
1809
dbus.UInt64, "Timeout",
1810
type_func=lambda td: td.total_seconds() * 1000)
1115
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1117
timedelta_to_milliseconds)
1811
1118
extended_timeout = notifychangeproperty(
1812
1119
dbus.UInt64, "ExtendedTimeout",
1813
type_func=lambda td: td.total_seconds() * 1000)
1814
interval = notifychangeproperty(
1815
dbus.UInt64, "Interval",
1816
type_func=lambda td: td.total_seconds() * 1000)
1120
type_func = timedelta_to_milliseconds)
1121
interval = notifychangeproperty(dbus.UInt64,
1124
timedelta_to_milliseconds)
1817
1125
checker_command = notifychangeproperty(dbus.String, "Checker")
1818
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1819
invalidate_only=True)
1821
1127
del notifychangeproperty
1823
1129
def __del__(self, *args, **kwargs):
1825
1131
self.remove_from_connection()
1904
1211
server to mandos-client
1908
1215
# Rejected - signal
1909
1216
@dbus.service.signal(_interface, signature="s")
1910
1217
def Rejected(self, reason):
1914
1221
# NeedApproval - signal
1915
1222
@dbus.service.signal(_interface, signature="tb")
1916
1223
def NeedApproval(self, timeout, default):
1918
1225
return self.need_approval()
1922
1229
# Approve - method
1923
1230
@dbus.service.method(_interface, in_signature="b")
1924
1231
def Approve(self, value):
1925
1232
self.approve(value)
1927
1234
# CheckedOK - method
1928
1235
@dbus.service.method(_interface)
1929
1236
def CheckedOK(self):
1930
1237
self.checked_ok()
1932
1239
# Enable - method
1933
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1934
1240
@dbus.service.method(_interface)
1935
1241
def Enable(self):
1939
1245
# StartChecker - method
1940
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1941
1246
@dbus.service.method(_interface)
1942
1247
def StartChecker(self):
1944
1249
self.start_checker()
1946
1251
# Disable - method
1947
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1948
1252
@dbus.service.method(_interface)
1949
1253
def Disable(self):
1953
1257
# StopChecker - method
1954
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1955
1258
@dbus.service.method(_interface)
1956
1259
def StopChecker(self):
1957
1260
self.stop_checker()
1961
1264
# ApprovalPending - property
1962
1265
@dbus_service_property(_interface, signature="b", access="read")
1963
1266
def ApprovalPending_dbus_property(self):
1964
1267
return dbus.Boolean(bool(self.approvals_pending))
1966
1269
# ApprovedByDefault - property
1967
@dbus_service_property(_interface,
1270
@dbus_service_property(_interface, signature="b",
1969
1271
access="readwrite")
1970
1272
def ApprovedByDefault_dbus_property(self, value=None):
1971
1273
if value is None: # get
1972
1274
return dbus.Boolean(self.approved_by_default)
1973
1275
self.approved_by_default = bool(value)
1975
1277
# ApprovalDelay - property
1976
@dbus_service_property(_interface,
1278
@dbus_service_property(_interface, signature="t",
1978
1279
access="readwrite")
1979
1280
def ApprovalDelay_dbus_property(self, value=None):
1980
1281
if value is None: # get
1981
return dbus.UInt64(self.approval_delay.total_seconds()
1282
return dbus.UInt64(self.approval_delay_milliseconds())
1983
1283
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1985
1285
# ApprovalDuration - property
1986
@dbus_service_property(_interface,
1286
@dbus_service_property(_interface, signature="t",
1988
1287
access="readwrite")
1989
1288
def ApprovalDuration_dbus_property(self, value=None):
1990
1289
if value is None: # get
1991
return dbus.UInt64(self.approval_duration.total_seconds()
1290
return dbus.UInt64(timedelta_to_milliseconds(
1291
self.approval_duration))
1993
1292
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1995
1294
# Name - property
1997
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1998
1295
@dbus_service_property(_interface, signature="s", access="read")
1999
1296
def Name_dbus_property(self):
2000
1297
return dbus.String(self.name)
2002
1299
# Fingerprint - property
2004
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2005
1300
@dbus_service_property(_interface, signature="s", access="read")
2006
1301
def Fingerprint_dbus_property(self):
2007
1302
return dbus.String(self.fingerprint)
2009
1304
# Host - property
2010
@dbus_service_property(_interface,
1305
@dbus_service_property(_interface, signature="s",
2012
1306
access="readwrite")
2013
1307
def Host_dbus_property(self, value=None):
2014
1308
if value is None: # get
2015
1309
return dbus.String(self.host)
2016
self.host = str(value)
1310
self.host = unicode(value)
2018
1312
# Created - property
2020
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2021
1313
@dbus_service_property(_interface, signature="s", access="read")
2022
1314
def Created_dbus_property(self):
2023
1315
return datetime_to_dbus(self.created)
2025
1317
# LastEnabled - property
2026
1318
@dbus_service_property(_interface, signature="s", access="read")
2027
1319
def LastEnabled_dbus_property(self):
2028
1320
return datetime_to_dbus(self.last_enabled)
2030
1322
# Enabled - property
2031
@dbus_service_property(_interface,
1323
@dbus_service_property(_interface, signature="b",
2033
1324
access="readwrite")
2034
1325
def Enabled_dbus_property(self, value=None):
2035
1326
if value is None: # get
2042
1333
# LastCheckedOK - property
2043
@dbus_service_property(_interface,
1334
@dbus_service_property(_interface, signature="s",
2045
1335
access="readwrite")
2046
1336
def LastCheckedOK_dbus_property(self, value=None):
2047
1337
if value is not None:
2048
1338
self.checked_ok()
2050
1340
return datetime_to_dbus(self.last_checked_ok)
2052
# LastCheckerStatus - property
2053
@dbus_service_property(_interface, signature="n", access="read")
2054
def LastCheckerStatus_dbus_property(self):
2055
return dbus.Int16(self.last_checker_status)
2057
1342
# Expires - property
2058
1343
@dbus_service_property(_interface, signature="s", access="read")
2059
1344
def Expires_dbus_property(self):
2060
1345
return datetime_to_dbus(self.expires)
2062
1347
# LastApprovalRequest - property
2063
1348
@dbus_service_property(_interface, signature="s", access="read")
2064
1349
def LastApprovalRequest_dbus_property(self):
2065
1350
return datetime_to_dbus(self.last_approval_request)
2067
1352
# Timeout - property
2068
@dbus_service_property(_interface,
1353
@dbus_service_property(_interface, signature="t",
2070
1354
access="readwrite")
2071
1355
def Timeout_dbus_property(self, value=None):
2072
1356
if value is None: # get
2073
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2074
old_timeout = self.timeout
1357
return dbus.UInt64(self.timeout_milliseconds())
2075
1358
self.timeout = datetime.timedelta(0, 0, 0, value)
2076
# Reschedule disabling
1359
# Reschedule timeout
2077
1360
if self.enabled:
2078
1361
now = datetime.datetime.utcnow()
2079
self.expires += self.timeout - old_timeout
2080
if self.expires <= now:
1362
time_to_die = timedelta_to_milliseconds(
1363
(self.last_checked_ok + self.timeout) - now)
1364
if time_to_die <= 0:
2081
1365
# The timeout has passed
1368
self.expires = (now +
1369
datetime.timedelta(milliseconds =
2084
1371
if (getattr(self, "disable_initiator_tag", None)
2087
GLib.source_remove(self.disable_initiator_tag)
2088
self.disable_initiator_tag = GLib.timeout_add(
2089
int((self.expires - now).total_seconds() * 1000),
1374
gobject.source_remove(self.disable_initiator_tag)
1375
self.disable_initiator_tag = (gobject.timeout_add
2092
1379
# ExtendedTimeout - property
2093
@dbus_service_property(_interface,
1380
@dbus_service_property(_interface, signature="t",
2095
1381
access="readwrite")
2096
1382
def ExtendedTimeout_dbus_property(self, value=None):
2097
1383
if value is None: # get
2098
return dbus.UInt64(self.extended_timeout.total_seconds()
1384
return dbus.UInt64(self.extended_timeout_milliseconds())
2100
1385
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2102
1387
# Interval - property
2103
@dbus_service_property(_interface,
1388
@dbus_service_property(_interface, signature="t",
2105
1389
access="readwrite")
2106
1390
def Interval_dbus_property(self, value=None):
2107
1391
if value is None: # get
2108
return dbus.UInt64(self.interval.total_seconds() * 1000)
1392
return dbus.UInt64(self.interval_milliseconds())
2109
1393
self.interval = datetime.timedelta(0, 0, 0, value)
2110
1394
if getattr(self, "checker_initiator_tag", None) is None:
2112
1396
if self.enabled:
2113
1397
# Reschedule checker run
2114
GLib.source_remove(self.checker_initiator_tag)
2115
self.checker_initiator_tag = GLib.timeout_add(
2116
value, self.start_checker)
2117
self.start_checker() # Start one now, too
1398
gobject.source_remove(self.checker_initiator_tag)
1399
self.checker_initiator_tag = (gobject.timeout_add
1400
(value, self.start_checker))
1401
self.start_checker() # Start one now, too
2119
1403
# Checker - property
2120
@dbus_service_property(_interface,
1404
@dbus_service_property(_interface, signature="s",
2122
1405
access="readwrite")
2123
1406
def Checker_dbus_property(self, value=None):
2124
1407
if value is None: # get
2125
1408
return dbus.String(self.checker_command)
2126
self.checker_command = str(value)
1409
self.checker_command = unicode(value)
2128
1411
# CheckerRunning - property
2129
@dbus_service_property(_interface,
1412
@dbus_service_property(_interface, signature="b",
2131
1413
access="readwrite")
2132
1414
def CheckerRunning_dbus_property(self, value=None):
2133
1415
if value is None: # get
2174
1448
if data[0] == 'data':
2176
1450
if data[0] == 'function':
2178
1451
def func(*args, **kwargs):
2179
1452
self._pipe.send(('funcall', name, args, kwargs))
2180
1453
return self._pipe.recv()[1]
2184
1456
def __setattr__(self, name, value):
2185
1457
if name == '_pipe':
2186
1458
return super(ProxyClient, self).__setattr__(name, value)
2187
1459
self._pipe.send(('setattr', name, value))
1462
class ClientDBusTransitional(ClientDBus):
1463
__metaclass__ = AlternateDBusNamesMetaclass
2190
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
2191
1467
"""A class to handle client connections.
2193
1469
Instantiated once for each connection to handle it.
2194
1470
Note: This will run in its own forked process."""
2196
1472
def handle(self):
2197
1473
with contextlib.closing(self.server.child_pipe) as child_pipe:
2198
1474
logger.info("TCP connection from: %s",
2199
str(self.client_address))
1475
unicode(self.client_address))
2200
1476
logger.debug("Pipe FD: %d",
2201
1477
self.server.child_pipe.fileno())
2203
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
1479
session = (gnutls.connection
1480
.ClientSession(self.request,
1482
.X509Credentials()))
1484
# Note: gnutls.connection.X509Credentials is really a
1485
# generic GnuTLS certificate credentials object so long as
1486
# no X.509 keys are added to it. Therefore, we can use it
1487
# here despite using OpenPGP certificates.
1489
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1490
# "+AES-256-CBC", "+SHA1",
1491
# "+COMP-NULL", "+CTYPE-OPENPGP",
2209
1493
# Use a fallback default, since this MUST be set.
2210
1494
priority = self.server.gnutls_priority
2211
1495
if priority is None:
2212
1496
priority = "NORMAL"
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
1497
(gnutls.library.functions
1498
.gnutls_priority_set_direct(session._c_object,
2217
1501
# Start communication using the Mandos protocol
2218
1502
# Get protocol number
2219
1503
line = self.request.makefile().readline()
2220
1504
logger.debug("Protocol version: %r", line)
2222
1506
if int(line.strip().split()[0]) > 1:
2223
raise RuntimeError(line)
2224
1508
except (ValueError, IndexError, RuntimeError) as error:
2225
1509
logger.error("Unknown protocol version: %s", error)
2228
1512
# Start GnuTLS connection
2230
1514
session.handshake()
2231
except gnutls.Error as error:
1515
except gnutls.errors.GNUTLSError as error:
2232
1516
logger.warning("Handshake failed: %s", error)
2233
1517
# Do not run session.bye() here: the session is not
2234
1518
# established. Just abandon the request.
2236
1520
logger.debug("Handshake succeeded")
2238
1522
approval_required = False
2241
fpr = self.fingerprint(
2242
self.peer_certificate(session))
2243
except (TypeError, gnutls.Error) as error:
1525
fpr = self.fingerprint(self.peer_certificate
1528
gnutls.errors.GNUTLSError) as error:
2244
1529
logger.warning("Bad certificate: %s", error)
2246
1531
logger.debug("Fingerprint: %s", fpr)
2249
1534
client = ProxyClient(child_pipe, fpr,
2250
1535
self.client_address)
2251
1536
except KeyError:
2254
1539
if client.approval_delay:
2255
1540
delay = client.approval_delay
2256
1541
client.approvals_pending += 1
2257
1542
approval_required = True
2260
1545
if not client.enabled:
2261
1546
logger.info("Client %s is disabled",
2263
1548
if self.server.use_dbus:
2264
1549
# Emit D-Bus signal
2265
1550
client.Rejected("Disabled")
2268
1553
if client.approved or not client.approval_delay:
2269
# We are approved or approval is disabled
1554
#We are approved or approval is disabled
2271
1556
elif client.approved is None:
2272
1557
logger.info("Client %s needs approval",
2305
1592
delay -= time2 - time
2308
session.send(client.secret)
2309
except gnutls.Error as error:
2310
logger.warning("gnutls send failed",
1595
while sent_size < len(client.secret):
1597
sent = session.send(client.secret[sent_size:])
1598
except gnutls.errors.GNUTLSError as error:
1599
logger.warning("gnutls send failed")
1601
logger.debug("Sent: %d, remaining: %d",
1602
sent, len(client.secret)
1603
- (sent_size + sent))
2314
1606
logger.info("Sending secret to %s", client.name)
2315
1607
# bump the timeout using extended_timeout
2316
client.bump_timeout(client.extended_timeout)
1608
client.checked_ok(client.extended_timeout)
2317
1609
if self.server.use_dbus:
2318
1610
# Emit D-Bus signal
2319
1611
client.GotSecret()
2322
1614
if approval_required:
2323
1615
client.approvals_pending -= 1
2326
except gnutls.Error as error:
2327
logger.warning("GnuTLS bye failed",
1618
except gnutls.errors.GNUTLSError as error:
1619
logger.warning("GnuTLS bye failed")
2331
1622
def peer_certificate(session):
2332
1623
"Return the peer's OpenPGP certificate as a bytestring"
2333
1624
# If not an OpenPGP certificate...
2334
if (gnutls.certificate_type_get(session._c_object)
2335
!= gnutls.CRT_OPENPGP):
2336
# ...return invalid data
1625
if (gnutls.library.functions
1626
.gnutls_certificate_type_get(session._c_object)
1627
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1628
# ...do the normal thing
1629
return session.peer_certificate
2338
1630
list_size = ctypes.c_uint(1)
2339
cert_list = (gnutls.certificate_get_peers
1631
cert_list = (gnutls.library.functions
1632
.gnutls_certificate_get_peers
2340
1633
(session._c_object, ctypes.byref(list_size)))
2341
1634
if not bool(cert_list) and list_size.value != 0:
2342
raise gnutls.Error("error getting peer certificate")
1635
raise gnutls.errors.GNUTLSError("error getting peer"
2343
1637
if list_size.value == 0:
2345
1639
cert = cert_list[0]
2346
1640
return ctypes.string_at(cert.data, cert.size)
2349
1643
def fingerprint(openpgp):
2350
1644
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2351
1645
# New GnuTLS "datum" with the OpenPGP public key
2352
datum = gnutls.datum_t(
2353
ctypes.cast(ctypes.c_char_p(openpgp),
2354
ctypes.POINTER(ctypes.c_ubyte)),
2355
ctypes.c_uint(len(openpgp)))
1646
datum = (gnutls.library.types
1647
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1650
ctypes.c_uint(len(openpgp))))
2356
1651
# New empty GnuTLS certificate
2357
crt = gnutls.openpgp_crt_t()
2358
gnutls.openpgp_crt_init(ctypes.byref(crt))
1652
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1653
(gnutls.library.functions
1654
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2359
1655
# Import the OpenPGP public key into the certificate
2360
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2361
gnutls.OPENPGP_FMT_RAW)
1656
(gnutls.library.functions
1657
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1658
gnutls.library.constants
1659
.GNUTLS_OPENPGP_FMT_RAW))
2362
1660
# Verify the self signature in the key
2363
1661
crtverify = ctypes.c_uint()
2364
gnutls.openpgp_crt_verify_self(crt, 0,
2365
ctypes.byref(crtverify))
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_verify_self(crt, 0,
1664
ctypes.byref(crtverify)))
2366
1665
if crtverify.value != 0:
2367
gnutls.openpgp_crt_deinit(crt)
2368
raise gnutls.CertificateSecurityError(code
1666
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1667
raise (gnutls.errors.CertificateSecurityError
2370
1669
# New buffer for the fingerprint
2371
1670
buf = ctypes.create_string_buffer(20)
2372
1671
buf_len = ctypes.c_size_t()
2373
1672
# Get the fingerprint from the certificate into the buffer
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1673
(gnutls.library.functions
1674
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1675
ctypes.byref(buf_len)))
2376
1676
# Deinit the certificate
2377
gnutls.openpgp_crt_deinit(crt)
1677
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2378
1678
# Convert the buffer to a Python bytestring
2379
1679
fpr = ctypes.string_at(buf, buf_len.value)
2380
1680
# Convert the bytestring to hexadecimal notation
2385
1685
class MultiprocessingMixIn(object):
2386
1686
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2388
1687
def sub_process_main(self, request, address):
2390
1689
self.finish_request(request, address)
2391
1690
except Exception:
2392
1691
self.handle_error(request, address)
2393
1692
self.close_request(request)
2395
1694
def process_request(self, request, address):
2396
1695
"""Start a new process to process the request."""
2397
proc = multiprocessing.Process(target=self.sub_process_main,
2398
args=(request, address))
1696
proc = multiprocessing.Process(target = self.sub_process_main,
2403
1703
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2404
1704
""" adds a pipe to the MixIn """
2406
1705
def process_request(self, request, client_address):
2407
1706
"""Overrides and wraps the original process_request().
2409
1708
This function creates a new pipe in self.pipe
2411
1710
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2413
1712
proc = MultiprocessingMixIn.process_request(self, request,
2414
1713
client_address)
2415
1714
self.child_pipe.close()
2416
1715
self.add_pipe(parent_pipe, proc)
2418
1717
def add_pipe(self, parent_pipe, proc):
2419
1718
"""Dummy function; override as necessary"""
2420
raise NotImplementedError()
1719
raise NotImplementedError
2423
1722
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2424
1723
socketserver.TCPServer, object):
2425
1724
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2428
1727
enabled: Boolean; whether this server is activated yet
2429
1728
interface: None or a network interface name (string)
2430
1729
use_ipv6: Boolean; to use IPv6 or not
2433
1731
def __init__(self, server_address, RequestHandlerClass,
2437
"""If socketfd is set, use that file descriptor instead of
2438
creating a new one with socket.socket().
1732
interface=None, use_ipv6=True):
2440
1733
self.interface = interface
2442
1735
self.address_family = socket.AF_INET6
2443
if socketfd is not None:
2444
# Save the file descriptor
2445
self.socketfd = socketfd
2446
# Save the original socket.socket() function
2447
self.socket_socket = socket.socket
2449
# To implement --socket, we monkey patch socket.socket.
2451
# (When socketserver.TCPServer is a new-style class, we
2452
# could make self.socket into a property instead of monkey
2453
# patching socket.socket.)
2455
# Create a one-time-only replacement for socket.socket()
2456
@functools.wraps(socket.socket)
2457
def socket_wrapper(*args, **kwargs):
2458
# Restore original function so subsequent calls are
2460
socket.socket = self.socket_socket
2461
del self.socket_socket
2462
# This time only, return a new socket object from the
2463
# saved file descriptor.
2464
return socket.fromfd(self.socketfd, *args, **kwargs)
2465
# Replace socket.socket() function with wrapper
2466
socket.socket = socket_wrapper
2467
# The socketserver.TCPServer.__init__ will call
2468
# socket.socket(), which might be our replacement,
2469
# socket_wrapper(), if socketfd was set.
2470
1736
socketserver.TCPServer.__init__(self, server_address,
2471
1737
RequestHandlerClass)
2473
1738
def server_bind(self):
2474
1739
"""This overrides the normal server_bind() function
2475
1740
to bind to an interface if one was specified, and also NOT to
2476
1741
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
2478
1742
if self.interface is not None:
2479
1743
if SO_BINDTODEVICE is None:
2480
# Fall back to a hard-coded value which seems to be
2482
logger.warning("SO_BINDTODEVICE not found, trying 25")
2483
SO_BINDTODEVICE = 25
2485
self.socket.setsockopt(
2486
socket.SOL_SOCKET, SO_BINDTODEVICE,
2487
(self.interface + "\0").encode("utf-8"))
2488
except socket.error as error:
2489
if error.errno == errno.EPERM:
2490
logger.error("No permission to bind to"
2491
" interface %s", self.interface)
2492
elif error.errno == errno.ENOPROTOOPT:
2493
logger.error("SO_BINDTODEVICE not available;"
2494
" cannot bind to interface %s",
2496
elif error.errno == errno.ENODEV:
2497
logger.error("Interface %s does not exist,"
2498
" cannot bind", self.interface)
1744
logger.error("SO_BINDTODEVICE does not exist;"
1745
" cannot bind to interface %s",
1749
self.socket.setsockopt(socket.SOL_SOCKET,
1753
except socket.error as error:
1754
if error[0] == errno.EPERM:
1755
logger.error("No permission to"
1756
" bind to interface %s",
1758
elif error[0] == errno.ENOPROTOOPT:
1759
logger.error("SO_BINDTODEVICE not available;"
1760
" cannot bind to interface %s",
2501
1764
# Only bind(2) the socket if we really need to.
2502
1765
if self.server_address[0] or self.server_address[1]:
2503
1766
if not self.server_address[0]:
2504
1767
if self.address_family == socket.AF_INET6:
2505
any_address = "::" # in6addr_any
1768
any_address = "::" # in6addr_any
2507
any_address = "0.0.0.0" # INADDR_ANY
1770
any_address = socket.INADDR_ANY
2508
1771
self.server_address = (any_address,
2509
1772
self.server_address[1])
2510
1773
elif not self.server_address[1]:
2511
self.server_address = (self.server_address[0], 0)
1774
self.server_address = (self.server_address[0],
2512
1776
# if self.interface:
2513
1777
# self.server_address = (self.server_address[0],
2611
1881
funcname = request[1]
2612
1882
args = request[2]
2613
1883
kwargs = request[3]
2615
1885
parent_pipe.send(('data', getattr(client_object,
2616
1886
funcname)(*args,
2619
1889
if command == 'getattr':
2620
1890
attrname = request[1]
2621
if isinstance(client_object.__getattribute__(attrname),
2622
collections.Callable):
2623
parent_pipe.send(('function', ))
1891
if callable(client_object.__getattribute__(attrname)):
1892
parent_pipe.send(('function',))
2626
'data', client_object.__getattribute__(attrname)))
1894
parent_pipe.send(('data', client_object
1895
.__getattribute__(attrname)))
2628
1897
if command == 'setattr':
2629
1898
attrname = request[1]
2630
1899
value = request[2]
2631
1900
setattr(client_object, attrname, value)
2636
def rfc3339_duration_to_delta(duration):
2637
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2639
>>> rfc3339_duration_to_delta("P7D")
2640
datetime.timedelta(7)
2641
>>> rfc3339_duration_to_delta("PT60S")
2642
datetime.timedelta(0, 60)
2643
>>> rfc3339_duration_to_delta("PT60M")
2644
datetime.timedelta(0, 3600)
2645
>>> rfc3339_duration_to_delta("PT24H")
2646
datetime.timedelta(1)
2647
>>> rfc3339_duration_to_delta("P1W")
2648
datetime.timedelta(7)
2649
>>> rfc3339_duration_to_delta("PT5M30S")
2650
datetime.timedelta(0, 330)
2651
>>> rfc3339_duration_to_delta("P1DT3M20S")
2652
datetime.timedelta(1, 200)
2655
# Parsing an RFC 3339 duration with regular expressions is not
2656
# possible - there would have to be multiple places for the same
2657
# values, like seconds. The current code, while more esoteric, is
2658
# cleaner without depending on a parsing library. If Python had a
2659
# built-in library for parsing we would use it, but we'd like to
2660
# avoid excessive use of external libraries.
2662
# New type for defining tokens, syntax, and semantics all-in-one
2663
Token = collections.namedtuple("Token", (
2664
"regexp", # To match token; if "value" is not None, must have
2665
# a "group" containing digits
2666
"value", # datetime.timedelta or None
2667
"followers")) # Tokens valid after this token
2668
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2669
# the "duration" ABNF definition in RFC 3339, Appendix A.
2670
token_end = Token(re.compile(r"$"), None, frozenset())
2671
token_second = Token(re.compile(r"(\d+)S"),
2672
datetime.timedelta(seconds=1),
2673
frozenset((token_end, )))
2674
token_minute = Token(re.compile(r"(\d+)M"),
2675
datetime.timedelta(minutes=1),
2676
frozenset((token_second, token_end)))
2677
token_hour = Token(re.compile(r"(\d+)H"),
2678
datetime.timedelta(hours=1),
2679
frozenset((token_minute, token_end)))
2680
token_time = Token(re.compile(r"T"),
2682
frozenset((token_hour, token_minute,
2684
token_day = Token(re.compile(r"(\d+)D"),
2685
datetime.timedelta(days=1),
2686
frozenset((token_time, token_end)))
2687
token_month = Token(re.compile(r"(\d+)M"),
2688
datetime.timedelta(weeks=4),
2689
frozenset((token_day, token_end)))
2690
token_year = Token(re.compile(r"(\d+)Y"),
2691
datetime.timedelta(weeks=52),
2692
frozenset((token_month, token_end)))
2693
token_week = Token(re.compile(r"(\d+)W"),
2694
datetime.timedelta(weeks=1),
2695
frozenset((token_end, )))
2696
token_duration = Token(re.compile(r"P"), None,
2697
frozenset((token_year, token_month,
2698
token_day, token_time,
2700
# Define starting values:
2702
value = datetime.timedelta()
2704
# Following valid tokens
2705
followers = frozenset((token_duration, ))
2706
# String left to parse
2708
# Loop until end token is found
2709
while found_token is not token_end:
2710
# Search for any currently valid tokens
2711
for token in followers:
2712
match = token.regexp.match(s)
2713
if match is not None:
2715
if token.value is not None:
2716
# Value found, parse digits
2717
factor = int(match.group(1), 10)
2718
# Add to value so far
2719
value += factor * token.value
2720
# Strip token from string
2721
s = token.regexp.sub("", s, 1)
2724
# Set valid next tokens
2725
followers = found_token.followers
2728
# No currently valid tokens were found
2729
raise ValueError("Invalid RFC 3339 duration: {!r}"
2735
1905
def string_to_delta(interval):
2736
1906
"""Parse a string and return a datetime.timedelta
2738
1908
>>> string_to_delta('7d')
2739
1909
datetime.timedelta(7)
2740
1910
>>> string_to_delta('60s')
2835
1999
parser.add_argument("--no-dbus", action="store_false",
2836
2000
dest="use_dbus", help="Do not provide D-Bus"
2837
" system bus interface", default=None)
2001
" system bus interface")
2838
2002
parser.add_argument("--no-ipv6", action="store_false",
2839
dest="use_ipv6", help="Do not use IPv6",
2003
dest="use_ipv6", help="Do not use IPv6")
2841
2004
parser.add_argument("--no-restore", action="store_false",
2842
2005
dest="restore", help="Do not restore stored"
2843
" state", default=None)
2844
parser.add_argument("--socket", type=int,
2845
help="Specify a file descriptor to a network"
2846
" socket to use instead of creating one")
2847
2007
parser.add_argument("--statedir", metavar="DIR",
2848
2008
help="Directory to save/restore state in")
2849
parser.add_argument("--foreground", action="store_true",
2850
help="Run in foreground", default=None)
2851
parser.add_argument("--no-zeroconf", action="store_false",
2852
dest="zeroconf", help="Do not use Zeroconf",
2855
2010
options = parser.parse_args()
2857
2012
if options.check:
2859
fail_count, test_count = doctest.testmod()
2860
sys.exit(os.EX_OK if fail_count == 0 else 1)
2862
2017
# Default values for config file for server-global settings
2863
server_defaults = {"interface": "",
2868
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2869
":+SIGN-DSA-SHA256",
2870
"servicename": "Mandos",
2876
"statedir": "/var/lib/mandos",
2877
"foreground": "False",
2018
server_defaults = { "interface": "",
2023
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2024
"servicename": "Mandos",
2029
"statedir": "/var/lib/mandos"
2881
2032
# Parse config file for server-global settings
2882
2033
server_config = configparser.SafeConfigParser(server_defaults)
2883
2034
del server_defaults
2884
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2035
server_config.read(os.path.join(options.configdir,
2885
2037
# Convert the SafeConfigParser object to a dict
2886
2038
server_settings = server_config.defaults()
2887
2039
# Use the appropriate methods on the non-string config options
2888
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2889
"foreground", "zeroconf"):
2040
for option in ("debug", "use_dbus", "use_ipv6"):
2890
2041
server_settings[option] = server_config.getboolean("DEFAULT",
2892
2043
if server_settings["port"]:
2893
2044
server_settings["port"] = server_config.getint("DEFAULT",
2895
if server_settings["socket"]:
2896
server_settings["socket"] = server_config.getint("DEFAULT",
2898
# Later, stdin will, and stdout and stderr might, be dup'ed
2899
# over with an opened os.devnull. But we don't want this to
2900
# happen with a supplied network socket.
2901
if 0 <= server_settings["socket"] <= 2:
2902
server_settings["socket"] = os.dup(server_settings
2904
2046
del server_config
2906
2048
# Override the settings from the config file with command line
2907
2049
# options, if set.
2908
2050
for option in ("interface", "address", "port", "debug",
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2051
"priority", "servicename", "configdir",
2052
"use_dbus", "use_ipv6", "debuglevel", "restore",
2912
2054
value = getattr(options, option)
2913
2055
if value is not None:
2914
2056
server_settings[option] = value
2916
2058
# Force all strings to be unicode
2917
2059
for option in server_settings.keys():
2918
if isinstance(server_settings[option], bytes):
2919
server_settings[option] = (server_settings[option]
2921
# Force all boolean options to be boolean
2922
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2923
"foreground", "zeroconf"):
2924
server_settings[option] = bool(server_settings[option])
2925
# Debug implies foreground
2926
if server_settings["debug"]:
2927
server_settings["foreground"] = True
2060
if type(server_settings[option]) is str:
2061
server_settings[option] = unicode(server_settings[option])
2928
2062
# Now we have our good server settings in "server_settings"
2930
2064
##################################################################
2932
if (not server_settings["zeroconf"]
2933
and not (server_settings["port"]
2934
or server_settings["socket"] != "")):
2935
parser.error("Needs port or socket to work without Zeroconf")
2937
2066
# For convenience
2938
2067
debug = server_settings["debug"]
2939
2068
debuglevel = server_settings["debuglevel"]
2953
2080
level = getattr(logging, debuglevel.upper())
2954
2081
initlogger(debug, level)
2956
2083
if server_settings["servicename"] != "Mandos":
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2084
syslogger.setFormatter(logging.Formatter
2085
('Mandos (%s) [%%(process)d]:'
2086
' %%(levelname)s: %%(message)s'
2087
% server_settings["servicename"]))
2962
2089
# Parse config file with clients
2963
2090
client_config = configparser.SafeConfigParser(Client
2964
2091
.client_defaults)
2965
2092
client_config.read(os.path.join(server_settings["configdir"],
2966
2093
"clients.conf"))
2968
2095
global mandos_dbus_service
2969
2096
mandos_dbus_service = None
2972
if server_settings["socket"] != "":
2973
socketfd = server_settings["socket"]
2974
tcp_server = MandosServer(
2975
(server_settings["address"], server_settings["port"]),
2977
interface=(server_settings["interface"] or None),
2979
gnutls_priority=server_settings["priority"],
2983
pidfilename = "/run/mandos.pid"
2984
if not os.path.isdir("/run/."):
2985
pidfilename = "/var/run/mandos.pid"
2988
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2989
except IOError as e:
2990
logger.error("Could not open file %r", pidfilename,
2993
for name, group in (("_mandos", "_mandos"),
2994
("mandos", "mandos"),
2995
("nobody", "nogroup")):
2997
uid = pwd.getpwnam(name).pw_uid
2998
gid = pwd.getpwnam(group).pw_gid
2098
tcp_server = MandosServer((server_settings["address"],
2099
server_settings["port"]),
2101
interface=(server_settings["interface"]
2105
server_settings["priority"],
2108
pidfilename = "/var/run/mandos.pid"
2110
pidfile = open(pidfilename, "w")
2112
logger.error("Could not open file %r", pidfilename)
2115
uid = pwd.getpwnam("_mandos").pw_uid
2116
gid = pwd.getpwnam("_mandos").pw_gid
2119
uid = pwd.getpwnam("mandos").pw_uid
2120
gid = pwd.getpwnam("mandos").pw_gid
3000
2121
except KeyError:
2123
uid = pwd.getpwnam("nobody").pw_uid
2124
gid = pwd.getpwnam("nobody").pw_gid
3009
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3011
2131
except OSError as error:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
3014
if error.errno != errno.EPERM:
2132
if error[0] != errno.EPERM:
3018
2136
# Enable all possible GnuTLS debugging
3020
2138
# "Use a log level over 10 to enable all debugging options."
3021
2139
# - GnuTLS manual
3022
gnutls.global_set_log_level(11)
2140
gnutls.library.functions.gnutls_global_set_log_level(11)
2142
@gnutls.library.types.gnutls_log_func
3025
2143
def debug_gnutls(level, string):
3026
2144
logger.debug("GnuTLS: %s", string[:-1])
3028
gnutls.global_set_log_function(debug_gnutls)
2146
(gnutls.library.functions
2147
.gnutls_global_set_log_function(debug_gnutls))
3030
2149
# Redirect stdin so all checkers get /dev/null
3031
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2150
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3032
2151
os.dup2(null, sys.stdin.fileno())
3036
2155
# Need to fork before connecting to D-Bus
3038
2157
# Close all input and output, do double fork, etc.
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2160
gobject.threads_init()
3045
2162
global main_loop
3046
2163
# From the Avahi example code
3047
DBusGMainLoop(set_as_default=True)
3048
main_loop = GLib.MainLoop()
2164
DBusGMainLoop(set_as_default=True )
2165
main_loop = gobject.MainLoop()
3049
2166
bus = dbus.SystemBus()
3050
2167
# End of Avahi example code
3053
2170
bus_name = dbus.service.BusName("se.recompile.Mandos",
3056
old_bus_name = dbus.service.BusName(
3057
"se.bsnet.fukt.Mandos", bus,
3059
except dbus.exceptions.DBusException as e:
3060
logger.error("Disabling D-Bus:", exc_info=e)
2171
bus, do_not_queue=True)
2172
old_bus_name = (dbus.service.BusName
2173
("se.bsnet.fukt.Mandos", bus,
2175
except dbus.exceptions.NameExistsException as e:
2176
logger.error(unicode(e) + ", disabling D-Bus")
3061
2177
use_dbus = False
3062
2178
server_settings["use_dbus"] = False
3063
2179
tcp_server.use_dbus = False
3065
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3066
service = AvahiServiceToSyslog(
3067
name=server_settings["servicename"],
3068
servicetype="_mandos._tcp",
3071
if server_settings["interface"]:
3072
service.interface = if_nametoindex(
3073
server_settings["interface"].encode("utf-8"))
2180
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2181
service = AvahiServiceToSyslog(name =
2182
server_settings["servicename"],
2183
servicetype = "_mandos._tcp",
2184
protocol = protocol, bus = bus)
2185
if server_settings["interface"]:
2186
service.interface = (if_nametoindex
2187
(str(server_settings["interface"])))
3075
2189
global multiprocessing_manager
3076
2190
multiprocessing_manager = multiprocessing.Manager()
3078
2192
client_class = Client
3080
client_class = functools.partial(ClientDBus, bus=bus)
2194
client_class = functools.partial(ClientDBusTransitional,
3082
2197
client_settings = Client.config_parser(client_config)
3083
2198
old_client_settings = {}
3084
2199
clients_data = {}
3086
# This is used to redirect stdout and stderr for checker processes
3088
wnull = open(os.devnull, "w") # A writable /dev/null
3089
# Only used if server is running in foreground but not in debug
3091
if debug or not foreground:
3094
2201
# Get client data and settings from last running state.
3095
2202
if server_settings["restore"]:
3097
2204
with open(stored_state_path, "rb") as stored_state:
3098
if sys.version_info.major == 2:
3099
clients_data, old_client_settings = pickle.load(
3102
bytes_clients_data, bytes_old_client_settings = (
3103
pickle.load(stored_state, encoding="bytes"))
3104
# Fix bytes to strings
3107
clients_data = {(key.decode("utf-8")
3108
if isinstance(key, bytes)
3111
bytes_clients_data.items()}
3112
del bytes_clients_data
3113
for key in clients_data:
3114
value = {(k.decode("utf-8")
3115
if isinstance(k, bytes) else k): v
3117
clients_data[key].items()}
3118
clients_data[key] = value
3120
value["client_structure"] = [
3122
if isinstance(s, bytes)
3124
value["client_structure"]]
3126
for k in ("name", "host"):
3127
if isinstance(value[k], bytes):
3128
value[k] = value[k].decode("utf-8")
3129
# old_client_settings
3131
old_client_settings = {
3132
(key.decode("utf-8")
3133
if isinstance(key, bytes)
3136
bytes_old_client_settings.items()}
3137
del bytes_old_client_settings
3139
for value in old_client_settings.values():
3140
if isinstance(value["host"], bytes):
3141
value["host"] = (value["host"]
2205
clients_data, old_client_settings = (pickle.load
3143
2207
os.remove(stored_state_path)
3144
2208
except IOError as e:
3145
if e.errno == errno.ENOENT:
3146
logger.warning("Could not load persistent state:"
3147
" {}".format(os.strerror(e.errno)))
3149
logger.critical("Could not load persistent state:",
2209
logger.warning("Could not load persistent state: {0}"
2211
if e.errno != errno.ENOENT:
3152
2213
except EOFError as e:
3153
2214
logger.warning("Could not load persistent state: "
2215
"EOFError: {0}".format(e))
3157
2217
with PGPEngine() as pgp:
3158
for client_name, client in clients_data.items():
3159
# Skip removed clients
3160
if client_name not in client_settings:
2218
for client_name, client in clients_data.iteritems():
3163
2219
# Decide which value to use after restoring saved state.
3164
2220
# We have three different values: Old config file,
3165
2221
# new config file, and saved state.
3225
2282
clients_data[client_name] = client_settings[client_name]
3227
2284
# Create all client objects
3228
for client_name, client in clients_data.items():
2285
for client_name, client in clients_data.iteritems():
3229
2286
tcp_server.clients[client_name] = client_class(
3232
server_settings=server_settings)
2287
name = client_name, settings = client)
3234
2289
if not tcp_server.clients:
3235
2290
logger.warning("No clients defined")
3238
if pidfile is not None:
3242
print(pid, file=pidfile)
3244
logger.error("Could not write to file %r with PID %d",
2296
pidfile.write(str(pid) + "\n".encode("utf-8"))
2299
logger.error("Could not write to file %r with PID %d",
2302
# "pidfile" was never created
3247
2304
del pidfilename
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2305
signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2308
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2311
class MandosDBusService(dbus.service.Object):
3258
2312
"""A D-Bus proxy object"""
3260
2313
def __init__(self):
3261
2314
dbus.service.Object.__init__(self, bus, "/")
3263
2315
_interface = "se.recompile.Mandos"
3265
2317
@dbus.service.signal(_interface, signature="o")
3266
2318
def ClientAdded(self, objpath):
3270
2322
@dbus.service.signal(_interface, signature="ss")
3271
2323
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3277
2327
@dbus.service.signal(_interface, signature="os")
3278
2328
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3284
2332
@dbus.service.method(_interface, out_signature="ao")
3285
2333
def GetAllClients(self):
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2335
return dbus.Array(c.dbus_object_path
2337
tcp_server.clients.itervalues())
3292
2339
@dbus.service.method(_interface,
3293
2340
out_signature="a{oa{sv}}")
3294
2341
def GetAllClientsWithProperties(self):
3296
2343
return dbus.Dictionary(
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2344
((c.dbus_object_path, c.GetAll(""))
2345
for c in tcp_server.clients.itervalues()),
3300
2346
signature="oa{sv}")
3302
2348
@dbus.service.method(_interface, in_signature="o")
3303
2349
def RemoveClient(self, object_path):
3305
for c in tcp_server.clients.values():
2351
for c in tcp_server.clients.itervalues():
3306
2352
if c.dbus_object_path == object_path:
3307
2353
del tcp_server.clients[c.name]
3308
2354
c.remove_from_connection()
3309
# Don't signal the disabling
2355
# Don't signal anything except ClientRemoved
3310
2356
c.disable(quiet=True)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2358
self.ClientRemoved(object_path, c.name)
3314
2360
raise KeyError(object_path)
3318
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3319
out_signature="a{oa{sa{sv}}}")
3320
def GetManagedObjects(self):
3322
return dbus.Dictionary(
3323
{client.dbus_object_path:
3325
{interface: client.GetAll(interface)
3327
client._get_all_interface_names()})
3328
for client in tcp_server.clients.values()})
3330
def client_added_signal(self, client):
3331
"""Send the new standard signal and the old signal"""
3333
# New standard signal
3334
self.InterfacesAdded(
3335
client.dbus_object_path,
3337
{interface: client.GetAll(interface)
3339
client._get_all_interface_names()}))
3341
self.ClientAdded(client.dbus_object_path)
3343
def client_removed_signal(self, client):
3344
"""Send the new standard signal and the old signal"""
3346
# New standard signal
3347
self.InterfacesRemoved(
3348
client.dbus_object_path,
3349
client._get_all_interface_names())
3351
self.ClientRemoved(client.dbus_object_path,
3354
mandos_dbus_service = MandosDBusService()
3356
# Save modules to variables to exempt the modules from being
3357
# unloaded before the function registered with atexit() is run.
3358
mp = multiprocessing
2364
class MandosDBusServiceTransitional(MandosDBusService):
2365
__metaclass__ = AlternateDBusNamesMetaclass
2366
mandos_dbus_service = MandosDBusServiceTransitional()
3362
2369
"Cleanup function; run on exit"
3366
mp.active_children()
2372
multiprocessing.active_children()
3368
2373
if not (tcp_server.clients or client_settings):
3371
2376
# Store client before exiting. Secrets are encrypted with key
3372
2377
# based on what config file has. If config file is
3373
2378
# removed/edited, old secret will thus be unrecovable.
3375
2380
with PGPEngine() as pgp:
3376
for client in tcp_server.clients.values():
2381
for client in tcp_server.clients.itervalues():
3377
2382
key = client_settings[client.name]["secret"]
3378
2383
client.encrypted_secret = pgp.encrypt(client.secret,
3380
2385
client_dict = {}
3382
2387
# A list of attributes that can not be pickled
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2389
exclude = set(("bus", "changedstate", "secret",
2391
for name, typ in (inspect.getmembers
2392
(dbus.service.Object)):
3388
2393
exclude.add(name)
3390
2395
client_dict["encrypted_secret"] = (client
3391
2396
.encrypted_secret)
3392
2397
for attr in client.client_structure:
3393
2398
if attr not in exclude:
3394
2399
client_dict[attr] = getattr(client, attr)
3396
2401
clients[client.name] = client_dict
3397
2402
del client_settings[client.name]["secret"]
3400
with tempfile.NamedTemporaryFile(
3404
dir=os.path.dirname(stored_state_path),
3405
delete=False) as stored_state:
3406
pickle.dump((clients, client_settings), stored_state,
3408
tempname = stored_state.name
2405
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2408
(stored_state_path))
2409
with os.fdopen(tempfd, "wb") as stored_state:
2410
pickle.dump((clients, client_settings), stored_state)
3409
2411
os.rename(tempname, stored_state_path)
3410
2412
except (IOError, OSError) as e:
2413
logger.warning("Could not save persistent state: {0}"
3413
2417
os.remove(tempname)
3414
2418
except NameError:
3416
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3417
logger.warning("Could not save persistent state: {}"
3418
.format(os.strerror(e.errno)))
3420
logger.warning("Could not save persistent state:",
2420
if e.errno not in set((errno.ENOENT, errno.EACCES,
3424
2424
# Delete all clients, and settings from config
3425
2425
while tcp_server.clients:
3426
2426
name, client = tcp_server.clients.popitem()
3428
2428
client.remove_from_connection()
3429
# Don't signal the disabling
2429
# Don't signal anything except ClientRemoved
3430
2430
client.disable(quiet=True)
3431
# Emit D-Bus signal for removal
3433
mandos_dbus_service.client_removed_signal(client)
2433
mandos_dbus_service.ClientRemoved(client
3434
2436
client_settings.clear()
3436
2438
atexit.register(cleanup)
3438
for client in tcp_server.clients.values():
2440
for client in tcp_server.clients.itervalues():
3440
# Emit D-Bus signal for adding
3441
mandos_dbus_service.client_added_signal(client)
2443
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3442
2444
# Need to initiate checking of clients
3443
2445
if client.enabled:
3444
2446
client.init_checker()
3446
2448
tcp_server.enable()
3447
2449
tcp_server.server_activate()
3449
2451
# Find out what port we got
3451
service.port = tcp_server.socket.getsockname()[1]
2452
service.port = tcp_server.socket.getsockname()[1]
3453
2454
logger.info("Now listening on address %r, port %d,"
3454
" flowinfo %d, scope_id %d",
3455
*tcp_server.socket.getsockname())
2455
" flowinfo %d, scope_id %d"
2456
% tcp_server.socket.getsockname())
3457
logger.info("Now listening on address %r, port %d",
3458
*tcp_server.socket.getsockname())
3460
# service.interface = tcp_server.socket.getsockname()[3]
2458
logger.info("Now listening on address %r, port %d"
2459
% tcp_server.socket.getsockname())
2461
#service.interface = tcp_server.socket.getsockname()[3]
3464
# From the Avahi example code
3467
except dbus.exceptions.DBusException as error:
3468
logger.critical("D-Bus Exception", exc_info=error)
3471
# End of Avahi example code
3473
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3474
lambda *args, **kwargs:
3475
(tcp_server.handle_request
3476
(*args[2:], **kwargs) or True))
2464
# From the Avahi example code
2467
except dbus.exceptions.DBusException as error:
2468
logger.critical("DBusException: %s", error)
2471
# End of Avahi example code
2473
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2474
lambda *args, **kwargs:
2475
(tcp_server.handle_request
2476
(*args[2:], **kwargs) or True))
3478
2478
logger.debug("Starting main loop")
3479
2479
main_loop.run()
3480
2480
except AvahiError as error:
3481
logger.critical("Avahi Error", exc_info=error)
2481
logger.critical("AvahiError: %s", error)
3484
2484
except KeyboardInterrupt: