63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
70
82
import dbus.service
83
from gi.repository import GLib
73
84
from dbus.mainloop.glib import DBusGMainLoop
76
87
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:
81
94
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
95
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
84
99
from IN import SO_BINDTODEVICE
85
100
except ImportError:
86
SO_BINDTODEVICE = None
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:
89
119
stored_state_file = "clients.pickle"
91
121
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
100
127
except (OSError, AttributeError):
101
129
def if_nametoindex(interface):
102
130
"Get an interface index the hard way, i.e. using fcntl()"
103
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
132
with contextlib.closing(socket.socket()) as s:
105
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
136
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__,
113
155
def initlogger(debug, level=logging.WARNING):
114
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
116
162
syslogger.setFormatter(logging.Formatter
117
163
('Mandos [%(process)d]: %(levelname)s:'
119
165
logger.addHandler(syslogger)
122
168
console = logging.StreamHandler()
123
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
168
226
os.rmdir(self.tempdir)
169
227
self.tempdir = None
171
229
def password_encode(self, password):
172
230
# Passphrase can not be empty and can not contain newlines or
173
231
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
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"))
176
240
def encrypt(self, data, password):
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
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:
191
256
return ciphertext
193
258
def decrypt(self, data, password):
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
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:
208
274
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
212
304
class AvahiError(Exception):
213
305
def __init__(self, value, *args, **kwargs):
214
306
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
219
311
class AvahiServiceError(AvahiError):
222
315
class AvahiGroupError(AvahiError):
226
319
class AvahiService(object):
227
320
"""An Avahi (Zeroconf) service.
230
323
interface: integer; avahi.IF_UNSPEC or an interface index.
231
324
Used to optionally bind to the specified interface.
232
325
name: string; Example: 'Mandos'
233
326
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
327
See <https://www.iana.org/assignments/service-names-port-numbers>
235
328
port: integer; what port to announce
236
329
TXT: list of strings; TXT record for the service
237
330
domain: string; Domain to publish on, default to .local if empty.
366
489
follow_name_owner_changes=True),
367
490
avahi.DBUS_INTERFACE_SERVER)
368
491
self.server.connect_to_signal("StateChanged",
369
self.server_state_changed)
492
self.server_state_changed)
370
493
self.server_state_changed(self.server.GetState())
372
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
374
498
"""Add the new name to the syslog messages"""
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
499
ret = super(AvahiServiceToSyslog, self).rename(self, *args,
501
syslogger.setFormatter(logging.Formatter(
502
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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))
507
# Pretend that we have a GnuTLS module
508
class GnuTLS(object):
509
"""This isn't so much a class as it is a module-like namespace.
510
It is instantiated once, and simulates having a GnuTLS module."""
512
library = ctypes.util.find_library("gnutls")
514
library = ctypes.util.find_library("gnutls-deb0")
515
_library = ctypes.cdll.LoadLibrary(library)
517
_need_version = b"3.3.0"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
526
# Unless otherwise indicated, the constants and types below are
527
# all from the gnutls/gnutls.h C header file.
537
E_NO_CERTIFICATE_FOUND = -49
538
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
541
class session_int(ctypes.Structure):
543
session_t = ctypes.POINTER(session_int)
545
class certificate_credentials_st(ctypes.Structure):
547
certificate_credentials_t = ctypes.POINTER(
548
certificate_credentials_st)
549
certificate_type_t = ctypes.c_int
551
class datum_t(ctypes.Structure):
552
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
553
('size', ctypes.c_uint)]
555
class openpgp_crt_int(ctypes.Structure):
557
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
558
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
559
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
560
credentials_type_t = ctypes.c_int
561
transport_ptr_t = ctypes.c_void_p
562
close_request_t = ctypes.c_int
565
class Error(Exception):
566
# We need to use the class name "GnuTLS" here, since this
567
# exception might be raised from within GnuTLS.__init__,
568
# which is called before the assignment to the "gnutls"
569
# global variable has happened.
570
def __init__(self, message=None, code=None, args=()):
571
# Default usage is by a message string, but if a return
572
# code is passed, convert it to a string with
575
if message is None and code is not None:
576
message = GnuTLS.strerror(code)
577
return super(GnuTLS.Error, self).__init__(
580
class CertificateSecurityError(Error):
584
class Credentials(object):
586
self._c_object = gnutls.certificate_credentials_t()
587
gnutls.certificate_allocate_credentials(
588
ctypes.byref(self._c_object))
589
self.type = gnutls.CRD_CERTIFICATE
592
gnutls.certificate_free_credentials(self._c_object)
594
class ClientSession(object):
595
def __init__(self, socket, credentials=None):
596
self._c_object = gnutls.session_t()
597
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
598
gnutls.set_default_priority(self._c_object)
599
gnutls.transport_set_ptr(self._c_object, socket.fileno())
600
gnutls.handshake_set_private_extensions(self._c_object,
603
if credentials is None:
604
credentials = gnutls.Credentials()
605
gnutls.credentials_set(self._c_object, credentials.type,
606
ctypes.cast(credentials._c_object,
608
self.credentials = credentials
611
gnutls.deinit(self._c_object)
614
return gnutls.handshake(self._c_object)
616
def send(self, data):
620
data_len -= gnutls.record_send(self._c_object,
625
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
627
# Error handling functions
628
def _error_code(result):
629
"""A function to raise exceptions on errors, suitable
630
for the 'restype' attribute on ctypes functions"""
633
if result == gnutls.E_NO_CERTIFICATE_FOUND:
634
raise gnutls.CertificateSecurityError(code=result)
635
raise gnutls.Error(code=result)
637
def _retry_on_error(result, func, arguments):
638
"""A function to retry on some errors, suitable
639
for the 'errcheck' attribute on ctypes functions"""
641
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
642
return _error_code(result)
643
result = func(*arguments)
646
# Unless otherwise indicated, the function declarations below are
647
# all from the gnutls/gnutls.h C header file.
650
priority_set_direct = _library.gnutls_priority_set_direct
651
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
652
ctypes.POINTER(ctypes.c_char_p)]
653
priority_set_direct.restype = _error_code
655
init = _library.gnutls_init
656
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
657
init.restype = _error_code
659
set_default_priority = _library.gnutls_set_default_priority
660
set_default_priority.argtypes = [session_t]
661
set_default_priority.restype = _error_code
663
record_send = _library.gnutls_record_send
664
record_send.argtypes = [session_t, ctypes.c_void_p,
666
record_send.restype = ctypes.c_ssize_t
667
record_send.errcheck = _retry_on_error
669
certificate_allocate_credentials = (
670
_library.gnutls_certificate_allocate_credentials)
671
certificate_allocate_credentials.argtypes = [
672
ctypes.POINTER(certificate_credentials_t)]
673
certificate_allocate_credentials.restype = _error_code
675
certificate_free_credentials = (
676
_library.gnutls_certificate_free_credentials)
677
certificate_free_credentials.argtypes = [
678
certificate_credentials_t]
679
certificate_free_credentials.restype = None
681
handshake_set_private_extensions = (
682
_library.gnutls_handshake_set_private_extensions)
683
handshake_set_private_extensions.argtypes = [session_t,
685
handshake_set_private_extensions.restype = None
687
credentials_set = _library.gnutls_credentials_set
688
credentials_set.argtypes = [session_t, credentials_type_t,
690
credentials_set.restype = _error_code
692
strerror = _library.gnutls_strerror
693
strerror.argtypes = [ctypes.c_int]
694
strerror.restype = ctypes.c_char_p
696
certificate_type_get = _library.gnutls_certificate_type_get
697
certificate_type_get.argtypes = [session_t]
698
certificate_type_get.restype = _error_code
700
certificate_get_peers = _library.gnutls_certificate_get_peers
701
certificate_get_peers.argtypes = [session_t,
702
ctypes.POINTER(ctypes.c_uint)]
703
certificate_get_peers.restype = ctypes.POINTER(datum_t)
705
global_set_log_level = _library.gnutls_global_set_log_level
706
global_set_log_level.argtypes = [ctypes.c_int]
707
global_set_log_level.restype = None
709
global_set_log_function = _library.gnutls_global_set_log_function
710
global_set_log_function.argtypes = [log_func]
711
global_set_log_function.restype = None
713
deinit = _library.gnutls_deinit
714
deinit.argtypes = [session_t]
715
deinit.restype = None
717
handshake = _library.gnutls_handshake
718
handshake.argtypes = [session_t]
719
handshake.restype = _error_code
720
handshake.errcheck = _retry_on_error
722
transport_set_ptr = _library.gnutls_transport_set_ptr
723
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
724
transport_set_ptr.restype = None
726
bye = _library.gnutls_bye
727
bye.argtypes = [session_t, close_request_t]
728
bye.restype = _error_code
729
bye.errcheck = _retry_on_error
731
check_version = _library.gnutls_check_version
732
check_version.argtypes = [ctypes.c_char_p]
733
check_version.restype = ctypes.c_char_p
735
# All the function declarations below are from gnutls/openpgp.h
737
openpgp_crt_init = _library.gnutls_openpgp_crt_init
738
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
739
openpgp_crt_init.restype = _error_code
741
openpgp_crt_import = _library.gnutls_openpgp_crt_import
742
openpgp_crt_import.argtypes = [openpgp_crt_t,
743
ctypes.POINTER(datum_t),
745
openpgp_crt_import.restype = _error_code
747
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
748
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
749
ctypes.POINTER(ctypes.c_uint)]
750
openpgp_crt_verify_self.restype = _error_code
752
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
753
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
754
openpgp_crt_deinit.restype = None
756
openpgp_crt_get_fingerprint = (
757
_library.gnutls_openpgp_crt_get_fingerprint)
758
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
762
openpgp_crt_get_fingerprint.restype = _error_code
764
# Remove non-public functions
765
del _error_code, _retry_on_error
766
# Create the global "gnutls" object, simulating a module
770
def call_pipe(connection, # : multiprocessing.Connection
771
func, *args, **kwargs):
772
"""This function is meant to be called by multiprocessing.Process
774
This function runs func(*args, **kwargs), and writes the resulting
775
return value on the provided multiprocessing.Connection.
777
connection.send(func(*args, **kwargs))
388
781
class Client(object):
389
782
"""A representation of a client host served by this server.
392
785
approved: bool(); 'None' if not yet approved/disapproved
393
786
approval_delay: datetime.timedelta(); Time to wait for approval
541
925
self.current_checker_command = None
542
926
self.approved = None
543
927
self.approvals_pending = 0
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
928
self.changedstate = multiprocessing_manager.Condition(
929
multiprocessing_manager.Lock())
930
self.client_structure = [attr
931
for attr in self.__dict__.keys()
549
932
if not attr.startswith("_")]
550
933
self.client_structure.append("client_structure")
552
for name, t in inspect.getmembers(type(self),
935
for name, t in inspect.getmembers(
936
type(self), lambda obj: isinstance(obj, property)):
556
937
if not name.startswith("_"):
557
938
self.client_structure.append(name)
559
940
# Send notice to process children that client state has changed
560
941
def send_changedstate(self):
561
942
with self.changedstate:
562
943
self.changedstate.notify_all()
564
945
def enable(self):
565
946
"""Start this client's checker and timeout hooks"""
566
947
if getattr(self, "enabled", False):
567
948
# Already enabled
569
self.send_changedstate()
570
950
self.expires = datetime.datetime.utcnow() + self.timeout
571
951
self.enabled = True
572
952
self.last_enabled = datetime.datetime.utcnow()
573
953
self.init_checker()
954
self.send_changedstate()
575
956
def disable(self, quiet=True):
576
957
"""Disable this client."""
577
958
if not getattr(self, "enabled", False):
580
self.send_changedstate()
582
961
logger.info("Disabling client %s", self.name)
583
if getattr(self, "disable_initiator_tag", False):
584
gobject.source_remove(self.disable_initiator_tag)
962
if getattr(self, "disable_initiator_tag", None) is not None:
963
GLib.source_remove(self.disable_initiator_tag)
585
964
self.disable_initiator_tag = None
586
965
self.expires = None
587
if getattr(self, "checker_initiator_tag", False):
588
gobject.source_remove(self.checker_initiator_tag)
966
if getattr(self, "checker_initiator_tag", None) is not None:
967
GLib.source_remove(self.checker_initiator_tag)
589
968
self.checker_initiator_tag = None
590
969
self.stop_checker()
591
970
self.enabled = False
592
# Do not run this again if called by a gobject.timeout_add
972
self.send_changedstate()
973
# Do not run this again if called by a GLib.timeout_add
595
976
def __del__(self):
598
979
def init_checker(self):
599
980
# Schedule a new checker to be started an 'interval' from now,
600
981
# and every interval from then on.
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
982
if self.checker_initiator_tag is not None:
983
GLib.source_remove(self.checker_initiator_tag)
984
self.checker_initiator_tag = GLib.timeout_add(
985
int(self.interval.total_seconds() * 1000),
604
987
# Schedule a disable() when 'timeout' has passed
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
988
if self.disable_initiator_tag is not None:
989
GLib.source_remove(self.disable_initiator_tag)
990
self.disable_initiator_tag = GLib.timeout_add(
991
int(self.timeout.total_seconds() * 1000), self.disable)
608
992
# Also start a new checker *right now*.
609
993
self.start_checker()
611
def checker_callback(self, pid, condition, command):
995
def checker_callback(self, source, condition, connection,
612
997
"""The checker has completed, so take appropriate actions."""
613
998
self.checker_callback_tag = None
614
999
self.checker = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
1000
# Read return code from connection (see call_pipe)
1001
returncode = connection.recv()
1005
self.last_checker_status = returncode
1006
self.last_checker_signal = None
617
1007
if self.last_checker_status == 0:
618
1008
logger.info("Checker for %(name)s succeeded",
620
1010
self.checked_ok()
622
logger.info("Checker for %(name)s failed",
1012
logger.info("Checker for %(name)s failed", vars(self))
625
1014
self.last_checker_status = -1
1015
self.last_checker_signal = -returncode
626
1016
logger.warning("Checker for %(name)s crashed?",
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,
1020
def checked_ok(self):
1021
"""Assert that the client has been seen, alive and well."""
1022
self.last_checked_ok = datetime.datetime.utcnow()
1023
self.last_checker_status = 0
1024
self.last_checker_signal = None
1027
def bump_timeout(self, timeout=None):
1028
"""Bump up the timeout for this client."""
635
1029
if timeout is None:
636
1030
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
638
1031
if self.disable_initiator_tag is not None:
639
gobject.source_remove(self.disable_initiator_tag)
1032
GLib.source_remove(self.disable_initiator_tag)
1033
self.disable_initiator_tag = None
640
1034
if getattr(self, "enabled", False):
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
1035
self.disable_initiator_tag = GLib.timeout_add(
1036
int(timeout.total_seconds() * 1000), self.disable)
644
1037
self.expires = datetime.datetime.utcnow() + timeout
646
1039
def need_approval(self):
647
1040
self.last_approval_request = datetime.datetime.utcnow()
649
1042
def start_checker(self):
650
1043
"""Start a new checker subprocess if one is not running.
652
1045
If a checker already exists, leave it running and do
654
1047
# The reason for not killing a running checker is that if we
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
1048
# did that, and if a checker (for some reason) started running
1049
# slowly and taking more than 'interval' time, then the client
1050
# would inevitably timeout, since no checker would get a
1051
# chance to run to completion. If we instead leave running
659
1052
# checkers alone, the checker would have to take more time
660
1053
# than 'timeout' for the client to be disabled, which is as it
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)
1056
if self.checker is not None and not self.checker.is_alive():
1057
logger.warning("Checker was not alive; joining")
676
1060
# Start a new checker if needed
677
1061
if self.checker is None:
1062
# Escape attributes for the shell
1064
attr: re.escape(str(getattr(self, attr)))
1065
for attr in self.runtime_expansions}
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
1067
command = self.checker_command % escaped_attrs
1068
except TypeError as error:
1069
logger.error('Could not format string "%s"',
1070
self.checker_command,
1072
return True # Try again later
697
1073
self.current_checker_command = command
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
1074
logger.info("Starting checker %r for %s", command,
1076
# We don't need to redirect stdout and stderr, since
1077
# in normal mode, that is already done by daemon(),
1078
# and in debug mode we don't want to. (Stdin is
1079
# always replaced by /dev/null.)
1080
# The exception is when not debugging but nevertheless
1081
# running in the foreground; use the previously
1083
popen_args = {"close_fds": True,
1086
if (not self.server_settings["debug"]
1087
and self.server_settings["foreground"]):
1088
popen_args.update({"stdout": wnull,
1090
pipe = multiprocessing.Pipe(duplex=False)
1091
self.checker = multiprocessing.Process(
1093
args=(pipe[1], subprocess.call, command),
1095
self.checker.start()
1096
self.checker_callback_tag = GLib.io_add_watch(
1097
pipe[0].fileno(), GLib.IO_IN,
1098
self.checker_callback, pipe[0], command)
1099
# Re-run this periodically if run by GLib.timeout_add
724
1102
def stop_checker(self):
725
1103
"""Force the checker process, if any, to stop."""
726
1104
if self.checker_callback_tag:
727
gobject.source_remove(self.checker_callback_tag)
1105
GLib.source_remove(self.checker_callback_tag)
728
1106
self.checker_callback_tag = None
729
1107
if getattr(self, "checker", None) is None:
731
1109
logger.debug("Stopping checker for %(name)s", vars(self))
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
self.checker.terminate()
740
1111
self.checker = None
743
def dbus_service_property(dbus_interface, signature="v",
744
access="readwrite", byte_arrays=False):
1114
def dbus_service_property(dbus_interface,
745
1118
"""Decorators for marking methods of a DBusObjectWithProperties to
746
1119
become properties on the D-Bus.
748
1121
The decorated method will be called with no arguments by "Get"
749
1122
and with one argument by "Set".
751
1124
The parameters, where they are supported, are the same as
752
1125
dbus.service.method, except there is only "signature", since the
753
1126
type from Get() and the type sent to Set() is the same.
792
class DBusObjectWithProperties(dbus.service.Object):
1209
class DBusObjectWithAnnotations(dbus.service.Object):
1210
"""A D-Bus object with annotations.
1212
Classes inheriting from this can use the dbus_annotations
1213
decorator to add annotations to methods or signals.
1217
def _is_dbus_thing(thing):
1218
"""Returns a function testing if an attribute is a D-Bus thing
1220
If called like _is_dbus_thing("method") it returns a function
1221
suitable for use as predicate to inspect.getmembers().
1223
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1226
def _get_all_dbus_things(self, thing):
1227
"""Returns a generator of (name, attribute) pairs
1229
return ((getattr(athing.__get__(self), "_dbus_name", name),
1230
athing.__get__(self))
1231
for cls in self.__class__.__mro__
1233
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1235
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1237
path_keyword='object_path',
1238
connection_keyword='connection')
1239
def Introspect(self, object_path, connection):
1240
"""Overloading of standard D-Bus method.
1242
Inserts annotation tags on methods and signals.
1244
xmlstring = dbus.service.Object.Introspect(self, object_path,
1247
document = xml.dom.minidom.parseString(xmlstring)
1249
for if_tag in document.getElementsByTagName("interface"):
1250
# Add annotation tags
1251
for typ in ("method", "signal"):
1252
for tag in if_tag.getElementsByTagName(typ):
1254
for name, prop in (self.
1255
_get_all_dbus_things(typ)):
1256
if (name == tag.getAttribute("name")
1257
and prop._dbus_interface
1258
== if_tag.getAttribute("name")):
1259
annots.update(getattr(
1260
prop, "_dbus_annotations", {}))
1261
for name, value in annots.items():
1262
ann_tag = document.createElement(
1264
ann_tag.setAttribute("name", name)
1265
ann_tag.setAttribute("value", value)
1266
tag.appendChild(ann_tag)
1267
# Add interface annotation tags
1268
for annotation, value in dict(
1269
itertools.chain.from_iterable(
1270
annotations().items()
1271
for name, annotations
1272
in self._get_all_dbus_things("interface")
1273
if name == if_tag.getAttribute("name")
1275
ann_tag = document.createElement("annotation")
1276
ann_tag.setAttribute("name", annotation)
1277
ann_tag.setAttribute("value", value)
1278
if_tag.appendChild(ann_tag)
1279
# Fix argument name for the Introspect method itself
1280
if (if_tag.getAttribute("name")
1281
== dbus.INTROSPECTABLE_IFACE):
1282
for cn in if_tag.getElementsByTagName("method"):
1283
if cn.getAttribute("name") == "Introspect":
1284
for arg in cn.getElementsByTagName("arg"):
1285
if (arg.getAttribute("direction")
1287
arg.setAttribute("name",
1289
xmlstring = document.toxml("utf-8")
1291
except (AttributeError, xml.dom.DOMException,
1292
xml.parsers.expat.ExpatError) as error:
1293
logger.error("Failed to override Introspection method",
1298
class DBusObjectWithProperties(DBusObjectWithAnnotations):
793
1299
"""A D-Bus object with properties.
795
1301
Classes inheriting from this can use the dbus_service_property
796
1302
decorator to expose methods as D-Bus properties. It exposes the
797
1303
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))
812
1306
def _get_dbus_property(self, interface_name, property_name):
813
1307
"""Returns a bound method if one exists which is a D-Bus
814
1308
property with the specified name and interface.
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
1310
for cls in self.__class__.__mro__:
1311
for name, value in inspect.getmembers(
1312
cls, self._is_dbus_thing("property")):
819
1313
if (value._dbus_name == property_name
820
1314
and value._dbus_interface == interface_name):
821
1315
return value.__get__(self)
823
1317
# No such property
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1318
raise DBusPropertyNotFound("{}:{}.{}".format(
1319
self.dbus_object_path, interface_name, property_name))
1322
def _get_all_interface_names(cls):
1323
"""Get a sequence of all interfaces supported by an object"""
1324
return (name for name in set(getattr(getattr(x, attr),
1325
"_dbus_interface", None)
1326
for x in (inspect.getmro(cls))
1328
if name is not None)
1330
@dbus.service.method(dbus.PROPERTIES_IFACE,
829
1332
out_signature="v")
830
1333
def Get(self, interface_name, property_name):
831
1334
"""Standard D-Bus property Get() method, see D-Bus standard.
875
1381
if not hasattr(value, "variant_level"):
876
1382
properties[name] = value
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
1384
properties[name] = type(value)(
1385
value, variant_level=value.variant_level + 1)
880
1386
return dbus.Dictionary(properties, signature="sv")
1388
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1389
def PropertiesChanged(self, interface_name, changed_properties,
1390
invalidated_properties):
1391
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
882
1396
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
883
1397
out_signature="s",
884
1398
path_keyword='object_path',
885
1399
connection_keyword='connection')
886
1400
def Introspect(self, object_path, connection):
887
"""Standard D-Bus method, overloaded to insert property tags.
1401
"""Overloading of standard D-Bus method.
1403
Inserts property tags and interface annotation tags.
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
1405
xmlstring = DBusObjectWithAnnotations.Introspect(self,
892
1409
document = xml.dom.minidom.parseString(xmlstring)
893
1411
def make_tag(document, name, prop):
894
1412
e = document.createElement("property")
895
1413
e.setAttribute("name", name)
896
1414
e.setAttribute("type", prop._dbus_signature)
897
1415
e.setAttribute("access", prop._dbus_access)
899
1418
for if_tag in document.getElementsByTagName("interface"):
900
1420
for tag in (make_tag(document, name, prop)
902
in self._get_all_dbus_properties()
1422
in self._get_all_dbus_things("property")
903
1423
if prop._dbus_interface
904
1424
== if_tag.getAttribute("name")):
905
1425
if_tag.appendChild(tag)
1426
# Add annotation tags for properties
1427
for tag in if_tag.getElementsByTagName("property"):
1429
for name, prop in self._get_all_dbus_things(
1431
if (name == tag.getAttribute("name")
1432
and prop._dbus_interface
1433
== if_tag.getAttribute("name")):
1434
annots.update(getattr(
1435
prop, "_dbus_annotations", {}))
1436
for name, value in annots.items():
1437
ann_tag = document.createElement(
1439
ann_tag.setAttribute("name", name)
1440
ann_tag.setAttribute("value", value)
1441
tag.appendChild(ann_tag)
906
1442
# Add the names to the return values for the
907
1443
# "org.freedesktop.DBus.Properties" methods
908
1444
if (if_tag.getAttribute("name")
923
1459
except (AttributeError, xml.dom.DOMException,
924
1460
xml.parsers.expat.ExpatError) as error:
925
1461
logger.error("Failed to override Introspection method",
930
def datetime_to_dbus (dt, variant_level=0):
1467
dbus.OBJECT_MANAGER_IFACE
1468
except AttributeError:
1469
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1472
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1473
"""A D-Bus object with an ObjectManager.
1475
Classes inheriting from this exposes the standard
1476
GetManagedObjects call and the InterfacesAdded and
1477
InterfacesRemoved signals on the standard
1478
"org.freedesktop.DBus.ObjectManager" interface.
1480
Note: No signals are sent automatically; they must be sent
1483
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1484
out_signature="a{oa{sa{sv}}}")
1485
def GetManagedObjects(self):
1486
"""This function must be overridden"""
1487
raise NotImplementedError()
1489
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1490
signature="oa{sa{sv}}")
1491
def InterfacesAdded(self, object_path, interfaces_and_properties):
1494
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1495
def InterfacesRemoved(self, object_path, interfaces):
1498
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1500
path_keyword='object_path',
1501
connection_keyword='connection')
1502
def Introspect(self, object_path, connection):
1503
"""Overloading of standard D-Bus method.
1505
Override return argument name of GetManagedObjects to be
1506
"objpath_interfaces_and_properties"
1508
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1512
document = xml.dom.minidom.parseString(xmlstring)
1514
for if_tag in document.getElementsByTagName("interface"):
1515
# Fix argument name for the GetManagedObjects method
1516
if (if_tag.getAttribute("name")
1517
== dbus.OBJECT_MANAGER_IFACE):
1518
for cn in if_tag.getElementsByTagName("method"):
1519
if (cn.getAttribute("name")
1520
== "GetManagedObjects"):
1521
for arg in cn.getElementsByTagName("arg"):
1522
if (arg.getAttribute("direction")
1526
"objpath_interfaces"
1528
xmlstring = document.toxml("utf-8")
1530
except (AttributeError, xml.dom.DOMException,
1531
xml.parsers.expat.ExpatError) as error:
1532
logger.error("Failed to override Introspection method",
1537
def datetime_to_dbus(dt, variant_level=0):
931
1538
"""Convert a UTC datetime.datetime() to a D-Bus type."""
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.
1540
return dbus.String("", variant_level=variant_level)
1541
return dbus.String(dt.isoformat(), variant_level=variant_level)
1544
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1545
"""A class decorator; applied to a subclass of
1546
dbus.service.Object, it will add alternate D-Bus attributes with
1547
interface names according to the "alt_interface_names" mapping.
1550
@alternate_dbus_interfaces({"org.example.Interface":
1551
"net.example.AlternateInterface"})
1552
class SampleDBusObject(dbus.service.Object):
1553
@dbus.service.method("org.example.Interface")
1554
def SampleDBusMethod():
1557
The above "SampleDBusMethod" on "SampleDBusObject" will be
1558
reachable via two interfaces: "org.example.Interface" and
1559
"net.example.AlternateInterface", the latter of which will have
1560
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1561
"true", unless "deprecate" is passed with a False value.
1563
This works for methods and signals, and also for D-Bus properties
1564
(from DBusObjectWithProperties) and interfaces (from the
1565
dbus_interface_annotations decorator).
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):
1569
for orig_interface_name, alt_interface_name in (
1570
alt_interface_names.items()):
1572
interface_names = set()
1573
# Go though all attributes of the class
1574
for attrname, attribute in inspect.getmembers(cls):
950
1575
# Ignore non-D-Bus attributes, and D-Bus attributes
951
1576
# with the wrong interface name
952
1577
if (not hasattr(attribute, "_dbus_interface")
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1578
or not attribute._dbus_interface.startswith(
1579
orig_interface_name)):
956
1581
# Create an alternate D-Bus interface name based on
957
1582
# the current name
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1583
alt_interface = attribute._dbus_interface.replace(
1584
orig_interface_name, alt_interface_name)
1585
interface_names.add(alt_interface)
961
1586
# Is this a D-Bus signal?
962
1587
if getattr(attribute, "_dbus_is_signal", False):
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
1588
# Extract the original non-method undecorated
1589
# function by black magic
1590
if sys.version_info.major == 2:
1591
nonmethod_func = (dict(
966
1592
zip(attribute.func_code.co_freevars,
967
attribute.__closure__))["func"]
1593
attribute.__closure__))
1594
["func"].cell_contents)
1596
nonmethod_func = (dict(
1597
zip(attribute.__code__.co_freevars,
1598
attribute.__closure__))
1599
["func"].cell_contents)
969
1600
# Create a new, but exactly alike, function
970
1601
# object, and decorate it to be a new D-Bus signal
971
1602
# with the alternate D-Bus interface name
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)))
1603
new_function = copy_function(nonmethod_func)
1604
new_function = (dbus.service.signal(
1606
attribute._dbus_signature)(new_function))
1607
# Copy annotations, if any
1609
new_function._dbus_annotations = dict(
1610
attribute._dbus_annotations)
1611
except AttributeError:
981
1614
# Define a creator of a function to call both the
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1615
# original and alternate functions, so both the
1616
# original and alternate signals gets sent when
1617
# the function is called
984
1618
def fixscope(func1, func2):
985
1619
"""This function is a scope container to pass
986
1620
func1 and func2 to the "call_both" function
987
1621
outside of its arguments"""
1623
@functools.wraps(func2)
988
1624
def call_both(*args, **kwargs):
989
1625
"""This function will emit two D-Bus
990
1626
signals by calling func1 and func2"""
991
1627
func1(*args, **kwargs)
992
1628
func2(*args, **kwargs)
1629
# Make wrapper function look like a D-Bus
1631
for name, attr in inspect.getmembers(func2):
1632
if name.startswith("_dbus_"):
1633
setattr(call_both, name, attr)
993
1635
return call_both
994
1636
# Create the "call_both" function and add it to
996
attr[attrname] = fixscope(attribute,
1638
attr[attrname] = fixscope(attribute, new_function)
998
1639
# Is this a D-Bus method?
999
1640
elif getattr(attribute, "_dbus_is_method", False):
1000
1641
# Create a new, but exactly alike, function
1001
1642
# object. Decorate it to be a new D-Bus method
1002
1643
# with the alternate D-Bus interface name. Add it
1003
1644
# to the class.
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)))
1646
dbus.service.method(
1648
attribute._dbus_in_signature,
1649
attribute._dbus_out_signature)
1650
(copy_function(attribute)))
1651
# Copy annotations, if any
1653
attr[attrname]._dbus_annotations = dict(
1654
attribute._dbus_annotations)
1655
except AttributeError:
1014
1657
# Is this a D-Bus property?
1015
1658
elif getattr(attribute, "_dbus_is_property", False):
1016
1659
# Create a new, but exactly alike, function
1017
1660
# object, and decorate it to be a new D-Bus
1018
1661
# property with the alternate D-Bus interface
1019
1662
# name. Add it to the class.
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)
1663
attr[attrname] = (dbus_service_property(
1664
alt_interface, attribute._dbus_signature,
1665
attribute._dbus_access,
1666
attribute._dbus_get_args_options
1668
(copy_function(attribute)))
1669
# Copy annotations, if any
1671
attr[attrname]._dbus_annotations = dict(
1672
attribute._dbus_annotations)
1673
except AttributeError:
1675
# Is this a D-Bus interface?
1676
elif getattr(attribute, "_dbus_is_interface", False):
1677
# Create a new, but exactly alike, function
1678
# object. Decorate it to be a new D-Bus interface
1679
# with the alternate D-Bus interface name. Add it
1682
dbus_interface_annotations(alt_interface)
1683
(copy_function(attribute)))
1685
# Deprecate all alternate interfaces
1686
iname = "_AlternateDBusNames_interface_annotation{}"
1687
for interface_name in interface_names:
1689
@dbus_interface_annotations(interface_name)
1691
return {"org.freedesktop.DBus.Deprecated":
1693
# Find an unused name
1694
for aname in (iname.format(i)
1695
for i in itertools.count()):
1696
if aname not in attr:
1700
# Replace the class with a new subclass of it with
1701
# methods, signals, etc. as created above.
1702
if sys.version_info.major == 2:
1703
cls = type(b"{}Alternate".format(cls.__name__),
1706
cls = type("{}Alternate".format(cls.__name__),
1713
@alternate_dbus_interfaces({"se.recompile.Mandos":
1714
"se.bsnet.fukt.Mandos"})
1036
1715
class ClientDBus(Client, DBusObjectWithProperties):
1037
1716
"""A Client class using D-Bus
1040
1719
dbus_object_path: dbus.ObjectPath
1041
1720
bus: dbus.SystemBus()
1044
1723
runtime_expansions = (Client.runtime_expansions
1045
+ ("dbus_object_path",))
1724
+ ("dbus_object_path", ))
1726
_interface = "se.recompile.Mandos.Client"
1047
1728
# dbus.service.Object doesn't use super(), so we can't either.
1049
def __init__(self, bus = None, *args, **kwargs):
1730
def __init__(self, bus=None, *args, **kwargs):
1051
1732
Client.__init__(self, *args, **kwargs)
1052
1733
# Only now, when this client is initialized, can it show up on
1054
client_object_name = unicode(self.name).translate(
1735
client_object_name = str(self.name).translate(
1055
1736
{ord("."): ord("_"),
1056
1737
ord("-"): ord("_")})
1057
self.dbus_object_path = (dbus.ObjectPath
1058
("/clients/" + client_object_name))
1738
self.dbus_object_path = dbus.ObjectPath(
1739
"/clients/" + client_object_name)
1059
1740
DBusObjectWithProperties.__init__(self, self.bus,
1060
1741
self.dbus_object_path)
1062
def notifychangeproperty(transform_func,
1063
dbus_name, type_func=lambda x: x,
1743
def notifychangeproperty(transform_func, dbus_name,
1744
type_func=lambda x: x,
1746
invalidate_only=False,
1747
_interface=_interface):
1065
1748
""" Modify a variable so that it's a property which announces
1066
1749
its changes to DBus.
1068
1751
transform_fun: Function that takes a value and a variant_level
1069
1752
and transforms it to a D-Bus type.
1070
1753
dbus_name: D-Bus name of the variable
1072
1755
to the D-Bus. Default: no transform
1073
1756
variant_level: D-Bus variant level. Default: 1
1075
attrname = "_{0}".format(dbus_name)
1758
attrname = "_{}".format(dbus_name)
1076
1760
def setter(self, value):
1077
1761
if hasattr(self, "dbus_object_path"):
1078
1762
if (not hasattr(self, attrname) or
1079
1763
type_func(getattr(self, attrname, None))
1080
1764
!= type_func(value)):
1081
dbus_value = transform_func(type_func(value),
1084
self.PropertyChanged(dbus.String(dbus_name),
1766
self.PropertiesChanged(
1767
_interface, dbus.Dictionary(),
1768
dbus.Array((dbus_name, )))
1770
dbus_value = transform_func(
1772
variant_level=variant_level)
1773
self.PropertyChanged(dbus.String(dbus_name),
1775
self.PropertiesChanged(
1777
dbus.Dictionary({dbus.String(dbus_name):
1086
1780
setattr(self, attrname, value)
1088
1782
return property(lambda self: getattr(self, attrname), setter)
1091
1784
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1092
1785
approvals_pending = notifychangeproperty(dbus.Boolean,
1093
1786
"ApprovalPending",
1095
1788
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1096
1789
last_enabled = notifychangeproperty(datetime_to_dbus,
1098
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1099
type_func = lambda checker:
1100
checker is not None)
1791
checker = notifychangeproperty(
1792
dbus.Boolean, "CheckerRunning",
1793
type_func=lambda checker: checker is not None)
1101
1794
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1102
1795
"LastCheckedOK")
1796
last_checker_status = notifychangeproperty(dbus.Int16,
1797
"LastCheckerStatus")
1103
1798
last_approval_request = notifychangeproperty(
1104
1799
datetime_to_dbus, "LastApprovalRequest")
1105
1800
approved_by_default = notifychangeproperty(dbus.Boolean,
1106
1801
"ApprovedByDefault")
1107
approval_delay = notifychangeproperty(dbus.UInt64,
1110
timedelta_to_milliseconds)
1802
approval_delay = notifychangeproperty(
1803
dbus.UInt64, "ApprovalDelay",
1804
type_func=lambda td: td.total_seconds() * 1000)
1111
1805
approval_duration = notifychangeproperty(
1112
1806
dbus.UInt64, "ApprovalDuration",
1113
type_func = timedelta_to_milliseconds)
1807
type_func=lambda td: td.total_seconds() * 1000)
1114
1808
host = notifychangeproperty(dbus.String, "Host")
1115
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1117
timedelta_to_milliseconds)
1809
timeout = notifychangeproperty(
1810
dbus.UInt64, "Timeout",
1811
type_func=lambda td: td.total_seconds() * 1000)
1118
1812
extended_timeout = notifychangeproperty(
1119
1813
dbus.UInt64, "ExtendedTimeout",
1120
type_func = timedelta_to_milliseconds)
1121
interval = notifychangeproperty(dbus.UInt64,
1124
timedelta_to_milliseconds)
1814
type_func=lambda td: td.total_seconds() * 1000)
1815
interval = notifychangeproperty(
1816
dbus.UInt64, "Interval",
1817
type_func=lambda td: td.total_seconds() * 1000)
1125
1818
checker_command = notifychangeproperty(dbus.String, "Checker")
1819
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1820
invalidate_only=True)
1127
1822
del notifychangeproperty
1129
1824
def __del__(self, *args, **kwargs):
1131
1826
self.remove_from_connection()
1211
1905
server to mandos-client
1215
1909
# Rejected - signal
1216
1910
@dbus.service.signal(_interface, signature="s")
1217
1911
def Rejected(self, reason):
1221
1915
# NeedApproval - signal
1222
1916
@dbus.service.signal(_interface, signature="tb")
1223
1917
def NeedApproval(self, timeout, default):
1225
1919
return self.need_approval()
1229
1923
# Approve - method
1230
1924
@dbus.service.method(_interface, in_signature="b")
1231
1925
def Approve(self, value):
1232
1926
self.approve(value)
1234
1928
# CheckedOK - method
1235
1929
@dbus.service.method(_interface)
1236
1930
def CheckedOK(self):
1237
1931
self.checked_ok()
1239
1933
# Enable - method
1934
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1240
1935
@dbus.service.method(_interface)
1241
1936
def Enable(self):
1245
1940
# StartChecker - method
1941
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1246
1942
@dbus.service.method(_interface)
1247
1943
def StartChecker(self):
1249
1945
self.start_checker()
1251
1947
# Disable - method
1948
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1252
1949
@dbus.service.method(_interface)
1253
1950
def Disable(self):
1257
1954
# StopChecker - method
1955
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1258
1956
@dbus.service.method(_interface)
1259
1957
def StopChecker(self):
1260
1958
self.stop_checker()
1264
1962
# ApprovalPending - property
1265
1963
@dbus_service_property(_interface, signature="b", access="read")
1266
1964
def ApprovalPending_dbus_property(self):
1267
1965
return dbus.Boolean(bool(self.approvals_pending))
1269
1967
# ApprovedByDefault - property
1270
@dbus_service_property(_interface, signature="b",
1968
@dbus_service_property(_interface,
1271
1970
access="readwrite")
1272
1971
def ApprovedByDefault_dbus_property(self, value=None):
1273
1972
if value is None: # get
1274
1973
return dbus.Boolean(self.approved_by_default)
1275
1974
self.approved_by_default = bool(value)
1277
1976
# ApprovalDelay - property
1278
@dbus_service_property(_interface, signature="t",
1977
@dbus_service_property(_interface,
1279
1979
access="readwrite")
1280
1980
def ApprovalDelay_dbus_property(self, value=None):
1281
1981
if value is None: # get
1282
return dbus.UInt64(self.approval_delay_milliseconds())
1982
return dbus.UInt64(self.approval_delay.total_seconds()
1283
1984
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1285
1986
# ApprovalDuration - property
1286
@dbus_service_property(_interface, signature="t",
1987
@dbus_service_property(_interface,
1287
1989
access="readwrite")
1288
1990
def ApprovalDuration_dbus_property(self, value=None):
1289
1991
if value is None: # get
1290
return dbus.UInt64(timedelta_to_milliseconds(
1291
self.approval_duration))
1992
return dbus.UInt64(self.approval_duration.total_seconds()
1292
1994
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1294
1996
# Name - property
1998
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1295
1999
@dbus_service_property(_interface, signature="s", access="read")
1296
2000
def Name_dbus_property(self):
1297
2001
return dbus.String(self.name)
1299
2003
# Fingerprint - property
2005
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1300
2006
@dbus_service_property(_interface, signature="s", access="read")
1301
2007
def Fingerprint_dbus_property(self):
1302
2008
return dbus.String(self.fingerprint)
1304
2010
# Host - property
1305
@dbus_service_property(_interface, signature="s",
2011
@dbus_service_property(_interface,
1306
2013
access="readwrite")
1307
2014
def Host_dbus_property(self, value=None):
1308
2015
if value is None: # get
1309
2016
return dbus.String(self.host)
1310
self.host = unicode(value)
2017
self.host = str(value)
1312
2019
# Created - property
2021
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1313
2022
@dbus_service_property(_interface, signature="s", access="read")
1314
2023
def Created_dbus_property(self):
1315
2024
return datetime_to_dbus(self.created)
1317
2026
# LastEnabled - property
1318
2027
@dbus_service_property(_interface, signature="s", access="read")
1319
2028
def LastEnabled_dbus_property(self):
1320
2029
return datetime_to_dbus(self.last_enabled)
1322
2031
# Enabled - property
1323
@dbus_service_property(_interface, signature="b",
2032
@dbus_service_property(_interface,
1324
2034
access="readwrite")
1325
2035
def Enabled_dbus_property(self, value=None):
1326
2036
if value is None: # get
1333
2043
# LastCheckedOK - property
1334
@dbus_service_property(_interface, signature="s",
2044
@dbus_service_property(_interface,
1335
2046
access="readwrite")
1336
2047
def LastCheckedOK_dbus_property(self, value=None):
1337
2048
if value is not None:
1338
2049
self.checked_ok()
1340
2051
return datetime_to_dbus(self.last_checked_ok)
2053
# LastCheckerStatus - property
2054
@dbus_service_property(_interface, signature="n", access="read")
2055
def LastCheckerStatus_dbus_property(self):
2056
return dbus.Int16(self.last_checker_status)
1342
2058
# Expires - property
1343
2059
@dbus_service_property(_interface, signature="s", access="read")
1344
2060
def Expires_dbus_property(self):
1345
2061
return datetime_to_dbus(self.expires)
1347
2063
# LastApprovalRequest - property
1348
2064
@dbus_service_property(_interface, signature="s", access="read")
1349
2065
def LastApprovalRequest_dbus_property(self):
1350
2066
return datetime_to_dbus(self.last_approval_request)
1352
2068
# Timeout - property
1353
@dbus_service_property(_interface, signature="t",
2069
@dbus_service_property(_interface,
1354
2071
access="readwrite")
1355
2072
def Timeout_dbus_property(self, value=None):
1356
2073
if value is None: # get
1357
return dbus.UInt64(self.timeout_milliseconds())
2074
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2075
old_timeout = self.timeout
1358
2076
self.timeout = datetime.timedelta(0, 0, 0, value)
1359
# Reschedule timeout
2077
# Reschedule disabling
1360
2078
if self.enabled:
1361
2079
now = datetime.datetime.utcnow()
1362
time_to_die = timedelta_to_milliseconds(
1363
(self.last_checked_ok + self.timeout) - now)
1364
if time_to_die <= 0:
2080
self.expires += self.timeout - old_timeout
2081
if self.expires <= now:
1365
2082
# The timeout has passed
1368
self.expires = (now +
1369
datetime.timedelta(milliseconds =
1371
2085
if (getattr(self, "disable_initiator_tag", None)
1374
gobject.source_remove(self.disable_initiator_tag)
1375
self.disable_initiator_tag = (gobject.timeout_add
2088
GLib.source_remove(self.disable_initiator_tag)
2089
self.disable_initiator_tag = GLib.timeout_add(
2090
int((self.expires - now).total_seconds() * 1000),
1379
2093
# ExtendedTimeout - property
1380
@dbus_service_property(_interface, signature="t",
2094
@dbus_service_property(_interface,
1381
2096
access="readwrite")
1382
2097
def ExtendedTimeout_dbus_property(self, value=None):
1383
2098
if value is None: # get
1384
return dbus.UInt64(self.extended_timeout_milliseconds())
2099
return dbus.UInt64(self.extended_timeout.total_seconds()
1385
2101
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1387
2103
# Interval - property
1388
@dbus_service_property(_interface, signature="t",
2104
@dbus_service_property(_interface,
1389
2106
access="readwrite")
1390
2107
def Interval_dbus_property(self, value=None):
1391
2108
if value is None: # get
1392
return dbus.UInt64(self.interval_milliseconds())
2109
return dbus.UInt64(self.interval.total_seconds() * 1000)
1393
2110
self.interval = datetime.timedelta(0, 0, 0, value)
1394
2111
if getattr(self, "checker_initiator_tag", None) is None:
1396
2113
if self.enabled:
1397
2114
# Reschedule checker run
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
2115
GLib.source_remove(self.checker_initiator_tag)
2116
self.checker_initiator_tag = GLib.timeout_add(
2117
value, self.start_checker)
2118
self.start_checker() # Start one now, too
1403
2120
# Checker - property
1404
@dbus_service_property(_interface, signature="s",
2121
@dbus_service_property(_interface,
1405
2123
access="readwrite")
1406
2124
def Checker_dbus_property(self, value=None):
1407
2125
if value is None: # get
1408
2126
return dbus.String(self.checker_command)
1409
self.checker_command = unicode(value)
2127
self.checker_command = str(value)
1411
2129
# CheckerRunning - property
1412
@dbus_service_property(_interface, signature="b",
2130
@dbus_service_property(_interface,
1413
2132
access="readwrite")
1414
2133
def CheckerRunning_dbus_property(self, value=None):
1415
2134
if value is None: # get
1448
2175
if data[0] == 'data':
1450
2177
if data[0] == 'function':
1451
2179
def func(*args, **kwargs):
1452
2180
self._pipe.send(('funcall', name, args, kwargs))
1453
2181
return self._pipe.recv()[1]
1456
2185
def __setattr__(self, name, value):
1457
2186
if name == '_pipe':
1458
2187
return super(ProxyClient, self).__setattr__(name, value)
1459
2188
self._pipe.send(('setattr', name, value))
1462
class ClientDBusTransitional(ClientDBus):
1463
__metaclass__ = AlternateDBusNamesMetaclass
1466
2191
class ClientHandler(socketserver.BaseRequestHandler, object):
1467
2192
"""A class to handle client connections.
1469
2194
Instantiated once for each connection to handle it.
1470
2195
Note: This will run in its own forked process."""
1472
2197
def handle(self):
1473
2198
with contextlib.closing(self.server.child_pipe) as child_pipe:
1474
2199
logger.info("TCP connection from: %s",
1475
unicode(self.client_address))
2200
str(self.client_address))
1476
2201
logger.debug("Pipe FD: %d",
1477
2202
self.server.child_pipe.fileno())
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",
2204
session = gnutls.ClientSession(self.request)
2206
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2207
# "+AES-256-CBC", "+SHA1",
2208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1493
2210
# Use a fallback default, since this MUST be set.
1494
2211
priority = self.server.gnutls_priority
1495
2212
if priority is None:
1496
2213
priority = "NORMAL"
1497
(gnutls.library.functions
1498
.gnutls_priority_set_direct(session._c_object,
2214
gnutls.priority_set_direct(session._c_object,
2215
priority.encode("utf-8"),
1501
2218
# Start communication using the Mandos protocol
1502
2219
# Get protocol number
1503
2220
line = self.request.makefile().readline()
1504
2221
logger.debug("Protocol version: %r", line)
1506
2223
if int(line.strip().split()[0]) > 1:
2224
raise RuntimeError(line)
1508
2225
except (ValueError, IndexError, RuntimeError) as error:
1509
2226
logger.error("Unknown protocol version: %s", error)
1512
2229
# Start GnuTLS connection
1514
2231
session.handshake()
1515
except gnutls.errors.GNUTLSError as error:
2232
except gnutls.Error as error:
1516
2233
logger.warning("Handshake failed: %s", error)
1517
2234
# Do not run session.bye() here: the session is not
1518
2235
# established. Just abandon the request.
1520
2237
logger.debug("Handshake succeeded")
1522
2239
approval_required = False
1525
fpr = self.fingerprint(self.peer_certificate
1528
gnutls.errors.GNUTLSError) as error:
2242
fpr = self.fingerprint(
2243
self.peer_certificate(session))
2244
except (TypeError, gnutls.Error) as error:
1529
2245
logger.warning("Bad certificate: %s", error)
1531
2247
logger.debug("Fingerprint: %s", fpr)
1534
2250
client = ProxyClient(child_pipe, fpr,
1535
2251
self.client_address)
1536
2252
except KeyError:
1539
2255
if client.approval_delay:
1540
2256
delay = client.approval_delay
1541
2257
client.approvals_pending += 1
1542
2258
approval_required = True
1545
2261
if not client.enabled:
1546
2262
logger.info("Client %s is disabled",
1548
2264
if self.server.use_dbus:
1549
2265
# Emit D-Bus signal
1550
2266
client.Rejected("Disabled")
1553
2269
if client.approved or not client.approval_delay:
1554
#We are approved or approval is disabled
2270
# We are approved or approval is disabled
1556
2272
elif client.approved is None:
1557
2273
logger.info("Client %s needs approval",
1592
2306
delay -= time2 - time
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))
2309
session.send(client.secret)
2310
except gnutls.Error as error:
2311
logger.warning("gnutls send failed",
1606
2315
logger.info("Sending secret to %s", client.name)
1607
2316
# bump the timeout using extended_timeout
1608
client.checked_ok(client.extended_timeout)
2317
client.bump_timeout(client.extended_timeout)
1609
2318
if self.server.use_dbus:
1610
2319
# Emit D-Bus signal
1611
2320
client.GotSecret()
1614
2323
if approval_required:
1615
2324
client.approvals_pending -= 1
1618
except gnutls.errors.GNUTLSError as error:
1619
logger.warning("GnuTLS bye failed")
2327
except gnutls.Error as error:
2328
logger.warning("GnuTLS bye failed",
1622
2332
def peer_certificate(session):
1623
2333
"Return the peer's OpenPGP certificate as a bytestring"
1624
2334
# If not an OpenPGP certificate...
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
2335
if (gnutls.certificate_type_get(session._c_object)
2336
!= gnutls.CRT_OPENPGP):
2337
# ...return invalid data
1630
2339
list_size = ctypes.c_uint(1)
1631
cert_list = (gnutls.library.functions
1632
.gnutls_certificate_get_peers
2340
cert_list = (gnutls.certificate_get_peers
1633
2341
(session._c_object, ctypes.byref(list_size)))
1634
2342
if not bool(cert_list) and list_size.value != 0:
1635
raise gnutls.errors.GNUTLSError("error getting peer"
2343
raise gnutls.Error("error getting peer certificate")
1637
2344
if list_size.value == 0:
1639
2346
cert = cert_list[0]
1640
2347
return ctypes.string_at(cert.data, cert.size)
1643
2350
def fingerprint(openpgp):
1644
2351
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1645
2352
# New GnuTLS "datum" with the OpenPGP public key
1646
datum = (gnutls.library.types
1647
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1650
ctypes.c_uint(len(openpgp))))
2353
datum = gnutls.datum_t(
2354
ctypes.cast(ctypes.c_char_p(openpgp),
2355
ctypes.POINTER(ctypes.c_ubyte)),
2356
ctypes.c_uint(len(openpgp)))
1651
2357
# New empty GnuTLS certificate
1652
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1653
(gnutls.library.functions
1654
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2358
crt = gnutls.openpgp_crt_t()
2359
gnutls.openpgp_crt_init(ctypes.byref(crt))
1655
2360
# Import the OpenPGP public key into the certificate
1656
(gnutls.library.functions
1657
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1658
gnutls.library.constants
1659
.GNUTLS_OPENPGP_FMT_RAW))
2361
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2362
gnutls.OPENPGP_FMT_RAW)
1660
2363
# Verify the self signature in the key
1661
2364
crtverify = ctypes.c_uint()
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_verify_self(crt, 0,
1664
ctypes.byref(crtverify)))
2365
gnutls.openpgp_crt_verify_self(crt, 0,
2366
ctypes.byref(crtverify))
1665
2367
if crtverify.value != 0:
1666
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1667
raise (gnutls.errors.CertificateSecurityError
2368
gnutls.openpgp_crt_deinit(crt)
2369
raise gnutls.CertificateSecurityError("Verify failed")
1669
2370
# New buffer for the fingerprint
1670
2371
buf = ctypes.create_string_buffer(20)
1671
2372
buf_len = ctypes.c_size_t()
1672
2373
# Get the fingerprint from the certificate into the buffer
1673
(gnutls.library.functions
1674
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1675
ctypes.byref(buf_len)))
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1676
2376
# Deinit the certificate
1677
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2377
gnutls.openpgp_crt_deinit(crt)
1678
2378
# Convert the buffer to a Python bytestring
1679
2379
fpr = ctypes.string_at(buf, buf_len.value)
1680
2380
# Convert the bytestring to hexadecimal notation
1685
2385
class MultiprocessingMixIn(object):
1686
2386
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1687
2388
def sub_process_main(self, request, address):
1689
2390
self.finish_request(request, address)
1690
2391
except Exception:
1691
2392
self.handle_error(request, address)
1692
2393
self.close_request(request)
1694
2395
def process_request(self, request, address):
1695
2396
"""Start a new process to process the request."""
1696
proc = multiprocessing.Process(target = self.sub_process_main,
2397
proc = multiprocessing.Process(target=self.sub_process_main,
2398
args=(request, address))
1703
2403
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1704
2404
""" adds a pipe to the MixIn """
1705
2406
def process_request(self, request, client_address):
1706
2407
"""Overrides and wraps the original process_request().
1708
2409
This function creates a new pipe in self.pipe
1710
2411
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1712
2413
proc = MultiprocessingMixIn.process_request(self, request,
1713
2414
client_address)
1714
2415
self.child_pipe.close()
1715
2416
self.add_pipe(parent_pipe, proc)
1717
2418
def add_pipe(self, parent_pipe, proc):
1718
2419
"""Dummy function; override as necessary"""
1719
raise NotImplementedError
2420
raise NotImplementedError()
1722
2423
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1723
2424
socketserver.TCPServer, object):
1724
2425
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1727
2428
enabled: Boolean; whether this server is activated yet
1728
2429
interface: None or a network interface name (string)
1729
2430
use_ipv6: Boolean; to use IPv6 or not
1731
2433
def __init__(self, server_address, RequestHandlerClass,
1732
interface=None, use_ipv6=True):
2437
"""If socketfd is set, use that file descriptor instead of
2438
creating a new one with socket.socket().
1733
2440
self.interface = interface
1735
2442
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.
1736
2470
socketserver.TCPServer.__init__(self, server_address,
1737
2471
RequestHandlerClass)
1738
2473
def server_bind(self):
1739
2474
"""This overrides the normal server_bind() function
1740
2475
to bind to an interface if one was specified, and also NOT to
1741
2476
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
1742
2478
if self.interface is not None:
1743
2479
if SO_BINDTODEVICE is None:
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",
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)
1764
2501
# Only bind(2) the socket if we really need to.
1765
2502
if self.server_address[0] or self.server_address[1]:
1766
2503
if not self.server_address[0]:
1767
2504
if self.address_family == socket.AF_INET6:
1768
any_address = "::" # in6addr_any
2505
any_address = "::" # in6addr_any
1770
any_address = socket.INADDR_ANY
2507
any_address = "0.0.0.0" # INADDR_ANY
1771
2508
self.server_address = (any_address,
1772
2509
self.server_address[1])
1773
2510
elif not self.server_address[1]:
1774
self.server_address = (self.server_address[0],
2511
self.server_address = (self.server_address[0], 0)
1776
2512
# if self.interface:
1777
2513
# self.server_address = (self.server_address[0],
1881
2611
funcname = request[1]
1882
2612
args = request[2]
1883
2613
kwargs = request[3]
1885
2615
parent_pipe.send(('data', getattr(client_object,
1886
2616
funcname)(*args,
1889
2619
if command == 'getattr':
1890
2620
attrname = request[1]
1891
if callable(client_object.__getattribute__(attrname)):
1892
parent_pipe.send(('function',))
2621
if isinstance(client_object.__getattribute__(attrname),
2622
collections.Callable):
2623
parent_pipe.send(('function', ))
1894
parent_pipe.send(('data', client_object
1895
.__getattribute__(attrname)))
2626
'data', client_object.__getattribute__(attrname)))
1897
2628
if command == 'setattr':
1898
2629
attrname = request[1]
1899
2630
value = request[2]
1900
2631
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}"
1905
2735
def string_to_delta(interval):
1906
2736
"""Parse a string and return a datetime.timedelta
1908
2738
>>> string_to_delta('7d')
1909
2739
datetime.timedelta(7)
1910
2740
>>> string_to_delta('60s')
1999
2835
parser.add_argument("--no-dbus", action="store_false",
2000
2836
dest="use_dbus", help="Do not provide D-Bus"
2001
" system bus interface")
2837
" system bus interface", default=None)
2002
2838
parser.add_argument("--no-ipv6", action="store_false",
2003
dest="use_ipv6", help="Do not use IPv6")
2839
dest="use_ipv6", help="Do not use IPv6",
2004
2841
parser.add_argument("--no-restore", action="store_false",
2005
2842
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")
2007
2847
parser.add_argument("--statedir", metavar="DIR",
2008
2848
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",
2010
2855
options = parser.parse_args()
2012
2857
if options.check:
2859
fail_count, test_count = doctest.testmod()
2860
sys.exit(os.EX_OK if fail_count == 0 else 1)
2017
2862
# Default values for config file for server-global settings
2018
server_defaults = { "interface": "",
2023
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2024
"servicename": "Mandos",
2029
"statedir": "/var/lib/mandos"
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",
2032
2881
# Parse config file for server-global settings
2033
2882
server_config = configparser.SafeConfigParser(server_defaults)
2034
2883
del server_defaults
2035
server_config.read(os.path.join(options.configdir,
2884
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2037
2885
# Convert the SafeConfigParser object to a dict
2038
2886
server_settings = server_config.defaults()
2039
2887
# Use the appropriate methods on the non-string config options
2040
for option in ("debug", "use_dbus", "use_ipv6"):
2888
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2889
"foreground", "zeroconf"):
2041
2890
server_settings[option] = server_config.getboolean("DEFAULT",
2043
2892
if server_settings["port"]:
2044
2893
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
2046
2904
del server_config
2048
2906
# Override the settings from the config file with command line
2049
2907
# options, if set.
2050
2908
for option in ("interface", "address", "port", "debug",
2051
"priority", "servicename", "configdir",
2052
"use_dbus", "use_ipv6", "debuglevel", "restore",
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2054
2912
value = getattr(options, option)
2055
2913
if value is not None:
2056
2914
server_settings[option] = value
2058
2916
# Force all strings to be unicode
2059
2917
for option in server_settings.keys():
2060
if type(server_settings[option]) is str:
2061
server_settings[option] = unicode(server_settings[option])
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
2062
2928
# Now we have our good server settings in "server_settings"
2064
2930
##################################################################
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")
2066
2937
# For convenience
2067
2938
debug = server_settings["debug"]
2068
2939
debuglevel = server_settings["debuglevel"]
2080
2953
level = getattr(logging, debuglevel.upper())
2081
2954
initlogger(debug, level)
2083
2956
if server_settings["servicename"] != "Mandos":
2084
syslogger.setFormatter(logging.Formatter
2085
('Mandos (%s) [%%(process)d]:'
2086
' %%(levelname)s: %%(message)s'
2087
% server_settings["servicename"]))
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2089
2962
# Parse config file with clients
2090
2963
client_config = configparser.SafeConfigParser(Client
2091
2964
.client_defaults)
2092
2965
client_config.read(os.path.join(server_settings["configdir"],
2093
2966
"clients.conf"))
2095
2968
global mandos_dbus_service
2096
2969
mandos_dbus_service = None
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
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
2121
3000
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,
2131
3011
except OSError as error:
2132
if error[0] != errno.EPERM:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
3014
if error.errno != errno.EPERM:
2136
3018
# Enable all possible GnuTLS debugging
2138
3020
# "Use a log level over 10 to enable all debugging options."
2139
3021
# - GnuTLS manual
2140
gnutls.library.functions.gnutls_global_set_log_level(11)
2142
@gnutls.library.types.gnutls_log_func
3022
gnutls.global_set_log_level(11)
2143
3025
def debug_gnutls(level, string):
2144
3026
logger.debug("GnuTLS: %s", string[:-1])
2146
(gnutls.library.functions
2147
.gnutls_global_set_log_function(debug_gnutls))
3028
gnutls.global_set_log_function(debug_gnutls)
2149
3030
# Redirect stdin so all checkers get /dev/null
2150
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3031
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2151
3032
os.dup2(null, sys.stdin.fileno())
2155
3036
# Need to fork before connecting to D-Bus
2157
3038
# Close all input and output, do double fork, etc.
2160
gobject.threads_init()
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2162
3045
global main_loop
2163
3046
# From the Avahi example code
2164
DBusGMainLoop(set_as_default=True )
2165
main_loop = gobject.MainLoop()
3047
DBusGMainLoop(set_as_default=True)
3048
main_loop = GLib.MainLoop()
2166
3049
bus = dbus.SystemBus()
2167
3050
# End of Avahi example code
2170
3053
bus_name = dbus.service.BusName("se.recompile.Mandos",
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")
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)
2177
3061
use_dbus = False
2178
3062
server_settings["use_dbus"] = False
2179
3063
tcp_server.use_dbus = False
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"])))
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"))
2189
3075
global multiprocessing_manager
2190
3076
multiprocessing_manager = multiprocessing.Manager()
2192
3078
client_class = Client
2194
client_class = functools.partial(ClientDBusTransitional,
3080
client_class = functools.partial(ClientDBus, bus=bus)
2197
3082
client_settings = Client.config_parser(client_config)
2198
3083
old_client_settings = {}
2199
3084
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:
2201
3094
# Get client data and settings from last running state.
2202
3095
if server_settings["restore"]:
2204
3097
with open(stored_state_path, "rb") as stored_state:
2205
clients_data, old_client_settings = (pickle.load
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"]
2207
3143
os.remove(stored_state_path)
2208
3144
except IOError as e:
2209
logger.warning("Could not load persistent state: {0}"
2211
if e.errno != errno.ENOENT:
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:",
2213
3152
except EOFError as e:
2214
3153
logger.warning("Could not load persistent state: "
2215
"EOFError: {0}".format(e))
2217
3157
with PGPEngine() as pgp:
2218
for client_name, client in clients_data.iteritems():
3158
for client_name, client in clients_data.items():
3159
# Skip removed clients
3160
if client_name not in client_settings:
2219
3163
# Decide which value to use after restoring saved state.
2220
3164
# We have three different values: Old config file,
2221
3165
# new config file, and saved state.
2282
3225
clients_data[client_name] = client_settings[client_name]
2284
3227
# Create all client objects
2285
for client_name, client in clients_data.iteritems():
3228
for client_name, client in clients_data.items():
2286
3229
tcp_server.clients[client_name] = client_class(
2287
name = client_name, settings = client)
3232
server_settings=server_settings)
2289
3234
if not tcp_server.clients:
2290
3235
logger.warning("No clients defined")
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
3238
if pidfile is not None:
3242
print(pid, file=pidfile)
3244
logger.error("Could not write to file %r with PID %d",
2304
3247
del pidfilename
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())
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2311
class MandosDBusService(dbus.service.Object):
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2312
3258
"""A D-Bus proxy object"""
2313
3260
def __init__(self):
2314
3261
dbus.service.Object.__init__(self, bus, "/")
2315
3263
_interface = "se.recompile.Mandos"
2317
3265
@dbus.service.signal(_interface, signature="o")
2318
3266
def ClientAdded(self, objpath):
2322
3270
@dbus.service.signal(_interface, signature="ss")
2323
3271
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2327
3277
@dbus.service.signal(_interface, signature="os")
2328
3278
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2332
3284
@dbus.service.method(_interface, out_signature="ao")
2333
3285
def GetAllClients(self):
2335
return dbus.Array(c.dbus_object_path
2337
tcp_server.clients.itervalues())
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2339
3292
@dbus.service.method(_interface,
2340
3293
out_signature="a{oa{sv}}")
2341
3294
def GetAllClientsWithProperties(self):
2343
3296
return dbus.Dictionary(
2344
((c.dbus_object_path, c.GetAll(""))
2345
for c in tcp_server.clients.itervalues()),
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2346
3300
signature="oa{sv}")
2348
3302
@dbus.service.method(_interface, in_signature="o")
2349
3303
def RemoveClient(self, object_path):
2351
for c in tcp_server.clients.itervalues():
3305
for c in tcp_server.clients.values():
2352
3306
if c.dbus_object_path == object_path:
2353
3307
del tcp_server.clients[c.name]
2354
3308
c.remove_from_connection()
2355
# Don't signal anything except ClientRemoved
3309
# Don't signal the disabling
2356
3310
c.disable(quiet=True)
2358
self.ClientRemoved(object_path, c.name)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2360
3314
raise KeyError(object_path)
2364
class MandosDBusServiceTransitional(MandosDBusService):
2365
__metaclass__ = AlternateDBusNamesMetaclass
2366
mandos_dbus_service = MandosDBusServiceTransitional()
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
2369
3362
"Cleanup function; run on exit"
2372
multiprocessing.active_children()
3366
mp.active_children()
2373
3368
if not (tcp_server.clients or client_settings):
2376
3371
# Store client before exiting. Secrets are encrypted with key
2377
3372
# based on what config file has. If config file is
2378
3373
# removed/edited, old secret will thus be unrecovable.
2380
3375
with PGPEngine() as pgp:
2381
for client in tcp_server.clients.itervalues():
3376
for client in tcp_server.clients.values():
2382
3377
key = client_settings[client.name]["secret"]
2383
3378
client.encrypted_secret = pgp.encrypt(client.secret,
2385
3380
client_dict = {}
2387
3382
# A list of attributes that can not be pickled
2389
exclude = set(("bus", "changedstate", "secret",
2391
for name, typ in (inspect.getmembers
2392
(dbus.service.Object)):
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2393
3388
exclude.add(name)
2395
3390
client_dict["encrypted_secret"] = (client
2396
3391
.encrypted_secret)
2397
3392
for attr in client.client_structure:
2398
3393
if attr not in exclude:
2399
3394
client_dict[attr] = getattr(client, attr)
2401
3396
clients[client.name] = client_dict
2402
3397
del client_settings[client.name]["secret"]
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)
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
2411
3409
os.rename(tempname, stored_state_path)
2412
3410
except (IOError, OSError) as e:
2413
logger.warning("Could not save persistent state: {0}"
2417
3413
os.remove(tempname)
2418
3414
except NameError:
2420
if e.errno not in set((errno.ENOENT, errno.EACCES,
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:",
2424
3424
# Delete all clients, and settings from config
2425
3425
while tcp_server.clients:
2426
3426
name, client = tcp_server.clients.popitem()
2428
3428
client.remove_from_connection()
2429
# Don't signal anything except ClientRemoved
3429
# Don't signal the disabling
2430
3430
client.disable(quiet=True)
3431
# Emit D-Bus signal for removal
2433
mandos_dbus_service.ClientRemoved(client
3433
mandos_dbus_service.client_removed_signal(client)
2436
3434
client_settings.clear()
2438
3436
atexit.register(cleanup)
2440
for client in tcp_server.clients.itervalues():
3438
for client in tcp_server.clients.values():
2443
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3440
# Emit D-Bus signal for adding
3441
mandos_dbus_service.client_added_signal(client)
2444
3442
# Need to initiate checking of clients
2445
3443
if client.enabled:
2446
3444
client.init_checker()
2448
3446
tcp_server.enable()
2449
3447
tcp_server.server_activate()
2451
3449
# Find out what port we got
2452
service.port = tcp_server.socket.getsockname()[1]
3451
service.port = tcp_server.socket.getsockname()[1]
2454
3453
logger.info("Now listening on address %r, port %d,"
2455
" flowinfo %d, scope_id %d"
2456
% tcp_server.socket.getsockname())
3454
" flowinfo %d, scope_id %d",
3455
*tcp_server.socket.getsockname())
2458
logger.info("Now listening on address %r, port %d"
2459
% tcp_server.socket.getsockname())
2461
#service.interface = tcp_server.socket.getsockname()[3]
3457
logger.info("Now listening on address %r, port %d",
3458
*tcp_server.socket.getsockname())
3460
# service.interface = tcp_server.socket.getsockname()[3]
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))
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))
2478
3478
logger.debug("Starting main loop")
2479
3479
main_loop.run()
2480
3480
except AvahiError as error:
2481
logger.critical("AvahiError: %s", error)
3481
logger.critical("Avahi Error", exc_info=error)
2484
3484
except KeyboardInterrupt: