69
import cPickle as pickle
65
import cPickle as pickle
72
66
import multiprocessing
81
74
import dbus.service
82
from gi.repository import GLib
83
77
from dbus.mainloop.glib import DBusGMainLoop
86
80
import xml.dom.minidom
89
# Try to find the value of SO_BINDTODEVICE:
91
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
# newer, and it is also the most natural place for it:
93
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
85
except AttributeError:
96
# This is where SO_BINDTODEVICE was up to and including Python
98
87
from IN import SO_BINDTODEVICE
99
88
except ImportError:
100
# In Python 2.7 it seems to have been removed entirely.
101
# Try running the C preprocessor:
103
cc = subprocess.Popen(["cc", "--language=c", "-E",
105
stdin=subprocess.PIPE,
106
stdout=subprocess.PIPE)
107
stdout = cc.communicate(
108
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
except (OSError, ValueError, IndexError):
112
SO_BINDTODEVICE = None
114
if sys.version_info.major == 2:
89
SO_BINDTODEVICE = None
118
92
stored_state_file = "clients.pickle"
120
94
logger = logging.getLogger()
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
126
101
except (OSError, AttributeError):
128
102
def if_nametoindex(interface):
129
103
"Get an interface index the hard way, i.e. using fcntl()"
130
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
131
105
with contextlib.closing(socket.socket()) as s:
132
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
135
111
return interface_index
138
def copy_function(func):
139
"""Make a copy of a function"""
140
if sys.version_info.major == 2:
141
return types.FunctionType(func.func_code,
147
return types.FunctionType(func.__code__,
154
114
def initlogger(debug, level=logging.WARNING):
155
115
"""init logger and add loglevel"""
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
118
syslogger = (logging.handlers.SysLogHandler
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
161
122
syslogger.setFormatter(logging.Formatter
162
123
('Mandos [%(process)d]: %(levelname)s:'
164
125
logger.addHandler(syslogger)
167
128
console = logging.StreamHandler()
168
129
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
235
182
.replace(b"\n", b"\\n")
236
183
.replace(b"\0", b"\\x00"))
239
186
def encrypt(self, data, password):
240
187
passphrase = self.password_encode(password)
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
188
with tempfile.NamedTemporaryFile(dir=self.tempdir
243
190
passfile.write(passphrase)
245
proc = subprocess.Popen([self.gpg, '--symmetric',
192
proc = subprocess.Popen(['gpg', '--symmetric',
246
193
'--passphrase-file',
248
195
+ self.gnupgargs,
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
196
stdin = subprocess.PIPE,
197
stdout = subprocess.PIPE,
198
stderr = subprocess.PIPE)
199
ciphertext, err = proc.communicate(input = data)
253
200
if proc.returncode != 0:
254
201
raise PGPError(err)
255
202
return ciphertext
257
204
def decrypt(self, data, password):
258
205
passphrase = self.password_encode(password)
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
206
with tempfile.NamedTemporaryFile(dir = self.tempdir
261
208
passfile.write(passphrase)
263
proc = subprocess.Popen([self.gpg, '--decrypt',
210
proc = subprocess.Popen(['gpg', '--decrypt',
264
211
'--passphrase-file',
266
213
+ self.gnupgargs,
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
214
stdin = subprocess.PIPE,
215
stdout = subprocess.PIPE,
216
stderr = subprocess.PIPE)
217
decrypted_plaintext, err = proc.communicate(input
271
219
if proc.returncode != 0:
272
220
raise PGPError(err)
273
221
return decrypted_plaintext
276
# Pretend that we have an Avahi module
278
"""This isn't so much a class as it is a module-like namespace.
279
It is instantiated once, and simulates having an Avahi module."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
289
def string_array_to_txt_array(self, t):
290
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
for s in t), signature="ay")
292
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
293
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
294
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
295
SERVER_INVALID = 0 # avahi-common/defs.h
296
SERVER_REGISTERING = 1 # avahi-common/defs.h
297
SERVER_RUNNING = 2 # avahi-common/defs.h
298
SERVER_COLLISION = 3 # avahi-common/defs.h
299
SERVER_FAILURE = 4 # avahi-common/defs.h
303
224
class AvahiError(Exception):
304
225
def __init__(self, value, *args, **kwargs):
305
226
self.value = value
306
return super(AvahiError, self).__init__(value, *args,
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
310
231
class AvahiServiceError(AvahiError):
314
234
class AvahiGroupError(AvahiError):
318
238
class AvahiService(object):
319
239
"""An Avahi (Zeroconf) service.
322
242
interface: integer; avahi.IF_UNSPEC or an interface index.
323
243
Used to optionally bind to the specified interface.
488
386
follow_name_owner_changes=True),
489
387
avahi.DBUS_INTERFACE_SERVER)
490
388
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
389
self.server_state_changed)
492
390
self.server_state_changed(self.server.GetState())
495
393
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
395
"""Add the new name to the syslog messages"""
498
ret = AvahiService.rename(self, *args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
505
# Pretend that we have a GnuTLS module
506
class GnuTLS(object):
507
"""This isn't so much a class as it is a module-like namespace.
508
It is instantiated once, and simulates having a GnuTLS module."""
510
library = ctypes.util.find_library("gnutls")
512
library = ctypes.util.find_library("gnutls-deb0")
513
_library = ctypes.cdll.LoadLibrary(library)
515
_need_version = b"3.3.0"
518
# Need to use "self" here, since this method is called before
519
# the assignment to the "gnutls" global variable happens.
520
if self.check_version(self._need_version) is None:
521
raise self.Error("Needs GnuTLS {} or later"
522
.format(self._need_version))
524
# Unless otherwise indicated, the constants and types below are
525
# all from the gnutls/gnutls.h C header file.
535
E_NO_CERTIFICATE_FOUND = -49
536
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
539
class session_int(ctypes.Structure):
541
session_t = ctypes.POINTER(session_int)
543
class certificate_credentials_st(ctypes.Structure):
545
certificate_credentials_t = ctypes.POINTER(
546
certificate_credentials_st)
547
certificate_type_t = ctypes.c_int
549
class datum_t(ctypes.Structure):
550
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
551
('size', ctypes.c_uint)]
553
class openpgp_crt_int(ctypes.Structure):
555
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
556
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
557
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
558
credentials_type_t = ctypes.c_int
559
transport_ptr_t = ctypes.c_void_p
560
close_request_t = ctypes.c_int
563
class Error(Exception):
564
# We need to use the class name "GnuTLS" here, since this
565
# exception might be raised from within GnuTLS.__init__,
566
# which is called before the assignment to the "gnutls"
567
# global variable has happened.
568
def __init__(self, message=None, code=None, args=()):
569
# Default usage is by a message string, but if a return
570
# code is passed, convert it to a string with
573
if message is None and code is not None:
574
message = GnuTLS.strerror(code)
575
return super(GnuTLS.Error, self).__init__(
578
class CertificateSecurityError(Error):
582
class Credentials(object):
584
self._c_object = gnutls.certificate_credentials_t()
585
gnutls.certificate_allocate_credentials(
586
ctypes.byref(self._c_object))
587
self.type = gnutls.CRD_CERTIFICATE
590
gnutls.certificate_free_credentials(self._c_object)
592
class ClientSession(object):
593
def __init__(self, socket, credentials=None):
594
self._c_object = gnutls.session_t()
595
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
596
gnutls.set_default_priority(self._c_object)
597
gnutls.transport_set_ptr(self._c_object, socket.fileno())
598
gnutls.handshake_set_private_extensions(self._c_object,
601
if credentials is None:
602
credentials = gnutls.Credentials()
603
gnutls.credentials_set(self._c_object, credentials.type,
604
ctypes.cast(credentials._c_object,
606
self.credentials = credentials
609
gnutls.deinit(self._c_object)
612
return gnutls.handshake(self._c_object)
614
def send(self, data):
618
data_len -= gnutls.record_send(self._c_object,
623
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
625
# Error handling functions
626
def _error_code(result):
627
"""A function to raise exceptions on errors, suitable
628
for the 'restype' attribute on ctypes functions"""
631
if result == gnutls.E_NO_CERTIFICATE_FOUND:
632
raise gnutls.CertificateSecurityError(code=result)
633
raise gnutls.Error(code=result)
635
def _retry_on_error(result, func, arguments):
636
"""A function to retry on some errors, suitable
637
for the 'errcheck' attribute on ctypes functions"""
639
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
640
return _error_code(result)
641
result = func(*arguments)
644
# Unless otherwise indicated, the function declarations below are
645
# all from the gnutls/gnutls.h C header file.
648
priority_set_direct = _library.gnutls_priority_set_direct
649
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
650
ctypes.POINTER(ctypes.c_char_p)]
651
priority_set_direct.restype = _error_code
653
init = _library.gnutls_init
654
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
655
init.restype = _error_code
657
set_default_priority = _library.gnutls_set_default_priority
658
set_default_priority.argtypes = [session_t]
659
set_default_priority.restype = _error_code
661
record_send = _library.gnutls_record_send
662
record_send.argtypes = [session_t, ctypes.c_void_p,
664
record_send.restype = ctypes.c_ssize_t
665
record_send.errcheck = _retry_on_error
667
certificate_allocate_credentials = (
668
_library.gnutls_certificate_allocate_credentials)
669
certificate_allocate_credentials.argtypes = [
670
ctypes.POINTER(certificate_credentials_t)]
671
certificate_allocate_credentials.restype = _error_code
673
certificate_free_credentials = (
674
_library.gnutls_certificate_free_credentials)
675
certificate_free_credentials.argtypes = [
676
certificate_credentials_t]
677
certificate_free_credentials.restype = None
679
handshake_set_private_extensions = (
680
_library.gnutls_handshake_set_private_extensions)
681
handshake_set_private_extensions.argtypes = [session_t,
683
handshake_set_private_extensions.restype = None
685
credentials_set = _library.gnutls_credentials_set
686
credentials_set.argtypes = [session_t, credentials_type_t,
688
credentials_set.restype = _error_code
690
strerror = _library.gnutls_strerror
691
strerror.argtypes = [ctypes.c_int]
692
strerror.restype = ctypes.c_char_p
694
certificate_type_get = _library.gnutls_certificate_type_get
695
certificate_type_get.argtypes = [session_t]
696
certificate_type_get.restype = _error_code
698
certificate_get_peers = _library.gnutls_certificate_get_peers
699
certificate_get_peers.argtypes = [session_t,
700
ctypes.POINTER(ctypes.c_uint)]
701
certificate_get_peers.restype = ctypes.POINTER(datum_t)
703
global_set_log_level = _library.gnutls_global_set_log_level
704
global_set_log_level.argtypes = [ctypes.c_int]
705
global_set_log_level.restype = None
707
global_set_log_function = _library.gnutls_global_set_log_function
708
global_set_log_function.argtypes = [log_func]
709
global_set_log_function.restype = None
711
deinit = _library.gnutls_deinit
712
deinit.argtypes = [session_t]
713
deinit.restype = None
715
handshake = _library.gnutls_handshake
716
handshake.argtypes = [session_t]
717
handshake.restype = _error_code
718
handshake.errcheck = _retry_on_error
720
transport_set_ptr = _library.gnutls_transport_set_ptr
721
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
722
transport_set_ptr.restype = None
724
bye = _library.gnutls_bye
725
bye.argtypes = [session_t, close_request_t]
726
bye.restype = _error_code
727
bye.errcheck = _retry_on_error
729
check_version = _library.gnutls_check_version
730
check_version.argtypes = [ctypes.c_char_p]
731
check_version.restype = ctypes.c_char_p
733
# All the function declarations below are from gnutls/openpgp.h
735
openpgp_crt_init = _library.gnutls_openpgp_crt_init
736
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
737
openpgp_crt_init.restype = _error_code
739
openpgp_crt_import = _library.gnutls_openpgp_crt_import
740
openpgp_crt_import.argtypes = [openpgp_crt_t,
741
ctypes.POINTER(datum_t),
743
openpgp_crt_import.restype = _error_code
745
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
746
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
747
ctypes.POINTER(ctypes.c_uint)]
748
openpgp_crt_verify_self.restype = _error_code
750
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
751
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
752
openpgp_crt_deinit.restype = None
754
openpgp_crt_get_fingerprint = (
755
_library.gnutls_openpgp_crt_get_fingerprint)
756
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
760
openpgp_crt_get_fingerprint.restype = _error_code
762
# Remove non-public functions
763
del _error_code, _retry_on_error
764
# Create the global "gnutls" object, simulating a module
768
def call_pipe(connection, # : multiprocessing.Connection
769
func, *args, **kwargs):
770
"""This function is meant to be called by multiprocessing.Process
772
This function runs func(*args, **kwargs), and writes the resulting
773
return value on the provided multiprocessing.Connection.
775
connection.send(func(*args, **kwargs))
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
779
411
class Client(object):
780
412
"""A representation of a client host served by this server.
783
415
approved: bool(); 'None' if not yet approved/disapproved
784
416
approval_delay: datetime.timedelta(); Time to wait for approval
959
604
logger.info("Disabling client %s", self.name)
960
605
if getattr(self, "disable_initiator_tag", None) is not None:
961
GLib.source_remove(self.disable_initiator_tag)
606
gobject.source_remove(self.disable_initiator_tag)
962
607
self.disable_initiator_tag = None
963
608
self.expires = None
964
609
if getattr(self, "checker_initiator_tag", None) is not None:
965
GLib.source_remove(self.checker_initiator_tag)
610
gobject.source_remove(self.checker_initiator_tag)
966
611
self.checker_initiator_tag = None
967
612
self.stop_checker()
968
613
self.enabled = False
970
615
self.send_changedstate()
971
# Do not run this again if called by a GLib.timeout_add
616
# Do not run this again if called by a gobject.timeout_add
974
619
def __del__(self):
977
622
def init_checker(self):
978
623
# Schedule a new checker to be started an 'interval' from now,
979
624
# and every interval from then on.
980
625
if self.checker_initiator_tag is not None:
981
GLib.source_remove(self.checker_initiator_tag)
982
self.checker_initiator_tag = GLib.timeout_add(
983
int(self.interval.total_seconds() * 1000),
626
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
985
630
# Schedule a disable() when 'timeout' has passed
986
631
if self.disable_initiator_tag is not None:
987
GLib.source_remove(self.disable_initiator_tag)
988
self.disable_initiator_tag = GLib.timeout_add(
989
int(self.timeout.total_seconds() * 1000), self.disable)
632
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
990
636
# Also start a new checker *right now*.
991
637
self.start_checker()
993
def checker_callback(self, source, condition, connection,
639
def checker_callback(self, pid, condition, command):
995
640
"""The checker has completed, so take appropriate actions."""
996
641
self.checker_callback_tag = None
997
642
self.checker = None
998
# Read return code from connection (see call_pipe)
999
returncode = connection.recv()
1003
self.last_checker_status = returncode
1004
self.last_checker_signal = None
643
if os.WIFEXITED(condition):
644
self.last_checker_status = os.WEXITSTATUS(condition)
1005
645
if self.last_checker_status == 0:
1006
646
logger.info("Checker for %(name)s succeeded",
1008
648
self.checked_ok()
1010
logger.info("Checker for %(name)s failed", vars(self))
650
logger.info("Checker for %(name)s failed",
1012
653
self.last_checker_status = -1
1013
self.last_checker_signal = -returncode
1014
654
logger.warning("Checker for %(name)s crashed?",
1018
657
def checked_ok(self):
1019
658
"""Assert that the client has been seen, alive and well."""
1020
659
self.last_checked_ok = datetime.datetime.utcnow()
1021
660
self.last_checker_status = 0
1022
self.last_checker_signal = None
1023
661
self.bump_timeout()
1025
663
def bump_timeout(self, timeout=None):
1026
664
"""Bump up the timeout for this client."""
1027
665
if timeout is None:
1028
666
timeout = self.timeout
1029
667
if self.disable_initiator_tag is not None:
1030
GLib.source_remove(self.disable_initiator_tag)
668
gobject.source_remove(self.disable_initiator_tag)
1031
669
self.disable_initiator_tag = None
1032
670
if getattr(self, "enabled", False):
1033
self.disable_initiator_tag = GLib.timeout_add(
1034
int(timeout.total_seconds() * 1000), self.disable)
671
self.disable_initiator_tag = (gobject.timeout_add
672
(timedelta_to_milliseconds
673
(timeout), self.disable))
1035
674
self.expires = datetime.datetime.utcnow() + timeout
1037
676
def need_approval(self):
1038
677
self.last_approval_request = datetime.datetime.utcnow()
1040
679
def start_checker(self):
1041
680
"""Start a new checker subprocess if one is not running.
1043
682
If a checker already exists, leave it running and do
1045
684
# The reason for not killing a running checker is that if we
1050
689
# checkers alone, the checker would have to take more time
1051
690
# than 'timeout' for the client to be disabled, which is as it
1054
if self.checker is not None and not self.checker.is_alive():
1055
logger.warning("Checker was not alive; joining")
693
# If a checker exists, make sure it is not a zombie
695
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
except AttributeError:
698
except OSError as error:
699
if error.errno != errno.ECHILD:
703
logger.warning("Checker was a zombie")
704
gobject.source_remove(self.checker_callback_tag)
705
self.checker_callback(pid, status,
706
self.current_checker_command)
1058
707
# Start a new checker if needed
1059
708
if self.checker is None:
1060
709
# Escape attributes for the shell
1062
attr: re.escape(str(getattr(self, attr)))
1063
for attr in self.runtime_expansions}
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
713
self.runtime_expansions)
1065
715
command = self.checker_command % escaped_attrs
1066
716
except TypeError as error:
1067
717
logger.error('Could not format string "%s"',
1068
self.checker_command,
718
self.checker_command, exc_info=error)
719
return True # Try again later
720
self.current_checker_command = command
722
logger.info("Starting checker %r for %s",
724
# We don't need to redirect stdout and stderr, since
725
# in normal mode, that is already done by daemon(),
726
# and in debug mode we don't want to. (Stdin is
727
# always replaced by /dev/null.)
728
# The exception is when not debugging but nevertheless
729
# running in the foreground; use the previously
732
if (not self.server_settings["debug"]
733
and self.server_settings["foreground"]):
734
popen_args.update({"stdout": wnull,
736
self.checker = subprocess.Popen(command,
740
except OSError as error:
741
logger.error("Failed to start subprocess",
1070
return True # Try again later
1071
self.current_checker_command = command
1072
logger.info("Starting checker %r for %s", command,
1074
# We don't need to redirect stdout and stderr, since
1075
# in normal mode, that is already done by daemon(),
1076
# and in debug mode we don't want to. (Stdin is
1077
# always replaced by /dev/null.)
1078
# The exception is when not debugging but nevertheless
1079
# running in the foreground; use the previously
1081
popen_args = {"close_fds": True,
1084
if (not self.server_settings["debug"]
1085
and self.server_settings["foreground"]):
1086
popen_args.update({"stdout": wnull,
1088
pipe = multiprocessing.Pipe(duplex=False)
1089
self.checker = multiprocessing.Process(
1091
args=(pipe[1], subprocess.call, command),
1093
self.checker.start()
1094
self.checker_callback_tag = GLib.io_add_watch(
1095
pipe[0].fileno(), GLib.IO_IN,
1096
self.checker_callback, pipe[0], command)
1097
# Re-run this periodically if run by GLib.timeout_add
744
self.checker_callback_tag = (gobject.child_watch_add
746
self.checker_callback,
748
# The checker may have completed before the gobject
749
# watch was added. Check for this.
751
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
752
except OSError as error:
753
if error.errno == errno.ECHILD:
754
# This should never happen
755
logger.error("Child process vanished",
760
gobject.source_remove(self.checker_callback_tag)
761
self.checker_callback(pid, status, command)
762
# Re-run this periodically if run by gobject.timeout_add
1100
765
def stop_checker(self):
1101
766
"""Force the checker process, if any, to stop."""
1102
767
if self.checker_callback_tag:
1103
GLib.source_remove(self.checker_callback_tag)
768
gobject.source_remove(self.checker_callback_tag)
1104
769
self.checker_callback_tag = None
1105
770
if getattr(self, "checker", None) is None:
1107
772
logger.debug("Stopping checker for %(name)s", vars(self))
1108
self.checker.terminate()
774
self.checker.terminate()
776
#if self.checker.poll() is None:
777
# self.checker.kill()
778
except OSError as error:
779
if error.errno != errno.ESRCH: # No such process
1109
781
self.checker = None
1112
def dbus_service_property(dbus_interface,
784
def dbus_service_property(dbus_interface, signature="v",
785
access="readwrite", byte_arrays=False):
1116
786
"""Decorators for marking methods of a DBusObjectWithProperties to
1117
787
become properties on the D-Bus.
1119
789
The decorated method will be called with no arguments by "Get"
1120
790
and with one argument by "Set".
1122
792
The parameters, where they are supported, are the same as
1123
793
dbus.service.method, except there is only "signature", since the
1124
794
type from Get() and the type sent to Set() is the same.
1207
class DBusObjectWithAnnotations(dbus.service.Object):
1208
"""A D-Bus object with annotations.
1210
Classes inheriting from this can use the dbus_annotations
1211
decorator to add annotations to methods or signals.
870
class DBusObjectWithProperties(dbus.service.Object):
871
"""A D-Bus object with properties.
873
Classes inheriting from this can use the dbus_service_property
874
decorator to expose methods as D-Bus properties. It exposes the
875
standard Get(), Set(), and GetAll() methods on the D-Bus.
1215
879
def _is_dbus_thing(thing):
1216
880
"""Returns a function testing if an attribute is a D-Bus thing
1218
882
If called like _is_dbus_thing("method") it returns a function
1219
883
suitable for use as predicate to inspect.getmembers().
1221
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1224
888
def _get_all_dbus_things(self, thing):
1225
889
"""Returns a generator of (name, attribute) pairs
1227
return ((getattr(athing.__get__(self), "_dbus_name", name),
891
return ((getattr(athing.__get__(self), "_dbus_name",
1228
893
athing.__get__(self))
1229
894
for cls in self.__class__.__mro__
1230
895
for name, athing in
1231
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1233
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1235
path_keyword='object_path',
1236
connection_keyword='connection')
1237
def Introspect(self, object_path, connection):
1238
"""Overloading of standard D-Bus method.
1240
Inserts annotation tags on methods and signals.
1242
xmlstring = dbus.service.Object.Introspect(self, object_path,
1245
document = xml.dom.minidom.parseString(xmlstring)
1247
for if_tag in document.getElementsByTagName("interface"):
1248
# Add annotation tags
1249
for typ in ("method", "signal"):
1250
for tag in if_tag.getElementsByTagName(typ):
1252
for name, prop in (self.
1253
_get_all_dbus_things(typ)):
1254
if (name == tag.getAttribute("name")
1255
and prop._dbus_interface
1256
== if_tag.getAttribute("name")):
1257
annots.update(getattr(
1258
prop, "_dbus_annotations", {}))
1259
for name, value in annots.items():
1260
ann_tag = document.createElement(
1262
ann_tag.setAttribute("name", name)
1263
ann_tag.setAttribute("value", value)
1264
tag.appendChild(ann_tag)
1265
# Add interface annotation tags
1266
for annotation, value in dict(
1267
itertools.chain.from_iterable(
1268
annotations().items()
1269
for name, annotations
1270
in self._get_all_dbus_things("interface")
1271
if name == if_tag.getAttribute("name")
1273
ann_tag = document.createElement("annotation")
1274
ann_tag.setAttribute("name", annotation)
1275
ann_tag.setAttribute("value", value)
1276
if_tag.appendChild(ann_tag)
1277
# Fix argument name for the Introspect method itself
1278
if (if_tag.getAttribute("name")
1279
== dbus.INTROSPECTABLE_IFACE):
1280
for cn in if_tag.getElementsByTagName("method"):
1281
if cn.getAttribute("name") == "Introspect":
1282
for arg in cn.getElementsByTagName("arg"):
1283
if (arg.getAttribute("direction")
1285
arg.setAttribute("name",
1287
xmlstring = document.toxml("utf-8")
1289
except (AttributeError, xml.dom.DOMException,
1290
xml.parsers.expat.ExpatError) as error:
1291
logger.error("Failed to override Introspection method",
1296
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1297
"""A D-Bus object with properties.
1299
Classes inheriting from this can use the dbus_service_property
1300
decorator to expose methods as D-Bus properties. It exposes the
1301
standard Get(), Set(), and GetAll() methods on the D-Bus.
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
1304
899
def _get_dbus_property(self, interface_name, property_name):
1305
900
"""Returns a bound method if one exists which is a D-Bus
1306
901
property with the specified name and interface.
1308
for cls in self.__class__.__mro__:
1309
for name, value in inspect.getmembers(
1310
cls, self._is_dbus_thing("property")):
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
906
self._is_dbus_thing("property"))):
1311
907
if (value._dbus_name == property_name
1312
908
and value._dbus_interface == interface_name):
1313
909
return value.__get__(self)
1315
911
# No such property
1316
raise DBusPropertyNotFound("{}:{}.{}".format(
1317
self.dbus_object_path, interface_name, property_name))
1320
def _get_all_interface_names(cls):
1321
"""Get a sequence of all interfaces supported by an object"""
1322
return (name for name in set(getattr(getattr(x, attr),
1323
"_dbus_interface", None)
1324
for x in (inspect.getmro(cls))
1326
if name is not None)
1328
@dbus.service.method(dbus.PROPERTIES_IFACE,
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1330
917
out_signature="v")
1331
918
def Get(self, interface_name, property_name):
1332
919
"""Standard D-Bus property Get() method, see D-Bus standard.
1460
1050
exc_info=error)
1461
1051
return xmlstring
1464
dbus.OBJECT_MANAGER_IFACE
1465
except AttributeError:
1466
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1469
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1470
"""A D-Bus object with an ObjectManager.
1472
Classes inheriting from this exposes the standard
1473
GetManagedObjects call and the InterfacesAdded and
1474
InterfacesRemoved signals on the standard
1475
"org.freedesktop.DBus.ObjectManager" interface.
1477
Note: No signals are sent automatically; they must be sent
1480
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1481
out_signature="a{oa{sa{sv}}}")
1482
def GetManagedObjects(self):
1483
"""This function must be overridden"""
1484
raise NotImplementedError()
1486
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1487
signature="oa{sa{sv}}")
1488
def InterfacesAdded(self, object_path, interfaces_and_properties):
1491
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1492
def InterfacesRemoved(self, object_path, interfaces):
1495
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1497
path_keyword='object_path',
1498
connection_keyword='connection')
1499
def Introspect(self, object_path, connection):
1500
"""Overloading of standard D-Bus method.
1502
Override return argument name of GetManagedObjects to be
1503
"objpath_interfaces_and_properties"
1505
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1509
document = xml.dom.minidom.parseString(xmlstring)
1511
for if_tag in document.getElementsByTagName("interface"):
1512
# Fix argument name for the GetManagedObjects method
1513
if (if_tag.getAttribute("name")
1514
== dbus.OBJECT_MANAGER_IFACE):
1515
for cn in if_tag.getElementsByTagName("method"):
1516
if (cn.getAttribute("name")
1517
== "GetManagedObjects"):
1518
for arg in cn.getElementsByTagName("arg"):
1519
if (arg.getAttribute("direction")
1523
"objpath_interfaces"
1525
xmlstring = document.toxml("utf-8")
1527
except (AttributeError, xml.dom.DOMException,
1528
xml.parsers.expat.ExpatError) as error:
1529
logger.error("Failed to override Introspection method",
1534
1054
def datetime_to_dbus(dt, variant_level=0):
1535
1055
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1537
return dbus.String("", variant_level=variant_level)
1538
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
return dbus.String("", variant_level = variant_level)
1058
return dbus.String(dt.isoformat(),
1059
variant_level=variant_level)
1541
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1572
1092
# Ignore non-D-Bus attributes, and D-Bus attributes
1573
1093
# with the wrong interface name
1574
1094
if (not hasattr(attribute, "_dbus_interface")
1575
or not attribute._dbus_interface.startswith(
1576
orig_interface_name)):
1095
or not attribute._dbus_interface
1096
.startswith(orig_interface_name)):
1578
1098
# Create an alternate D-Bus interface name based on
1579
1099
# the current name
1580
alt_interface = attribute._dbus_interface.replace(
1581
orig_interface_name, alt_interface_name)
1100
alt_interface = (attribute._dbus_interface
1101
.replace(orig_interface_name,
1102
alt_interface_name))
1582
1103
interface_names.add(alt_interface)
1583
1104
# Is this a D-Bus signal?
1584
1105
if getattr(attribute, "_dbus_is_signal", False):
1585
1106
# Extract the original non-method undecorated
1586
1107
# function by black magic
1587
if sys.version_info.major == 2:
1588
nonmethod_func = (dict(
1108
nonmethod_func = (dict(
1589
1109
zip(attribute.func_code.co_freevars,
1590
attribute.__closure__))
1591
["func"].cell_contents)
1593
nonmethod_func = (dict(
1594
zip(attribute.__code__.co_freevars,
1595
attribute.__closure__))
1596
["func"].cell_contents)
1110
attribute.__closure__))["func"]
1597
1112
# Create a new, but exactly alike, function
1598
1113
# object, and decorate it to be a new D-Bus signal
1599
1114
# with the alternate D-Bus interface name
1600
new_function = copy_function(nonmethod_func)
1601
new_function = (dbus.service.signal(
1603
attribute._dbus_signature)(new_function))
1115
new_function = (dbus.service.signal
1117
attribute._dbus_signature)
1118
(types.FunctionType(
1119
nonmethod_func.func_code,
1120
nonmethod_func.func_globals,
1121
nonmethod_func.func_name,
1122
nonmethod_func.func_defaults,
1123
nonmethod_func.func_closure)))
1604
1124
# Copy annotations, if any
1606
new_function._dbus_annotations = dict(
1607
attribute._dbus_annotations)
1126
new_function._dbus_annotations = (
1127
dict(attribute._dbus_annotations))
1608
1128
except AttributeError:
1611
1130
# Define a creator of a function to call both the
1612
1131
# original and alternate functions, so both the
1613
1132
# original and alternate signals gets sent when
1696
1222
if interface_names:
1697
1223
# Replace the class with a new subclass of it with
1698
1224
# methods, signals, etc. as created above.
1699
if sys.version_info.major == 2:
1700
cls = type(b"{}Alternate".format(cls.__name__),
1703
cls = type("{}Alternate".format(cls.__name__),
1225
cls = type(b"{0}Alternate".format(cls.__name__),
1710
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
1711
"se.bsnet.fukt.Mandos"})
1232
"se.bsnet.fukt.Mandos"})
1712
1233
class ClientDBus(Client, DBusObjectWithProperties):
1713
1234
"""A Client class using D-Bus
1716
1237
dbus_object_path: dbus.ObjectPath
1717
1238
bus: dbus.SystemBus()
1720
1241
runtime_expansions = (Client.runtime_expansions
1721
+ ("dbus_object_path", ))
1723
_interface = "se.recompile.Mandos.Client"
1242
+ ("dbus_object_path",))
1725
1244
# dbus.service.Object doesn't use super(), so we can't either.
1727
def __init__(self, bus=None, *args, **kwargs):
1246
def __init__(self, bus = None, *args, **kwargs):
1729
1248
Client.__init__(self, *args, **kwargs)
1730
1249
# Only now, when this client is initialized, can it show up on
1732
client_object_name = str(self.name).translate(
1251
client_object_name = unicode(self.name).translate(
1733
1252
{ord("."): ord("_"),
1734
1253
ord("-"): ord("_")})
1735
self.dbus_object_path = dbus.ObjectPath(
1736
"/clients/" + client_object_name)
1254
self.dbus_object_path = (dbus.ObjectPath
1255
("/clients/" + client_object_name))
1737
1256
DBusObjectWithProperties.__init__(self, self.bus,
1738
1257
self.dbus_object_path)
1740
def notifychangeproperty(transform_func, dbus_name,
1741
type_func=lambda x: x,
1743
invalidate_only=False,
1744
_interface=_interface):
1259
def notifychangeproperty(transform_func,
1260
dbus_name, type_func=lambda x: x,
1745
1262
""" Modify a variable so that it's a property which announces
1746
1263
its changes to DBus.
1748
1265
transform_fun: Function that takes a value and a variant_level
1749
1266
and transforms it to a D-Bus type.
1750
1267
dbus_name: D-Bus name of the variable
1902
1411
server to mandos-client
1906
1415
# Rejected - signal
1907
1416
@dbus.service.signal(_interface, signature="s")
1908
1417
def Rejected(self, reason):
1912
1421
# NeedApproval - signal
1913
1422
@dbus.service.signal(_interface, signature="tb")
1914
1423
def NeedApproval(self, timeout, default):
1916
1425
return self.need_approval()
1920
1429
# Approve - method
1921
1430
@dbus.service.method(_interface, in_signature="b")
1922
1431
def Approve(self, value):
1923
1432
self.approve(value)
1925
1434
# CheckedOK - method
1926
1435
@dbus.service.method(_interface)
1927
1436
def CheckedOK(self):
1928
1437
self.checked_ok()
1930
1439
# Enable - method
1931
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1932
1440
@dbus.service.method(_interface)
1933
1441
def Enable(self):
1937
1445
# StartChecker - method
1938
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1939
1446
@dbus.service.method(_interface)
1940
1447
def StartChecker(self):
1942
1449
self.start_checker()
1944
1451
# Disable - method
1945
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1946
1452
@dbus.service.method(_interface)
1947
1453
def Disable(self):
1951
1457
# StopChecker - method
1952
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1953
1458
@dbus.service.method(_interface)
1954
1459
def StopChecker(self):
1955
1460
self.stop_checker()
1959
1464
# ApprovalPending - property
1960
1465
@dbus_service_property(_interface, signature="b", access="read")
1961
1466
def ApprovalPending_dbus_property(self):
1962
1467
return dbus.Boolean(bool(self.approvals_pending))
1964
1469
# ApprovedByDefault - property
1965
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="b",
1967
1471
access="readwrite")
1968
1472
def ApprovedByDefault_dbus_property(self, value=None):
1969
1473
if value is None: # get
1970
1474
return dbus.Boolean(self.approved_by_default)
1971
1475
self.approved_by_default = bool(value)
1973
1477
# ApprovalDelay - property
1974
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
1976
1479
access="readwrite")
1977
1480
def ApprovalDelay_dbus_property(self, value=None):
1978
1481
if value is None: # get
1979
return dbus.UInt64(self.approval_delay.total_seconds()
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1981
1483
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1983
1485
# ApprovalDuration - property
1984
@dbus_service_property(_interface,
1486
@dbus_service_property(_interface, signature="t",
1986
1487
access="readwrite")
1987
1488
def ApprovalDuration_dbus_property(self, value=None):
1988
1489
if value is None: # get
1989
return dbus.UInt64(self.approval_duration.total_seconds()
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1991
1492
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1993
1494
# Name - property
1995
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1996
1495
@dbus_service_property(_interface, signature="s", access="read")
1997
1496
def Name_dbus_property(self):
1998
1497
return dbus.String(self.name)
2000
1499
# Fingerprint - property
2002
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2003
1500
@dbus_service_property(_interface, signature="s", access="read")
2004
1501
def Fingerprint_dbus_property(self):
2005
1502
return dbus.String(self.fingerprint)
2007
1504
# Host - property
2008
@dbus_service_property(_interface,
1505
@dbus_service_property(_interface, signature="s",
2010
1506
access="readwrite")
2011
1507
def Host_dbus_property(self, value=None):
2012
1508
if value is None: # get
2013
1509
return dbus.String(self.host)
2014
self.host = str(value)
1510
self.host = unicode(value)
2016
1512
# Created - property
2018
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2019
1513
@dbus_service_property(_interface, signature="s", access="read")
2020
1514
def Created_dbus_property(self):
2021
1515
return datetime_to_dbus(self.created)
2023
1517
# LastEnabled - property
2024
1518
@dbus_service_property(_interface, signature="s", access="read")
2025
1519
def LastEnabled_dbus_property(self):
2026
1520
return datetime_to_dbus(self.last_enabled)
2028
1522
# Enabled - property
2029
@dbus_service_property(_interface,
1523
@dbus_service_property(_interface, signature="b",
2031
1524
access="readwrite")
2032
1525
def Enabled_dbus_property(self, value=None):
2033
1526
if value is None: # get
2082
1574
if (getattr(self, "disable_initiator_tag", None)
2085
GLib.source_remove(self.disable_initiator_tag)
2086
self.disable_initiator_tag = GLib.timeout_add(
2087
int((self.expires - now).total_seconds() * 1000),
1577
gobject.source_remove(self.disable_initiator_tag)
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
2090
1583
# ExtendedTimeout - property
2091
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2093
1585
access="readwrite")
2094
1586
def ExtendedTimeout_dbus_property(self, value=None):
2095
1587
if value is None: # get
2096
return dbus.UInt64(self.extended_timeout.total_seconds()
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
2098
1589
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2100
1591
# Interval - property
2101
@dbus_service_property(_interface,
1592
@dbus_service_property(_interface, signature="t",
2103
1593
access="readwrite")
2104
1594
def Interval_dbus_property(self, value=None):
2105
1595
if value is None: # get
2106
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
return dbus.UInt64(self.interval_milliseconds())
2107
1597
self.interval = datetime.timedelta(0, 0, 0, value)
2108
1598
if getattr(self, "checker_initiator_tag", None) is None:
2110
1600
if self.enabled:
2111
1601
# Reschedule checker run
2112
GLib.source_remove(self.checker_initiator_tag)
2113
self.checker_initiator_tag = GLib.timeout_add(
2114
value, self.start_checker)
2115
self.start_checker() # Start one now, too
1602
gobject.source_remove(self.checker_initiator_tag)
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
2117
1607
# Checker - property
2118
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="s",
2120
1609
access="readwrite")
2121
1610
def Checker_dbus_property(self, value=None):
2122
1611
if value is None: # get
2123
1612
return dbus.String(self.checker_command)
2124
self.checker_command = str(value)
1613
self.checker_command = unicode(value)
2126
1615
# CheckerRunning - property
2127
@dbus_service_property(_interface,
1616
@dbus_service_property(_interface, signature="b",
2129
1617
access="readwrite")
2130
1618
def CheckerRunning_dbus_property(self, value=None):
2131
1619
if value is None: # get
2188
1666
class ClientHandler(socketserver.BaseRequestHandler, object):
2189
1667
"""A class to handle client connections.
2191
1669
Instantiated once for each connection to handle it.
2192
1670
Note: This will run in its own forked process."""
2194
1672
def handle(self):
2195
1673
with contextlib.closing(self.server.child_pipe) as child_pipe:
2196
1674
logger.info("TCP connection from: %s",
2197
str(self.client_address))
1675
unicode(self.client_address))
2198
1676
logger.debug("Pipe FD: %d",
2199
1677
self.server.child_pipe.fileno())
2201
session = gnutls.ClientSession(self.request)
2203
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2204
# "+AES-256-CBC", "+SHA1",
2205
# "+COMP-NULL", "+CTYPE-OPENPGP",
1679
session = (gnutls.connection
1680
.ClientSession(self.request,
1682
.X509Credentials()))
1684
# Note: gnutls.connection.X509Credentials is really a
1685
# generic GnuTLS certificate credentials object so long as
1686
# no X.509 keys are added to it. Therefore, we can use it
1687
# here despite using OpenPGP certificates.
1689
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1690
# "+AES-256-CBC", "+SHA1",
1691
# "+COMP-NULL", "+CTYPE-OPENPGP",
2207
1693
# Use a fallback default, since this MUST be set.
2208
1694
priority = self.server.gnutls_priority
2209
1695
if priority is None:
2210
1696
priority = "NORMAL"
2211
gnutls.priority_set_direct(session._c_object,
2212
priority.encode("utf-8"),
1697
(gnutls.library.functions
1698
.gnutls_priority_set_direct(session._c_object,
2215
1701
# Start communication using the Mandos protocol
2216
1702
# Get protocol number
2217
1703
line = self.request.makefile().readline()
2303
1792
delay -= time2 - time
2306
session.send(client.secret)
2307
except gnutls.Error as error:
2308
logger.warning("gnutls send failed",
1795
while sent_size < len(client.secret):
1797
sent = session.send(client.secret[sent_size:])
1798
except gnutls.errors.GNUTLSError as error:
1799
logger.warning("gnutls send failed",
1802
logger.debug("Sent: %d, remaining: %d",
1803
sent, len(client.secret)
1804
- (sent_size + sent))
2312
1807
logger.info("Sending secret to %s", client.name)
2313
1808
# bump the timeout using extended_timeout
2314
1809
client.bump_timeout(client.extended_timeout)
2315
1810
if self.server.use_dbus:
2316
1811
# Emit D-Bus signal
2317
1812
client.GotSecret()
2320
1815
if approval_required:
2321
1816
client.approvals_pending -= 1
2324
except gnutls.Error as error:
1819
except gnutls.errors.GNUTLSError as error:
2325
1820
logger.warning("GnuTLS bye failed",
2326
1821
exc_info=error)
2329
1824
def peer_certificate(session):
2330
1825
"Return the peer's OpenPGP certificate as a bytestring"
2331
1826
# If not an OpenPGP certificate...
2332
if (gnutls.certificate_type_get(session._c_object)
2333
!= gnutls.CRT_OPENPGP):
2334
# ...return invalid data
1827
if (gnutls.library.functions
1828
.gnutls_certificate_type_get(session._c_object)
1829
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1830
# ...do the normal thing
1831
return session.peer_certificate
2336
1832
list_size = ctypes.c_uint(1)
2337
cert_list = (gnutls.certificate_get_peers
1833
cert_list = (gnutls.library.functions
1834
.gnutls_certificate_get_peers
2338
1835
(session._c_object, ctypes.byref(list_size)))
2339
1836
if not bool(cert_list) and list_size.value != 0:
2340
raise gnutls.Error("error getting peer certificate")
1837
raise gnutls.errors.GNUTLSError("error getting peer"
2341
1839
if list_size.value == 0:
2343
1841
cert = cert_list[0]
2344
1842
return ctypes.string_at(cert.data, cert.size)
2347
1845
def fingerprint(openpgp):
2348
1846
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2349
1847
# New GnuTLS "datum" with the OpenPGP public key
2350
datum = gnutls.datum_t(
2351
ctypes.cast(ctypes.c_char_p(openpgp),
2352
ctypes.POINTER(ctypes.c_ubyte)),
2353
ctypes.c_uint(len(openpgp)))
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
ctypes.c_uint(len(openpgp))))
2354
1853
# New empty GnuTLS certificate
2355
crt = gnutls.openpgp_crt_t()
2356
gnutls.openpgp_crt_init(ctypes.byref(crt))
1854
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2357
1857
# Import the OpenPGP public key into the certificate
2358
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2359
gnutls.OPENPGP_FMT_RAW)
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
2360
1862
# Verify the self signature in the key
2361
1863
crtverify = ctypes.c_uint()
2362
gnutls.openpgp_crt_verify_self(crt, 0,
2363
ctypes.byref(crtverify))
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
2364
1867
if crtverify.value != 0:
2365
gnutls.openpgp_crt_deinit(crt)
2366
raise gnutls.CertificateSecurityError("Verify failed")
1868
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1869
raise (gnutls.errors.CertificateSecurityError
2367
1871
# New buffer for the fingerprint
2368
1872
buf = ctypes.create_string_buffer(20)
2369
1873
buf_len = ctypes.c_size_t()
2370
1874
# Get the fingerprint from the certificate into the buffer
2371
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2372
ctypes.byref(buf_len))
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
2373
1878
# Deinit the certificate
2374
gnutls.openpgp_crt_deinit(crt)
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2375
1880
# Convert the buffer to a Python bytestring
2376
1881
fpr = ctypes.string_at(buf, buf_len.value)
2377
1882
# Convert the bytestring to hexadecimal notation
2466
1965
# socket_wrapper(), if socketfd was set.
2467
1966
socketserver.TCPServer.__init__(self, server_address,
2468
1967
RequestHandlerClass)
2470
1969
def server_bind(self):
2471
1970
"""This overrides the normal server_bind() function
2472
1971
to bind to an interface if one was specified, and also NOT to
2473
1972
bind to an address or port if they were not specified."""
2474
global SO_BINDTODEVICE
2475
1973
if self.interface is not None:
2476
1974
if SO_BINDTODEVICE is None:
2477
# Fall back to a hard-coded value which seems to be
2479
logger.warning("SO_BINDTODEVICE not found, trying 25")
2480
SO_BINDTODEVICE = 25
2482
self.socket.setsockopt(
2483
socket.SOL_SOCKET, SO_BINDTODEVICE,
2484
(self.interface + "\0").encode("utf-8"))
2485
except socket.error as error:
2486
if error.errno == errno.EPERM:
2487
logger.error("No permission to bind to"
2488
" interface %s", self.interface)
2489
elif error.errno == errno.ENOPROTOOPT:
2490
logger.error("SO_BINDTODEVICE not available;"
2491
" cannot bind to interface %s",
2493
elif error.errno == errno.ENODEV:
2494
logger.error("Interface %s does not exist,"
2495
" cannot bind", self.interface)
1975
logger.error("SO_BINDTODEVICE does not exist;"
1976
" cannot bind to interface %s",
1980
self.socket.setsockopt(socket.SOL_SOCKET,
1982
str(self.interface + '\0'))
1983
except socket.error as error:
1984
if error.errno == errno.EPERM:
1985
logger.error("No permission to bind to"
1986
" interface %s", self.interface)
1987
elif error.errno == errno.ENOPROTOOPT:
1988
logger.error("SO_BINDTODEVICE not available;"
1989
" cannot bind to interface %s",
1991
elif error.errno == errno.ENODEV:
1992
logger.error("Interface %s does not exist,"
1993
" cannot bind", self.interface)
2498
1996
# Only bind(2) the socket if we really need to.
2499
1997
if self.server_address[0] or self.server_address[1]:
2500
1998
if not self.server_address[0]:
2501
1999
if self.address_family == socket.AF_INET6:
2502
any_address = "::" # in6addr_any
2000
any_address = "::" # in6addr_any
2504
any_address = "0.0.0.0" # INADDR_ANY
2002
any_address = "0.0.0.0" # INADDR_ANY
2505
2003
self.server_address = (any_address,
2506
2004
self.server_address[1])
2507
2005
elif not self.server_address[1]:
2508
self.server_address = (self.server_address[0], 0)
2006
self.server_address = (self.server_address[0],
2509
2008
# if self.interface:
2510
2009
# self.server_address = (self.server_address[0],
2949
2441
level = getattr(logging, debuglevel.upper())
2950
2442
initlogger(debug, level)
2952
2444
if server_settings["servicename"] != "Mandos":
2953
syslogger.setFormatter(
2954
logging.Formatter('Mandos ({}) [%(process)d]:'
2955
' %(levelname)s: %(message)s'.format(
2956
server_settings["servicename"])))
2445
syslogger.setFormatter(logging.Formatter
2446
('Mandos ({0}) [%(process)d]:'
2447
' %(levelname)s: %(message)s'
2448
.format(server_settings
2958
2451
# Parse config file with clients
2959
2452
client_config = configparser.SafeConfigParser(Client
2960
2453
.client_defaults)
2961
2454
client_config.read(os.path.join(server_settings["configdir"],
2962
2455
"clients.conf"))
2964
2457
global mandos_dbus_service
2965
2458
mandos_dbus_service = None
2967
2460
socketfd = None
2968
2461
if server_settings["socket"] != "":
2969
2462
socketfd = server_settings["socket"]
2970
tcp_server = MandosServer(
2971
(server_settings["address"], server_settings["port"]),
2973
interface=(server_settings["interface"] or None),
2975
gnutls_priority=server_settings["priority"],
2463
tcp_server = MandosServer((server_settings["address"],
2464
server_settings["port"]),
2466
interface=(server_settings["interface"]
2470
server_settings["priority"],
2978
2473
if not foreground:
2979
2474
pidfilename = "/run/mandos.pid"
2980
2475
if not os.path.isdir("/run/."):
2981
2476
pidfilename = "/var/run/mandos.pid"
2984
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2479
pidfile = open(pidfilename, "w")
2985
2480
except IOError as e:
2986
2481
logger.error("Could not open file %r", pidfilename,
2989
for name, group in (("_mandos", "_mandos"),
2990
("mandos", "mandos"),
2991
("nobody", "nogroup")):
2484
for name in ("_mandos", "mandos", "nobody"):
2993
2486
uid = pwd.getpwnam(name).pw_uid
2994
gid = pwd.getpwnam(group).pw_gid
2487
gid = pwd.getpwnam(name).pw_gid
2996
2489
except KeyError:
3005
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3007
2497
except OSError as error:
3008
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3009
.format(uid, gid, os.strerror(error.errno)))
3010
2498
if error.errno != errno.EPERM:
3014
2502
# Enable all possible GnuTLS debugging
3016
2504
# "Use a log level over 10 to enable all debugging options."
3017
2505
# - GnuTLS manual
3018
gnutls.global_set_log_level(11)
2506
gnutls.library.functions.gnutls_global_set_log_level(11)
2508
@gnutls.library.types.gnutls_log_func
3021
2509
def debug_gnutls(level, string):
3022
2510
logger.debug("GnuTLS: %s", string[:-1])
3024
gnutls.global_set_log_function(debug_gnutls)
2512
(gnutls.library.functions
2513
.gnutls_global_set_log_function(debug_gnutls))
3026
2515
# Redirect stdin so all checkers get /dev/null
3027
2516
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3028
2517
os.dup2(null, sys.stdin.fileno())
3032
2521
# Need to fork before connecting to D-Bus
3033
2522
if not foreground:
3034
2523
# Close all input and output, do double fork, etc.
3037
# multiprocessing will use threads, so before we use GLib we need
3038
# to inform GLib that threads will be used.
2526
# multiprocessing will use threads, so before we use gobject we
2527
# need to inform gobject that threads will be used.
2528
gobject.threads_init()
3041
2530
global main_loop
3042
2531
# From the Avahi example code
3043
2532
DBusGMainLoop(set_as_default=True)
3044
main_loop = GLib.MainLoop()
2533
main_loop = gobject.MainLoop()
3045
2534
bus = dbus.SystemBus()
3046
2535
# End of Avahi example code
3049
2538
bus_name = dbus.service.BusName("se.recompile.Mandos",
3052
old_bus_name = dbus.service.BusName(
3053
"se.bsnet.fukt.Mandos", bus,
3055
except dbus.exceptions.DBusException as e:
2539
bus, do_not_queue=True)
2540
old_bus_name = (dbus.service.BusName
2541
("se.bsnet.fukt.Mandos", bus,
2543
except dbus.exceptions.NameExistsException as e:
3056
2544
logger.error("Disabling D-Bus:", exc_info=e)
3057
2545
use_dbus = False
3058
2546
server_settings["use_dbus"] = False
3059
2547
tcp_server.use_dbus = False
3061
2549
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3062
service = AvahiServiceToSyslog(
3063
name=server_settings["servicename"],
3064
servicetype="_mandos._tcp",
2550
service = AvahiServiceToSyslog(name =
2551
server_settings["servicename"],
2552
servicetype = "_mandos._tcp",
2553
protocol = protocol, bus = bus)
3067
2554
if server_settings["interface"]:
3068
service.interface = if_nametoindex(
3069
server_settings["interface"].encode("utf-8"))
2555
service.interface = (if_nametoindex
2556
(str(server_settings["interface"])))
3071
2558
global multiprocessing_manager
3072
2559
multiprocessing_manager = multiprocessing.Manager()
3074
2561
client_class = Client
3076
client_class = functools.partial(ClientDBus, bus=bus)
2563
client_class = functools.partial(ClientDBus, bus = bus)
3078
2565
client_settings = Client.config_parser(client_config)
3079
2566
old_client_settings = {}
3080
2567
clients_data = {}
3082
2569
# This is used to redirect stdout and stderr for checker processes
3084
wnull = open(os.devnull, "w") # A writable /dev/null
2571
wnull = open(os.devnull, "w") # A writable /dev/null
3085
2572
# Only used if server is running in foreground but not in debug
3087
2574
if debug or not foreground:
3090
2577
# Get client data and settings from last running state.
3091
2578
if server_settings["restore"]:
3093
2580
with open(stored_state_path, "rb") as stored_state:
3094
if sys.version_info.major == 2:
3095
clients_data, old_client_settings = pickle.load(
3098
bytes_clients_data, bytes_old_client_settings = (
3099
pickle.load(stored_state, encoding="bytes"))
3100
# Fix bytes to strings
3103
clients_data = {(key.decode("utf-8")
3104
if isinstance(key, bytes)
3107
bytes_clients_data.items()}
3108
del bytes_clients_data
3109
for key in clients_data:
3110
value = {(k.decode("utf-8")
3111
if isinstance(k, bytes) else k): v
3113
clients_data[key].items()}
3114
clients_data[key] = value
3116
value["client_structure"] = [
3118
if isinstance(s, bytes)
3120
value["client_structure"]]
3122
for k in ("name", "host"):
3123
if isinstance(value[k], bytes):
3124
value[k] = value[k].decode("utf-8")
3125
# old_client_settings
3127
old_client_settings = {
3128
(key.decode("utf-8")
3129
if isinstance(key, bytes)
3132
bytes_old_client_settings.items()}
3133
del bytes_old_client_settings
3135
for value in old_client_settings.values():
3136
if isinstance(value["host"], bytes):
3137
value["host"] = (value["host"]
2581
clients_data, old_client_settings = (pickle.load
3139
2583
os.remove(stored_state_path)
3140
2584
except IOError as e:
3141
2585
if e.errno == errno.ENOENT:
3142
logger.warning("Could not load persistent state:"
3143
" {}".format(os.strerror(e.errno)))
2586
logger.warning("Could not load persistent state: {0}"
2587
.format(os.strerror(e.errno)))
3145
2589
logger.critical("Could not load persistent state:",
3148
2592
except EOFError as e:
3149
2593
logger.warning("Could not load persistent state: "
2594
"EOFError:", exc_info=e)
3153
2596
with PGPEngine() as pgp:
3154
for client_name, client in clients_data.items():
2597
for client_name, client in clients_data.iteritems():
3155
2598
# Skip removed clients
3156
2599
if client_name not in client_settings:
3159
2602
# Decide which value to use after restoring saved state.
3160
2603
# We have three different values: Old config file,
3161
2604
# new config file, and saved state.
3219
2662
for client_name in (set(client_settings)
3220
2663
- set(old_client_settings)):
3221
2664
clients_data[client_name] = client_settings[client_name]
3223
2666
# Create all client objects
3224
for client_name, client in clients_data.items():
2667
for client_name, client in clients_data.iteritems():
3225
2668
tcp_server.clients[client_name] = client_class(
3228
server_settings=server_settings)
2669
name = client_name, settings = client,
2670
server_settings = server_settings)
3230
2672
if not tcp_server.clients:
3231
2673
logger.warning("No clients defined")
3233
2675
if not foreground:
3234
2676
if pidfile is not None:
3238
print(pid, file=pidfile)
2680
pidfile.write(str(pid) + "\n".encode("utf-8"))
3239
2681
except IOError:
3240
2682
logger.error("Could not write to file %r with PID %d",
3241
2683
pidfilename, pid)
3243
2685
del pidfilename
3245
for termsig in (signal.SIGHUP, signal.SIGTERM):
3246
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3247
lambda: main_loop.quit() and False)
2687
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2688
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3251
@alternate_dbus_interfaces(
3252
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3253
class MandosDBusService(DBusObjectWithObjectManager):
2691
@alternate_dbus_interfaces({"se.recompile.Mandos":
2692
"se.bsnet.fukt.Mandos"})
2693
class MandosDBusService(DBusObjectWithProperties):
3254
2694
"""A D-Bus proxy object"""
3256
2695
def __init__(self):
3257
2696
dbus.service.Object.__init__(self, bus, "/")
3259
2697
_interface = "se.recompile.Mandos"
2699
@dbus_interface_annotations(_interface)
2701
return { "org.freedesktop.DBus.Property"
2702
".EmitsChangedSignal":
3261
2705
@dbus.service.signal(_interface, signature="o")
3262
2706
def ClientAdded(self, objpath):
3266
2710
@dbus.service.signal(_interface, signature="ss")
3267
2711
def ClientNotFound(self, fingerprint, address):
3271
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3273
2715
@dbus.service.signal(_interface, signature="os")
3274
2716
def ClientRemoved(self, objpath, name):
3278
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3280
2720
@dbus.service.method(_interface, out_signature="ao")
3281
2721
def GetAllClients(self):
3283
return dbus.Array(c.dbus_object_path for c in
3284
tcp_server.clients.values())
3286
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2723
return dbus.Array(c.dbus_object_path
2725
tcp_server.clients.itervalues())
3288
2727
@dbus.service.method(_interface,
3289
2728
out_signature="a{oa{sv}}")
3290
2729
def GetAllClientsWithProperties(self):
3292
2731
return dbus.Dictionary(
3293
{c.dbus_object_path: c.GetAll(
3294
"se.recompile.Mandos.Client")
3295
for c in tcp_server.clients.values()},
2732
((c.dbus_object_path, c.GetAll(""))
2733
for c in tcp_server.clients.itervalues()),
3296
2734
signature="oa{sv}")
3298
2736
@dbus.service.method(_interface, in_signature="o")
3299
2737
def RemoveClient(self, object_path):
3301
for c in tcp_server.clients.values():
2739
for c in tcp_server.clients.itervalues():
3302
2740
if c.dbus_object_path == object_path:
3303
2741
del tcp_server.clients[c.name]
3304
2742
c.remove_from_connection()
3305
# Don't signal the disabling
2743
# Don't signal anything except ClientRemoved
3306
2744
c.disable(quiet=True)
3307
# Emit D-Bus signal for removal
3308
self.client_removed_signal(c)
2746
self.ClientRemoved(object_path, c.name)
3310
2748
raise KeyError(object_path)
3314
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3315
out_signature="a{oa{sa{sv}}}")
3316
def GetManagedObjects(self):
3318
return dbus.Dictionary(
3319
{client.dbus_object_path:
3321
{interface: client.GetAll(interface)
3323
client._get_all_interface_names()})
3324
for client in tcp_server.clients.values()})
3326
def client_added_signal(self, client):
3327
"""Send the new standard signal and the old signal"""
3329
# New standard signal
3330
self.InterfacesAdded(
3331
client.dbus_object_path,
3333
{interface: client.GetAll(interface)
3335
client._get_all_interface_names()}))
3337
self.ClientAdded(client.dbus_object_path)
3339
def client_removed_signal(self, client):
3340
"""Send the new standard signal and the old signal"""
3342
# New standard signal
3343
self.InterfacesRemoved(
3344
client.dbus_object_path,
3345
client._get_all_interface_names())
3347
self.ClientRemoved(client.dbus_object_path,
3350
2752
mandos_dbus_service = MandosDBusService()
3352
# Save modules to variables to exempt the modules from being
3353
# unloaded before the function registered with atexit() is run.
3354
mp = multiprocessing
3358
2755
"Cleanup function; run on exit"
3360
2757
service.cleanup()
3362
mp.active_children()
2759
multiprocessing.active_children()
3364
2761
if not (tcp_server.clients or client_settings):
3367
2764
# Store client before exiting. Secrets are encrypted with key
3368
2765
# based on what config file has. If config file is
3369
2766
# removed/edited, old secret will thus be unrecovable.
3371
2768
with PGPEngine() as pgp:
3372
for client in tcp_server.clients.values():
2769
for client in tcp_server.clients.itervalues():
3373
2770
key = client_settings[client.name]["secret"]
3374
2771
client.encrypted_secret = pgp.encrypt(client.secret,
3376
2773
client_dict = {}
3378
2775
# A list of attributes that can not be pickled
3380
exclude = {"bus", "changedstate", "secret",
3381
"checker", "server_settings"}
3382
for name, typ in inspect.getmembers(dbus.service
2777
exclude = set(("bus", "changedstate", "secret",
2778
"checker", "server_settings"))
2779
for name, typ in (inspect.getmembers
2780
(dbus.service.Object)):
3384
2781
exclude.add(name)
3386
2783
client_dict["encrypted_secret"] = (client
3387
2784
.encrypted_secret)
3388
2785
for attr in client.client_structure:
3389
2786
if attr not in exclude:
3390
2787
client_dict[attr] = getattr(client, attr)
3392
2789
clients[client.name] = client_dict
3393
2790
del client_settings[client.name]["secret"]
3396
with tempfile.NamedTemporaryFile(
3400
dir=os.path.dirname(stored_state_path),
3401
delete=False) as stored_state:
3402
pickle.dump((clients, client_settings), stored_state,
3404
tempname = stored_state.name
2793
with (tempfile.NamedTemporaryFile
2794
(mode='wb', suffix=".pickle", prefix='clients-',
2795
dir=os.path.dirname(stored_state_path),
2796
delete=False)) as stored_state:
2797
pickle.dump((clients, client_settings), stored_state)
2798
tempname=stored_state.name
3405
2799
os.rename(tempname, stored_state_path)
3406
2800
except (IOError, OSError) as e: