70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
83
71
import dbus.service
85
from gi.repository import GLib
86
74
from dbus.mainloop.glib import DBusGMainLoop
89
77
import xml.dom.minidom
92
if sys.version_info.major == 2:
95
# Show warnings by default
96
if not sys.warnoptions:
98
warnings.simplefilter("default")
100
# Try to find the value of SO_BINDTODEVICE:
102
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
103
# newer, and it is also the most natural place for it:
104
82
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
105
83
except AttributeError:
107
# This is where SO_BINDTODEVICE was up to and including Python
109
85
from IN import SO_BINDTODEVICE
110
86
except ImportError:
111
# In Python 2.7 it seems to have been removed entirely.
112
# Try running the C preprocessor:
114
cc = subprocess.Popen(["cc", "--language=c", "-E",
116
stdin=subprocess.PIPE,
117
stdout=subprocess.PIPE)
118
stdout = cc.communicate(
119
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
120
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
121
except (OSError, ValueError, IndexError):
123
SO_BINDTODEVICE = None
125
if sys.version_info.major == 2:
128
if sys.version_info < (3, 2):
129
configparser.Configparser = configparser.SafeConfigParser
87
SO_BINDTODEVICE = None
132
90
stored_state_file = "clients.pickle"
134
92
logger = logging.getLogger()
135
logging.captureWarnings(True) # Show warnings via the logging system
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
139
if_nametoindex = ctypes.cdll.LoadLibrary(
140
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
141
101
except (OSError, AttributeError):
143
102
def if_nametoindex(interface):
144
103
"Get an interface index the hard way, i.e. using fcntl()"
145
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
146
105
with contextlib.closing(socket.socket()) as s:
147
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
148
struct.pack(b"16s16x", interface))
149
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
150
111
return interface_index
153
def copy_function(func):
154
"""Make a copy of a function"""
155
if sys.version_info.major == 2:
156
return types.FunctionType(func.func_code,
162
return types.FunctionType(func.__code__,
169
114
def initlogger(debug, level=logging.WARNING):
170
115
"""init logger and add loglevel"""
173
syslogger = (logging.handlers.SysLogHandler(
174
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
176
117
syslogger.setFormatter(logging.Formatter
177
118
('Mandos [%(process)d]: %(levelname)s:'
179
120
logger.addHandler(syslogger)
182
123
console = logging.StreamHandler()
183
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
240
169
os.rmdir(self.tempdir)
241
170
self.tempdir = None
243
172
def password_encode(self, password):
244
173
# Passphrase can not be empty and can not contain newlines or
245
174
# NUL bytes. So we prefix it and hex encode it.
246
encoded = b"mandos" + binascii.hexlify(password)
247
if len(encoded) > 2048:
248
# GnuPG can't handle long passwords, so encode differently
249
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
250
.replace(b"\n", b"\\n")
251
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
254
177
def encrypt(self, data, password):
255
passphrase = self.password_encode(password)
256
with tempfile.NamedTemporaryFile(
257
dir=self.tempdir) as passfile:
258
passfile.write(passphrase)
260
proc = subprocess.Popen([self.gpg, '--symmetric',
264
stdin=subprocess.PIPE,
265
stdout=subprocess.PIPE,
266
stderr=subprocess.PIPE)
267
ciphertext, err = proc.communicate(input=data)
268
if proc.returncode != 0:
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
270
192
return ciphertext
272
194
def decrypt(self, data, password):
273
passphrase = self.password_encode(password)
274
with tempfile.NamedTemporaryFile(
275
dir=self.tempdir) as passfile:
276
passfile.write(passphrase)
278
proc = subprocess.Popen([self.gpg, '--decrypt',
282
stdin=subprocess.PIPE,
283
stdout=subprocess.PIPE,
284
stderr=subprocess.PIPE)
285
decrypted_plaintext, err = proc.communicate(input=data)
286
if proc.returncode != 0:
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
288
209
return decrypted_plaintext
291
# Pretend that we have an Avahi module
293
"""This isn't so much a class as it is a module-like namespace."""
294
IF_UNSPEC = -1 # avahi-common/address.h
295
PROTO_UNSPEC = -1 # avahi-common/address.h
296
PROTO_INET = 0 # avahi-common/address.h
297
PROTO_INET6 = 1 # avahi-common/address.h
298
DBUS_NAME = "org.freedesktop.Avahi"
299
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
300
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
301
DBUS_PATH_SERVER = "/"
304
def string_array_to_txt_array(t):
305
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
306
for s in t), signature="ay")
307
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
308
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
309
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
310
SERVER_INVALID = 0 # avahi-common/defs.h
311
SERVER_REGISTERING = 1 # avahi-common/defs.h
312
SERVER_RUNNING = 2 # avahi-common/defs.h
313
SERVER_COLLISION = 3 # avahi-common/defs.h
314
SERVER_FAILURE = 4 # avahi-common/defs.h
317
213
class AvahiError(Exception):
318
214
def __init__(self, value, *args, **kwargs):
319
215
self.value = value
320
return super(AvahiError, self).__init__(value, *args,
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
324
220
class AvahiServiceError(AvahiError):
328
223
class AvahiGroupError(AvahiError):
227
class AvahiService(object):
333
228
"""An Avahi (Zeroconf) service.
336
231
interface: integer; avahi.IF_UNSPEC or an interface index.
337
232
Used to optionally bind to the specified interface.
338
233
name: string; Example: 'Mandos'
339
234
type: string; Example: '_mandos._tcp'.
340
See <https://www.iana.org/assignments/service-names-port-numbers>
235
See <http://www.dns-sd.org/ServiceTypes.html>
341
236
port: integer; what port to announce
342
237
TXT: list of strings; TXT record for the service
343
238
domain: string; Domain to publish on, default to .local if empty.
502
367
follow_name_owner_changes=True),
503
368
avahi.DBUS_INTERFACE_SERVER)
504
369
self.server.connect_to_signal("StateChanged",
505
self.server_state_changed)
370
self.server_state_changed)
506
371
self.server_state_changed(self.server.GetState())
509
373
class AvahiServiceToSyslog(AvahiService):
510
def rename(self, *args, **kwargs):
511
375
"""Add the new name to the syslog messages"""
512
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
513
syslogger.setFormatter(logging.Formatter(
514
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos (%s) [%%(process)d]:'
379
' %%(levelname)s: %%(message)s'
519
# Pretend that we have a GnuTLS module
521
"""This isn't so much a class as it is a module-like namespace."""
523
library = ctypes.util.find_library("gnutls")
525
library = ctypes.util.find_library("gnutls-deb0")
526
_library = ctypes.cdll.LoadLibrary(library)
529
# Unless otherwise indicated, the constants and types below are
530
# all from the gnutls/gnutls.h C header file.
541
E_NO_CERTIFICATE_FOUND = -49
546
KEYID_USE_SHA256 = 1 # gnutls/x509.h
547
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
550
class session_int(ctypes.Structure):
552
session_t = ctypes.POINTER(session_int)
554
class certificate_credentials_st(ctypes.Structure):
556
certificate_credentials_t = ctypes.POINTER(
557
certificate_credentials_st)
558
certificate_type_t = ctypes.c_int
560
class datum_t(ctypes.Structure):
561
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
562
('size', ctypes.c_uint)]
564
class openpgp_crt_int(ctypes.Structure):
566
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
567
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
568
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
569
credentials_type_t = ctypes.c_int
570
transport_ptr_t = ctypes.c_void_p
571
close_request_t = ctypes.c_int
574
class Error(Exception):
575
def __init__(self, message=None, code=None, args=()):
576
# Default usage is by a message string, but if a return
577
# code is passed, convert it to a string with
580
if message is None and code is not None:
581
message = gnutls.strerror(code)
582
return super(gnutls.Error, self).__init__(
585
class CertificateSecurityError(Error):
591
self._c_object = gnutls.certificate_credentials_t()
592
gnutls.certificate_allocate_credentials(
593
ctypes.byref(self._c_object))
594
self.type = gnutls.CRD_CERTIFICATE
597
gnutls.certificate_free_credentials(self._c_object)
600
def __init__(self, socket, credentials=None):
601
self._c_object = gnutls.session_t()
602
gnutls_flags = gnutls.CLIENT
603
if gnutls.check_version(b"3.5.6"):
604
gnutls_flags |= gnutls.NO_TICKETS
606
gnutls_flags |= gnutls.ENABLE_RAWPK
607
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
609
gnutls.set_default_priority(self._c_object)
610
gnutls.transport_set_ptr(self._c_object, socket.fileno())
611
gnutls.handshake_set_private_extensions(self._c_object,
614
if credentials is None:
615
credentials = gnutls.Credentials()
616
gnutls.credentials_set(self._c_object, credentials.type,
617
ctypes.cast(credentials._c_object,
619
self.credentials = credentials
622
gnutls.deinit(self._c_object)
625
return gnutls.handshake(self._c_object)
627
def send(self, data):
631
data_len -= gnutls.record_send(self._c_object,
636
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
638
# Error handling functions
639
def _error_code(result):
640
"""A function to raise exceptions on errors, suitable
641
for the 'restype' attribute on ctypes functions"""
644
if result == gnutls.E_NO_CERTIFICATE_FOUND:
645
raise gnutls.CertificateSecurityError(code=result)
646
raise gnutls.Error(code=result)
648
def _retry_on_error(result, func, arguments):
649
"""A function to retry on some errors, suitable
650
for the 'errcheck' attribute on ctypes functions"""
652
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
653
return _error_code(result)
654
result = func(*arguments)
657
# Unless otherwise indicated, the function declarations below are
658
# all from the gnutls/gnutls.h C header file.
661
priority_set_direct = _library.gnutls_priority_set_direct
662
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
663
ctypes.POINTER(ctypes.c_char_p)]
664
priority_set_direct.restype = _error_code
666
init = _library.gnutls_init
667
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
668
init.restype = _error_code
670
set_default_priority = _library.gnutls_set_default_priority
671
set_default_priority.argtypes = [session_t]
672
set_default_priority.restype = _error_code
674
record_send = _library.gnutls_record_send
675
record_send.argtypes = [session_t, ctypes.c_void_p,
677
record_send.restype = ctypes.c_ssize_t
678
record_send.errcheck = _retry_on_error
680
certificate_allocate_credentials = (
681
_library.gnutls_certificate_allocate_credentials)
682
certificate_allocate_credentials.argtypes = [
683
ctypes.POINTER(certificate_credentials_t)]
684
certificate_allocate_credentials.restype = _error_code
686
certificate_free_credentials = (
687
_library.gnutls_certificate_free_credentials)
688
certificate_free_credentials.argtypes = [
689
certificate_credentials_t]
690
certificate_free_credentials.restype = None
692
handshake_set_private_extensions = (
693
_library.gnutls_handshake_set_private_extensions)
694
handshake_set_private_extensions.argtypes = [session_t,
696
handshake_set_private_extensions.restype = None
698
credentials_set = _library.gnutls_credentials_set
699
credentials_set.argtypes = [session_t, credentials_type_t,
701
credentials_set.restype = _error_code
703
strerror = _library.gnutls_strerror
704
strerror.argtypes = [ctypes.c_int]
705
strerror.restype = ctypes.c_char_p
707
certificate_type_get = _library.gnutls_certificate_type_get
708
certificate_type_get.argtypes = [session_t]
709
certificate_type_get.restype = _error_code
711
certificate_get_peers = _library.gnutls_certificate_get_peers
712
certificate_get_peers.argtypes = [session_t,
713
ctypes.POINTER(ctypes.c_uint)]
714
certificate_get_peers.restype = ctypes.POINTER(datum_t)
716
global_set_log_level = _library.gnutls_global_set_log_level
717
global_set_log_level.argtypes = [ctypes.c_int]
718
global_set_log_level.restype = None
720
global_set_log_function = _library.gnutls_global_set_log_function
721
global_set_log_function.argtypes = [log_func]
722
global_set_log_function.restype = None
724
deinit = _library.gnutls_deinit
725
deinit.argtypes = [session_t]
726
deinit.restype = None
728
handshake = _library.gnutls_handshake
729
handshake.argtypes = [session_t]
730
handshake.restype = _error_code
731
handshake.errcheck = _retry_on_error
733
transport_set_ptr = _library.gnutls_transport_set_ptr
734
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
735
transport_set_ptr.restype = None
737
bye = _library.gnutls_bye
738
bye.argtypes = [session_t, close_request_t]
739
bye.restype = _error_code
740
bye.errcheck = _retry_on_error
742
check_version = _library.gnutls_check_version
743
check_version.argtypes = [ctypes.c_char_p]
744
check_version.restype = ctypes.c_char_p
746
_need_version = b"3.3.0"
747
if check_version(_need_version) is None:
748
raise self.Error("Needs GnuTLS {} or later"
749
.format(_need_version))
751
_tls_rawpk_version = b"3.6.6"
752
has_rawpk = bool(check_version(_tls_rawpk_version))
756
class pubkey_st(ctypes.Structure):
758
pubkey_t = ctypes.POINTER(pubkey_st)
760
x509_crt_fmt_t = ctypes.c_int
762
# All the function declarations below are from gnutls/abstract.h
763
pubkey_init = _library.gnutls_pubkey_init
764
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
765
pubkey_init.restype = _error_code
767
pubkey_import = _library.gnutls_pubkey_import
768
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
770
pubkey_import.restype = _error_code
772
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
773
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
774
ctypes.POINTER(ctypes.c_ubyte),
775
ctypes.POINTER(ctypes.c_size_t)]
776
pubkey_get_key_id.restype = _error_code
778
pubkey_deinit = _library.gnutls_pubkey_deinit
779
pubkey_deinit.argtypes = [pubkey_t]
780
pubkey_deinit.restype = None
782
# All the function declarations below are from gnutls/openpgp.h
784
openpgp_crt_init = _library.gnutls_openpgp_crt_init
785
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
786
openpgp_crt_init.restype = _error_code
788
openpgp_crt_import = _library.gnutls_openpgp_crt_import
789
openpgp_crt_import.argtypes = [openpgp_crt_t,
790
ctypes.POINTER(datum_t),
792
openpgp_crt_import.restype = _error_code
794
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
795
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
796
ctypes.POINTER(ctypes.c_uint)]
797
openpgp_crt_verify_self.restype = _error_code
799
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
800
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
801
openpgp_crt_deinit.restype = None
803
openpgp_crt_get_fingerprint = (
804
_library.gnutls_openpgp_crt_get_fingerprint)
805
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
809
openpgp_crt_get_fingerprint.restype = _error_code
811
if check_version(b"3.6.4"):
812
certificate_type_get2 = _library.gnutls_certificate_type_get2
813
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
814
certificate_type_get2.restype = _error_code
816
# Remove non-public functions
817
del _error_code, _retry_on_error
820
def call_pipe(connection, # : multiprocessing.Connection
821
func, *args, **kwargs):
822
"""This function is meant to be called by multiprocessing.Process
824
This function runs func(*args, **kwargs), and writes the resulting
825
return value on the provided multiprocessing.Connection.
827
connection.send(func(*args, **kwargs))
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
389
class Client(object):
832
390
"""A representation of a client host served by this server.
835
393
approved: bool(); 'None' if not yet approved/disapproved
836
394
approval_delay: datetime.timedelta(); Time to wait for approval
837
395
approval_duration: datetime.timedelta(); Duration of one approval
838
checker: multiprocessing.Process(); a running checker process used
839
to see if the client lives. 'None' if no process is
841
checker_callback_tag: a GLib event source tag, or None
396
checker: subprocess.Popen(); a running checker process used
397
to see if the client lives.
398
'None' if no process is running.
399
checker_callback_tag: a gobject event source tag, or None
842
400
checker_command: string; External command which is run to check
843
401
if client lives. %() expansions are done at
844
402
runtime with vars(self) as dict, so that for
845
403
instance %(name)s can be used in the command.
846
checker_initiator_tag: a GLib event source tag, or None
404
checker_initiator_tag: a gobject event source tag, or None
847
405
created: datetime.datetime(); (UTC) object creation
848
406
client_structure: Object describing what attributes a client has
849
407
and is used for storing the client at exit
850
408
current_checker_command: string; current running checker_command
851
disable_initiator_tag: a GLib event source tag, or None
409
disable_initiator_tag: a gobject event source tag, or None
853
411
fingerprint: string (40 or 32 hexadecimal digits); used to
854
uniquely identify an OpenPGP client
855
key_id: string (64 hexadecimal digits); used to uniquely identify
856
a client using raw public keys
412
uniquely identify the client
857
413
host: string; available for use by the checker command
858
414
interval: datetime.timedelta(); How often to start a new checker
859
415
last_approval_request: datetime.datetime(); (UTC) or None
980
542
self.current_checker_command = None
981
543
self.approved = None
982
544
self.approvals_pending = 0
983
self.changedstate = multiprocessing_manager.Condition(
984
multiprocessing_manager.Lock())
985
self.client_structure = [attr
986
for attr in self.__dict__.keys()
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
987
550
if not attr.startswith("_")]
988
551
self.client_structure.append("client_structure")
990
for name, t in inspect.getmembers(
991
type(self), lambda obj: isinstance(obj, property)):
553
for name, t in inspect.getmembers(type(self),
992
557
if not name.startswith("_"):
993
558
self.client_structure.append(name)
995
560
# Send notice to process children that client state has changed
996
561
def send_changedstate(self):
997
562
with self.changedstate:
998
563
self.changedstate.notify_all()
1000
565
def enable(self):
1001
566
"""Start this client's checker and timeout hooks"""
1002
567
if getattr(self, "enabled", False):
1003
568
# Already enabled
570
self.send_changedstate()
1005
571
self.expires = datetime.datetime.utcnow() + self.timeout
1006
572
self.enabled = True
1007
573
self.last_enabled = datetime.datetime.utcnow()
1008
574
self.init_checker()
1009
self.send_changedstate()
1011
576
def disable(self, quiet=True):
1012
577
"""Disable this client."""
1013
578
if not getattr(self, "enabled", False):
581
self.send_changedstate()
1016
583
logger.info("Disabling client %s", self.name)
1017
if getattr(self, "disable_initiator_tag", None) is not None:
1018
GLib.source_remove(self.disable_initiator_tag)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1019
586
self.disable_initiator_tag = None
1020
587
self.expires = None
1021
if getattr(self, "checker_initiator_tag", None) is not None:
1022
GLib.source_remove(self.checker_initiator_tag)
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1023
590
self.checker_initiator_tag = None
1024
591
self.stop_checker()
1025
592
self.enabled = False
1027
self.send_changedstate()
1028
# Do not run this again if called by a GLib.timeout_add
593
# Do not run this again if called by a gobject.timeout_add
1031
596
def __del__(self):
1034
599
def init_checker(self):
1035
600
# Schedule a new checker to be started an 'interval' from now,
1036
601
# and every interval from then on.
1037
if self.checker_initiator_tag is not None:
1038
GLib.source_remove(self.checker_initiator_tag)
1039
self.checker_initiator_tag = GLib.timeout_add(
1040
int(self.interval.total_seconds() * 1000),
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1042
605
# Schedule a disable() when 'timeout' has passed
1043
if self.disable_initiator_tag is not None:
1044
GLib.source_remove(self.disable_initiator_tag)
1045
self.disable_initiator_tag = GLib.timeout_add(
1046
int(self.timeout.total_seconds() * 1000), self.disable)
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1047
609
# Also start a new checker *right now*.
1048
610
self.start_checker()
1050
def checker_callback(self, source, condition, connection,
612
def checker_callback(self, pid, condition, command):
1052
613
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
1056
if self.checker is not None:
1058
614
self.checker_callback_tag = None
1059
615
self.checker = None
1062
self.last_checker_status = returncode
1063
self.last_checker_signal = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1064
618
if self.last_checker_status == 0:
1065
619
logger.info("Checker for %(name)s succeeded",
1067
621
self.checked_ok()
1069
logger.info("Checker for %(name)s failed", vars(self))
623
logger.info("Checker for %(name)s failed",
1071
626
self.last_checker_status = -1
1072
self.last_checker_signal = -returncode
1073
627
logger.warning("Checker for %(name)s crashed?",
1077
630
def checked_ok(self):
1078
631
"""Assert that the client has been seen, alive and well."""
1079
632
self.last_checked_ok = datetime.datetime.utcnow()
1080
633
self.last_checker_status = 0
1081
self.last_checker_signal = None
1082
634
self.bump_timeout()
1084
636
def bump_timeout(self, timeout=None):
1085
637
"""Bump up the timeout for this client."""
1086
638
if timeout is None:
1087
639
timeout = self.timeout
1088
640
if self.disable_initiator_tag is not None:
1089
GLib.source_remove(self.disable_initiator_tag)
1090
self.disable_initiator_tag = None
641
gobject.source_remove(self.disable_initiator_tag)
1091
642
if getattr(self, "enabled", False):
1092
self.disable_initiator_tag = GLib.timeout_add(
1093
int(timeout.total_seconds() * 1000), self.disable)
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1094
646
self.expires = datetime.datetime.utcnow() + timeout
1096
648
def need_approval(self):
1097
649
self.last_approval_request = datetime.datetime.utcnow()
1099
651
def start_checker(self):
1100
652
"""Start a new checker subprocess if one is not running.
1102
654
If a checker already exists, leave it running and do
1104
656
# The reason for not killing a running checker is that if we
1105
# did that, and if a checker (for some reason) started running
1106
# slowly and taking more than 'interval' time, then the client
1107
# would inevitably timeout, since no checker would get a
1108
# chance to run to completion. If we instead leave running
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
1109
661
# checkers alone, the checker would have to take more time
1110
662
# than 'timeout' for the client to be disabled, which is as it
1113
if self.checker is not None and not self.checker.is_alive():
1114
logger.warning("Checker was not alive; joining")
665
# If a checker exists, make sure it is not a zombie
667
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
669
if (isinstance(error, OSError)
670
and error.errno != errno.ECHILD):
674
logger.warning("Checker was a zombie")
675
gobject.source_remove(self.checker_callback_tag)
676
self.checker_callback(pid, status,
677
self.current_checker_command)
1117
678
# Start a new checker if needed
1118
679
if self.checker is None:
1119
# Escape attributes for the shell
1121
attr: re.escape(str(getattr(self, attr)))
1122
for attr in self.runtime_expansions}
1124
command = self.checker_command % escaped_attrs
1125
except TypeError as error:
1126
logger.error('Could not format string "%s"',
1127
self.checker_command,
1129
return True # Try again later
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
684
# Escape attributes for the shell
685
escaped_attrs = dict(
687
re.escape(unicode(str(getattr(self, attr, "")),
691
self.runtime_expansions)
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s":'
697
' %s', self.checker_command, error)
698
return True # Try again later
1130
699
self.current_checker_command = command
1131
logger.info("Starting checker %r for %s", command,
1133
# We don't need to redirect stdout and stderr, since
1134
# in normal mode, that is already done by daemon(),
1135
# and in debug mode we don't want to. (Stdin is
1136
# always replaced by /dev/null.)
1137
# The exception is when not debugging but nevertheless
1138
# running in the foreground; use the previously
1140
popen_args = {"close_fds": True,
1143
if (not self.server_settings["debug"]
1144
and self.server_settings["foreground"]):
1145
popen_args.update({"stdout": wnull,
1147
pipe = multiprocessing.Pipe(duplex=False)
1148
self.checker = multiprocessing.Process(
1150
args=(pipe[1], subprocess.call, command),
1152
self.checker.start()
1153
self.checker_callback_tag = GLib.io_add_watch(
1154
GLib.IOChannel.unix_new(pipe[0].fileno()),
1155
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1156
self.checker_callback, pipe[0], command)
1157
# Re-run this periodically if run by GLib.timeout_add
701
logger.info("Starting checker %r for %s",
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
710
self.checker_callback_tag = (gobject.child_watch_add
712
self.checker_callback,
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess: %s",
723
# Re-run this periodically if run by gobject.timeout_add
1160
726
def stop_checker(self):
1161
727
"""Force the checker process, if any, to stop."""
1162
728
if self.checker_callback_tag:
1163
GLib.source_remove(self.checker_callback_tag)
729
gobject.source_remove(self.checker_callback_tag)
1164
730
self.checker_callback_tag = None
1165
731
if getattr(self, "checker", None) is None:
1167
733
logger.debug("Stopping checker for %(name)s", vars(self))
1168
self.checker.terminate()
735
os.kill(self.checker.pid, signal.SIGTERM)
737
#if self.checker.poll() is None:
738
# os.kill(self.checker.pid, signal.SIGKILL)
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
1169
742
self.checker = None
1172
def dbus_service_property(dbus_interface,
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1176
747
"""Decorators for marking methods of a DBusObjectWithProperties to
1177
748
become properties on the D-Bus.
1179
750
The decorated method will be called with no arguments by "Get"
1180
751
and with one argument by "Set".
1182
753
The parameters, where they are supported, are the same as
1183
754
dbus.service.method, except there is only "signature", since the
1184
755
type from Get() and the type sent to Set() is the same.
1267
class DBusObjectWithAnnotations(dbus.service.Object):
1268
"""A D-Bus object with annotations.
1270
Classes inheriting from this can use the dbus_annotations
1271
decorator to add annotations to methods or signals.
813
class DBusObjectWithProperties(dbus.service.Object):
814
"""A D-Bus object with properties.
816
Classes inheriting from this can use the dbus_service_property
817
decorator to expose methods as D-Bus properties. It exposes the
818
standard Get(), Set(), and GetAll() methods on the D-Bus.
1275
822
def _is_dbus_thing(thing):
1276
823
"""Returns a function testing if an attribute is a D-Bus thing
1278
825
If called like _is_dbus_thing("method") it returns a function
1279
826
suitable for use as predicate to inspect.getmembers().
1281
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
828
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1284
831
def _get_all_dbus_things(self, thing):
1285
832
"""Returns a generator of (name, attribute) pairs
1287
return ((getattr(athing.__get__(self), "_dbus_name", name),
834
return ((athing.__get__(self)._dbus_name,
1288
835
athing.__get__(self))
1289
836
for cls in self.__class__.__mro__
1290
837
for name, athing in
1291
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1293
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1295
path_keyword='object_path',
1296
connection_keyword='connection')
1297
def Introspect(self, object_path, connection):
1298
"""Overloading of standard D-Bus method.
1300
Inserts annotation tags on methods and signals.
1302
xmlstring = dbus.service.Object.Introspect(self, object_path,
1305
document = xml.dom.minidom.parseString(xmlstring)
1307
for if_tag in document.getElementsByTagName("interface"):
1308
# Add annotation tags
1309
for typ in ("method", "signal"):
1310
for tag in if_tag.getElementsByTagName(typ):
1312
for name, prop in (self.
1313
_get_all_dbus_things(typ)):
1314
if (name == tag.getAttribute("name")
1315
and prop._dbus_interface
1316
== if_tag.getAttribute("name")):
1317
annots.update(getattr(
1318
prop, "_dbus_annotations", {}))
1319
for name, value in annots.items():
1320
ann_tag = document.createElement(
1322
ann_tag.setAttribute("name", name)
1323
ann_tag.setAttribute("value", value)
1324
tag.appendChild(ann_tag)
1325
# Add interface annotation tags
1326
for annotation, value in dict(
1327
itertools.chain.from_iterable(
1328
annotations().items()
1329
for name, annotations
1330
in self._get_all_dbus_things("interface")
1331
if name == if_tag.getAttribute("name")
1333
ann_tag = document.createElement("annotation")
1334
ann_tag.setAttribute("name", annotation)
1335
ann_tag.setAttribute("value", value)
1336
if_tag.appendChild(ann_tag)
1337
# Fix argument name for the Introspect method itself
1338
if (if_tag.getAttribute("name")
1339
== dbus.INTROSPECTABLE_IFACE):
1340
for cn in if_tag.getElementsByTagName("method"):
1341
if cn.getAttribute("name") == "Introspect":
1342
for arg in cn.getElementsByTagName("arg"):
1343
if (arg.getAttribute("direction")
1345
arg.setAttribute("name",
1347
xmlstring = document.toxml("utf-8")
1349
except (AttributeError, xml.dom.DOMException,
1350
xml.parsers.expat.ExpatError) as error:
1351
logger.error("Failed to override Introspection method",
1356
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1357
"""A D-Bus object with properties.
1359
Classes inheriting from this can use the dbus_service_property
1360
decorator to expose methods as D-Bus properties. It exposes the
1361
standard Get(), Set(), and GetAll() methods on the D-Bus.
838
inspect.getmembers(cls,
839
self._is_dbus_thing(thing)))
1364
841
def _get_dbus_property(self, interface_name, property_name):
1365
842
"""Returns a bound method if one exists which is a D-Bus
1366
843
property with the specified name and interface.
1368
for cls in self.__class__.__mro__:
1369
for name, value in inspect.getmembers(
1370
cls, self._is_dbus_thing("property")):
845
for cls in self.__class__.__mro__:
846
for name, value in (inspect.getmembers
848
self._is_dbus_thing("property"))):
1371
849
if (value._dbus_name == property_name
1372
850
and value._dbus_interface == interface_name):
1373
851
return value.__get__(self)
1375
853
# No such property
1376
raise DBusPropertyNotFound("{}:{}.{}".format(
1377
self.dbus_object_path, interface_name, property_name))
1380
def _get_all_interface_names(cls):
1381
"""Get a sequence of all interfaces supported by an object"""
1382
return (name for name in set(getattr(getattr(x, attr),
1383
"_dbus_interface", None)
1384
for x in (inspect.getmro(cls))
1386
if name is not None)
1388
@dbus.service.method(dbus.PROPERTIES_IFACE,
854
raise DBusPropertyNotFound(self.dbus_object_path + ":"
855
+ interface_name + "."
858
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1390
859
out_signature="v")
1391
860
def Get(self, interface_name, property_name):
1392
861
"""Standard D-Bus property Get() method, see D-Bus standard.
1517
968
except (AttributeError, xml.dom.DOMException,
1518
969
xml.parsers.expat.ExpatError) as error:
1519
970
logger.error("Failed to override Introspection method",
1525
dbus.OBJECT_MANAGER_IFACE
1526
except AttributeError:
1527
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1530
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1531
"""A D-Bus object with an ObjectManager.
1533
Classes inheriting from this exposes the standard
1534
GetManagedObjects call and the InterfacesAdded and
1535
InterfacesRemoved signals on the standard
1536
"org.freedesktop.DBus.ObjectManager" interface.
1538
Note: No signals are sent automatically; they must be sent
1541
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1542
out_signature="a{oa{sa{sv}}}")
1543
def GetManagedObjects(self):
1544
"""This function must be overridden"""
1545
raise NotImplementedError()
1547
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1548
signature="oa{sa{sv}}")
1549
def InterfacesAdded(self, object_path, interfaces_and_properties):
1552
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1553
def InterfacesRemoved(self, object_path, interfaces):
1556
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1558
path_keyword='object_path',
1559
connection_keyword='connection')
1560
def Introspect(self, object_path, connection):
1561
"""Overloading of standard D-Bus method.
1563
Override return argument name of GetManagedObjects to be
1564
"objpath_interfaces_and_properties"
1566
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1570
document = xml.dom.minidom.parseString(xmlstring)
1572
for if_tag in document.getElementsByTagName("interface"):
1573
# Fix argument name for the GetManagedObjects method
1574
if (if_tag.getAttribute("name")
1575
== dbus.OBJECT_MANAGER_IFACE):
1576
for cn in if_tag.getElementsByTagName("method"):
1577
if (cn.getAttribute("name")
1578
== "GetManagedObjects"):
1579
for arg in cn.getElementsByTagName("arg"):
1580
if (arg.getAttribute("direction")
1584
"objpath_interfaces"
1586
xmlstring = document.toxml("utf-8")
1588
except (AttributeError, xml.dom.DOMException,
1589
xml.parsers.expat.ExpatError) as error:
1590
logger.error("Failed to override Introspection method",
1595
def datetime_to_dbus(dt, variant_level=0):
975
def datetime_to_dbus (dt, variant_level=0):
1596
976
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1598
return dbus.String("", variant_level=variant_level)
1599
return dbus.String(dt.isoformat(), variant_level=variant_level)
1602
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1603
"""A class decorator; applied to a subclass of
1604
dbus.service.Object, it will add alternate D-Bus attributes with
1605
interface names according to the "alt_interface_names" mapping.
1608
@alternate_dbus_interfaces({"org.example.Interface":
1609
"net.example.AlternateInterface"})
1610
class SampleDBusObject(dbus.service.Object):
1611
@dbus.service.method("org.example.Interface")
1612
def SampleDBusMethod():
1615
The above "SampleDBusMethod" on "SampleDBusObject" will be
1616
reachable via two interfaces: "org.example.Interface" and
1617
"net.example.AlternateInterface", the latter of which will have
1618
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1619
"true", unless "deprecate" is passed with a False value.
1621
This works for methods and signals, and also for D-Bus properties
1622
(from DBusObjectWithProperties) and interfaces (from the
1623
dbus_interface_annotations decorator).
978
return dbus.String("", variant_level = variant_level)
979
return dbus.String(dt.isoformat(),
980
variant_level=variant_level)
983
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
985
"""Applied to an empty subclass of a D-Bus object, this metaclass
986
will add additional D-Bus attributes matching a certain pattern.
1627
for orig_interface_name, alt_interface_name in (
1628
alt_interface_names.items()):
1630
interface_names = set()
1631
# Go though all attributes of the class
1632
for attrname, attribute in inspect.getmembers(cls):
988
def __new__(mcs, name, bases, attr):
989
# Go through all the base classes which could have D-Bus
990
# methods, signals, or properties in them
991
old_interface_names = []
992
for base in (b for b in bases
993
if issubclass(b, dbus.service.Object)):
994
# Go though all attributes of the base class
995
for attrname, attribute in inspect.getmembers(base):
1633
996
# Ignore non-D-Bus attributes, and D-Bus attributes
1634
997
# with the wrong interface name
1635
998
if (not hasattr(attribute, "_dbus_interface")
1636
or not attribute._dbus_interface.startswith(
1637
orig_interface_name)):
999
or not attribute._dbus_interface
1000
.startswith("se.recompile.Mandos")):
1639
1002
# Create an alternate D-Bus interface name based on
1640
1003
# the current name
1641
alt_interface = attribute._dbus_interface.replace(
1642
orig_interface_name, alt_interface_name)
1643
interface_names.add(alt_interface)
1004
alt_interface = (attribute._dbus_interface
1005
.replace("se.recompile.Mandos",
1006
"se.bsnet.fukt.Mandos"))
1007
if alt_interface != attribute._dbus_interface:
1008
old_interface_names.append(alt_interface)
1644
1009
# Is this a D-Bus signal?
1645
1010
if getattr(attribute, "_dbus_is_signal", False):
1646
# Extract the original non-method undecorated
1647
# function by black magic
1648
if sys.version_info.major == 2:
1649
nonmethod_func = (dict(
1011
# Extract the original non-method function by
1013
nonmethod_func = (dict(
1650
1014
zip(attribute.func_code.co_freevars,
1651
attribute.__closure__))
1652
["func"].cell_contents)
1654
nonmethod_func = (dict(
1655
zip(attribute.__code__.co_freevars,
1656
attribute.__closure__))
1657
["func"].cell_contents)
1015
attribute.__closure__))["func"]
1658
1017
# Create a new, but exactly alike, function
1659
1018
# object, and decorate it to be a new D-Bus signal
1660
1019
# with the alternate D-Bus interface name
1661
new_function = copy_function(nonmethod_func)
1662
new_function = (dbus.service.signal(
1664
attribute._dbus_signature)(new_function))
1665
# Copy annotations, if any
1667
new_function._dbus_annotations = dict(
1668
attribute._dbus_annotations)
1669
except AttributeError:
1020
new_function = (dbus.service.signal
1022
attribute._dbus_signature)
1023
(types.FunctionType(
1024
nonmethod_func.func_code,
1025
nonmethod_func.func_globals,
1026
nonmethod_func.func_name,
1027
nonmethod_func.func_defaults,
1028
nonmethod_func.func_closure)))
1672
1029
# Define a creator of a function to call both the
1673
# original and alternate functions, so both the
1674
# original and alternate signals gets sent when
1675
# the function is called
1030
# old and new functions, so both the old and new
1031
# signals gets sent when the function is called
1676
1032
def fixscope(func1, func2):
1677
1033
"""This function is a scope container to pass
1678
1034
func1 and func2 to the "call_both" function
1679
1035
outside of its arguments"""
1681
@functools.wraps(func2)
1682
1036
def call_both(*args, **kwargs):
1683
1037
"""This function will emit two D-Bus
1684
1038
signals by calling func1 and func2"""
1685
1039
func1(*args, **kwargs)
1686
1040
func2(*args, **kwargs)
1687
# Make wrapper function look like a D-Bus
1689
for name, attr in inspect.getmembers(func2):
1690
if name.startswith("_dbus_"):
1691
setattr(call_both, name, attr)
1693
1041
return call_both
1694
1042
# Create the "call_both" function and add it to
1696
attr[attrname] = fixscope(attribute, new_function)
1044
attr[attrname] = fixscope(attribute,
1697
1046
# Is this a D-Bus method?
1698
1047
elif getattr(attribute, "_dbus_is_method", False):
1699
1048
# Create a new, but exactly alike, function
1700
1049
# object. Decorate it to be a new D-Bus method
1701
1050
# with the alternate D-Bus interface name. Add it
1702
1051
# to the class.
1704
dbus.service.method(
1706
attribute._dbus_in_signature,
1707
attribute._dbus_out_signature)
1708
(copy_function(attribute)))
1709
# Copy annotations, if any
1711
attr[attrname]._dbus_annotations = dict(
1712
attribute._dbus_annotations)
1713
except AttributeError:
1052
attr[attrname] = (dbus.service.method
1054
attribute._dbus_in_signature,
1055
attribute._dbus_out_signature)
1057
(attribute.func_code,
1058
attribute.func_globals,
1059
attribute.func_name,
1060
attribute.func_defaults,
1061
attribute.func_closure)))
1715
1062
# Is this a D-Bus property?
1716
1063
elif getattr(attribute, "_dbus_is_property", False):
1717
1064
# Create a new, but exactly alike, function
1718
1065
# object, and decorate it to be a new D-Bus
1719
1066
# property with the alternate D-Bus interface
1720
1067
# name. Add it to the class.
1721
attr[attrname] = (dbus_service_property(
1722
alt_interface, attribute._dbus_signature,
1723
attribute._dbus_access,
1724
attribute._dbus_get_args_options
1726
(copy_function(attribute)))
1727
# Copy annotations, if any
1729
attr[attrname]._dbus_annotations = dict(
1730
attribute._dbus_annotations)
1731
except AttributeError:
1068
attr[attrname] = (dbus_service_property
1070
attribute._dbus_signature,
1071
attribute._dbus_access,
1073
._dbus_get_args_options
1076
(attribute.func_code,
1077
attribute.func_globals,
1078
attribute.func_name,
1079
attribute.func_defaults,
1080
attribute.func_closure)))
1733
1081
# Is this a D-Bus interface?
1734
1082
elif getattr(attribute, "_dbus_is_interface", False):
1735
1083
# Create a new, but exactly alike, function
1736
1084
# object. Decorate it to be a new D-Bus interface
1737
1085
# with the alternate D-Bus interface name. Add it
1738
1086
# to the class.
1740
dbus_interface_annotations(alt_interface)
1741
(copy_function(attribute)))
1743
# Deprecate all alternate interfaces
1744
iname = "_AlternateDBusNames_interface_annotation{}"
1745
for interface_name in interface_names:
1747
@dbus_interface_annotations(interface_name)
1749
return {"org.freedesktop.DBus.Deprecated":
1751
# Find an unused name
1752
for aname in (iname.format(i)
1753
for i in itertools.count()):
1754
if aname not in attr:
1758
# Replace the class with a new subclass of it with
1759
# methods, signals, etc. as created above.
1760
if sys.version_info.major == 2:
1761
cls = type(b"{}Alternate".format(cls.__name__),
1764
cls = type("{}Alternate".format(cls.__name__),
1771
@alternate_dbus_interfaces({"se.recompile.Mandos":
1772
"se.bsnet.fukt.Mandos"})
1087
attr[attrname] = (dbus_interface_annotations
1090
(attribute.func_code,
1091
attribute.func_globals,
1092
attribute.func_name,
1093
attribute.func_defaults,
1094
attribute.func_closure)))
1095
# Deprecate all old interfaces
1096
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1097
for old_interface_name in old_interface_names:
1098
@dbus_interface_annotations(old_interface_name)
1100
return { "org.freedesktop.DBus.Deprecated": "true" }
1101
# Find an unused name
1102
for aname in (basename.format(i) for i in
1104
if aname not in attr:
1107
return type.__new__(mcs, name, bases, attr)
1773
1110
class ClientDBus(Client, DBusObjectWithProperties):
1774
1111
"""A Client class using D-Bus
1777
1114
dbus_object_path: dbus.ObjectPath
1778
1115
bus: dbus.SystemBus()
1781
1118
runtime_expansions = (Client.runtime_expansions
1782
+ ("dbus_object_path", ))
1784
_interface = "se.recompile.Mandos.Client"
1119
+ ("dbus_object_path",))
1786
1121
# dbus.service.Object doesn't use super(), so we can't either.
1788
def __init__(self, bus=None, *args, **kwargs):
1123
def __init__(self, bus = None, *args, **kwargs):
1790
1125
Client.__init__(self, *args, **kwargs)
1791
1126
# Only now, when this client is initialized, can it show up on
1793
client_object_name = str(self.name).translate(
1128
client_object_name = unicode(self.name).translate(
1794
1129
{ord("."): ord("_"),
1795
1130
ord("-"): ord("_")})
1796
self.dbus_object_path = dbus.ObjectPath(
1797
"/clients/" + client_object_name)
1131
self.dbus_object_path = (dbus.ObjectPath
1132
("/clients/" + client_object_name))
1798
1133
DBusObjectWithProperties.__init__(self, self.bus,
1799
1134
self.dbus_object_path)
1801
def notifychangeproperty(transform_func, dbus_name,
1802
type_func=lambda x: x,
1804
invalidate_only=False,
1805
_interface=_interface):
1136
def notifychangeproperty(transform_func,
1137
dbus_name, type_func=lambda x: x,
1806
1139
""" Modify a variable so that it's a property which announces
1807
1140
its changes to DBus.
1809
1142
transform_fun: Function that takes a value and a variant_level
1810
1143
and transforms it to a D-Bus type.
1811
1144
dbus_name: D-Bus name of the variable
1963
1294
server to mandos-client
1967
1298
# Rejected - signal
1968
1299
@dbus.service.signal(_interface, signature="s")
1969
1300
def Rejected(self, reason):
1973
1304
# NeedApproval - signal
1974
1305
@dbus.service.signal(_interface, signature="tb")
1975
1306
def NeedApproval(self, timeout, default):
1977
1308
return self.need_approval()
1981
1312
# Approve - method
1982
1313
@dbus.service.method(_interface, in_signature="b")
1983
1314
def Approve(self, value):
1984
1315
self.approve(value)
1986
1317
# CheckedOK - method
1987
1318
@dbus.service.method(_interface)
1988
1319
def CheckedOK(self):
1989
1320
self.checked_ok()
1991
1322
# Enable - method
1992
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1993
1323
@dbus.service.method(_interface)
1994
1324
def Enable(self):
1998
1328
# StartChecker - method
1999
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2000
1329
@dbus.service.method(_interface)
2001
1330
def StartChecker(self):
2003
1332
self.start_checker()
2005
1334
# Disable - method
2006
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2007
1335
@dbus.service.method(_interface)
2008
1336
def Disable(self):
2012
1340
# StopChecker - method
2013
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2014
1341
@dbus.service.method(_interface)
2015
1342
def StopChecker(self):
2016
1343
self.stop_checker()
2020
1347
# ApprovalPending - property
2021
1348
@dbus_service_property(_interface, signature="b", access="read")
2022
1349
def ApprovalPending_dbus_property(self):
2023
1350
return dbus.Boolean(bool(self.approvals_pending))
2025
1352
# ApprovedByDefault - property
2026
@dbus_service_property(_interface,
1353
@dbus_service_property(_interface, signature="b",
2028
1354
access="readwrite")
2029
1355
def ApprovedByDefault_dbus_property(self, value=None):
2030
1356
if value is None: # get
2031
1357
return dbus.Boolean(self.approved_by_default)
2032
1358
self.approved_by_default = bool(value)
2034
1360
# ApprovalDelay - property
2035
@dbus_service_property(_interface,
1361
@dbus_service_property(_interface, signature="t",
2037
1362
access="readwrite")
2038
1363
def ApprovalDelay_dbus_property(self, value=None):
2039
1364
if value is None: # get
2040
return dbus.UInt64(self.approval_delay.total_seconds()
1365
return dbus.UInt64(self.approval_delay_milliseconds())
2042
1366
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2044
1368
# ApprovalDuration - property
2045
@dbus_service_property(_interface,
1369
@dbus_service_property(_interface, signature="t",
2047
1370
access="readwrite")
2048
1371
def ApprovalDuration_dbus_property(self, value=None):
2049
1372
if value is None: # get
2050
return dbus.UInt64(self.approval_duration.total_seconds()
1373
return dbus.UInt64(timedelta_to_milliseconds(
1374
self.approval_duration))
2052
1375
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2054
1377
# Name - property
2056
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2057
1378
@dbus_service_property(_interface, signature="s", access="read")
2058
1379
def Name_dbus_property(self):
2059
1380
return dbus.String(self.name)
2063
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2064
@dbus_service_property(_interface, signature="s", access="read")
2065
def KeyID_dbus_property(self):
2066
return dbus.String(self.key_id)
2068
1382
# Fingerprint - property
2070
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2071
1383
@dbus_service_property(_interface, signature="s", access="read")
2072
1384
def Fingerprint_dbus_property(self):
2073
1385
return dbus.String(self.fingerprint)
2075
1387
# Host - property
2076
@dbus_service_property(_interface,
1388
@dbus_service_property(_interface, signature="s",
2078
1389
access="readwrite")
2079
1390
def Host_dbus_property(self, value=None):
2080
1391
if value is None: # get
2081
1392
return dbus.String(self.host)
2082
self.host = str(value)
1393
self.host = unicode(value)
2084
1395
# Created - property
2086
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2087
1396
@dbus_service_property(_interface, signature="s", access="read")
2088
1397
def Created_dbus_property(self):
2089
1398
return datetime_to_dbus(self.created)
2091
1400
# LastEnabled - property
2092
1401
@dbus_service_property(_interface, signature="s", access="read")
2093
1402
def LastEnabled_dbus_property(self):
2094
1403
return datetime_to_dbus(self.last_enabled)
2096
1405
# Enabled - property
2097
@dbus_service_property(_interface,
1406
@dbus_service_property(_interface, signature="b",
2099
1407
access="readwrite")
2100
1408
def Enabled_dbus_property(self, value=None):
2101
1409
if value is None: # get
2108
1416
# LastCheckedOK - property
2109
@dbus_service_property(_interface,
1417
@dbus_service_property(_interface, signature="s",
2111
1418
access="readwrite")
2112
1419
def LastCheckedOK_dbus_property(self, value=None):
2113
1420
if value is not None:
2114
1421
self.checked_ok()
2116
1423
return datetime_to_dbus(self.last_checked_ok)
2118
1425
# LastCheckerStatus - property
2119
@dbus_service_property(_interface, signature="n", access="read")
1426
@dbus_service_property(_interface, signature="n",
2120
1428
def LastCheckerStatus_dbus_property(self):
2121
1429
return dbus.Int16(self.last_checker_status)
2123
1431
# Expires - property
2124
1432
@dbus_service_property(_interface, signature="s", access="read")
2125
1433
def Expires_dbus_property(self):
2126
1434
return datetime_to_dbus(self.expires)
2128
1436
# LastApprovalRequest - property
2129
1437
@dbus_service_property(_interface, signature="s", access="read")
2130
1438
def LastApprovalRequest_dbus_property(self):
2131
1439
return datetime_to_dbus(self.last_approval_request)
2133
1441
# Timeout - property
2134
@dbus_service_property(_interface,
1442
@dbus_service_property(_interface, signature="t",
2136
1443
access="readwrite")
2137
1444
def Timeout_dbus_property(self, value=None):
2138
1445
if value is None: # get
2139
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2140
old_timeout = self.timeout
1446
return dbus.UInt64(self.timeout_milliseconds())
2141
1447
self.timeout = datetime.timedelta(0, 0, 0, value)
2142
# Reschedule disabling
1448
# Reschedule timeout
2143
1449
if self.enabled:
2144
1450
now = datetime.datetime.utcnow()
2145
self.expires += self.timeout - old_timeout
2146
if self.expires <= now:
1451
time_to_die = timedelta_to_milliseconds(
1452
(self.last_checked_ok + self.timeout) - now)
1453
if time_to_die <= 0:
2147
1454
# The timeout has passed
1457
self.expires = (now +
1458
datetime.timedelta(milliseconds =
2150
1460
if (getattr(self, "disable_initiator_tag", None)
2153
GLib.source_remove(self.disable_initiator_tag)
2154
self.disable_initiator_tag = GLib.timeout_add(
2155
int((self.expires - now).total_seconds() * 1000),
1463
gobject.source_remove(self.disable_initiator_tag)
1464
self.disable_initiator_tag = (gobject.timeout_add
2158
1468
# ExtendedTimeout - property
2159
@dbus_service_property(_interface,
1469
@dbus_service_property(_interface, signature="t",
2161
1470
access="readwrite")
2162
1471
def ExtendedTimeout_dbus_property(self, value=None):
2163
1472
if value is None: # get
2164
return dbus.UInt64(self.extended_timeout.total_seconds()
1473
return dbus.UInt64(self.extended_timeout_milliseconds())
2166
1474
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2168
1476
# Interval - property
2169
@dbus_service_property(_interface,
1477
@dbus_service_property(_interface, signature="t",
2171
1478
access="readwrite")
2172
1479
def Interval_dbus_property(self, value=None):
2173
1480
if value is None: # get
2174
return dbus.UInt64(self.interval.total_seconds() * 1000)
1481
return dbus.UInt64(self.interval_milliseconds())
2175
1482
self.interval = datetime.timedelta(0, 0, 0, value)
2176
1483
if getattr(self, "checker_initiator_tag", None) is None:
2178
1485
if self.enabled:
2179
1486
# Reschedule checker run
2180
GLib.source_remove(self.checker_initiator_tag)
2181
self.checker_initiator_tag = GLib.timeout_add(
2182
value, self.start_checker)
2183
self.start_checker() # Start one now, too
1487
gobject.source_remove(self.checker_initiator_tag)
1488
self.checker_initiator_tag = (gobject.timeout_add
1489
(value, self.start_checker))
1490
self.start_checker() # Start one now, too
2185
1492
# Checker - property
2186
@dbus_service_property(_interface,
1493
@dbus_service_property(_interface, signature="s",
2188
1494
access="readwrite")
2189
1495
def Checker_dbus_property(self, value=None):
2190
1496
if value is None: # get
2191
1497
return dbus.String(self.checker_command)
2192
self.checker_command = str(value)
1498
self.checker_command = unicode(value)
2194
1500
# CheckerRunning - property
2195
@dbus_service_property(_interface,
1501
@dbus_service_property(_interface, signature="b",
2197
1502
access="readwrite")
2198
1503
def CheckerRunning_dbus_property(self, value=None):
2199
1504
if value is None: # get
2240
1537
if data[0] == 'data':
2242
1539
if data[0] == 'function':
2244
1540
def func(*args, **kwargs):
2245
1541
self._pipe.send(('funcall', name, args, kwargs))
2246
1542
return self._pipe.recv()[1]
2250
1545
def __setattr__(self, name, value):
2251
1546
if name == '_pipe':
2252
1547
return super(ProxyClient, self).__setattr__(name, value)
2253
1548
self._pipe.send(('setattr', name, value))
1551
class ClientDBusTransitional(ClientDBus):
1552
__metaclass__ = AlternateDBusNamesMetaclass
2256
1555
class ClientHandler(socketserver.BaseRequestHandler, object):
2257
1556
"""A class to handle client connections.
2259
1558
Instantiated once for each connection to handle it.
2260
1559
Note: This will run in its own forked process."""
2262
1561
def handle(self):
2263
1562
with contextlib.closing(self.server.child_pipe) as child_pipe:
2264
1563
logger.info("TCP connection from: %s",
2265
str(self.client_address))
1564
unicode(self.client_address))
2266
1565
logger.debug("Pipe FD: %d",
2267
1566
self.server.child_pipe.fileno())
2269
session = gnutls.ClientSession(self.request)
2271
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2272
# "+AES-256-CBC", "+SHA1",
2273
# "+COMP-NULL", "+CTYPE-OPENPGP",
1568
session = (gnutls.connection
1569
.ClientSession(self.request,
1571
.X509Credentials()))
1573
# Note: gnutls.connection.X509Credentials is really a
1574
# generic GnuTLS certificate credentials object so long as
1575
# no X.509 keys are added to it. Therefore, we can use it
1576
# here despite using OpenPGP certificates.
1578
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1579
# "+AES-256-CBC", "+SHA1",
1580
# "+COMP-NULL", "+CTYPE-OPENPGP",
2275
1582
# Use a fallback default, since this MUST be set.
2276
1583
priority = self.server.gnutls_priority
2277
1584
if priority is None:
2278
1585
priority = "NORMAL"
2279
gnutls.priority_set_direct(session._c_object,
2280
priority.encode("utf-8"),
1586
(gnutls.library.functions
1587
.gnutls_priority_set_direct(session._c_object,
2283
1590
# Start communication using the Mandos protocol
2284
1591
# Get protocol number
2285
1592
line = self.request.makefile().readline()
2286
1593
logger.debug("Protocol version: %r", line)
2288
1595
if int(line.strip().split()[0]) > 1:
2289
raise RuntimeError(line)
2290
1597
except (ValueError, IndexError, RuntimeError) as error:
2291
1598
logger.error("Unknown protocol version: %s", error)
2294
1601
# Start GnuTLS connection
2296
1603
session.handshake()
2297
except gnutls.Error as error:
1604
except gnutls.errors.GNUTLSError as error:
2298
1605
logger.warning("Handshake failed: %s", error)
2299
1606
# Do not run session.bye() here: the session is not
2300
1607
# established. Just abandon the request.
2302
1609
logger.debug("Handshake succeeded")
2304
1611
approval_required = False
2306
if gnutls.has_rawpk:
2309
key_id = self.key_id(
2310
self.peer_certificate(session))
2311
except (TypeError, gnutls.Error) as error:
2312
logger.warning("Bad certificate: %s", error)
2314
logger.debug("Key ID: %s", key_id)
2319
fpr = self.fingerprint(
2320
self.peer_certificate(session))
2321
except (TypeError, gnutls.Error) as error:
2322
logger.warning("Bad certificate: %s", error)
2324
logger.debug("Fingerprint: %s", fpr)
2327
client = ProxyClient(child_pipe, key_id, fpr,
1614
fpr = self.fingerprint(self.peer_certificate
1617
gnutls.errors.GNUTLSError) as error:
1618
logger.warning("Bad certificate: %s", error)
1620
logger.debug("Fingerprint: %s", fpr)
1623
client = ProxyClient(child_pipe, fpr,
2328
1624
self.client_address)
2329
1625
except KeyError:
2332
1628
if client.approval_delay:
2333
1629
delay = client.approval_delay
2334
1630
client.approvals_pending += 1
2335
1631
approval_required = True
2338
1634
if not client.enabled:
2339
1635
logger.info("Client %s is disabled",
2341
1637
if self.server.use_dbus:
2342
1638
# Emit D-Bus signal
2343
1639
client.Rejected("Disabled")
2346
1642
if client.approved or not client.approval_delay:
2347
# We are approved or approval is disabled
1643
#We are approved or approval is disabled
2349
1645
elif client.approved is None:
2350
1646
logger.info("Client %s needs approval",
2383
1681
delay -= time2 - time
2386
session.send(client.secret)
2387
except gnutls.Error as error:
2388
logger.warning("gnutls send failed",
1684
while sent_size < len(client.secret):
1686
sent = session.send(client.secret[sent_size:])
1687
except gnutls.errors.GNUTLSError as error:
1688
logger.warning("gnutls send failed")
1690
logger.debug("Sent: %d, remaining: %d",
1691
sent, len(client.secret)
1692
- (sent_size + sent))
2392
1695
logger.info("Sending secret to %s", client.name)
2393
1696
# bump the timeout using extended_timeout
2394
1697
client.bump_timeout(client.extended_timeout)
2395
1698
if self.server.use_dbus:
2396
1699
# Emit D-Bus signal
2397
1700
client.GotSecret()
2400
1703
if approval_required:
2401
1704
client.approvals_pending -= 1
2404
except gnutls.Error as error:
2405
logger.warning("GnuTLS bye failed",
1707
except gnutls.errors.GNUTLSError as error:
1708
logger.warning("GnuTLS bye failed")
2409
1711
def peer_certificate(session):
2410
"Return the peer's certificate as a bytestring"
2412
cert_type = gnutls.certificate_type_get2(session._c_object,
2414
except AttributeError:
2415
cert_type = gnutls.certificate_type_get(session._c_object)
2416
if gnutls.has_rawpk:
2417
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2419
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2420
# If not a valid certificate type...
2421
if cert_type not in valid_cert_types:
2422
logger.info("Cert type %r not in %r", cert_type,
2424
# ...return invalid data
1712
"Return the peer's OpenPGP certificate as a bytestring"
1713
# If not an OpenPGP certificate...
1714
if (gnutls.library.functions
1715
.gnutls_certificate_type_get(session._c_object)
1716
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1717
# ...do the normal thing
1718
return session.peer_certificate
2426
1719
list_size = ctypes.c_uint(1)
2427
cert_list = (gnutls.certificate_get_peers
1720
cert_list = (gnutls.library.functions
1721
.gnutls_certificate_get_peers
2428
1722
(session._c_object, ctypes.byref(list_size)))
2429
1723
if not bool(cert_list) and list_size.value != 0:
2430
raise gnutls.Error("error getting peer certificate")
1724
raise gnutls.errors.GNUTLSError("error getting peer"
2431
1726
if list_size.value == 0:
2433
1728
cert = cert_list[0]
2434
1729
return ctypes.string_at(cert.data, cert.size)
2437
def key_id(certificate):
2438
"Convert a certificate bytestring to a hexdigit key ID"
2439
# New GnuTLS "datum" with the public key
2440
datum = gnutls.datum_t(
2441
ctypes.cast(ctypes.c_char_p(certificate),
2442
ctypes.POINTER(ctypes.c_ubyte)),
2443
ctypes.c_uint(len(certificate)))
2444
# XXX all these need to be created in the gnutls "module"
2445
# New empty GnuTLS certificate
2446
pubkey = gnutls.pubkey_t()
2447
gnutls.pubkey_init(ctypes.byref(pubkey))
2448
# Import the raw public key into the certificate
2449
gnutls.pubkey_import(pubkey,
2450
ctypes.byref(datum),
2451
gnutls.X509_FMT_DER)
2452
# New buffer for the key ID
2453
buf = ctypes.create_string_buffer(32)
2454
buf_len = ctypes.c_size_t(len(buf))
2455
# Get the key ID from the raw public key into the buffer
2456
gnutls.pubkey_get_key_id(pubkey,
2457
gnutls.KEYID_USE_SHA256,
2458
ctypes.cast(ctypes.byref(buf),
2459
ctypes.POINTER(ctypes.c_ubyte)),
2460
ctypes.byref(buf_len))
2461
# Deinit the certificate
2462
gnutls.pubkey_deinit(pubkey)
2464
# Convert the buffer to a Python bytestring
2465
key_id = ctypes.string_at(buf, buf_len.value)
2466
# Convert the bytestring to hexadecimal notation
2467
hex_key_id = binascii.hexlify(key_id).upper()
2471
1732
def fingerprint(openpgp):
2472
1733
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2473
1734
# New GnuTLS "datum" with the OpenPGP public key
2474
datum = gnutls.datum_t(
2475
ctypes.cast(ctypes.c_char_p(openpgp),
2476
ctypes.POINTER(ctypes.c_ubyte)),
2477
ctypes.c_uint(len(openpgp)))
1735
datum = (gnutls.library.types
1736
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1739
ctypes.c_uint(len(openpgp))))
2478
1740
# New empty GnuTLS certificate
2479
crt = gnutls.openpgp_crt_t()
2480
gnutls.openpgp_crt_init(ctypes.byref(crt))
1741
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1742
(gnutls.library.functions
1743
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2481
1744
# Import the OpenPGP public key into the certificate
2482
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2483
gnutls.OPENPGP_FMT_RAW)
1745
(gnutls.library.functions
1746
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1747
gnutls.library.constants
1748
.GNUTLS_OPENPGP_FMT_RAW))
2484
1749
# Verify the self signature in the key
2485
1750
crtverify = ctypes.c_uint()
2486
gnutls.openpgp_crt_verify_self(crt, 0,
2487
ctypes.byref(crtverify))
1751
(gnutls.library.functions
1752
.gnutls_openpgp_crt_verify_self(crt, 0,
1753
ctypes.byref(crtverify)))
2488
1754
if crtverify.value != 0:
2489
gnutls.openpgp_crt_deinit(crt)
2490
raise gnutls.CertificateSecurityError(code
1755
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1756
raise (gnutls.errors.CertificateSecurityError
2492
1758
# New buffer for the fingerprint
2493
1759
buf = ctypes.create_string_buffer(20)
2494
1760
buf_len = ctypes.c_size_t()
2495
1761
# Get the fingerprint from the certificate into the buffer
2496
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2497
ctypes.byref(buf_len))
1762
(gnutls.library.functions
1763
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1764
ctypes.byref(buf_len)))
2498
1765
# Deinit the certificate
2499
gnutls.openpgp_crt_deinit(crt)
1766
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2500
1767
# Convert the buffer to a Python bytestring
2501
1768
fpr = ctypes.string_at(buf, buf_len.value)
2502
1769
# Convert the bytestring to hexadecimal notation
2507
class MultiprocessingMixIn:
1774
class MultiprocessingMixIn(object):
2508
1775
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2510
1776
def sub_process_main(self, request, address):
2512
1778
self.finish_request(request, address)
2513
1779
except Exception:
2514
1780
self.handle_error(request, address)
2515
1781
self.close_request(request)
2517
1783
def process_request(self, request, address):
2518
1784
"""Start a new process to process the request."""
2519
proc = multiprocessing.Process(target=self.sub_process_main,
2520
args=(request, address))
1785
proc = multiprocessing.Process(target = self.sub_process_main,
2525
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1792
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2526
1793
""" adds a pipe to the MixIn """
2528
1794
def process_request(self, request, client_address):
2529
1795
"""Overrides and wraps the original process_request().
2531
1797
This function creates a new pipe in self.pipe
2533
1799
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2535
1801
proc = MultiprocessingMixIn.process_request(self, request,
2536
1802
client_address)
2537
1803
self.child_pipe.close()
2538
1804
self.add_pipe(parent_pipe, proc)
2540
1806
def add_pipe(self, parent_pipe, proc):
2541
1807
"""Dummy function; override as necessary"""
2542
raise NotImplementedError()
1808
raise NotImplementedError
2545
1811
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2546
socketserver.TCPServer):
1812
socketserver.TCPServer, object):
2547
1813
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2550
1816
enabled: Boolean; whether this server is activated yet
2551
1817
interface: None or a network interface name (string)
2552
1818
use_ipv6: Boolean; to use IPv6 or not
2555
1820
def __init__(self, server_address, RequestHandlerClass,
2559
"""If socketfd is set, use that file descriptor instead of
2560
creating a new one with socket.socket().
1821
interface=None, use_ipv6=True):
2562
1822
self.interface = interface
2564
1824
self.address_family = socket.AF_INET6
2565
if socketfd is not None:
2566
# Save the file descriptor
2567
self.socketfd = socketfd
2568
# Save the original socket.socket() function
2569
self.socket_socket = socket.socket
2571
# To implement --socket, we monkey patch socket.socket.
2573
# (When socketserver.TCPServer is a new-style class, we
2574
# could make self.socket into a property instead of monkey
2575
# patching socket.socket.)
2577
# Create a one-time-only replacement for socket.socket()
2578
@functools.wraps(socket.socket)
2579
def socket_wrapper(*args, **kwargs):
2580
# Restore original function so subsequent calls are
2582
socket.socket = self.socket_socket
2583
del self.socket_socket
2584
# This time only, return a new socket object from the
2585
# saved file descriptor.
2586
return socket.fromfd(self.socketfd, *args, **kwargs)
2587
# Replace socket.socket() function with wrapper
2588
socket.socket = socket_wrapper
2589
# The socketserver.TCPServer.__init__ will call
2590
# socket.socket(), which might be our replacement,
2591
# socket_wrapper(), if socketfd was set.
2592
1825
socketserver.TCPServer.__init__(self, server_address,
2593
1826
RequestHandlerClass)
2595
1827
def server_bind(self):
2596
1828
"""This overrides the normal server_bind() function
2597
1829
to bind to an interface if one was specified, and also NOT to
2598
1830
bind to an address or port if they were not specified."""
2599
global SO_BINDTODEVICE
2600
1831
if self.interface is not None:
2601
1832
if SO_BINDTODEVICE is None:
2602
# Fall back to a hard-coded value which seems to be
2604
logger.warning("SO_BINDTODEVICE not found, trying 25")
2605
SO_BINDTODEVICE = 25
2607
self.socket.setsockopt(
2608
socket.SOL_SOCKET, SO_BINDTODEVICE,
2609
(self.interface + "\0").encode("utf-8"))
2610
except socket.error as error:
2611
if error.errno == errno.EPERM:
2612
logger.error("No permission to bind to"
2613
" interface %s", self.interface)
2614
elif error.errno == errno.ENOPROTOOPT:
2615
logger.error("SO_BINDTODEVICE not available;"
2616
" cannot bind to interface %s",
2618
elif error.errno == errno.ENODEV:
2619
logger.error("Interface %s does not exist,"
2620
" cannot bind", self.interface)
1833
logger.error("SO_BINDTODEVICE does not exist;"
1834
" cannot bind to interface %s",
1838
self.socket.setsockopt(socket.SOL_SOCKET,
1842
except socket.error as error:
1843
if error[0] == errno.EPERM:
1844
logger.error("No permission to"
1845
" bind to interface %s",
1847
elif error[0] == errno.ENOPROTOOPT:
1848
logger.error("SO_BINDTODEVICE not available;"
1849
" cannot bind to interface %s",
2623
1853
# Only bind(2) the socket if we really need to.
2624
1854
if self.server_address[0] or self.server_address[1]:
2625
if self.server_address[1]:
2626
self.allow_reuse_address = True
2627
1855
if not self.server_address[0]:
2628
1856
if self.address_family == socket.AF_INET6:
2629
any_address = "::" # in6addr_any
1857
any_address = "::" # in6addr_any
2631
any_address = "0.0.0.0" # INADDR_ANY
1859
any_address = socket.INADDR_ANY
2632
1860
self.server_address = (any_address,
2633
1861
self.server_address[1])
2634
1862
elif not self.server_address[1]:
2635
self.server_address = (self.server_address[0], 0)
1863
self.server_address = (self.server_address[0],
2636
1865
# if self.interface:
2637
1866
# self.server_address = (self.server_address[0],
2668
1892
self.gnutls_priority = gnutls_priority
2669
1893
IPv6_TCPServer.__init__(self, server_address,
2670
1894
RequestHandlerClass,
2671
interface=interface,
1895
interface = interface,
1896
use_ipv6 = use_ipv6)
2675
1897
def server_activate(self):
2676
1898
if self.enabled:
2677
1899
return socketserver.TCPServer.server_activate(self)
2679
1901
def enable(self):
2680
1902
self.enabled = True
2682
1904
def add_pipe(self, parent_pipe, proc):
2683
1905
# Call "handle_ipc" for both data and EOF events
2685
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2686
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2687
functools.partial(self.handle_ipc,
2688
parent_pipe=parent_pipe,
2691
def handle_ipc(self, source, condition,
2694
client_object=None):
1906
gobject.io_add_watch(parent_pipe.fileno(),
1907
gobject.IO_IN | gobject.IO_HUP,
1908
functools.partial(self.handle_ipc,
1913
def handle_ipc(self, source, condition, parent_pipe=None,
1914
proc = None, client_object=None):
1916
gobject.IO_IN: "IN", # There is data to read.
1917
gobject.IO_OUT: "OUT", # Data can be written (without
1919
gobject.IO_PRI: "PRI", # There is urgent data to read.
1920
gobject.IO_ERR: "ERR", # Error condition.
1921
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1922
# broken, usually for pipes and
1925
conditions_string = ' | '.join(name
1927
condition_names.iteritems()
1928
if cond & condition)
2695
1929
# error, or the other end of multiprocessing.Pipe has closed
2696
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1930
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2697
1931
# Wait for other process to exit
2701
1935
# Read a request from the child
2702
1936
request = parent_pipe.recv()
2703
1937
command = request[0]
2705
1939
if command == 'init':
2706
key_id = request[1].decode("ascii")
2707
fpr = request[2].decode("ascii")
2708
address = request[3]
2710
for c in self.clients.values():
2711
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2713
if key_id and c.key_id == key_id:
2716
if fpr and c.fingerprint == fpr:
1941
address = request[2]
1943
for c in self.clients.itervalues():
1944
if c.fingerprint == fpr:
2720
logger.info("Client not found for key ID: %s, address"
2721
": %s", key_id or fpr, address)
1948
logger.info("Client not found for fingerprint: %s, ad"
1949
"dress: %s", fpr, address)
2722
1950
if self.use_dbus:
2723
1951
# Emit D-Bus signal
2724
mandos_dbus_service.ClientNotFound(key_id or fpr,
1952
mandos_dbus_service.ClientNotFound(fpr,
2726
1954
parent_pipe.send(False)
2730
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2731
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2732
functools.partial(self.handle_ipc,
2733
parent_pipe=parent_pipe,
2735
client_object=client))
1957
gobject.io_add_watch(parent_pipe.fileno(),
1958
gobject.IO_IN | gobject.IO_HUP,
1959
functools.partial(self.handle_ipc,
2736
1965
parent_pipe.send(True)
2737
1966
# remove the old hook in favor of the new above hook on
2741
1970
funcname = request[1]
2742
1971
args = request[2]
2743
1972
kwargs = request[3]
2745
1974
parent_pipe.send(('data', getattr(client_object,
2746
1975
funcname)(*args,
2749
1978
if command == 'getattr':
2750
1979
attrname = request[1]
2751
if isinstance(client_object.__getattribute__(attrname),
2752
collections.Callable):
2753
parent_pipe.send(('function', ))
1980
if callable(client_object.__getattribute__(attrname)):
1981
parent_pipe.send(('function',))
2756
'data', client_object.__getattribute__(attrname)))
1983
parent_pipe.send(('data', client_object
1984
.__getattribute__(attrname)))
2758
1986
if command == 'setattr':
2759
1987
attrname = request[1]
2760
1988
value = request[2]
2761
1989
setattr(client_object, attrname, value)
2766
def rfc3339_duration_to_delta(duration):
2767
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2769
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2771
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2773
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2775
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2777
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2779
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2781
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2785
# Parsing an RFC 3339 duration with regular expressions is not
2786
# possible - there would have to be multiple places for the same
2787
# values, like seconds. The current code, while more esoteric, is
2788
# cleaner without depending on a parsing library. If Python had a
2789
# built-in library for parsing we would use it, but we'd like to
2790
# avoid excessive use of external libraries.
2792
# New type for defining tokens, syntax, and semantics all-in-one
2793
Token = collections.namedtuple("Token", (
2794
"regexp", # To match token; if "value" is not None, must have
2795
# a "group" containing digits
2796
"value", # datetime.timedelta or None
2797
"followers")) # Tokens valid after this token
2798
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2799
# the "duration" ABNF definition in RFC 3339, Appendix A.
2800
token_end = Token(re.compile(r"$"), None, frozenset())
2801
token_second = Token(re.compile(r"(\d+)S"),
2802
datetime.timedelta(seconds=1),
2803
frozenset((token_end, )))
2804
token_minute = Token(re.compile(r"(\d+)M"),
2805
datetime.timedelta(minutes=1),
2806
frozenset((token_second, token_end)))
2807
token_hour = Token(re.compile(r"(\d+)H"),
2808
datetime.timedelta(hours=1),
2809
frozenset((token_minute, token_end)))
2810
token_time = Token(re.compile(r"T"),
2812
frozenset((token_hour, token_minute,
2814
token_day = Token(re.compile(r"(\d+)D"),
2815
datetime.timedelta(days=1),
2816
frozenset((token_time, token_end)))
2817
token_month = Token(re.compile(r"(\d+)M"),
2818
datetime.timedelta(weeks=4),
2819
frozenset((token_day, token_end)))
2820
token_year = Token(re.compile(r"(\d+)Y"),
2821
datetime.timedelta(weeks=52),
2822
frozenset((token_month, token_end)))
2823
token_week = Token(re.compile(r"(\d+)W"),
2824
datetime.timedelta(weeks=1),
2825
frozenset((token_end, )))
2826
token_duration = Token(re.compile(r"P"), None,
2827
frozenset((token_year, token_month,
2828
token_day, token_time,
2830
# Define starting values:
2832
value = datetime.timedelta()
2834
# Following valid tokens
2835
followers = frozenset((token_duration, ))
2836
# String left to parse
2838
# Loop until end token is found
2839
while found_token is not token_end:
2840
# Search for any currently valid tokens
2841
for token in followers:
2842
match = token.regexp.match(s)
2843
if match is not None:
2845
if token.value is not None:
2846
# Value found, parse digits
2847
factor = int(match.group(1), 10)
2848
# Add to value so far
2849
value += factor * token.value
2850
# Strip token from string
2851
s = token.regexp.sub("", s, 1)
2854
# Set valid next tokens
2855
followers = found_token.followers
2858
# No currently valid tokens were found
2859
raise ValueError("Invalid RFC 3339 duration: {!r}"
2865
1994
def string_to_delta(interval):
2866
1995
"""Parse a string and return a datetime.timedelta
2868
>>> string_to_delta('7d') == datetime.timedelta(7)
2870
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2872
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2874
>>> string_to_delta('24h') == datetime.timedelta(1)
2876
>>> string_to_delta('1w') == datetime.timedelta(7)
2878
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
1997
>>> string_to_delta('7d')
1998
datetime.timedelta(7)
1999
>>> string_to_delta('60s')
2000
datetime.timedelta(0, 60)
2001
>>> string_to_delta('60m')
2002
datetime.timedelta(0, 3600)
2003
>>> string_to_delta('24h')
2004
datetime.timedelta(1)
2005
>>> string_to_delta('1w')
2006
datetime.timedelta(7)
2007
>>> string_to_delta('5m 30s')
2008
datetime.timedelta(0, 330)
2883
return rfc3339_duration_to_delta(interval)
2887
2010
timevalue = datetime.timedelta(0)
2888
2011
for s in interval.split():
2013
suffix = unicode(s[-1])
2891
2014
value = int(s[:-1])
2892
2015
if suffix == "d":
2893
2016
delta = datetime.timedelta(value)
2965
2088
parser.add_argument("--no-dbus", action="store_false",
2966
2089
dest="use_dbus", help="Do not provide D-Bus"
2967
" system bus interface", default=None)
2090
" system bus interface")
2968
2091
parser.add_argument("--no-ipv6", action="store_false",
2969
dest="use_ipv6", help="Do not use IPv6",
2092
dest="use_ipv6", help="Do not use IPv6")
2971
2093
parser.add_argument("--no-restore", action="store_false",
2972
2094
dest="restore", help="Do not restore stored"
2973
" state", default=None)
2974
parser.add_argument("--socket", type=int,
2975
help="Specify a file descriptor to a network"
2976
" socket to use instead of creating one")
2977
2096
parser.add_argument("--statedir", metavar="DIR",
2978
2097
help="Directory to save/restore state in")
2979
parser.add_argument("--foreground", action="store_true",
2980
help="Run in foreground", default=None)
2981
parser.add_argument("--no-zeroconf", action="store_false",
2982
dest="zeroconf", help="Do not use Zeroconf",
2985
2099
options = parser.parse_args()
2987
2106
# Default values for config file for server-global settings
2988
if gnutls.has_rawpk:
2989
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2990
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2992
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2993
":+SIGN-DSA-SHA256")
2994
server_defaults = {"interface": "",
2998
"priority": priority,
2999
"servicename": "Mandos",
3005
"statedir": "/var/lib/mandos",
3006
"foreground": "False",
2107
server_defaults = { "interface": "",
2112
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2113
"servicename": "Mandos",
2118
"statedir": "/var/lib/mandos"
3011
2121
# Parse config file for server-global settings
3012
server_config = configparser.ConfigParser(server_defaults)
2122
server_config = configparser.SafeConfigParser(server_defaults)
3013
2123
del server_defaults
3014
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3015
# Convert the ConfigParser object to a dict
2124
server_config.read(os.path.join(options.configdir,
2126
# Convert the SafeConfigParser object to a dict
3016
2127
server_settings = server_config.defaults()
3017
2128
# Use the appropriate methods on the non-string config options
3018
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3019
"foreground", "zeroconf"):
2129
for option in ("debug", "use_dbus", "use_ipv6"):
3020
2130
server_settings[option] = server_config.getboolean("DEFAULT",
3022
2132
if server_settings["port"]:
3023
2133
server_settings["port"] = server_config.getint("DEFAULT",
3025
if server_settings["socket"]:
3026
server_settings["socket"] = server_config.getint("DEFAULT",
3028
# Later, stdin will, and stdout and stderr might, be dup'ed
3029
# over with an opened os.devnull. But we don't want this to
3030
# happen with a supplied network socket.
3031
if 0 <= server_settings["socket"] <= 2:
3032
server_settings["socket"] = os.dup(server_settings
3034
2135
del server_config
3036
2137
# Override the settings from the config file with command line
3037
2138
# options, if set.
3038
2139
for option in ("interface", "address", "port", "debug",
3039
"priority", "servicename", "configdir", "use_dbus",
3040
"use_ipv6", "debuglevel", "restore", "statedir",
3041
"socket", "foreground", "zeroconf"):
2140
"priority", "servicename", "configdir",
2141
"use_dbus", "use_ipv6", "debuglevel", "restore",
3042
2143
value = getattr(options, option)
3043
2144
if value is not None:
3044
2145
server_settings[option] = value
3046
2147
# Force all strings to be unicode
3047
2148
for option in server_settings.keys():
3048
if isinstance(server_settings[option], bytes):
3049
server_settings[option] = (server_settings[option]
3051
# Force all boolean options to be boolean
3052
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3053
"foreground", "zeroconf"):
3054
server_settings[option] = bool(server_settings[option])
3055
# Debug implies foreground
3056
if server_settings["debug"]:
3057
server_settings["foreground"] = True
2149
if type(server_settings[option]) is str:
2150
server_settings[option] = unicode(server_settings[option])
3058
2151
# Now we have our good server settings in "server_settings"
3060
2153
##################################################################
3062
if (not server_settings["zeroconf"]
3063
and not (server_settings["port"]
3064
or server_settings["socket"] != "")):
3065
parser.error("Needs port or socket to work without Zeroconf")
3067
2155
# For convenience
3068
2156
debug = server_settings["debug"]
3069
2157
debuglevel = server_settings["debuglevel"]
3083
2169
level = getattr(logging, debuglevel.upper())
3084
2170
initlogger(debug, level)
3086
2172
if server_settings["servicename"] != "Mandos":
3087
syslogger.setFormatter(
3088
logging.Formatter('Mandos ({}) [%(process)d]:'
3089
' %(levelname)s: %(message)s'.format(
3090
server_settings["servicename"])))
2173
syslogger.setFormatter(logging.Formatter
2174
('Mandos (%s) [%%(process)d]:'
2175
' %%(levelname)s: %%(message)s'
2176
% server_settings["servicename"]))
3092
2178
# Parse config file with clients
3093
client_config = configparser.ConfigParser(Client.client_defaults)
2179
client_config = configparser.SafeConfigParser(Client
3094
2181
client_config.read(os.path.join(server_settings["configdir"],
3095
2182
"clients.conf"))
3097
2184
global mandos_dbus_service
3098
2185
mandos_dbus_service = None
3101
if server_settings["socket"] != "":
3102
socketfd = server_settings["socket"]
3103
tcp_server = MandosServer(
3104
(server_settings["address"], server_settings["port"]),
3106
interface=(server_settings["interface"] or None),
3108
gnutls_priority=server_settings["priority"],
3112
pidfilename = "/run/mandos.pid"
3113
if not os.path.isdir("/run/."):
3114
pidfilename = "/var/run/mandos.pid"
3117
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3118
except IOError as e:
3119
logger.error("Could not open file %r", pidfilename,
3122
for name, group in (("_mandos", "_mandos"),
3123
("mandos", "mandos"),
3124
("nobody", "nogroup")):
3126
uid = pwd.getpwnam(name).pw_uid
3127
gid = pwd.getpwnam(group).pw_gid
2187
tcp_server = MandosServer((server_settings["address"],
2188
server_settings["port"]),
2190
interface=(server_settings["interface"]
2194
server_settings["priority"],
2197
pidfilename = "/var/run/mandos.pid"
2199
pidfile = open(pidfilename, "w")
2201
logger.error("Could not open file %r", pidfilename)
2204
uid = pwd.getpwnam("_mandos").pw_uid
2205
gid = pwd.getpwnam("_mandos").pw_gid
2208
uid = pwd.getpwnam("mandos").pw_uid
2209
gid = pwd.getpwnam("mandos").pw_gid
3129
2210
except KeyError:
2212
uid = pwd.getpwnam("nobody").pw_uid
2213
gid = pwd.getpwnam("nobody").pw_gid
3138
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3140
2220
except OSError as error:
3141
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3142
.format(uid, gid, os.strerror(error.errno)))
3143
if error.errno != errno.EPERM:
2221
if error[0] != errno.EPERM:
3147
2225
# Enable all possible GnuTLS debugging
3149
2227
# "Use a log level over 10 to enable all debugging options."
3150
2228
# - GnuTLS manual
3151
gnutls.global_set_log_level(11)
2229
gnutls.library.functions.gnutls_global_set_log_level(11)
2231
@gnutls.library.types.gnutls_log_func
3154
2232
def debug_gnutls(level, string):
3155
2233
logger.debug("GnuTLS: %s", string[:-1])
3157
gnutls.global_set_log_function(debug_gnutls)
2235
(gnutls.library.functions
2236
.gnutls_global_set_log_function(debug_gnutls))
3159
2238
# Redirect stdin so all checkers get /dev/null
3160
2239
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3161
2240
os.dup2(null, sys.stdin.fileno())
3165
2244
# Need to fork before connecting to D-Bus
3167
2246
# Close all input and output, do double fork, etc.
3170
if gi.version_info < (3, 10, 2):
3171
# multiprocessing will use threads, so before we use GLib we
3172
# need to inform GLib that threads will be used.
2249
gobject.threads_init()
3175
2251
global main_loop
3176
2252
# From the Avahi example code
3177
2253
DBusGMainLoop(set_as_default=True)
3178
main_loop = GLib.MainLoop()
2254
main_loop = gobject.MainLoop()
3179
2255
bus = dbus.SystemBus()
3180
2256
# End of Avahi example code
3183
2259
bus_name = dbus.service.BusName("se.recompile.Mandos",
3186
old_bus_name = dbus.service.BusName(
3187
"se.bsnet.fukt.Mandos", bus,
3189
except dbus.exceptions.DBusException as e:
3190
logger.error("Disabling D-Bus:", exc_info=e)
2260
bus, do_not_queue=True)
2261
old_bus_name = (dbus.service.BusName
2262
("se.bsnet.fukt.Mandos", bus,
2264
except dbus.exceptions.NameExistsException as e:
2265
logger.error(unicode(e) + ", disabling D-Bus")
3191
2266
use_dbus = False
3192
2267
server_settings["use_dbus"] = False
3193
2268
tcp_server.use_dbus = False
3195
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3196
service = AvahiServiceToSyslog(
3197
name=server_settings["servicename"],
3198
servicetype="_mandos._tcp",
3201
if server_settings["interface"]:
3202
service.interface = if_nametoindex(
3203
server_settings["interface"].encode("utf-8"))
2269
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2270
service = AvahiServiceToSyslog(name =
2271
server_settings["servicename"],
2272
servicetype = "_mandos._tcp",
2273
protocol = protocol, bus = bus)
2274
if server_settings["interface"]:
2275
service.interface = (if_nametoindex
2276
(str(server_settings["interface"])))
3205
2278
global multiprocessing_manager
3206
2279
multiprocessing_manager = multiprocessing.Manager()
3208
2281
client_class = Client
3210
client_class = functools.partial(ClientDBus, bus=bus)
2283
client_class = functools.partial(ClientDBusTransitional,
3212
2286
client_settings = Client.config_parser(client_config)
3213
2287
old_client_settings = {}
3214
2288
clients_data = {}
3216
# This is used to redirect stdout and stderr for checker processes
3218
wnull = open(os.devnull, "w") # A writable /dev/null
3219
# Only used if server is running in foreground but not in debug
3221
if debug or not foreground:
3224
2290
# Get client data and settings from last running state.
3225
2291
if server_settings["restore"]:
3227
2293
with open(stored_state_path, "rb") as stored_state:
3228
if sys.version_info.major == 2:
3229
clients_data, old_client_settings = pickle.load(
3232
bytes_clients_data, bytes_old_client_settings = (
3233
pickle.load(stored_state, encoding="bytes"))
3234
# Fix bytes to strings
3237
clients_data = {(key.decode("utf-8")
3238
if isinstance(key, bytes)
3241
bytes_clients_data.items()}
3242
del bytes_clients_data
3243
for key in clients_data:
3244
value = {(k.decode("utf-8")
3245
if isinstance(k, bytes) else k): v
3247
clients_data[key].items()}
3248
clients_data[key] = value
3250
value["client_structure"] = [
3252
if isinstance(s, bytes)
3254
value["client_structure"]]
3255
# .name, .host, and .checker_command
3256
for k in ("name", "host", "checker_command"):
3257
if isinstance(value[k], bytes):
3258
value[k] = value[k].decode("utf-8")
3259
if "key_id" not in value:
3260
value["key_id"] = ""
3261
elif "fingerprint" not in value:
3262
value["fingerprint"] = ""
3263
# old_client_settings
3265
old_client_settings = {
3266
(key.decode("utf-8")
3267
if isinstance(key, bytes)
3270
bytes_old_client_settings.items()}
3271
del bytes_old_client_settings
3272
# .host and .checker_command
3273
for value in old_client_settings.values():
3274
for attribute in ("host", "checker_command"):
3275
if isinstance(value[attribute], bytes):
3276
value[attribute] = (value[attribute]
2294
clients_data, old_client_settings = (pickle.load
3278
2296
os.remove(stored_state_path)
3279
2297
except IOError as e:
3280
if e.errno == errno.ENOENT:
3281
logger.warning("Could not load persistent state:"
3282
" {}".format(os.strerror(e.errno)))
3284
logger.critical("Could not load persistent state:",
2298
logger.warning("Could not load persistent state: {0}"
2300
if e.errno != errno.ENOENT:
3287
2302
except EOFError as e:
3288
2303
logger.warning("Could not load persistent state: "
2304
"EOFError: {0}".format(e))
3292
2306
with PGPEngine() as pgp:
3293
for client_name, client in clients_data.items():
3294
# Skip removed clients
3295
if client_name not in client_settings:
2307
for client_name, client in clients_data.iteritems():
3298
2308
# Decide which value to use after restoring saved state.
3299
2309
# We have three different values: Old config file,
3300
2310
# new config file, and saved state.
3360
2371
clients_data[client_name] = client_settings[client_name]
3362
2373
# Create all client objects
3363
for client_name, client in clients_data.items():
2374
for client_name, client in clients_data.iteritems():
3364
2375
tcp_server.clients[client_name] = client_class(
3367
server_settings=server_settings)
2376
name = client_name, settings = client)
3369
2378
if not tcp_server.clients:
3370
2379
logger.warning("No clients defined")
3373
if pidfile is not None:
3377
print(pid, file=pidfile)
3379
logger.error("Could not write to file %r with PID %d",
2385
pidfile.write(str(pid) + "\n".encode("utf-8"))
2388
logger.error("Could not write to file %r with PID %d",
2391
# "pidfile" was never created
3382
2393
del pidfilename
3384
for termsig in (signal.SIGHUP, signal.SIGTERM):
3385
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3386
lambda: main_loop.quit() and False)
2394
signal.signal(signal.SIGINT, signal.SIG_IGN)
2396
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2397
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3390
@alternate_dbus_interfaces(
3391
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3392
class MandosDBusService(DBusObjectWithObjectManager):
2400
class MandosDBusService(DBusObjectWithProperties):
3393
2401
"""A D-Bus proxy object"""
3395
2402
def __init__(self):
3396
2403
dbus.service.Object.__init__(self, bus, "/")
3398
2404
_interface = "se.recompile.Mandos"
2406
@dbus_interface_annotations(_interface)
2408
return { "org.freedesktop.DBus.Property"
2409
".EmitsChangedSignal":
3400
2412
@dbus.service.signal(_interface, signature="o")
3401
2413
def ClientAdded(self, objpath):
3405
2417
@dbus.service.signal(_interface, signature="ss")
3406
def ClientNotFound(self, key_id, address):
2418
def ClientNotFound(self, fingerprint, address):
3410
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3412
2422
@dbus.service.signal(_interface, signature="os")
3413
2423
def ClientRemoved(self, objpath, name):
3417
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3419
2427
@dbus.service.method(_interface, out_signature="ao")
3420
2428
def GetAllClients(self):
3422
return dbus.Array(c.dbus_object_path for c in
3423
tcp_server.clients.values())
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2430
return dbus.Array(c.dbus_object_path
2432
tcp_server.clients.itervalues())
3427
2434
@dbus.service.method(_interface,
3428
2435
out_signature="a{oa{sv}}")
3429
2436
def GetAllClientsWithProperties(self):
3431
2438
return dbus.Dictionary(
3432
{c.dbus_object_path: c.GetAll(
3433
"se.recompile.Mandos.Client")
3434
for c in tcp_server.clients.values()},
2439
((c.dbus_object_path, c.GetAll(""))
2440
for c in tcp_server.clients.itervalues()),
3435
2441
signature="oa{sv}")
3437
2443
@dbus.service.method(_interface, in_signature="o")
3438
2444
def RemoveClient(self, object_path):
3440
for c in tcp_server.clients.values():
2446
for c in tcp_server.clients.itervalues():
3441
2447
if c.dbus_object_path == object_path:
3442
2448
del tcp_server.clients[c.name]
3443
2449
c.remove_from_connection()
3444
# Don't signal the disabling
2450
# Don't signal anything except ClientRemoved
3445
2451
c.disable(quiet=True)
3446
# Emit D-Bus signal for removal
3447
self.client_removed_signal(c)
2453
self.ClientRemoved(object_path, c.name)
3449
2455
raise KeyError(object_path)
3453
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3454
out_signature="a{oa{sa{sv}}}")
3455
def GetManagedObjects(self):
3457
return dbus.Dictionary(
3458
{client.dbus_object_path:
3460
{interface: client.GetAll(interface)
3462
client._get_all_interface_names()})
3463
for client in tcp_server.clients.values()})
3465
def client_added_signal(self, client):
3466
"""Send the new standard signal and the old signal"""
3468
# New standard signal
3469
self.InterfacesAdded(
3470
client.dbus_object_path,
3472
{interface: client.GetAll(interface)
3474
client._get_all_interface_names()}))
3476
self.ClientAdded(client.dbus_object_path)
3478
def client_removed_signal(self, client):
3479
"""Send the new standard signal and the old signal"""
3481
# New standard signal
3482
self.InterfacesRemoved(
3483
client.dbus_object_path,
3484
client._get_all_interface_names())
3486
self.ClientRemoved(client.dbus_object_path,
3489
mandos_dbus_service = MandosDBusService()
3491
# Save modules to variables to exempt the modules from being
3492
# unloaded before the function registered with atexit() is run.
3493
mp = multiprocessing
2459
class MandosDBusServiceTransitional(MandosDBusService):
2460
__metaclass__ = AlternateDBusNamesMetaclass
2461
mandos_dbus_service = MandosDBusServiceTransitional()
3497
2464
"Cleanup function; run on exit"
3501
mp.active_children()
2467
multiprocessing.active_children()
3503
2468
if not (tcp_server.clients or client_settings):
3506
2471
# Store client before exiting. Secrets are encrypted with key
3507
2472
# based on what config file has. If config file is
3508
2473
# removed/edited, old secret will thus be unrecovable.
3510
2475
with PGPEngine() as pgp:
3511
for client in tcp_server.clients.values():
2476
for client in tcp_server.clients.itervalues():
3512
2477
key = client_settings[client.name]["secret"]
3513
2478
client.encrypted_secret = pgp.encrypt(client.secret,
3515
2480
client_dict = {}
3517
2482
# A list of attributes that can not be pickled
3519
exclude = {"bus", "changedstate", "secret",
3520
"checker", "server_settings"}
3521
for name, typ in inspect.getmembers(dbus.service
2484
exclude = set(("bus", "changedstate", "secret",
2486
for name, typ in (inspect.getmembers
2487
(dbus.service.Object)):
3523
2488
exclude.add(name)
3525
2490
client_dict["encrypted_secret"] = (client
3526
2491
.encrypted_secret)
3527
2492
for attr in client.client_structure:
3528
2493
if attr not in exclude:
3529
2494
client_dict[attr] = getattr(client, attr)
3531
2496
clients[client.name] = client_dict
3532
2497
del client_settings[client.name]["secret"]
3535
with tempfile.NamedTemporaryFile(
3539
dir=os.path.dirname(stored_state_path),
3540
delete=False) as stored_state:
3541
pickle.dump((clients, client_settings), stored_state,
3543
tempname = stored_state.name
2500
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2503
(stored_state_path))
2504
with os.fdopen(tempfd, "wb") as stored_state:
2505
pickle.dump((clients, client_settings), stored_state)
3544
2506
os.rename(tempname, stored_state_path)
3545
2507
except (IOError, OSError) as e:
2508
logger.warning("Could not save persistent state: {0}"
3548
2512
os.remove(tempname)
3549
2513
except NameError:
3551
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3552
logger.warning("Could not save persistent state: {}"
3553
.format(os.strerror(e.errno)))
3555
logger.warning("Could not save persistent state:",
2515
if e.errno not in set((errno.ENOENT, errno.EACCES,
3559
2519
# Delete all clients, and settings from config
3560
2520
while tcp_server.clients:
3561
2521
name, client = tcp_server.clients.popitem()
3563
2523
client.remove_from_connection()
3564
# Don't signal the disabling
2524
# Don't signal anything except ClientRemoved
3565
2525
client.disable(quiet=True)
3566
# Emit D-Bus signal for removal
3568
mandos_dbus_service.client_removed_signal(client)
2528
mandos_dbus_service.ClientRemoved(client
3569
2531
client_settings.clear()
3571
2533
atexit.register(cleanup)
3573
for client in tcp_server.clients.values():
2535
for client in tcp_server.clients.itervalues():
3575
# Emit D-Bus signal for adding
3576
mandos_dbus_service.client_added_signal(client)
2538
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3577
2539
# Need to initiate checking of clients
3578
2540
if client.enabled:
3579
2541
client.init_checker()
3581
2543
tcp_server.enable()
3582
2544
tcp_server.server_activate()
3584
2546
# Find out what port we got
3586
service.port = tcp_server.socket.getsockname()[1]
2547
service.port = tcp_server.socket.getsockname()[1]
3588
2549
logger.info("Now listening on address %r, port %d,"
3589
" flowinfo %d, scope_id %d",
3590
*tcp_server.socket.getsockname())
2550
" flowinfo %d, scope_id %d"
2551
% tcp_server.socket.getsockname())
3592
logger.info("Now listening on address %r, port %d",
3593
*tcp_server.socket.getsockname())
3595
# service.interface = tcp_server.socket.getsockname()[3]
2553
logger.info("Now listening on address %r, port %d"
2554
% tcp_server.socket.getsockname())
2556
#service.interface = tcp_server.socket.getsockname()[3]
3599
# From the Avahi example code
3602
except dbus.exceptions.DBusException as error:
3603
logger.critical("D-Bus Exception", exc_info=error)
3606
# End of Avahi example code
3609
GLib.IOChannel.unix_new(tcp_server.fileno()),
3610
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3611
lambda *args, **kwargs: (tcp_server.handle_request
3612
(*args[2:], **kwargs) or True))
2559
# From the Avahi example code
2562
except dbus.exceptions.DBusException as error:
2563
logger.critical("DBusException: %s", error)
2566
# End of Avahi example code
2568
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2569
lambda *args, **kwargs:
2570
(tcp_server.handle_request
2571
(*args[2:], **kwargs) or True))
3614
2573
logger.debug("Starting main loop")
3615
2574
main_loop.run()
3616
2575
except AvahiError as error:
3617
logger.critical("Avahi Error", exc_info=error)
2576
logger.critical("AvahiError: %s", error)
3620
2579
except KeyboardInterrupt: