69
import cPickle as pickle
63
import cPickle as pickle
72
64
import multiprocessing
81
70
import dbus.service
82
from gi.repository import GLib
83
73
from dbus.mainloop.glib import DBusGMainLoop
86
76
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
81
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
82
except AttributeError:
96
# This is where SO_BINDTODEVICE was up to and including Python
98
84
from IN import SO_BINDTODEVICE
99
85
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:
86
SO_BINDTODEVICE = None
118
89
stored_state_file = "clients.pickle"
120
91
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
126
100
except (OSError, AttributeError):
128
101
def if_nametoindex(interface):
129
102
"Get an interface index the hard way, i.e. using fcntl()"
130
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
131
104
with contextlib.closing(socket.socket()) as s:
132
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
135
110
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
113
def initlogger(debug, level=logging.WARNING):
155
114
"""init logger and add loglevel"""
158
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
161
116
syslogger.setFormatter(logging.Formatter
162
117
('Mandos [%(process)d]: %(levelname)s:'
164
119
logger.addHandler(syslogger)
167
122
console = logging.StreamHandler()
168
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
225
167
os.rmdir(self.tempdir)
226
168
self.tempdir = None
228
170
def password_encode(self, password):
229
171
# Passphrase can not be empty and can not contain newlines or
230
172
# NUL bytes. So we prefix it and hex encode it.
231
encoded = b"mandos" + binascii.hexlify(password)
232
if len(encoded) > 2048:
233
# GnuPG can't handle long passwords, so encode differently
234
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
235
.replace(b"\n", b"\\n")
236
.replace(b"\0", b"\\x00"))
173
return b"mandos" + binascii.hexlify(password)
239
175
def encrypt(self, data, password):
240
passphrase = self.password_encode(password)
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
243
passfile.write(passphrase)
245
proc = subprocess.Popen([self.gpg, '--symmetric',
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
253
if proc.returncode != 0:
176
self.gnupg.passphrase = self.password_encode(password)
177
with open(os.devnull) as devnull:
179
proc = self.gnupg.run(['--symmetric'],
180
create_fhs=['stdin', 'stdout'],
181
attach_fhs={'stderr': devnull})
182
with contextlib.closing(proc.handles['stdin']) as f:
184
with contextlib.closing(proc.handles['stdout']) as f:
185
ciphertext = f.read()
189
self.gnupg.passphrase = None
255
190
return ciphertext
257
192
def decrypt(self, data, password):
258
passphrase = self.password_encode(password)
259
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
261
passfile.write(passphrase)
263
proc = subprocess.Popen([self.gpg, '--decrypt',
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
271
if proc.returncode != 0:
193
self.gnupg.passphrase = self.password_encode(password)
194
with open(os.devnull) as devnull:
196
proc = self.gnupg.run(['--decrypt'],
197
create_fhs=['stdin', 'stdout'],
198
attach_fhs={'stderr': devnull})
199
with contextlib.closing(proc.handles['stdin'] ) as f:
201
with contextlib.closing(proc.handles['stdout']) as f:
202
decrypted_plaintext = f.read()
206
self.gnupg.passphrase = None
273
207
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
211
class AvahiError(Exception):
304
212
def __init__(self, value, *args, **kwargs):
305
213
self.value = value
306
return super(AvahiError, self).__init__(value, *args,
214
super(AvahiError, self).__init__(value, *args, **kwargs)
215
def __unicode__(self):
216
return unicode(repr(self.value))
310
218
class AvahiServiceError(AvahiError):
314
221
class AvahiGroupError(AvahiError):
318
225
class AvahiService(object):
319
226
"""An Avahi (Zeroconf) service.
322
229
interface: integer; avahi.IF_UNSPEC or an interface index.
323
230
Used to optionally bind to the specified interface.
324
231
name: string; Example: 'Mandos'
325
232
type: string; Example: '_mandos._tcp'.
326
See <https://www.iana.org/assignments/service-names-port-numbers>
233
See <http://www.dns-sd.org/ServiceTypes.html>
327
234
port: integer; what port to announce
328
235
TXT: list of strings; TXT record for the service
329
236
domain: string; Domain to publish on, default to .local if empty.
488
365
follow_name_owner_changes=True),
489
366
avahi.DBUS_INTERFACE_SERVER)
490
367
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
368
self.server_state_changed)
492
369
self.server_state_changed(self.server.GetState())
495
371
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
373
"""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'
374
ret = AvahiService.rename(self)
375
syslogger.setFormatter(logging.Formatter
376
('Mandos (%s) [%%(process)d]:'
377
' %%(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))
381
def timedelta_to_milliseconds(td):
382
"Convert a datetime.timedelta() to milliseconds"
383
return ((td.days * 24 * 60 * 60 * 1000)
384
+ (td.seconds * 1000)
385
+ (td.microseconds // 1000))
779
387
class Client(object):
780
388
"""A representation of a client host served by this server.
783
391
approved: bool(); 'None' if not yet approved/disapproved
784
392
approval_delay: datetime.timedelta(); Time to wait for approval
806
414
last_checked_ok: datetime.datetime(); (UTC) or None
807
415
last_checker_status: integer between 0 and 255 reflecting exit
808
416
status of last checker. -1 reflects crashed
809
checker, -2 means no checker completed yet.
810
last_checker_signal: The signal which killed the last checker, if
811
last_checker_status is -1
812
418
last_enabled: datetime.datetime(); (UTC) or None
813
419
name: string; from the config file, used in log messages and
814
420
D-Bus identifiers
815
421
secret: bytestring; sent verbatim (over TLS) to client
816
422
timeout: datetime.timedelta(); How long from last_checked_ok
817
423
until this client is disabled
818
extended_timeout: extra long timeout when secret has been sent
424
extended_timeout: extra long timeout when password has been sent
819
425
runtime_expansions: Allowed attributes for runtime expansion.
820
426
expires: datetime.datetime(); time (UTC) when a client will be
821
427
disabled, or None
822
server_settings: The server_settings dict from main()
825
430
runtime_expansions = ("approval_delay", "approval_duration",
826
"created", "enabled", "expires",
827
"fingerprint", "host", "interval",
828
"last_approval_request", "last_checked_ok",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
829
433
"last_enabled", "name", "timeout")
832
"extended_timeout": "PT15M",
834
"checker": "fping -q -- %%(host)s",
836
"approval_delay": "PT0S",
837
"approval_duration": "PT1S",
838
"approved_by_default": "True",
434
client_defaults = { "timeout": "5m",
435
"extended_timeout": "15m",
437
"checker": "fping -q -- %%(host)s",
439
"approval_delay": "0s",
440
"approval_duration": "1s",
441
"approved_by_default": "True",
445
def timeout_milliseconds(self):
446
"Return the 'timeout' attribute in milliseconds"
447
return timedelta_to_milliseconds(self.timeout)
449
def extended_timeout_milliseconds(self):
450
"Return the 'extended_timeout' attribute in milliseconds"
451
return timedelta_to_milliseconds(self.extended_timeout)
453
def interval_milliseconds(self):
454
"Return the 'interval' attribute in milliseconds"
455
return timedelta_to_milliseconds(self.interval)
457
def approval_delay_milliseconds(self):
458
return timedelta_to_milliseconds(self.approval_delay)
843
461
def config_parser(config):
844
"""Construct a new dict of client settings of this form:
462
""" Construct a new dict of client settings of this form:
845
463
{ client_name: {setting_name: value, ...}, ...}
846
with exceptions for any special settings as defined above.
847
NOTE: Must be a pure function. Must return the same result
848
value given the same arguments.
464
with exceptions for any special settings as defined above"""
851
466
for client_name in config.sections():
852
467
section = dict(config.items(client_name))
853
468
client = settings[client_name] = {}
855
470
client["host"] = section["host"]
856
471
# Reformat values from string types to Python types
857
472
client["approved_by_default"] = config.getboolean(
858
473
client_name, "approved_by_default")
859
client["enabled"] = config.getboolean(client_name,
862
# Uppercase and remove spaces from fingerprint for later
863
# comparison purposes with return value from the
864
# fingerprint() function
474
client["enabled"] = config.getboolean(client_name, "enabled")
865
476
client["fingerprint"] = (section["fingerprint"].upper()
866
477
.replace(" ", ""))
867
478
if "secret" in section:
868
client["secret"] = codecs.decode(section["secret"]
479
client["secret"] = section["secret"].decode("base64")
871
480
elif "secfile" in section:
872
481
with open(os.path.expanduser(os.path.expandvars
873
482
(section["secfile"])),
874
483
"rb") as secfile:
875
484
client["secret"] = secfile.read()
877
raise TypeError("No secret or secfile for section {}"
486
raise TypeError("No secret or secfile for section %s"
879
488
client["timeout"] = string_to_delta(section["timeout"])
880
489
client["extended_timeout"] = string_to_delta(
881
490
section["extended_timeout"])
923
532
self.current_checker_command = None
924
533
self.approved = None
925
534
self.approvals_pending = 0
926
self.changedstate = multiprocessing_manager.Condition(
927
multiprocessing_manager.Lock())
928
self.client_structure = [attr
929
for attr in self.__dict__.keys()
535
self.changedstate = (multiprocessing_manager
536
.Condition(multiprocessing_manager
538
self.client_structure = [attr for attr in
539
self.__dict__.iterkeys()
930
540
if not attr.startswith("_")]
931
541
self.client_structure.append("client_structure")
933
for name, t in inspect.getmembers(
934
type(self), lambda obj: isinstance(obj, property)):
543
for name, t in inspect.getmembers(type(self),
935
547
if not name.startswith("_"):
936
548
self.client_structure.append(name)
938
550
# Send notice to process children that client state has changed
939
551
def send_changedstate(self):
940
552
with self.changedstate:
941
553
self.changedstate.notify_all()
943
555
def enable(self):
944
556
"""Start this client's checker and timeout hooks"""
945
557
if getattr(self, "enabled", False):
946
558
# Already enabled
560
self.send_changedstate()
948
561
self.expires = datetime.datetime.utcnow() + self.timeout
949
562
self.enabled = True
950
563
self.last_enabled = datetime.datetime.utcnow()
951
564
self.init_checker()
952
self.send_changedstate()
954
566
def disable(self, quiet=True):
955
567
"""Disable this client."""
956
568
if not getattr(self, "enabled", False):
571
self.send_changedstate()
959
573
logger.info("Disabling client %s", self.name)
960
if getattr(self, "disable_initiator_tag", None) is not None:
961
GLib.source_remove(self.disable_initiator_tag)
574
if getattr(self, "disable_initiator_tag", False):
575
gobject.source_remove(self.disable_initiator_tag)
962
576
self.disable_initiator_tag = None
963
577
self.expires = None
964
if getattr(self, "checker_initiator_tag", None) is not None:
965
GLib.source_remove(self.checker_initiator_tag)
578
if getattr(self, "checker_initiator_tag", False):
579
gobject.source_remove(self.checker_initiator_tag)
966
580
self.checker_initiator_tag = None
967
581
self.stop_checker()
968
582
self.enabled = False
970
self.send_changedstate()
971
# Do not run this again if called by a GLib.timeout_add
583
# Do not run this again if called by a gobject.timeout_add
974
586
def __del__(self):
977
589
def init_checker(self):
978
590
# Schedule a new checker to be started an 'interval' from now,
979
591
# and every interval from then on.
980
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),
592
self.checker_initiator_tag = (gobject.timeout_add
593
(self.interval_milliseconds(),
985
595
# Schedule a disable() when 'timeout' has passed
986
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)
596
self.disable_initiator_tag = (gobject.timeout_add
597
(self.timeout_milliseconds(),
990
599
# Also start a new checker *right now*.
991
600
self.start_checker()
993
def checker_callback(self, source, condition, connection,
602
def checker_callback(self, pid, condition, command):
995
603
"""The checker has completed, so take appropriate actions."""
996
604
self.checker_callback_tag = None
997
605
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
606
if os.WIFEXITED(condition):
607
self.last_checker_status = os.WEXITSTATUS(condition)
1005
608
if self.last_checker_status == 0:
1006
609
logger.info("Checker for %(name)s succeeded",
1008
611
self.checked_ok()
1010
logger.info("Checker for %(name)s failed", vars(self))
613
logger.info("Checker for %(name)s failed",
1012
616
self.last_checker_status = -1
1013
self.last_checker_signal = -returncode
1014
617
logger.warning("Checker for %(name)s crashed?",
1018
def checked_ok(self):
1019
"""Assert that the client has been seen, alive and well."""
1020
self.last_checked_ok = datetime.datetime.utcnow()
1021
self.last_checker_status = 0
1022
self.last_checker_signal = None
1025
def bump_timeout(self, timeout=None):
1026
"""Bump up the timeout for this client."""
620
def checked_ok(self, timeout=None):
621
"""Bump up the timeout for this client.
623
This should only be called when the client has been seen,
1027
626
if timeout is None:
1028
627
timeout = self.timeout
628
self.last_checked_ok = datetime.datetime.utcnow()
1029
629
if self.disable_initiator_tag is not None:
1030
GLib.source_remove(self.disable_initiator_tag)
1031
self.disable_initiator_tag = None
630
gobject.source_remove(self.disable_initiator_tag)
1032
631
if getattr(self, "enabled", False):
1033
self.disable_initiator_tag = GLib.timeout_add(
1034
int(timeout.total_seconds() * 1000), self.disable)
632
self.disable_initiator_tag = (gobject.timeout_add
633
(timedelta_to_milliseconds
634
(timeout), self.disable))
1035
635
self.expires = datetime.datetime.utcnow() + timeout
1037
637
def need_approval(self):
1038
638
self.last_approval_request = datetime.datetime.utcnow()
1040
640
def start_checker(self):
1041
641
"""Start a new checker subprocess if one is not running.
1043
643
If a checker already exists, leave it running and do
1045
645
# The reason for not killing a running checker is that if we
1046
# did that, and if a checker (for some reason) started running
1047
# slowly and taking more than 'interval' time, then the client
1048
# would inevitably timeout, since no checker would get a
1049
# chance to run to completion. If we instead leave running
646
# did that, then if a checker (for some reason) started
647
# running slowly and taking more than 'interval' time, the
648
# client would inevitably timeout, since no checker would get
649
# a chance to run to completion. If we instead leave running
1050
650
# checkers alone, the checker would have to take more time
1051
651
# 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")
654
# If a checker exists, make sure it is not a zombie
656
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
657
except (AttributeError, OSError) as error:
658
if (isinstance(error, OSError)
659
and error.errno != errno.ECHILD):
663
logger.warning("Checker was a zombie")
664
gobject.source_remove(self.checker_callback_tag)
665
self.checker_callback(pid, status,
666
self.current_checker_command)
1058
667
# Start a new checker if needed
1059
668
if self.checker is None:
1060
# Escape attributes for the shell
1062
attr: re.escape(str(getattr(self, attr)))
1063
for attr in self.runtime_expansions}
1065
command = self.checker_command % escaped_attrs
1066
except TypeError as error:
1067
logger.error('Could not format string "%s"',
1068
self.checker_command,
1070
return True # Try again later
670
# In case checker_command has exactly one % operator
671
command = self.checker_command % self.host
673
# Escape attributes for the shell
674
escaped_attrs = dict(
676
re.escape(unicode(str(getattr(self, attr, "")),
680
self.runtime_expansions)
683
command = self.checker_command % escaped_attrs
684
except TypeError as error:
685
logger.error('Could not format string "%s":'
686
' %s', self.checker_command, error)
687
return True # Try again later
1071
688
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
690
logger.info("Starting checker %r for %s",
692
# We don't need to redirect stdout and stderr, since
693
# in normal mode, that is already done by daemon(),
694
# and in debug mode we don't want to. (Stdin is
695
# always replaced by /dev/null.)
696
self.checker = subprocess.Popen(command,
699
self.checker_callback_tag = (gobject.child_watch_add
701
self.checker_callback,
703
# The checker may have completed before the gobject
704
# watch was added. Check for this.
705
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
707
gobject.source_remove(self.checker_callback_tag)
708
self.checker_callback(pid, status, command)
709
except OSError as error:
710
logger.error("Failed to start subprocess: %s",
712
# Re-run this periodically if run by gobject.timeout_add
1100
715
def stop_checker(self):
1101
716
"""Force the checker process, if any, to stop."""
1102
717
if self.checker_callback_tag:
1103
GLib.source_remove(self.checker_callback_tag)
718
gobject.source_remove(self.checker_callback_tag)
1104
719
self.checker_callback_tag = None
1105
720
if getattr(self, "checker", None) is None:
1107
722
logger.debug("Stopping checker for %(name)s", vars(self))
1108
self.checker.terminate()
724
os.kill(self.checker.pid, signal.SIGTERM)
726
#if self.checker.poll() is None:
727
# os.kill(self.checker.pid, signal.SIGKILL)
728
except OSError as error:
729
if error.errno != errno.ESRCH: # No such process
1109
731
self.checker = None
1112
def dbus_service_property(dbus_interface,
734
def dbus_service_property(dbus_interface, signature="v",
735
access="readwrite", byte_arrays=False):
1116
736
"""Decorators for marking methods of a DBusObjectWithProperties to
1117
737
become properties on the D-Bus.
1119
739
The decorated method will be called with no arguments by "Get"
1120
740
and with one argument by "Set".
1122
742
The parameters, where they are supported, are the same as
1123
743
dbus.service.method, except there is only "signature", since the
1124
744
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.
1215
def _is_dbus_thing(thing):
1216
"""Returns a function testing if an attribute is a D-Bus thing
1218
If called like _is_dbus_thing("method") it returns a function
1219
suitable for use as predicate to inspect.getmembers().
1221
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1224
def _get_all_dbus_things(self, thing):
1225
"""Returns a generator of (name, attribute) pairs
1227
return ((getattr(athing.__get__(self), "_dbus_name", name),
1228
athing.__get__(self))
1229
for cls in self.__class__.__mro__
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):
783
class DBusObjectWithProperties(dbus.service.Object):
1297
784
"""A D-Bus object with properties.
1299
786
Classes inheriting from this can use the dbus_service_property
1300
787
decorator to expose methods as D-Bus properties. It exposes the
1301
788
standard Get(), Set(), and GetAll() methods on the D-Bus.
792
def _is_dbus_property(obj):
793
return getattr(obj, "_dbus_is_property", False)
795
def _get_all_dbus_properties(self):
796
"""Returns a generator of (name, attribute) pairs
798
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
799
for cls in self.__class__.__mro__
801
inspect.getmembers(cls, self._is_dbus_property))
1304
803
def _get_dbus_property(self, interface_name, property_name):
1305
804
"""Returns a bound method if one exists which is a D-Bus
1306
805
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")):
807
for cls in self.__class__.__mro__:
808
for name, value in (inspect.getmembers
809
(cls, self._is_dbus_property)):
1311
810
if (value._dbus_name == property_name
1312
811
and value._dbus_interface == interface_name):
1313
812
return value.__get__(self)
1315
814
# 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,
815
raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
+ interface_name + "."
819
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1330
820
out_signature="v")
1331
821
def Get(self, interface_name, property_name):
1332
822
"""Standard D-Bus property Get() method, see D-Bus standard.
1379
866
if not hasattr(value, "variant_level"):
1380
867
properties[name] = value
1382
properties[name] = type(value)(
1383
value, variant_level=value.variant_level + 1)
869
properties[name] = type(value)(value, variant_level=
870
value.variant_level+1)
1384
871
return dbus.Dictionary(properties, signature="sv")
1386
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1387
def PropertiesChanged(self, interface_name, changed_properties,
1388
invalidated_properties):
1389
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1394
873
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1395
874
out_signature="s",
1396
875
path_keyword='object_path',
1397
876
connection_keyword='connection')
1398
877
def Introspect(self, object_path, connection):
1399
"""Overloading of standard D-Bus method.
1401
Inserts property tags and interface annotation tags.
878
"""Standard D-Bus method, overloaded to insert property tags.
1403
xmlstring = DBusObjectWithAnnotations.Introspect(self,
880
xmlstring = dbus.service.Object.Introspect(self, object_path,
1407
883
document = xml.dom.minidom.parseString(xmlstring)
1409
884
def make_tag(document, name, prop):
1410
885
e = document.createElement("property")
1411
886
e.setAttribute("name", name)
1412
887
e.setAttribute("type", prop._dbus_signature)
1413
888
e.setAttribute("access", prop._dbus_access)
1416
890
for if_tag in document.getElementsByTagName("interface"):
1418
891
for tag in (make_tag(document, name, prop)
1420
in self._get_all_dbus_things("property")
893
in self._get_all_dbus_properties()
1421
894
if prop._dbus_interface
1422
895
== if_tag.getAttribute("name")):
1423
896
if_tag.appendChild(tag)
1424
# Add annotation tags for properties
1425
for tag in if_tag.getElementsByTagName("property"):
1427
for name, prop in self._get_all_dbus_things(
1429
if (name == tag.getAttribute("name")
1430
and prop._dbus_interface
1431
== if_tag.getAttribute("name")):
1432
annots.update(getattr(
1433
prop, "_dbus_annotations", {}))
1434
for name, value in annots.items():
1435
ann_tag = document.createElement(
1437
ann_tag.setAttribute("name", name)
1438
ann_tag.setAttribute("value", value)
1439
tag.appendChild(ann_tag)
1440
897
# Add the names to the return values for the
1441
898
# "org.freedesktop.DBus.Properties" methods
1442
899
if (if_tag.getAttribute("name")
1457
914
except (AttributeError, xml.dom.DOMException,
1458
915
xml.parsers.expat.ExpatError) as error:
1459
916
logger.error("Failed to override Introspection method",
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
def datetime_to_dbus(dt, variant_level=0):
921
def datetime_to_dbus (dt, variant_level=0):
1535
922
"""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)
1541
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1542
"""A class decorator; applied to a subclass of
1543
dbus.service.Object, it will add alternate D-Bus attributes with
1544
interface names according to the "alt_interface_names" mapping.
1547
@alternate_dbus_interfaces({"org.example.Interface":
1548
"net.example.AlternateInterface"})
1549
class SampleDBusObject(dbus.service.Object):
1550
@dbus.service.method("org.example.Interface")
1551
def SampleDBusMethod():
1554
The above "SampleDBusMethod" on "SampleDBusObject" will be
1555
reachable via two interfaces: "org.example.Interface" and
1556
"net.example.AlternateInterface", the latter of which will have
1557
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1558
"true", unless "deprecate" is passed with a False value.
1560
This works for methods and signals, and also for D-Bus properties
1561
(from DBusObjectWithProperties) and interfaces (from the
1562
dbus_interface_annotations decorator).
924
return dbus.String("", variant_level = variant_level)
925
return dbus.String(dt.isoformat(),
926
variant_level=variant_level)
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
931
"""Applied to an empty subclass of a D-Bus object, this metaclass
932
will add additional D-Bus attributes matching a certain pattern.
1566
for orig_interface_name, alt_interface_name in (
1567
alt_interface_names.items()):
1569
interface_names = set()
1570
# Go though all attributes of the class
1571
for attrname, attribute in inspect.getmembers(cls):
934
def __new__(mcs, name, bases, attr):
935
# Go through all the base classes which could have D-Bus
936
# methods, signals, or properties in them
937
for base in (b for b in bases
938
if issubclass(b, dbus.service.Object)):
939
# Go though all attributes of the base class
940
for attrname, attribute in inspect.getmembers(base):
1572
941
# Ignore non-D-Bus attributes, and D-Bus attributes
1573
942
# with the wrong interface name
1574
943
if (not hasattr(attribute, "_dbus_interface")
1575
or not attribute._dbus_interface.startswith(
1576
orig_interface_name)):
944
or not attribute._dbus_interface
945
.startswith("se.recompile.Mandos")):
1578
947
# Create an alternate D-Bus interface name based on
1579
948
# the current name
1580
alt_interface = attribute._dbus_interface.replace(
1581
orig_interface_name, alt_interface_name)
1582
interface_names.add(alt_interface)
949
alt_interface = (attribute._dbus_interface
950
.replace("se.recompile.Mandos",
951
"se.bsnet.fukt.Mandos"))
1583
952
# Is this a D-Bus signal?
1584
953
if getattr(attribute, "_dbus_is_signal", False):
1585
# Extract the original non-method undecorated
1586
# function by black magic
1587
if sys.version_info.major == 2:
1588
nonmethod_func = (dict(
954
# Extract the original non-method function by
956
nonmethod_func = (dict(
1589
957
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)
958
attribute.__closure__))["func"]
1597
960
# Create a new, but exactly alike, function
1598
961
# object, and decorate it to be a new D-Bus signal
1599
962
# 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))
1604
# Copy annotations, if any
1606
new_function._dbus_annotations = dict(
1607
attribute._dbus_annotations)
1608
except AttributeError:
963
new_function = (dbus.service.signal
965
attribute._dbus_signature)
967
nonmethod_func.func_code,
968
nonmethod_func.func_globals,
969
nonmethod_func.func_name,
970
nonmethod_func.func_defaults,
971
nonmethod_func.func_closure)))
1611
972
# Define a creator of a function to call both the
1612
# original and alternate functions, so both the
1613
# original and alternate signals gets sent when
1614
# the function is called
973
# old and new functions, so both the old and new
974
# signals gets sent when the function is called
1615
975
def fixscope(func1, func2):
1616
976
"""This function is a scope container to pass
1617
977
func1 and func2 to the "call_both" function
1618
978
outside of its arguments"""
1620
@functools.wraps(func2)
1621
979
def call_both(*args, **kwargs):
1622
980
"""This function will emit two D-Bus
1623
981
signals by calling func1 and func2"""
1624
982
func1(*args, **kwargs)
1625
983
func2(*args, **kwargs)
1626
# Make wrapper function look like a D-Bus
1628
for name, attr in inspect.getmembers(func2):
1629
if name.startswith("_dbus_"):
1630
setattr(call_both, name, attr)
1632
984
return call_both
1633
985
# Create the "call_both" function and add it to
1635
attr[attrname] = fixscope(attribute, new_function)
987
attr[attrname] = fixscope(attribute,
1636
989
# Is this a D-Bus method?
1637
990
elif getattr(attribute, "_dbus_is_method", False):
1638
991
# Create a new, but exactly alike, function
1639
992
# object. Decorate it to be a new D-Bus method
1640
993
# with the alternate D-Bus interface name. Add it
1643
dbus.service.method(
1645
attribute._dbus_in_signature,
1646
attribute._dbus_out_signature)
1647
(copy_function(attribute)))
1648
# Copy annotations, if any
1650
attr[attrname]._dbus_annotations = dict(
1651
attribute._dbus_annotations)
1652
except AttributeError:
995
attr[attrname] = (dbus.service.method
997
attribute._dbus_in_signature,
998
attribute._dbus_out_signature)
1000
(attribute.func_code,
1001
attribute.func_globals,
1002
attribute.func_name,
1003
attribute.func_defaults,
1004
attribute.func_closure)))
1654
1005
# Is this a D-Bus property?
1655
1006
elif getattr(attribute, "_dbus_is_property", False):
1656
1007
# Create a new, but exactly alike, function
1657
1008
# object, and decorate it to be a new D-Bus
1658
1009
# property with the alternate D-Bus interface
1659
1010
# name. Add it to the class.
1660
attr[attrname] = (dbus_service_property(
1661
alt_interface, attribute._dbus_signature,
1662
attribute._dbus_access,
1663
attribute._dbus_get_args_options
1665
(copy_function(attribute)))
1666
# Copy annotations, if any
1668
attr[attrname]._dbus_annotations = dict(
1669
attribute._dbus_annotations)
1670
except AttributeError:
1672
# Is this a D-Bus interface?
1673
elif getattr(attribute, "_dbus_is_interface", False):
1674
# Create a new, but exactly alike, function
1675
# object. Decorate it to be a new D-Bus interface
1676
# with the alternate D-Bus interface name. Add it
1679
dbus_interface_annotations(alt_interface)
1680
(copy_function(attribute)))
1682
# Deprecate all alternate interfaces
1683
iname = "_AlternateDBusNames_interface_annotation{}"
1684
for interface_name in interface_names:
1686
@dbus_interface_annotations(interface_name)
1688
return {"org.freedesktop.DBus.Deprecated":
1690
# Find an unused name
1691
for aname in (iname.format(i)
1692
for i in itertools.count()):
1693
if aname not in attr:
1697
# Replace the class with a new subclass of it with
1698
# 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__),
1710
@alternate_dbus_interfaces({"se.recompile.Mandos":
1711
"se.bsnet.fukt.Mandos"})
1011
attr[attrname] = (dbus_service_property
1013
attribute._dbus_signature,
1014
attribute._dbus_access,
1016
._dbus_get_args_options
1019
(attribute.func_code,
1020
attribute.func_globals,
1021
attribute.func_name,
1022
attribute.func_defaults,
1023
attribute.func_closure)))
1024
return type.__new__(mcs, name, bases, attr)
1712
1027
class ClientDBus(Client, DBusObjectWithProperties):
1713
1028
"""A Client class using D-Bus
1716
1031
dbus_object_path: dbus.ObjectPath
1717
1032
bus: dbus.SystemBus()
1720
1035
runtime_expansions = (Client.runtime_expansions
1721
+ ("dbus_object_path", ))
1723
_interface = "se.recompile.Mandos.Client"
1036
+ ("dbus_object_path",))
1725
1038
# dbus.service.Object doesn't use super(), so we can't either.
1727
def __init__(self, bus=None, *args, **kwargs):
1040
def __init__(self, bus = None, *args, **kwargs):
1729
1042
Client.__init__(self, *args, **kwargs)
1043
self._approvals_pending = 0
1045
self._approvals_pending = 0
1730
1046
# Only now, when this client is initialized, can it show up on
1732
client_object_name = str(self.name).translate(
1048
client_object_name = unicode(self.name).translate(
1733
1049
{ord("."): ord("_"),
1734
1050
ord("-"): ord("_")})
1735
self.dbus_object_path = dbus.ObjectPath(
1736
"/clients/" + client_object_name)
1051
self.dbus_object_path = (dbus.ObjectPath
1052
("/clients/" + client_object_name))
1737
1053
DBusObjectWithProperties.__init__(self, self.bus,
1738
1054
self.dbus_object_path)
1740
def notifychangeproperty(transform_func, dbus_name,
1741
type_func=lambda x: x,
1743
invalidate_only=False,
1744
_interface=_interface):
1056
def notifychangeproperty(transform_func,
1057
dbus_name, type_func=lambda x: x,
1745
1059
""" Modify a variable so that it's a property which announces
1746
1060
its changes to DBus.
1748
1062
transform_fun: Function that takes a value and a variant_level
1749
1063
and transforms it to a D-Bus type.
1750
1064
dbus_name: D-Bus name of the variable
1752
1066
to the D-Bus. Default: no transform
1753
1067
variant_level: D-Bus variant level. Default: 1
1755
attrname = "_{}".format(dbus_name)
1069
attrname = "_{0}".format(dbus_name)
1757
1070
def setter(self, value):
1758
1071
if hasattr(self, "dbus_object_path"):
1759
1072
if (not hasattr(self, attrname) or
1760
1073
type_func(getattr(self, attrname, None))
1761
1074
!= type_func(value)):
1763
self.PropertiesChanged(
1764
_interface, dbus.Dictionary(),
1765
dbus.Array((dbus_name, )))
1767
dbus_value = transform_func(
1769
variant_level=variant_level)
1770
self.PropertyChanged(dbus.String(dbus_name),
1772
self.PropertiesChanged(
1774
dbus.Dictionary({dbus.String(dbus_name):
1075
dbus_value = transform_func(type_func(value),
1078
self.PropertyChanged(dbus.String(dbus_name),
1777
1080
setattr(self, attrname, value)
1779
1082
return property(lambda self: getattr(self, attrname), setter)
1781
1085
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1782
1086
approvals_pending = notifychangeproperty(dbus.Boolean,
1783
1087
"ApprovalPending",
1785
1089
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1786
1090
last_enabled = notifychangeproperty(datetime_to_dbus,
1788
checker = notifychangeproperty(
1789
dbus.Boolean, "CheckerRunning",
1790
type_func=lambda checker: checker is not None)
1092
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
type_func = lambda checker:
1094
checker is not None)
1791
1095
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1792
1096
"LastCheckedOK")
1793
last_checker_status = notifychangeproperty(dbus.Int16,
1794
"LastCheckerStatus")
1795
1097
last_approval_request = notifychangeproperty(
1796
1098
datetime_to_dbus, "LastApprovalRequest")
1797
1099
approved_by_default = notifychangeproperty(dbus.Boolean,
1798
1100
"ApprovedByDefault")
1799
approval_delay = notifychangeproperty(
1800
dbus.UInt64, "ApprovalDelay",
1801
type_func=lambda td: td.total_seconds() * 1000)
1101
approval_delay = notifychangeproperty(dbus.UInt64,
1104
timedelta_to_milliseconds)
1802
1105
approval_duration = notifychangeproperty(
1803
1106
dbus.UInt64, "ApprovalDuration",
1804
type_func=lambda td: td.total_seconds() * 1000)
1107
type_func = timedelta_to_milliseconds)
1805
1108
host = notifychangeproperty(dbus.String, "Host")
1806
timeout = notifychangeproperty(
1807
dbus.UInt64, "Timeout",
1808
type_func=lambda td: td.total_seconds() * 1000)
1109
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1111
timedelta_to_milliseconds)
1809
1112
extended_timeout = notifychangeproperty(
1810
1113
dbus.UInt64, "ExtendedTimeout",
1811
type_func=lambda td: td.total_seconds() * 1000)
1812
interval = notifychangeproperty(
1813
dbus.UInt64, "Interval",
1814
type_func=lambda td: td.total_seconds() * 1000)
1114
type_func = timedelta_to_milliseconds)
1115
interval = notifychangeproperty(dbus.UInt64,
1118
timedelta_to_milliseconds)
1815
1119
checker_command = notifychangeproperty(dbus.String, "Checker")
1816
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1817
invalidate_only=True)
1819
1121
del notifychangeproperty
1821
1123
def __del__(self, *args, **kwargs):
1823
1125
self.remove_from_connection()
1902
1205
server to mandos-client
1906
1209
# Rejected - signal
1907
1210
@dbus.service.signal(_interface, signature="s")
1908
1211
def Rejected(self, reason):
1912
1215
# NeedApproval - signal
1913
1216
@dbus.service.signal(_interface, signature="tb")
1914
1217
def NeedApproval(self, timeout, default):
1916
1219
return self.need_approval()
1221
# NeRwequest - signal
1222
@dbus.service.signal(_interface, signature="s")
1223
def NewRequest(self, ip):
1225
Is sent after a client request a password.
1920
1231
# Approve - method
1921
1232
@dbus.service.method(_interface, in_signature="b")
1922
1233
def Approve(self, value):
1923
1234
self.approve(value)
1925
1236
# CheckedOK - method
1926
1237
@dbus.service.method(_interface)
1927
1238
def CheckedOK(self):
1928
1239
self.checked_ok()
1930
1241
# Enable - method
1931
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1932
1242
@dbus.service.method(_interface)
1933
1243
def Enable(self):
1937
1247
# StartChecker - method
1938
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1939
1248
@dbus.service.method(_interface)
1940
1249
def StartChecker(self):
1942
1251
self.start_checker()
1944
1253
# Disable - method
1945
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1946
1254
@dbus.service.method(_interface)
1947
1255
def Disable(self):
1951
1259
# StopChecker - method
1952
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1953
1260
@dbus.service.method(_interface)
1954
1261
def StopChecker(self):
1955
1262
self.stop_checker()
1959
1266
# ApprovalPending - property
1960
1267
@dbus_service_property(_interface, signature="b", access="read")
1961
1268
def ApprovalPending_dbus_property(self):
1962
1269
return dbus.Boolean(bool(self.approvals_pending))
1964
1271
# ApprovedByDefault - property
1965
@dbus_service_property(_interface,
1272
@dbus_service_property(_interface, signature="b",
1967
1273
access="readwrite")
1968
1274
def ApprovedByDefault_dbus_property(self, value=None):
1969
1275
if value is None: # get
1970
1276
return dbus.Boolean(self.approved_by_default)
1971
1277
self.approved_by_default = bool(value)
1973
1279
# ApprovalDelay - property
1974
@dbus_service_property(_interface,
1280
@dbus_service_property(_interface, signature="t",
1976
1281
access="readwrite")
1977
1282
def ApprovalDelay_dbus_property(self, value=None):
1978
1283
if value is None: # get
1979
return dbus.UInt64(self.approval_delay.total_seconds()
1284
return dbus.UInt64(self.approval_delay_milliseconds())
1981
1285
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1983
1287
# ApprovalDuration - property
1984
@dbus_service_property(_interface,
1288
@dbus_service_property(_interface, signature="t",
1986
1289
access="readwrite")
1987
1290
def ApprovalDuration_dbus_property(self, value=None):
1988
1291
if value is None: # get
1989
return dbus.UInt64(self.approval_duration.total_seconds()
1292
return dbus.UInt64(timedelta_to_milliseconds(
1293
self.approval_duration))
1991
1294
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1993
1296
# Name - property
1995
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1996
1297
@dbus_service_property(_interface, signature="s", access="read")
1997
1298
def Name_dbus_property(self):
1998
1299
return dbus.String(self.name)
2000
1301
# Fingerprint - property
2002
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2003
1302
@dbus_service_property(_interface, signature="s", access="read")
2004
1303
def Fingerprint_dbus_property(self):
2005
1304
return dbus.String(self.fingerprint)
2007
1306
# Host - property
2008
@dbus_service_property(_interface,
1307
@dbus_service_property(_interface, signature="s",
2010
1308
access="readwrite")
2011
1309
def Host_dbus_property(self, value=None):
2012
1310
if value is None: # get
2013
1311
return dbus.String(self.host)
2014
self.host = str(value)
1312
self.host = unicode(value)
2016
1314
# Created - property
2018
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2019
1315
@dbus_service_property(_interface, signature="s", access="read")
2020
1316
def Created_dbus_property(self):
2021
1317
return datetime_to_dbus(self.created)
2023
1319
# LastEnabled - property
2024
1320
@dbus_service_property(_interface, signature="s", access="read")
2025
1321
def LastEnabled_dbus_property(self):
2026
1322
return datetime_to_dbus(self.last_enabled)
2028
1324
# Enabled - property
2029
@dbus_service_property(_interface,
1325
@dbus_service_property(_interface, signature="b",
2031
1326
access="readwrite")
2032
1327
def Enabled_dbus_property(self, value=None):
2033
1328
if value is None: # get
2040
1335
# LastCheckedOK - property
2041
@dbus_service_property(_interface,
1336
@dbus_service_property(_interface, signature="s",
2043
1337
access="readwrite")
2044
1338
def LastCheckedOK_dbus_property(self, value=None):
2045
1339
if value is not None:
2046
1340
self.checked_ok()
2048
1342
return datetime_to_dbus(self.last_checked_ok)
2050
# LastCheckerStatus - property
2051
@dbus_service_property(_interface, signature="n", access="read")
2052
def LastCheckerStatus_dbus_property(self):
2053
return dbus.Int16(self.last_checker_status)
2055
1344
# Expires - property
2056
1345
@dbus_service_property(_interface, signature="s", access="read")
2057
1346
def Expires_dbus_property(self):
2058
1347
return datetime_to_dbus(self.expires)
2060
1349
# LastApprovalRequest - property
2061
1350
@dbus_service_property(_interface, signature="s", access="read")
2062
1351
def LastApprovalRequest_dbus_property(self):
2063
1352
return datetime_to_dbus(self.last_approval_request)
2065
1354
# Timeout - property
2066
@dbus_service_property(_interface,
1355
@dbus_service_property(_interface, signature="t",
2068
1356
access="readwrite")
2069
1357
def Timeout_dbus_property(self, value=None):
2070
1358
if value is None: # get
2071
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2072
old_timeout = self.timeout
1359
return dbus.UInt64(self.timeout_milliseconds())
2073
1360
self.timeout = datetime.timedelta(0, 0, 0, value)
2074
# Reschedule disabling
2076
now = datetime.datetime.utcnow()
2077
self.expires += self.timeout - old_timeout
2078
if self.expires <= now:
2079
# The timeout has passed
2082
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),
1361
if getattr(self, "disable_initiator_tag", None) is None:
1363
# Reschedule timeout
1364
gobject.source_remove(self.disable_initiator_tag)
1365
self.disable_initiator_tag = None
1367
time_to_die = timedelta_to_milliseconds((self
1372
if time_to_die <= 0:
1373
# The timeout has passed
1376
self.expires = (datetime.datetime.utcnow()
1377
+ datetime.timedelta(milliseconds =
1379
self.disable_initiator_tag = (gobject.timeout_add
1380
(time_to_die, self.disable))
2090
1382
# ExtendedTimeout - property
2091
@dbus_service_property(_interface,
1383
@dbus_service_property(_interface, signature="t",
2093
1384
access="readwrite")
2094
1385
def ExtendedTimeout_dbus_property(self, value=None):
2095
1386
if value is None: # get
2096
return dbus.UInt64(self.extended_timeout.total_seconds()
1387
return dbus.UInt64(self.extended_timeout_milliseconds())
2098
1388
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2100
1390
# Interval - property
2101
@dbus_service_property(_interface,
1391
@dbus_service_property(_interface, signature="t",
2103
1392
access="readwrite")
2104
1393
def Interval_dbus_property(self, value=None):
2105
1394
if value is None: # get
2106
return dbus.UInt64(self.interval.total_seconds() * 1000)
1395
return dbus.UInt64(self.interval_milliseconds())
2107
1396
self.interval = datetime.timedelta(0, 0, 0, value)
2108
1397
if getattr(self, "checker_initiator_tag", None) is None:
2110
1399
if self.enabled:
2111
1400
# 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
1401
gobject.source_remove(self.checker_initiator_tag)
1402
self.checker_initiator_tag = (gobject.timeout_add
1403
(value, self.start_checker))
1404
self.start_checker() # Start one now, too
2117
1406
# Checker - property
2118
@dbus_service_property(_interface,
1407
@dbus_service_property(_interface, signature="s",
2120
1408
access="readwrite")
2121
1409
def Checker_dbus_property(self, value=None):
2122
1410
if value is None: # get
2123
1411
return dbus.String(self.checker_command)
2124
self.checker_command = str(value)
1412
self.checker_command = unicode(value)
2126
1414
# CheckerRunning - property
2127
@dbus_service_property(_interface,
1415
@dbus_service_property(_interface, signature="b",
2129
1416
access="readwrite")
2130
1417
def CheckerRunning_dbus_property(self, value=None):
2131
1418
if value is None: # get
2172
1451
if data[0] == 'data':
2174
1453
if data[0] == 'function':
2176
1454
def func(*args, **kwargs):
2177
1455
self._pipe.send(('funcall', name, args, kwargs))
2178
1456
return self._pipe.recv()[1]
2182
1459
def __setattr__(self, name, value):
2183
1460
if name == '_pipe':
2184
1461
return super(ProxyClient, self).__setattr__(name, value)
2185
1462
self._pipe.send(('setattr', name, value))
1465
class ClientDBusTransitional(ClientDBus):
1466
__metaclass__ = AlternateDBusNamesMetaclass
2188
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
2189
1470
"""A class to handle client connections.
2191
1472
Instantiated once for each connection to handle it.
2192
1473
Note: This will run in its own forked process."""
2194
1475
def handle(self):
2195
1476
with contextlib.closing(self.server.child_pipe) as child_pipe:
2196
1477
logger.info("TCP connection from: %s",
2197
str(self.client_address))
1478
unicode(self.client_address))
2198
1479
logger.debug("Pipe FD: %d",
2199
1480
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",
1482
session = (gnutls.connection
1483
.ClientSession(self.request,
1485
.X509Credentials()))
1487
# Note: gnutls.connection.X509Credentials is really a
1488
# generic GnuTLS certificate credentials object so long as
1489
# no X.509 keys are added to it. Therefore, we can use it
1490
# here despite using OpenPGP certificates.
1492
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1493
# "+AES-256-CBC", "+SHA1",
1494
# "+COMP-NULL", "+CTYPE-OPENPGP",
2207
1496
# Use a fallback default, since this MUST be set.
2208
1497
priority = self.server.gnutls_priority
2209
1498
if priority is None:
2210
1499
priority = "NORMAL"
2211
gnutls.priority_set_direct(session._c_object,
2212
priority.encode("utf-8"),
1500
(gnutls.library.functions
1501
.gnutls_priority_set_direct(session._c_object,
2215
1504
# Start communication using the Mandos protocol
2216
1505
# Get protocol number
2217
1506
line = self.request.makefile().readline()
2218
1507
logger.debug("Protocol version: %r", line)
2220
1509
if int(line.strip().split()[0]) > 1:
2221
raise RuntimeError(line)
2222
1511
except (ValueError, IndexError, RuntimeError) as error:
2223
1512
logger.error("Unknown protocol version: %s", error)
2226
1515
# Start GnuTLS connection
2228
1517
session.handshake()
2229
except gnutls.Error as error:
1518
except gnutls.errors.GNUTLSError as error:
2230
1519
logger.warning("Handshake failed: %s", error)
2231
1520
# Do not run session.bye() here: the session is not
2232
1521
# established. Just abandon the request.
2234
1523
logger.debug("Handshake succeeded")
2236
1525
approval_required = False
2239
fpr = self.fingerprint(
2240
self.peer_certificate(session))
2241
except (TypeError, gnutls.Error) as error:
1528
fpr = self.fingerprint(self.peer_certificate
1531
gnutls.errors.GNUTLSError) as error:
2242
1532
logger.warning("Bad certificate: %s", error)
2244
1534
logger.debug("Fingerprint: %s", fpr)
2247
1537
client = ProxyClient(child_pipe, fpr,
2248
1538
self.client_address)
2249
1539
except KeyError:
1542
if self.server.use_dbus:
1544
client.NewRequest(str(self.client_address))
2252
1546
if client.approval_delay:
2253
1547
delay = client.approval_delay
2254
1548
client.approvals_pending += 1
2255
1549
approval_required = True
2258
1552
if not client.enabled:
2259
1553
logger.info("Client %s is disabled",
2261
1555
if self.server.use_dbus:
2262
1556
# Emit D-Bus signal
2263
1557
client.Rejected("Disabled")
2266
1560
if client.approved or not client.approval_delay:
2267
# We are approved or approval is disabled
1561
#We are approved or approval is disabled
2269
1563
elif client.approved is None:
2270
1564
logger.info("Client %s needs approval",
2303
1599
delay -= time2 - time
2306
session.send(client.secret)
2307
except gnutls.Error as error:
2308
logger.warning("gnutls send failed",
1602
while sent_size < len(client.secret):
1604
sent = session.send(client.secret[sent_size:])
1605
except gnutls.errors.GNUTLSError as error:
1606
logger.warning("gnutls send failed")
1608
logger.debug("Sent: %d, remaining: %d",
1609
sent, len(client.secret)
1610
- (sent_size + sent))
2312
1613
logger.info("Sending secret to %s", client.name)
2313
1614
# bump the timeout using extended_timeout
2314
client.bump_timeout(client.extended_timeout)
1615
client.checked_ok(client.extended_timeout)
2315
1616
if self.server.use_dbus:
2316
1617
# Emit D-Bus signal
2317
1618
client.GotSecret()
2320
1621
if approval_required:
2321
1622
client.approvals_pending -= 1
2324
except gnutls.Error as error:
2325
logger.warning("GnuTLS bye failed",
1625
except gnutls.errors.GNUTLSError as error:
1626
logger.warning("GnuTLS bye failed")
2329
1629
def peer_certificate(session):
2330
1630
"Return the peer's OpenPGP certificate as a bytestring"
2331
1631
# If not an OpenPGP certificate...
2332
if (gnutls.certificate_type_get(session._c_object)
2333
!= gnutls.CRT_OPENPGP):
2334
# ...return invalid data
1632
if (gnutls.library.functions
1633
.gnutls_certificate_type_get(session._c_object)
1634
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1635
# ...do the normal thing
1636
return session.peer_certificate
2336
1637
list_size = ctypes.c_uint(1)
2337
cert_list = (gnutls.certificate_get_peers
1638
cert_list = (gnutls.library.functions
1639
.gnutls_certificate_get_peers
2338
1640
(session._c_object, ctypes.byref(list_size)))
2339
1641
if not bool(cert_list) and list_size.value != 0:
2340
raise gnutls.Error("error getting peer certificate")
1642
raise gnutls.errors.GNUTLSError("error getting peer"
2341
1644
if list_size.value == 0:
2343
1646
cert = cert_list[0]
2344
1647
return ctypes.string_at(cert.data, cert.size)
2347
1650
def fingerprint(openpgp):
2348
1651
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2349
1652
# 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)))
1653
datum = (gnutls.library.types
1654
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1657
ctypes.c_uint(len(openpgp))))
2354
1658
# New empty GnuTLS certificate
2355
crt = gnutls.openpgp_crt_t()
2356
gnutls.openpgp_crt_init(ctypes.byref(crt))
1659
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1660
(gnutls.library.functions
1661
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2357
1662
# Import the OpenPGP public key into the certificate
2358
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2359
gnutls.OPENPGP_FMT_RAW)
1663
(gnutls.library.functions
1664
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1665
gnutls.library.constants
1666
.GNUTLS_OPENPGP_FMT_RAW))
2360
1667
# Verify the self signature in the key
2361
1668
crtverify = ctypes.c_uint()
2362
gnutls.openpgp_crt_verify_self(crt, 0,
2363
ctypes.byref(crtverify))
1669
(gnutls.library.functions
1670
.gnutls_openpgp_crt_verify_self(crt, 0,
1671
ctypes.byref(crtverify)))
2364
1672
if crtverify.value != 0:
2365
gnutls.openpgp_crt_deinit(crt)
2366
raise gnutls.CertificateSecurityError("Verify failed")
1673
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1674
raise (gnutls.errors.CertificateSecurityError
2367
1676
# New buffer for the fingerprint
2368
1677
buf = ctypes.create_string_buffer(20)
2369
1678
buf_len = ctypes.c_size_t()
2370
1679
# Get the fingerprint from the certificate into the buffer
2371
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2372
ctypes.byref(buf_len))
1680
(gnutls.library.functions
1681
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1682
ctypes.byref(buf_len)))
2373
1683
# Deinit the certificate
2374
gnutls.openpgp_crt_deinit(crt)
1684
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2375
1685
# Convert the buffer to a Python bytestring
2376
1686
fpr = ctypes.string_at(buf, buf_len.value)
2377
1687
# Convert the bytestring to hexadecimal notation
2382
1692
class MultiprocessingMixIn(object):
2383
1693
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2385
1694
def sub_process_main(self, request, address):
2387
1696
self.finish_request(request, address)
2388
1697
except Exception:
2389
1698
self.handle_error(request, address)
2390
1699
self.close_request(request)
2392
1701
def process_request(self, request, address):
2393
1702
"""Start a new process to process the request."""
2394
proc = multiprocessing.Process(target=self.sub_process_main,
2395
args=(request, address))
1703
proc = multiprocessing.Process(target = self.sub_process_main,
2400
1710
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2401
1711
""" adds a pipe to the MixIn """
2403
1712
def process_request(self, request, client_address):
2404
1713
"""Overrides and wraps the original process_request().
2406
1715
This function creates a new pipe in self.pipe
2408
1717
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2410
1719
proc = MultiprocessingMixIn.process_request(self, request,
2411
1720
client_address)
2412
1721
self.child_pipe.close()
2413
1722
self.add_pipe(parent_pipe, proc)
2415
1724
def add_pipe(self, parent_pipe, proc):
2416
1725
"""Dummy function; override as necessary"""
2417
raise NotImplementedError()
1726
raise NotImplementedError
2420
1729
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2421
1730
socketserver.TCPServer, object):
2422
1731
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2425
1734
enabled: Boolean; whether this server is activated yet
2426
1735
interface: None or a network interface name (string)
2427
1736
use_ipv6: Boolean; to use IPv6 or not
2430
1738
def __init__(self, server_address, RequestHandlerClass,
2434
"""If socketfd is set, use that file descriptor instead of
2435
creating a new one with socket.socket().
1739
interface=None, use_ipv6=True):
2437
1740
self.interface = interface
2439
1742
self.address_family = socket.AF_INET6
2440
if socketfd is not None:
2441
# Save the file descriptor
2442
self.socketfd = socketfd
2443
# Save the original socket.socket() function
2444
self.socket_socket = socket.socket
2446
# To implement --socket, we monkey patch socket.socket.
2448
# (When socketserver.TCPServer is a new-style class, we
2449
# could make self.socket into a property instead of monkey
2450
# patching socket.socket.)
2452
# Create a one-time-only replacement for socket.socket()
2453
@functools.wraps(socket.socket)
2454
def socket_wrapper(*args, **kwargs):
2455
# Restore original function so subsequent calls are
2457
socket.socket = self.socket_socket
2458
del self.socket_socket
2459
# This time only, return a new socket object from the
2460
# saved file descriptor.
2461
return socket.fromfd(self.socketfd, *args, **kwargs)
2462
# Replace socket.socket() function with wrapper
2463
socket.socket = socket_wrapper
2464
# The socketserver.TCPServer.__init__ will call
2465
# socket.socket(), which might be our replacement,
2466
# socket_wrapper(), if socketfd was set.
2467
1743
socketserver.TCPServer.__init__(self, server_address,
2468
1744
RequestHandlerClass)
2470
1745
def server_bind(self):
2471
1746
"""This overrides the normal server_bind() function
2472
1747
to bind to an interface if one was specified, and also NOT to
2473
1748
bind to an address or port if they were not specified."""
2474
global SO_BINDTODEVICE
2475
1749
if self.interface is not None:
2476
1750
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)
1751
logger.error("SO_BINDTODEVICE does not exist;"
1752
" cannot bind to interface %s",
1756
self.socket.setsockopt(socket.SOL_SOCKET,
1760
except socket.error as error:
1761
if error[0] == errno.EPERM:
1762
logger.error("No permission to"
1763
" bind to interface %s",
1765
elif error[0] == errno.ENOPROTOOPT:
1766
logger.error("SO_BINDTODEVICE not available;"
1767
" cannot bind to interface %s",
2498
1771
# Only bind(2) the socket if we really need to.
2499
1772
if self.server_address[0] or self.server_address[1]:
2500
1773
if not self.server_address[0]:
2501
1774
if self.address_family == socket.AF_INET6:
2502
any_address = "::" # in6addr_any
1775
any_address = "::" # in6addr_any
2504
any_address = "0.0.0.0" # INADDR_ANY
1777
any_address = socket.INADDR_ANY
2505
1778
self.server_address = (any_address,
2506
1779
self.server_address[1])
2507
1780
elif not self.server_address[1]:
2508
self.server_address = (self.server_address[0], 0)
1781
self.server_address = (self.server_address[0],
2509
1783
# if self.interface:
2510
1784
# self.server_address = (self.server_address[0],
2608
1888
funcname = request[1]
2609
1889
args = request[2]
2610
1890
kwargs = request[3]
2612
1892
parent_pipe.send(('data', getattr(client_object,
2613
1893
funcname)(*args,
2616
1896
if command == 'getattr':
2617
1897
attrname = request[1]
2618
if isinstance(client_object.__getattribute__(attrname),
2619
collections.Callable):
2620
parent_pipe.send(('function', ))
1898
if callable(client_object.__getattribute__(attrname)):
1899
parent_pipe.send(('function',))
2623
'data', client_object.__getattribute__(attrname)))
1901
parent_pipe.send(('data', client_object
1902
.__getattribute__(attrname)))
2625
1904
if command == 'setattr':
2626
1905
attrname = request[1]
2627
1906
value = request[2]
2628
1907
setattr(client_object, attrname, value)
2633
def rfc3339_duration_to_delta(duration):
2634
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2636
>>> rfc3339_duration_to_delta("P7D")
2637
datetime.timedelta(7)
2638
>>> rfc3339_duration_to_delta("PT60S")
2639
datetime.timedelta(0, 60)
2640
>>> rfc3339_duration_to_delta("PT60M")
2641
datetime.timedelta(0, 3600)
2642
>>> rfc3339_duration_to_delta("PT24H")
2643
datetime.timedelta(1)
2644
>>> rfc3339_duration_to_delta("P1W")
2645
datetime.timedelta(7)
2646
>>> rfc3339_duration_to_delta("PT5M30S")
2647
datetime.timedelta(0, 330)
2648
>>> rfc3339_duration_to_delta("P1DT3M20S")
2649
datetime.timedelta(1, 200)
2652
# Parsing an RFC 3339 duration with regular expressions is not
2653
# possible - there would have to be multiple places for the same
2654
# values, like seconds. The current code, while more esoteric, is
2655
# cleaner without depending on a parsing library. If Python had a
2656
# built-in library for parsing we would use it, but we'd like to
2657
# avoid excessive use of external libraries.
2659
# New type for defining tokens, syntax, and semantics all-in-one
2660
Token = collections.namedtuple("Token", (
2661
"regexp", # To match token; if "value" is not None, must have
2662
# a "group" containing digits
2663
"value", # datetime.timedelta or None
2664
"followers")) # Tokens valid after this token
2665
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2666
# the "duration" ABNF definition in RFC 3339, Appendix A.
2667
token_end = Token(re.compile(r"$"), None, frozenset())
2668
token_second = Token(re.compile(r"(\d+)S"),
2669
datetime.timedelta(seconds=1),
2670
frozenset((token_end, )))
2671
token_minute = Token(re.compile(r"(\d+)M"),
2672
datetime.timedelta(minutes=1),
2673
frozenset((token_second, token_end)))
2674
token_hour = Token(re.compile(r"(\d+)H"),
2675
datetime.timedelta(hours=1),
2676
frozenset((token_minute, token_end)))
2677
token_time = Token(re.compile(r"T"),
2679
frozenset((token_hour, token_minute,
2681
token_day = Token(re.compile(r"(\d+)D"),
2682
datetime.timedelta(days=1),
2683
frozenset((token_time, token_end)))
2684
token_month = Token(re.compile(r"(\d+)M"),
2685
datetime.timedelta(weeks=4),
2686
frozenset((token_day, token_end)))
2687
token_year = Token(re.compile(r"(\d+)Y"),
2688
datetime.timedelta(weeks=52),
2689
frozenset((token_month, token_end)))
2690
token_week = Token(re.compile(r"(\d+)W"),
2691
datetime.timedelta(weeks=1),
2692
frozenset((token_end, )))
2693
token_duration = Token(re.compile(r"P"), None,
2694
frozenset((token_year, token_month,
2695
token_day, token_time,
2697
# Define starting values:
2699
value = datetime.timedelta()
2701
# Following valid tokens
2702
followers = frozenset((token_duration, ))
2703
# String left to parse
2705
# Loop until end token is found
2706
while found_token is not token_end:
2707
# Search for any currently valid tokens
2708
for token in followers:
2709
match = token.regexp.match(s)
2710
if match is not None:
2712
if token.value is not None:
2713
# Value found, parse digits
2714
factor = int(match.group(1), 10)
2715
# Add to value so far
2716
value += factor * token.value
2717
# Strip token from string
2718
s = token.regexp.sub("", s, 1)
2721
# Set valid next tokens
2722
followers = found_token.followers
2725
# No currently valid tokens were found
2726
raise ValueError("Invalid RFC 3339 duration: {!r}"
2732
1912
def string_to_delta(interval):
2733
1913
"""Parse a string and return a datetime.timedelta
2735
1915
>>> string_to_delta('7d')
2736
1916
datetime.timedelta(7)
2737
1917
>>> string_to_delta('60s')
2832
2006
parser.add_argument("--no-dbus", action="store_false",
2833
2007
dest="use_dbus", help="Do not provide D-Bus"
2834
" system bus interface", default=None)
2008
" system bus interface")
2835
2009
parser.add_argument("--no-ipv6", action="store_false",
2836
dest="use_ipv6", help="Do not use IPv6",
2010
dest="use_ipv6", help="Do not use IPv6")
2838
2011
parser.add_argument("--no-restore", action="store_false",
2839
2012
dest="restore", help="Do not restore stored"
2840
" state", default=None)
2841
parser.add_argument("--socket", type=int,
2842
help="Specify a file descriptor to a network"
2843
" socket to use instead of creating one")
2844
2014
parser.add_argument("--statedir", metavar="DIR",
2845
2015
help="Directory to save/restore state in")
2846
parser.add_argument("--foreground", action="store_true",
2847
help="Run in foreground", default=None)
2848
parser.add_argument("--no-zeroconf", action="store_false",
2849
dest="zeroconf", help="Do not use Zeroconf",
2852
2017
options = parser.parse_args()
2854
2019
if options.check:
2856
fail_count, test_count = doctest.testmod()
2857
sys.exit(os.EX_OK if fail_count == 0 else 1)
2859
2024
# Default values for config file for server-global settings
2860
server_defaults = {"interface": "",
2865
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2866
":+SIGN-DSA-SHA256",
2867
"servicename": "Mandos",
2873
"statedir": "/var/lib/mandos",
2874
"foreground": "False",
2025
server_defaults = { "interface": "",
2030
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2031
"servicename": "Mandos",
2036
"statedir": "/var/lib/mandos"
2878
2039
# Parse config file for server-global settings
2879
2040
server_config = configparser.SafeConfigParser(server_defaults)
2880
2041
del server_defaults
2881
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2042
server_config.read(os.path.join(options.configdir,
2882
2044
# Convert the SafeConfigParser object to a dict
2883
2045
server_settings = server_config.defaults()
2884
2046
# Use the appropriate methods on the non-string config options
2885
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2047
for option in ("debug", "use_dbus", "use_ipv6"):
2886
2048
server_settings[option] = server_config.getboolean("DEFAULT",
2888
2050
if server_settings["port"]:
2889
2051
server_settings["port"] = server_config.getint("DEFAULT",
2891
if server_settings["socket"]:
2892
server_settings["socket"] = server_config.getint("DEFAULT",
2894
# Later, stdin will, and stdout and stderr might, be dup'ed
2895
# over with an opened os.devnull. But we don't want this to
2896
# happen with a supplied network socket.
2897
if 0 <= server_settings["socket"] <= 2:
2898
server_settings["socket"] = os.dup(server_settings
2900
2053
del server_config
2902
2055
# Override the settings from the config file with command line
2903
2056
# options, if set.
2904
2057
for option in ("interface", "address", "port", "debug",
2905
"priority", "servicename", "configdir", "use_dbus",
2906
"use_ipv6", "debuglevel", "restore", "statedir",
2907
"socket", "foreground", "zeroconf"):
2058
"priority", "servicename", "configdir",
2059
"use_dbus", "use_ipv6", "debuglevel", "restore",
2908
2061
value = getattr(options, option)
2909
2062
if value is not None:
2910
2063
server_settings[option] = value
2912
2065
# Force all strings to be unicode
2913
2066
for option in server_settings.keys():
2914
if isinstance(server_settings[option], bytes):
2915
server_settings[option] = (server_settings[option]
2917
# Force all boolean options to be boolean
2918
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2919
"foreground", "zeroconf"):
2920
server_settings[option] = bool(server_settings[option])
2921
# Debug implies foreground
2922
if server_settings["debug"]:
2923
server_settings["foreground"] = True
2067
if type(server_settings[option]) is str:
2068
server_settings[option] = unicode(server_settings[option])
2924
2069
# Now we have our good server settings in "server_settings"
2926
2071
##################################################################
2928
if (not server_settings["zeroconf"]
2929
and not (server_settings["port"]
2930
or server_settings["socket"] != "")):
2931
parser.error("Needs port or socket to work without Zeroconf")
2933
2073
# For convenience
2934
2074
debug = server_settings["debug"]
2935
2075
debuglevel = server_settings["debuglevel"]
2949
2087
level = getattr(logging, debuglevel.upper())
2950
2088
initlogger(debug, level)
2952
2090
if server_settings["servicename"] != "Mandos":
2953
syslogger.setFormatter(
2954
logging.Formatter('Mandos ({}) [%(process)d]:'
2955
' %(levelname)s: %(message)s'.format(
2956
server_settings["servicename"])))
2091
syslogger.setFormatter(logging.Formatter
2092
('Mandos (%s) [%%(process)d]:'
2093
' %%(levelname)s: %%(message)s'
2094
% server_settings["servicename"]))
2958
2096
# Parse config file with clients
2959
client_config = configparser.SafeConfigParser(Client
2097
client_config = configparser.SafeConfigParser(Client.client_defaults)
2961
2098
client_config.read(os.path.join(server_settings["configdir"],
2962
2099
"clients.conf"))
2964
2101
global mandos_dbus_service
2965
2102
mandos_dbus_service = None
2968
if server_settings["socket"] != "":
2969
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"],
2979
pidfilename = "/run/mandos.pid"
2980
if not os.path.isdir("/run/."):
2981
pidfilename = "/var/run/mandos.pid"
2984
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2985
except IOError as e:
2986
logger.error("Could not open file %r", pidfilename,
2989
for name, group in (("_mandos", "_mandos"),
2990
("mandos", "mandos"),
2991
("nobody", "nogroup")):
2993
uid = pwd.getpwnam(name).pw_uid
2994
gid = pwd.getpwnam(group).pw_gid
2104
tcp_server = MandosServer((server_settings["address"],
2105
server_settings["port"]),
2107
interface=(server_settings["interface"]
2111
server_settings["priority"],
2114
pidfilename = "/var/run/mandos.pid"
2116
pidfile = open(pidfilename, "w")
2118
logger.error("Could not open file %r", pidfilename)
2121
uid = pwd.getpwnam("_mandos").pw_uid
2122
gid = pwd.getpwnam("_mandos").pw_gid
2125
uid = pwd.getpwnam("mandos").pw_uid
2126
gid = pwd.getpwnam("mandos").pw_gid
2996
2127
except KeyError:
2129
uid = pwd.getpwnam("nobody").pw_uid
2130
gid = pwd.getpwnam("nobody").pw_gid
3005
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3007
2137
except OSError as error:
3008
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3009
.format(uid, gid, os.strerror(error.errno)))
3010
if error.errno != errno.EPERM:
2138
if error[0] != errno.EPERM:
3014
2142
# Enable all possible GnuTLS debugging
3016
2144
# "Use a log level over 10 to enable all debugging options."
3017
2145
# - GnuTLS manual
3018
gnutls.global_set_log_level(11)
2146
gnutls.library.functions.gnutls_global_set_log_level(11)
2148
@gnutls.library.types.gnutls_log_func
3021
2149
def debug_gnutls(level, string):
3022
2150
logger.debug("GnuTLS: %s", string[:-1])
3024
gnutls.global_set_log_function(debug_gnutls)
2152
(gnutls.library.functions
2153
.gnutls_global_set_log_function(debug_gnutls))
3026
2155
# Redirect stdin so all checkers get /dev/null
3027
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3028
2157
os.dup2(null, sys.stdin.fileno())
3032
2161
# Need to fork before connecting to D-Bus
3034
2163
# 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.
2166
gobject.threads_init()
3041
2168
global main_loop
3042
2169
# From the Avahi example code
3043
DBusGMainLoop(set_as_default=True)
3044
main_loop = GLib.MainLoop()
2170
DBusGMainLoop(set_as_default=True )
2171
main_loop = gobject.MainLoop()
3045
2172
bus = dbus.SystemBus()
3046
2173
# End of Avahi example code
3049
2176
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:
3056
logger.error("Disabling D-Bus:", exc_info=e)
2177
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2181
except dbus.exceptions.NameExistsException as e:
2182
logger.error(unicode(e) + ", disabling D-Bus")
3057
2183
use_dbus = False
3058
2184
server_settings["use_dbus"] = False
3059
2185
tcp_server.use_dbus = False
3061
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3062
service = AvahiServiceToSyslog(
3063
name=server_settings["servicename"],
3064
servicetype="_mandos._tcp",
3067
if server_settings["interface"]:
3068
service.interface = if_nametoindex(
3069
server_settings["interface"].encode("utf-8"))
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
3071
2195
global multiprocessing_manager
3072
2196
multiprocessing_manager = multiprocessing.Manager()
3074
2198
client_class = Client
3076
client_class = functools.partial(ClientDBus, bus=bus)
2200
client_class = functools.partial(ClientDBusTransitional,
3078
2203
client_settings = Client.config_parser(client_config)
3079
2204
old_client_settings = {}
3080
2205
clients_data = {}
3082
# This is used to redirect stdout and stderr for checker processes
3084
wnull = open(os.devnull, "w") # A writable /dev/null
3085
# Only used if server is running in foreground but not in debug
3087
if debug or not foreground:
3090
2207
# Get client data and settings from last running state.
3091
2208
if server_settings["restore"]:
3093
2210
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"]
2211
clients_data, old_client_settings = (pickle.load
3139
2213
os.remove(stored_state_path)
3140
2214
except IOError as e:
3141
if e.errno == errno.ENOENT:
3142
logger.warning("Could not load persistent state:"
3143
" {}".format(os.strerror(e.errno)))
3145
logger.critical("Could not load persistent state:",
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
3148
2219
except EOFError as e:
3149
2220
logger.warning("Could not load persistent state: "
2221
"EOFError: {0}".format(e))
3153
2223
with PGPEngine() as pgp:
3154
for client_name, client in clients_data.items():
3155
# Skip removed clients
3156
if client_name not in client_settings:
2224
for client_name, client in clients_data.iteritems():
3159
2225
# Decide which value to use after restoring saved state.
3160
2226
# We have three different values: Old config file,
3161
2227
# new config file, and saved state.
3166
2232
# For each value in new config, check if it
3167
2233
# differs from the old config value (Except for
3168
2234
# the "secret" attribute)
3169
if (name != "secret"
3171
old_client_settings[client_name][name])):
2235
if (name != "secret" and
2236
value != old_client_settings[client_name]
3172
2238
client[name] = value
3173
2239
except KeyError:
3176
2242
# Clients who has passed its expire date can still be
3177
# enabled if its last checker was successful. A Client
3178
# whose checker succeeded before we stored its state is
3179
# assumed to have successfully run all checkers during
2243
# enabled if its last checker was successful. Clients
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
3181
2246
if client["enabled"]:
3182
2247
if datetime.datetime.utcnow() >= client["expires"]:
3183
2248
if not client["last_checked_ok"]:
3184
2249
logger.warning(
3185
"disabling client {} - Client never "
3186
"performed a successful checker".format(
2250
"disabling client {0} - Client never "
2251
"performed a successfull checker"
2252
.format(client["name"]))
3188
2253
client["enabled"] = False
3189
2254
elif client["last_checker_status"] != 0:
3190
2255
logger.warning(
3191
"disabling client {} - Client last"
3192
" checker failed with error code"
3195
client["last_checker_status"]))
2256
"disabling client {0} - Client "
2257
"last checker failed with error code {1}"
2258
.format(client["name"],
2259
client["last_checker_status"]))
3196
2260
client["enabled"] = False
3198
client["expires"] = (
3199
datetime.datetime.utcnow()
3200
+ client["timeout"])
3201
logger.debug("Last checker succeeded,"
3202
" keeping {} enabled".format(
2262
client["expires"] = (datetime.datetime
2264
+ client["timeout"])
3205
client["secret"] = pgp.decrypt(
3206
client["encrypted_secret"],
3207
client_settings[client_name]["secret"])
2267
client["secret"] = (
2268
pgp.decrypt(client["encrypted_secret"],
2269
client_settings[client_name]
3208
2271
except PGPError:
3209
2272
# If decryption fails, we use secret from new settings
3210
logger.debug("Failed to decrypt {} old secret".format(
3212
client["secret"] = (client_settings[client_name]
2273
logger.debug("Failed to decrypt {0} old secret"
2274
.format(client_name))
2275
client["secret"] = (
2276
client_settings[client_name]["secret"])
3215
2279
# Add/remove clients based on new changes made to config
3216
for client_name in (set(old_client_settings)
3217
- set(client_settings)):
2280
for client_name in set(old_client_settings) - set(client_settings):
3218
2281
del clients_data[client_name]
3219
for client_name in (set(client_settings)
3220
- set(old_client_settings)):
2282
for client_name in set(client_settings) - set(old_client_settings):
3221
2283
clients_data[client_name] = client_settings[client_name]
3223
# Create all client objects
3224
for client_name, client in clients_data.items():
2285
# Create clients all clients
2286
for client_name, client in clients_data.iteritems():
3225
2287
tcp_server.clients[client_name] = client_class(
3228
server_settings=server_settings)
2288
name = client_name, settings = client)
3230
2290
if not tcp_server.clients:
3231
2291
logger.warning("No clients defined")
3234
if pidfile is not None:
3238
print(pid, file=pidfile)
3240
logger.error("Could not write to file %r with PID %d",
2297
pidfile.write(str(pid) + "\n".encode("utf-8"))
2300
logger.error("Could not write to file %r with PID %d",
2303
# "pidfile" was never created
3243
2305
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)
2306
signal.signal(signal.SIGINT, signal.SIG_IGN)
2308
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
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):
2312
class MandosDBusService(dbus.service.Object):
3254
2313
"""A D-Bus proxy object"""
3256
2314
def __init__(self):
3257
2315
dbus.service.Object.__init__(self, bus, "/")
3259
2316
_interface = "se.recompile.Mandos"
3261
2318
@dbus.service.signal(_interface, signature="o")
3262
2319
def ClientAdded(self, objpath):
3266
2323
@dbus.service.signal(_interface, signature="ss")
3267
2324
def ClientNotFound(self, fingerprint, address):
3271
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3273
2328
@dbus.service.signal(_interface, signature="os")
3274
2329
def ClientRemoved(self, objpath, name):
3278
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3280
2333
@dbus.service.method(_interface, out_signature="ao")
3281
2334
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":
2336
return dbus.Array(c.dbus_object_path
2338
tcp_server.clients.itervalues())
3288
2340
@dbus.service.method(_interface,
3289
2341
out_signature="a{oa{sv}}")
3290
2342
def GetAllClientsWithProperties(self):
3292
2344
return dbus.Dictionary(
3293
{c.dbus_object_path: c.GetAll(
3294
"se.recompile.Mandos.Client")
3295
for c in tcp_server.clients.values()},
2345
((c.dbus_object_path, c.GetAll(""))
2346
for c in tcp_server.clients.itervalues()),
3296
2347
signature="oa{sv}")
3298
2349
@dbus.service.method(_interface, in_signature="o")
3299
2350
def RemoveClient(self, object_path):
3301
for c in tcp_server.clients.values():
2352
for c in tcp_server.clients.itervalues():
3302
2353
if c.dbus_object_path == object_path:
3303
2354
del tcp_server.clients[c.name]
3304
2355
c.remove_from_connection()
3305
# Don't signal the disabling
2356
# Don't signal anything except ClientRemoved
3306
2357
c.disable(quiet=True)
3307
# Emit D-Bus signal for removal
3308
self.client_removed_signal(c)
2359
self.ClientRemoved(object_path, c.name)
3310
2361
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
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
2365
class MandosDBusServiceTransitional(MandosDBusService):
2366
__metaclass__ = AlternateDBusNamesMetaclass
2367
mandos_dbus_service = MandosDBusServiceTransitional()
3358
2370
"Cleanup function; run on exit"
3362
mp.active_children()
2373
multiprocessing.active_children()
3364
2374
if not (tcp_server.clients or client_settings):
3367
2377
# Store client before exiting. Secrets are encrypted with key
3368
2378
# based on what config file has. If config file is
3369
2379
# removed/edited, old secret will thus be unrecovable.
3371
2381
with PGPEngine() as pgp:
3372
for client in tcp_server.clients.values():
2382
for client in tcp_server.clients.itervalues():
3373
2383
key = client_settings[client.name]["secret"]
3374
2384
client.encrypted_secret = pgp.encrypt(client.secret,
3376
2386
client_dict = {}
3378
2388
# 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
2390
exclude = set(("bus", "changedstate", "secret",
2392
for name, typ in (inspect.getmembers
2393
(dbus.service.Object)):
3384
2394
exclude.add(name)
3386
2396
client_dict["encrypted_secret"] = (client
3387
2397
.encrypted_secret)
3388
2398
for attr in client.client_structure:
3389
2399
if attr not in exclude:
3390
2400
client_dict[attr] = getattr(client, attr)
3392
2402
clients[client.name] = client_dict
3393
2403
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
2406
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2409
(stored_state_path))
2410
with os.fdopen(tempfd, "wb") as stored_state:
2411
pickle.dump((clients, client_settings), stored_state)
3405
2412
os.rename(tempname, stored_state_path)
3406
2413
except (IOError, OSError) as e:
2414
logger.warning("Could not save persistent state: {0}"
3409
2418
os.remove(tempname)
3410
2419
except NameError:
3412
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3413
logger.warning("Could not save persistent state: {}"
3414
.format(os.strerror(e.errno)))
3416
logger.warning("Could not save persistent state:",
2421
if e.errno not in set((errno.ENOENT, errno.EACCES,
3420
2425
# Delete all clients, and settings from config
3421
2426
while tcp_server.clients:
3422
2427
name, client = tcp_server.clients.popitem()
3424
2429
client.remove_from_connection()
3425
# Don't signal the disabling
2430
# Don't signal anything except ClientRemoved
3426
2431
client.disable(quiet=True)
3427
# Emit D-Bus signal for removal
3429
mandos_dbus_service.client_removed_signal(client)
2434
mandos_dbus_service.ClientRemoved(client
3430
2437
client_settings.clear()
3432
2439
atexit.register(cleanup)
3434
for client in tcp_server.clients.values():
2441
for client in tcp_server.clients.itervalues():
3436
# Emit D-Bus signal for adding
3437
mandos_dbus_service.client_added_signal(client)
2444
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3438
2445
# Need to initiate checking of clients
3439
2446
if client.enabled:
3440
2447
client.init_checker()
3442
2449
tcp_server.enable()
3443
2450
tcp_server.server_activate()
3445
2452
# Find out what port we got
3447
service.port = tcp_server.socket.getsockname()[1]
2453
service.port = tcp_server.socket.getsockname()[1]
3449
2455
logger.info("Now listening on address %r, port %d,"
3450
" flowinfo %d, scope_id %d",
3451
*tcp_server.socket.getsockname())
2456
" flowinfo %d, scope_id %d"
2457
% tcp_server.socket.getsockname())
3453
logger.info("Now listening on address %r, port %d",
3454
*tcp_server.socket.getsockname())
3456
# service.interface = tcp_server.socket.getsockname()[3]
2459
logger.info("Now listening on address %r, port %d"
2460
% tcp_server.socket.getsockname())
2462
#service.interface = tcp_server.socket.getsockname()[3]
3460
# From the Avahi example code
3463
except dbus.exceptions.DBusException as error:
3464
logger.critical("D-Bus Exception", exc_info=error)
3467
# End of Avahi example code
3469
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3470
lambda *args, **kwargs:
3471
(tcp_server.handle_request
3472
(*args[2:], **kwargs) or True))
2465
# From the Avahi example code
2468
except dbus.exceptions.DBusException as error:
2469
logger.critical("DBusException: %s", error)
2472
# End of Avahi example code
2474
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2475
lambda *args, **kwargs:
2476
(tcp_server.handle_request
2477
(*args[2:], **kwargs) or True))
3474
2479
logger.debug("Starting main loop")
3475
2480
main_loop.run()
3476
2481
except AvahiError as error:
3477
logger.critical("Avahi Error", exc_info=error)
2482
logger.critical("AvahiError: %s", error)
3480
2485
except KeyboardInterrupt: