63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
71
83
import dbus.service
85
from gi.repository import GLib
74
86
from dbus.mainloop.glib import DBusGMainLoop
77
89
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:
82
104
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
83
105
except AttributeError:
107
# This is where SO_BINDTODEVICE was up to and including Python
85
109
from IN import SO_BINDTODEVICE
86
110
except ImportError:
87
SO_BINDTODEVICE = None
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
90
132
stored_state_file = "clients.pickle"
92
134
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
135
logging.captureWarnings(True) # Show warnings via the logging system
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
139
if_nametoindex = ctypes.cdll.LoadLibrary(
140
ctypes.util.find_library("c")).if_nametoindex
101
141
except (OSError, AttributeError):
102
143
def if_nametoindex(interface):
103
144
"Get an interface index the hard way, i.e. using fcntl()"
104
145
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
146
with contextlib.closing(socket.socket()) as s:
106
147
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
148
struct.pack(b"16s16x", interface))
149
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
150
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__,
114
169
def initlogger(debug, level=logging.WARNING):
115
170
"""init logger and add loglevel"""
173
syslogger = (logging.handlers.SysLogHandler(
174
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
176
syslogger.setFormatter(logging.Formatter
118
177
('Mandos [%(process)d]: %(levelname)s:'
120
179
logger.addHandler(syslogger)
123
182
console = logging.StreamHandler()
124
183
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
240
os.rmdir(self.tempdir)
170
241
self.tempdir = None
172
243
def password_encode(self, password):
173
244
# Passphrase can not be empty and can not contain newlines or
174
245
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
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"))
177
254
def encrypt(self, data, password):
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
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:
192
270
return ciphertext
194
272
def decrypt(self, data, password):
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
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:
209
288
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
213
317
class AvahiError(Exception):
214
318
def __init__(self, value, *args, **kwargs):
215
319
self.value = value
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
320
return super(AvahiError, self).__init__(value, *args,
220
324
class AvahiServiceError(AvahiError):
223
328
class AvahiGroupError(AvahiError):
227
class AvahiService(object):
228
333
"""An Avahi (Zeroconf) service.
231
336
interface: integer; avahi.IF_UNSPEC or an interface index.
232
337
Used to optionally bind to the specified interface.
233
338
name: string; Example: 'Mandos'
234
339
type: string; Example: '_mandos._tcp'.
235
See <http://www.dns-sd.org/ServiceTypes.html>
340
See <https://www.iana.org/assignments/service-names-port-numbers>
236
341
port: integer; what port to announce
237
342
TXT: list of strings; TXT record for the service
238
343
domain: string; Domain to publish on, default to .local if empty.
367
502
follow_name_owner_changes=True),
368
503
avahi.DBUS_INTERFACE_SERVER)
369
504
self.server.connect_to_signal("StateChanged",
370
self.server_state_changed)
505
self.server_state_changed)
371
506
self.server_state_changed(self.server.GetState())
373
509
class AvahiServiceToSyslog(AvahiService):
510
def rename(self, *args, **kwargs):
375
511
"""Add the new name to the syslog messages"""
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
512
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
513
syslogger.setFormatter(logging.Formatter(
514
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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):
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))
390
832
"""A representation of a client host served by this server.
393
835
approved: bool(); 'None' if not yet approved/disapproved
394
836
approval_delay: datetime.timedelta(); Time to wait for approval
395
837
approval_duration: datetime.timedelta(); Duration of one approval
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
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
400
842
checker_command: string; External command which is run to check
401
843
if client lives. %() expansions are done at
402
844
runtime with vars(self) as dict, so that for
403
845
instance %(name)s can be used in the command.
404
checker_initiator_tag: a gobject event source tag, or None
846
checker_initiator_tag: a GLib event source tag, or None
405
847
created: datetime.datetime(); (UTC) object creation
406
848
client_structure: Object describing what attributes a client has
407
849
and is used for storing the client at exit
408
850
current_checker_command: string; current running checker_command
409
disable_initiator_tag: a gobject event source tag, or None
851
disable_initiator_tag: a GLib event source tag, or None
411
853
fingerprint: string (40 or 32 hexadecimal digits); used to
412
uniquely identify the client
854
uniquely identify an OpenPGP client
855
key_id: string (64 hexadecimal digits); used to uniquely identify
856
a client using raw public keys
413
857
host: string; available for use by the checker command
414
858
interval: datetime.timedelta(); How often to start a new checker
415
859
last_approval_request: datetime.datetime(); (UTC) or None
542
980
self.current_checker_command = None
543
981
self.approved = None
544
982
self.approvals_pending = 0
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
983
self.changedstate = multiprocessing_manager.Condition(
984
multiprocessing_manager.Lock())
985
self.client_structure = [attr
986
for attr in self.__dict__.keys()
550
987
if not attr.startswith("_")]
551
988
self.client_structure.append("client_structure")
553
for name, t in inspect.getmembers(type(self),
990
for name, t in inspect.getmembers(
991
type(self), lambda obj: isinstance(obj, property)):
557
992
if not name.startswith("_"):
558
993
self.client_structure.append(name)
560
995
# Send notice to process children that client state has changed
561
996
def send_changedstate(self):
562
997
with self.changedstate:
563
998
self.changedstate.notify_all()
565
1000
def enable(self):
566
1001
"""Start this client's checker and timeout hooks"""
567
1002
if getattr(self, "enabled", False):
568
1003
# Already enabled
570
self.send_changedstate()
571
1005
self.expires = datetime.datetime.utcnow() + self.timeout
572
1006
self.enabled = True
573
1007
self.last_enabled = datetime.datetime.utcnow()
574
1008
self.init_checker()
1009
self.send_changedstate()
576
1011
def disable(self, quiet=True):
577
1012
"""Disable this client."""
578
1013
if not getattr(self, "enabled", False):
581
self.send_changedstate()
583
1016
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1017
if getattr(self, "disable_initiator_tag", None) is not None:
1018
GLib.source_remove(self.disable_initiator_tag)
586
1019
self.disable_initiator_tag = None
587
1020
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1021
if getattr(self, "checker_initiator_tag", None) is not None:
1022
GLib.source_remove(self.checker_initiator_tag)
590
1023
self.checker_initiator_tag = None
591
1024
self.stop_checker()
592
1025
self.enabled = False
593
# Do not run this again if called by a gobject.timeout_add
1027
self.send_changedstate()
1028
# Do not run this again if called by a GLib.timeout_add
596
1031
def __del__(self):
599
1034
def init_checker(self):
600
1035
# Schedule a new checker to be started an 'interval' from now,
601
1036
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
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),
605
1042
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
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)
609
1047
# Also start a new checker *right now*.
610
1048
self.start_checker()
612
def checker_callback(self, pid, condition, command):
1050
def checker_callback(self, source, condition, connection,
613
1052
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
614
1057
self.checker_callback_tag = None
615
1058
self.checker = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1061
self.last_checker_status = returncode
1062
self.last_checker_signal = None
618
1063
if self.last_checker_status == 0:
619
1064
logger.info("Checker for %(name)s succeeded",
621
1066
self.checked_ok()
623
logger.info("Checker for %(name)s failed",
1068
logger.info("Checker for %(name)s failed", vars(self))
626
1070
self.last_checker_status = -1
1071
self.last_checker_signal = -returncode
627
1072
logger.warning("Checker for %(name)s crashed?",
630
1076
def checked_ok(self):
631
1077
"""Assert that the client has been seen, alive and well."""
632
1078
self.last_checked_ok = datetime.datetime.utcnow()
633
1079
self.last_checker_status = 0
1080
self.last_checker_signal = None
634
1081
self.bump_timeout()
636
1083
def bump_timeout(self, timeout=None):
637
1084
"""Bump up the timeout for this client."""
638
1085
if timeout is None:
639
1086
timeout = self.timeout
640
1087
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
1088
GLib.source_remove(self.disable_initiator_tag)
1089
self.disable_initiator_tag = None
642
1090
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1091
self.disable_initiator_tag = GLib.timeout_add(
1092
int(timeout.total_seconds() * 1000), self.disable)
646
1093
self.expires = datetime.datetime.utcnow() + timeout
648
1095
def need_approval(self):
649
1096
self.last_approval_request = datetime.datetime.utcnow()
651
1098
def start_checker(self):
652
1099
"""Start a new checker subprocess if one is not running.
654
1101
If a checker already exists, leave it running and do
656
1103
# The reason for not killing a running checker is that if we
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
1104
# did that, and if a checker (for some reason) started running
1105
# slowly and taking more than 'interval' time, then the client
1106
# would inevitably timeout, since no checker would get a
1107
# chance to run to completion. If we instead leave running
661
1108
# checkers alone, the checker would have to take more time
662
1109
# than 'timeout' for the client to be disabled, which is as it
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)
1112
if self.checker is not None and not self.checker.is_alive():
1113
logger.warning("Checker was not alive; joining")
678
1116
# Start a new checker if needed
679
1117
if self.checker is None:
1118
# Escape attributes for the shell
1120
attr: re.escape(str(getattr(self, attr)))
1121
for attr in self.runtime_expansions}
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
self.checker_command, exc_info=error)
698
return True # Try again later
1123
command = self.checker_command % escaped_attrs
1124
except TypeError as error:
1125
logger.error('Could not format string "%s"',
1126
self.checker_command,
1128
return True # Try again later
699
1129
self.current_checker_command = command
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",
723
# Re-run this periodically if run by gobject.timeout_add
1130
logger.info("Starting checker %r for %s", command,
1132
# We don't need to redirect stdout and stderr, since
1133
# in normal mode, that is already done by daemon(),
1134
# and in debug mode we don't want to. (Stdin is
1135
# always replaced by /dev/null.)
1136
# The exception is when not debugging but nevertheless
1137
# running in the foreground; use the previously
1139
popen_args = {"close_fds": True,
1142
if (not self.server_settings["debug"]
1143
and self.server_settings["foreground"]):
1144
popen_args.update({"stdout": wnull,
1146
pipe = multiprocessing.Pipe(duplex=False)
1147
self.checker = multiprocessing.Process(
1149
args=(pipe[1], subprocess.call, command),
1151
self.checker.start()
1152
self.checker_callback_tag = GLib.io_add_watch(
1153
GLib.IOChannel.unix_new(pipe[0].fileno()),
1154
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1155
self.checker_callback, pipe[0], command)
1156
# Re-run this periodically if run by GLib.timeout_add
726
1159
def stop_checker(self):
727
1160
"""Force the checker process, if any, to stop."""
728
1161
if self.checker_callback_tag:
729
gobject.source_remove(self.checker_callback_tag)
1162
GLib.source_remove(self.checker_callback_tag)
730
1163
self.checker_callback_tag = None
731
1164
if getattr(self, "checker", None) is None:
733
1166
logger.debug("Stopping checker for %(name)s", vars(self))
735
self.checker.terminate()
737
#if self.checker.poll() is None:
738
# self.checker.kill()
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
1167
self.checker.terminate()
742
1168
self.checker = None
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1171
def dbus_service_property(dbus_interface,
747
1175
"""Decorators for marking methods of a DBusObjectWithProperties to
748
1176
become properties on the D-Bus.
750
1178
The decorated method will be called with no arguments by "Get"
751
1179
and with one argument by "Set".
753
1181
The parameters, where they are supported, are the same as
754
1182
dbus.service.method, except there is only "signature", since the
755
1183
type from Get() and the type sent to Set() is the same.
831
class DBusObjectWithProperties(dbus.service.Object):
832
"""A D-Bus object with properties.
834
Classes inheriting from this can use the dbus_service_property
835
decorator to expose methods as D-Bus properties. It exposes the
836
standard Get(), Set(), and GetAll() methods on the D-Bus.
1266
class DBusObjectWithAnnotations(dbus.service.Object):
1267
"""A D-Bus object with annotations.
1269
Classes inheriting from this can use the dbus_annotations
1270
decorator to add annotations to methods or signals.
840
1274
def _is_dbus_thing(thing):
841
1275
"""Returns a function testing if an attribute is a D-Bus thing
843
1277
If called like _is_dbus_thing("method") it returns a function
844
1278
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1280
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
849
1283
def _get_all_dbus_things(self, thing):
850
1284
"""Returns a generator of (name, attribute) pairs
852
return ((getattr(athing.__get__(self), "_dbus_name",
1286
return ((getattr(athing.__get__(self), "_dbus_name", name),
854
1287
athing.__get__(self))
855
1288
for cls in self.__class__.__mro__
856
1289
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1290
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1292
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1294
path_keyword='object_path',
1295
connection_keyword='connection')
1296
def Introspect(self, object_path, connection):
1297
"""Overloading of standard D-Bus method.
1299
Inserts annotation tags on methods and signals.
1301
xmlstring = dbus.service.Object.Introspect(self, object_path,
1304
document = xml.dom.minidom.parseString(xmlstring)
1306
for if_tag in document.getElementsByTagName("interface"):
1307
# Add annotation tags
1308
for typ in ("method", "signal"):
1309
for tag in if_tag.getElementsByTagName(typ):
1311
for name, prop in (self.
1312
_get_all_dbus_things(typ)):
1313
if (name == tag.getAttribute("name")
1314
and prop._dbus_interface
1315
== if_tag.getAttribute("name")):
1316
annots.update(getattr(
1317
prop, "_dbus_annotations", {}))
1318
for name, value in annots.items():
1319
ann_tag = document.createElement(
1321
ann_tag.setAttribute("name", name)
1322
ann_tag.setAttribute("value", value)
1323
tag.appendChild(ann_tag)
1324
# Add interface annotation tags
1325
for annotation, value in dict(
1326
itertools.chain.from_iterable(
1327
annotations().items()
1328
for name, annotations
1329
in self._get_all_dbus_things("interface")
1330
if name == if_tag.getAttribute("name")
1332
ann_tag = document.createElement("annotation")
1333
ann_tag.setAttribute("name", annotation)
1334
ann_tag.setAttribute("value", value)
1335
if_tag.appendChild(ann_tag)
1336
# Fix argument name for the Introspect method itself
1337
if (if_tag.getAttribute("name")
1338
== dbus.INTROSPECTABLE_IFACE):
1339
for cn in if_tag.getElementsByTagName("method"):
1340
if cn.getAttribute("name") == "Introspect":
1341
for arg in cn.getElementsByTagName("arg"):
1342
if (arg.getAttribute("direction")
1344
arg.setAttribute("name",
1346
xmlstring = document.toxml("utf-8")
1348
except (AttributeError, xml.dom.DOMException,
1349
xml.parsers.expat.ExpatError) as error:
1350
logger.error("Failed to override Introspection method",
1355
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1356
"""A D-Bus object with properties.
1358
Classes inheriting from this can use the dbus_service_property
1359
decorator to expose methods as D-Bus properties. It exposes the
1360
standard Get(), Set(), and GetAll() methods on the D-Bus.
860
1363
def _get_dbus_property(self, interface_name, property_name):
861
1364
"""Returns a bound method if one exists which is a D-Bus
862
1365
property with the specified name and interface.
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
867
self._is_dbus_thing("property"))):
1367
for cls in self.__class__.__mro__:
1368
for name, value in inspect.getmembers(
1369
cls, self._is_dbus_thing("property")):
868
1370
if (value._dbus_name == property_name
869
1371
and value._dbus_interface == interface_name):
870
1372
return value.__get__(self)
872
1374
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1375
raise DBusPropertyNotFound("{}:{}.{}".format(
1376
self.dbus_object_path, interface_name, property_name))
1379
def _get_all_interface_names(cls):
1380
"""Get a sequence of all interfaces supported by an object"""
1381
return (name for name in set(getattr(getattr(x, attr),
1382
"_dbus_interface", None)
1383
for x in (inspect.getmro(cls))
1385
if name is not None)
1387
@dbus.service.method(dbus.PROPERTIES_IFACE,
878
1389
out_signature="v")
879
1390
def Get(self, interface_name, property_name):
880
1391
"""Standard D-Bus property Get() method, see D-Bus standard.
1010
1520
return xmlstring
1013
def datetime_to_dbus (dt, variant_level=0):
1524
dbus.OBJECT_MANAGER_IFACE
1525
except AttributeError:
1526
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1529
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1530
"""A D-Bus object with an ObjectManager.
1532
Classes inheriting from this exposes the standard
1533
GetManagedObjects call and the InterfacesAdded and
1534
InterfacesRemoved signals on the standard
1535
"org.freedesktop.DBus.ObjectManager" interface.
1537
Note: No signals are sent automatically; they must be sent
1540
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1541
out_signature="a{oa{sa{sv}}}")
1542
def GetManagedObjects(self):
1543
"""This function must be overridden"""
1544
raise NotImplementedError()
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1547
signature="oa{sa{sv}}")
1548
def InterfacesAdded(self, object_path, interfaces_and_properties):
1551
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1552
def InterfacesRemoved(self, object_path, interfaces):
1555
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1557
path_keyword='object_path',
1558
connection_keyword='connection')
1559
def Introspect(self, object_path, connection):
1560
"""Overloading of standard D-Bus method.
1562
Override return argument name of GetManagedObjects to be
1563
"objpath_interfaces_and_properties"
1565
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1569
document = xml.dom.minidom.parseString(xmlstring)
1571
for if_tag in document.getElementsByTagName("interface"):
1572
# Fix argument name for the GetManagedObjects method
1573
if (if_tag.getAttribute("name")
1574
== dbus.OBJECT_MANAGER_IFACE):
1575
for cn in if_tag.getElementsByTagName("method"):
1576
if (cn.getAttribute("name")
1577
== "GetManagedObjects"):
1578
for arg in cn.getElementsByTagName("arg"):
1579
if (arg.getAttribute("direction")
1583
"objpath_interfaces"
1585
xmlstring = document.toxml("utf-8")
1587
except (AttributeError, xml.dom.DOMException,
1588
xml.parsers.expat.ExpatError) as error:
1589
logger.error("Failed to override Introspection method",
1594
def datetime_to_dbus(dt, variant_level=0):
1014
1595
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1016
return dbus.String("", variant_level = variant_level)
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1597
return dbus.String("", variant_level=variant_level)
1598
return dbus.String(dt.isoformat(), variant_level=variant_level)
1601
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1602
"""A class decorator; applied to a subclass of
1603
dbus.service.Object, it will add alternate D-Bus attributes with
1604
interface names according to the "alt_interface_names" mapping.
1607
@alternate_dbus_interfaces({"org.example.Interface":
1608
"net.example.AlternateInterface"})
1609
class SampleDBusObject(dbus.service.Object):
1610
@dbus.service.method("org.example.Interface")
1611
def SampleDBusMethod():
1614
The above "SampleDBusMethod" on "SampleDBusObject" will be
1615
reachable via two interfaces: "org.example.Interface" and
1616
"net.example.AlternateInterface", the latter of which will have
1617
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1618
"true", unless "deprecate" is passed with a False value.
1620
This works for methods and signals, and also for D-Bus properties
1621
(from DBusObjectWithProperties) and interfaces (from the
1622
dbus_interface_annotations decorator).
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1626
for orig_interface_name, alt_interface_name in (
1627
alt_interface_names.items()):
1629
interface_names = set()
1630
# Go though all attributes of the class
1631
for attrname, attribute in inspect.getmembers(cls):
1034
1632
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1633
# with the wrong interface name
1036
1634
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1635
or not attribute._dbus_interface.startswith(
1636
orig_interface_name)):
1040
1638
# Create an alternate D-Bus interface name based on
1041
1639
# the current name
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1640
alt_interface = attribute._dbus_interface.replace(
1641
orig_interface_name, alt_interface_name)
1642
interface_names.add(alt_interface)
1047
1643
# Is this a D-Bus signal?
1048
1644
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1645
# Extract the original non-method undecorated
1646
# function by black magic
1647
if sys.version_info.major == 2:
1648
nonmethod_func = (dict(
1052
1649
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1650
attribute.__closure__))
1651
["func"].cell_contents)
1653
nonmethod_func = (dict(
1654
zip(attribute.__code__.co_freevars,
1655
attribute.__closure__))
1656
["func"].cell_contents)
1055
1657
# Create a new, but exactly alike, function
1056
1658
# object, and decorate it to be a new D-Bus signal
1057
1659
# with the alternate D-Bus interface name
1058
new_function = (dbus.service.signal
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1660
new_function = copy_function(nonmethod_func)
1661
new_function = (dbus.service.signal(
1663
attribute._dbus_signature)(new_function))
1067
1664
# Copy annotations, if any
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1666
new_function._dbus_annotations = dict(
1667
attribute._dbus_annotations)
1071
1668
except AttributeError:
1073
1671
# Define a creator of a function to call both the
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1672
# original and alternate functions, so both the
1673
# original and alternate signals gets sent when
1674
# the function is called
1076
1675
def fixscope(func1, func2):
1077
1676
"""This function is a scope container to pass
1078
1677
func1 and func2 to the "call_both" function
1079
1678
outside of its arguments"""
1680
@functools.wraps(func2)
1080
1681
def call_both(*args, **kwargs):
1081
1682
"""This function will emit two D-Bus
1082
1683
signals by calling func1 and func2"""
1083
1684
func1(*args, **kwargs)
1084
1685
func2(*args, **kwargs)
1686
# Make wrapper function look like a D-Bus
1688
for name, attr in inspect.getmembers(func2):
1689
if name.startswith("_dbus_"):
1690
setattr(call_both, name, attr)
1085
1692
return call_both
1086
1693
# Create the "call_both" function and add it to
1088
attr[attrname] = fixscope(attribute,
1695
attr[attrname] = fixscope(attribute, new_function)
1090
1696
# Is this a D-Bus method?
1091
1697
elif getattr(attribute, "_dbus_is_method", False):
1092
1698
# Create a new, but exactly alike, function
1093
1699
# object. Decorate it to be a new D-Bus method
1094
1700
# with the alternate D-Bus interface name. Add it
1095
1701
# to the class.
1096
attr[attrname] = (dbus.service.method
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1703
dbus.service.method(
1705
attribute._dbus_in_signature,
1706
attribute._dbus_out_signature)
1707
(copy_function(attribute)))
1106
1708
# Copy annotations, if any
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1710
attr[attrname]._dbus_annotations = dict(
1711
attribute._dbus_annotations)
1110
1712
except AttributeError:
1112
1714
# Is this a D-Bus property?
1140
1735
# object. Decorate it to be a new D-Bus interface
1141
1736
# with the alternate D-Bus interface name. Add it
1142
1737
# to the class.
1143
attr[attrname] = (dbus_interface_annotations
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1160
if aname not in attr:
1163
return type.__new__(mcs, name, bases, attr)
1739
dbus_interface_annotations(alt_interface)
1740
(copy_function(attribute)))
1742
# Deprecate all alternate interfaces
1743
iname = "_AlternateDBusNames_interface_annotation{}"
1744
for interface_name in interface_names:
1746
@dbus_interface_annotations(interface_name)
1748
return {"org.freedesktop.DBus.Deprecated":
1750
# Find an unused name
1751
for aname in (iname.format(i)
1752
for i in itertools.count()):
1753
if aname not in attr:
1757
# Replace the class with a new subclass of it with
1758
# methods, signals, etc. as created above.
1759
if sys.version_info.major == 2:
1760
cls = type(b"{}Alternate".format(cls.__name__),
1763
cls = type("{}Alternate".format(cls.__name__),
1770
@alternate_dbus_interfaces({"se.recompile.Mandos":
1771
"se.bsnet.fukt.Mandos"})
1166
1772
class ClientDBus(Client, DBusObjectWithProperties):
1167
1773
"""A Client class using D-Bus
1170
1776
dbus_object_path: dbus.ObjectPath
1171
1777
bus: dbus.SystemBus()
1174
1780
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
1781
+ ("dbus_object_path", ))
1783
_interface = "se.recompile.Mandos.Client"
1177
1785
# dbus.service.Object doesn't use super(), so we can't either.
1179
def __init__(self, bus = None, *args, **kwargs):
1787
def __init__(self, bus=None, *args, **kwargs):
1181
1789
Client.__init__(self, *args, **kwargs)
1182
1790
# Only now, when this client is initialized, can it show up on
1184
client_object_name = unicode(self.name).translate(
1792
client_object_name = str(self.name).translate(
1185
1793
{ord("."): ord("_"),
1186
1794
ord("-"): ord("_")})
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1795
self.dbus_object_path = dbus.ObjectPath(
1796
"/clients/" + client_object_name)
1189
1797
DBusObjectWithProperties.__init__(self, self.bus,
1190
1798
self.dbus_object_path)
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1800
def notifychangeproperty(transform_func, dbus_name,
1801
type_func=lambda x: x,
1803
invalidate_only=False,
1804
_interface=_interface):
1195
1805
""" Modify a variable so that it's a property which announces
1196
1806
its changes to DBus.
1198
1808
transform_fun: Function that takes a value and a variant_level
1199
1809
and transforms it to a D-Bus type.
1200
1810
dbus_name: D-Bus name of the variable
1350
1962
server to mandos-client
1354
1966
# Rejected - signal
1355
1967
@dbus.service.signal(_interface, signature="s")
1356
1968
def Rejected(self, reason):
1360
1972
# NeedApproval - signal
1361
1973
@dbus.service.signal(_interface, signature="tb")
1362
1974
def NeedApproval(self, timeout, default):
1364
1976
return self.need_approval()
1368
1980
# Approve - method
1369
1981
@dbus.service.method(_interface, in_signature="b")
1370
1982
def Approve(self, value):
1371
1983
self.approve(value)
1373
1985
# CheckedOK - method
1374
1986
@dbus.service.method(_interface)
1375
1987
def CheckedOK(self):
1376
1988
self.checked_ok()
1378
1990
# Enable - method
1991
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
1992
@dbus.service.method(_interface)
1380
1993
def Enable(self):
1384
1997
# StartChecker - method
1998
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
1999
@dbus.service.method(_interface)
1386
2000
def StartChecker(self):
1388
2002
self.start_checker()
1390
2004
# Disable - method
2005
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2006
@dbus.service.method(_interface)
1392
2007
def Disable(self):
1396
2011
# StopChecker - method
2012
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2013
@dbus.service.method(_interface)
1398
2014
def StopChecker(self):
1399
2015
self.stop_checker()
1403
2019
# ApprovalPending - property
1404
2020
@dbus_service_property(_interface, signature="b", access="read")
1405
2021
def ApprovalPending_dbus_property(self):
1406
2022
return dbus.Boolean(bool(self.approvals_pending))
1408
2024
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2025
@dbus_service_property(_interface,
1410
2027
access="readwrite")
1411
2028
def ApprovedByDefault_dbus_property(self, value=None):
1412
2029
if value is None: # get
1413
2030
return dbus.Boolean(self.approved_by_default)
1414
2031
self.approved_by_default = bool(value)
1416
2033
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2034
@dbus_service_property(_interface,
1418
2036
access="readwrite")
1419
2037
def ApprovalDelay_dbus_property(self, value=None):
1420
2038
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2039
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2041
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2043
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2044
@dbus_service_property(_interface,
1426
2046
access="readwrite")
1427
2047
def ApprovalDuration_dbus_property(self, value=None):
1428
2048
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2049
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2051
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2053
# Name - property
2055
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2056
@dbus_service_property(_interface, signature="s", access="read")
1435
2057
def Name_dbus_property(self):
1436
2058
return dbus.String(self.name)
2062
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2063
@dbus_service_property(_interface, signature="s", access="read")
2064
def KeyID_dbus_property(self):
2065
return dbus.String(self.key_id)
1438
2067
# Fingerprint - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2070
@dbus_service_property(_interface, signature="s", access="read")
1440
2071
def Fingerprint_dbus_property(self):
1441
2072
return dbus.String(self.fingerprint)
1443
2074
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2075
@dbus_service_property(_interface,
1445
2077
access="readwrite")
1446
2078
def Host_dbus_property(self, value=None):
1447
2079
if value is None: # get
1448
2080
return dbus.String(self.host)
1449
self.host = unicode(value)
2081
self.host = str(value)
1451
2083
# Created - property
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2086
@dbus_service_property(_interface, signature="s", access="read")
1453
2087
def Created_dbus_property(self):
1454
2088
return datetime_to_dbus(self.created)
1456
2090
# LastEnabled - property
1457
2091
@dbus_service_property(_interface, signature="s", access="read")
1458
2092
def LastEnabled_dbus_property(self):
1459
2093
return datetime_to_dbus(self.last_enabled)
1461
2095
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2096
@dbus_service_property(_interface,
1463
2098
access="readwrite")
1464
2099
def Enabled_dbus_property(self, value=None):
1465
2100
if value is None: # get
1472
2107
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2108
@dbus_service_property(_interface,
1474
2110
access="readwrite")
1475
2111
def LastCheckedOK_dbus_property(self, value=None):
1476
2112
if value is not None:
1477
2113
self.checked_ok()
1479
2115
return datetime_to_dbus(self.last_checked_ok)
1481
2117
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2118
@dbus_service_property(_interface, signature="n", access="read")
1484
2119
def LastCheckerStatus_dbus_property(self):
1485
2120
return dbus.Int16(self.last_checker_status)
1487
2122
# Expires - property
1488
2123
@dbus_service_property(_interface, signature="s", access="read")
1489
2124
def Expires_dbus_property(self):
1490
2125
return datetime_to_dbus(self.expires)
1492
2127
# LastApprovalRequest - property
1493
2128
@dbus_service_property(_interface, signature="s", access="read")
1494
2129
def LastApprovalRequest_dbus_property(self):
1495
2130
return datetime_to_dbus(self.last_approval_request)
1497
2132
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2133
@dbus_service_property(_interface,
1499
2135
access="readwrite")
1500
2136
def Timeout_dbus_property(self, value=None):
1501
2137
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2138
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2139
old_timeout = self.timeout
1503
2140
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2141
# Reschedule disabling
1505
2142
if self.enabled:
1506
2143
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
2144
self.expires += self.timeout - old_timeout
2145
if self.expires <= now:
1510
2146
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2149
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2152
GLib.source_remove(self.disable_initiator_tag)
2153
self.disable_initiator_tag = GLib.timeout_add(
2154
int((self.expires - now).total_seconds() * 1000),
1524
2157
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2158
@dbus_service_property(_interface,
1526
2160
access="readwrite")
1527
2161
def ExtendedTimeout_dbus_property(self, value=None):
1528
2162
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2163
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2165
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2167
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2168
@dbus_service_property(_interface,
1534
2170
access="readwrite")
1535
2171
def Interval_dbus_property(self, value=None):
1536
2172
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2173
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2174
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2175
if getattr(self, "checker_initiator_tag", None) is None:
1541
2177
if self.enabled:
1542
2178
# Reschedule checker run
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
2179
GLib.source_remove(self.checker_initiator_tag)
2180
self.checker_initiator_tag = GLib.timeout_add(
2181
value, self.start_checker)
2182
self.start_checker() # Start one now, too
1548
2184
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2185
@dbus_service_property(_interface,
1550
2187
access="readwrite")
1551
2188
def Checker_dbus_property(self, value=None):
1552
2189
if value is None: # get
1553
2190
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2191
self.checker_command = str(value)
1556
2193
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2194
@dbus_service_property(_interface,
1558
2196
access="readwrite")
1559
2197
def CheckerRunning_dbus_property(self, value=None):
1560
2198
if value is None: # get
1593
2239
if data[0] == 'data':
1595
2241
if data[0] == 'function':
1596
2243
def func(*args, **kwargs):
1597
2244
self._pipe.send(('funcall', name, args, kwargs))
1598
2245
return self._pipe.recv()[1]
1601
2249
def __setattr__(self, name, value):
1602
2250
if name == '_pipe':
1603
2251
return super(ProxyClient, self).__setattr__(name, value)
1604
2252
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2255
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2256
"""A class to handle client connections.
1614
2258
Instantiated once for each connection to handle it.
1615
2259
Note: This will run in its own forked process."""
1617
2261
def handle(self):
1618
2262
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2263
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2264
str(self.client_address))
1621
2265
logger.debug("Pipe FD: %d",
1622
2266
self.server.child_pipe.fileno())
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1627
.X509Credentials()))
1629
# Note: gnutls.connection.X509Credentials is really a
1630
# generic GnuTLS certificate credentials object so long as
1631
# no X.509 keys are added to it. Therefore, we can use it
1632
# here despite using OpenPGP certificates.
1634
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
# "+AES-256-CBC", "+SHA1",
1636
# "+COMP-NULL", "+CTYPE-OPENPGP",
2268
session = gnutls.ClientSession(self.request)
2270
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2271
# "+AES-256-CBC", "+SHA1",
2272
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2274
# Use a fallback default, since this MUST be set.
1639
2275
priority = self.server.gnutls_priority
1640
2276
if priority is None:
1641
2277
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2278
gnutls.priority_set_direct(session._c_object,
2279
priority.encode("utf-8"),
1646
2282
# Start communication using the Mandos protocol
1647
2283
# Get protocol number
1648
2284
line = self.request.makefile().readline()
1649
2285
logger.debug("Protocol version: %r", line)
1651
2287
if int(line.strip().split()[0]) > 1:
2288
raise RuntimeError(line)
1653
2289
except (ValueError, IndexError, RuntimeError) as error:
1654
2290
logger.error("Unknown protocol version: %s", error)
1657
2293
# Start GnuTLS connection
1659
2295
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2296
except gnutls.Error as error:
1661
2297
logger.warning("Handshake failed: %s", error)
1662
2298
# Do not run session.bye() here: the session is not
1663
2299
# established. Just abandon the request.
1665
2301
logger.debug("Handshake succeeded")
1667
2303
approval_required = False
1670
fpr = self.fingerprint(self.peer_certificate
1673
gnutls.errors.GNUTLSError) as error:
1674
logger.warning("Bad certificate: %s", error)
1676
logger.debug("Fingerprint: %s", fpr)
1679
client = ProxyClient(child_pipe, fpr,
2305
if gnutls.has_rawpk:
2308
key_id = self.key_id(
2309
self.peer_certificate(session))
2310
except (TypeError, gnutls.Error) as error:
2311
logger.warning("Bad certificate: %s", error)
2313
logger.debug("Key ID: %s", key_id)
2318
fpr = self.fingerprint(
2319
self.peer_certificate(session))
2320
except (TypeError, gnutls.Error) as error:
2321
logger.warning("Bad certificate: %s", error)
2323
logger.debug("Fingerprint: %s", fpr)
2326
client = ProxyClient(child_pipe, key_id, fpr,
1680
2327
self.client_address)
1681
2328
except KeyError:
1684
2331
if client.approval_delay:
1685
2332
delay = client.approval_delay
1686
2333
client.approvals_pending += 1
1687
2334
approval_required = True
1690
2337
if not client.enabled:
1691
2338
logger.info("Client %s is disabled",
1693
2340
if self.server.use_dbus:
1694
2341
# Emit D-Bus signal
1695
2342
client.Rejected("Disabled")
1698
2345
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2346
# We are approved or approval is disabled
1701
2348
elif client.approved is None:
1702
2349
logger.info("Client %s needs approval",
1737
2382
delay -= time2 - time
1740
while sent_size < len(client.secret):
1742
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed")
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
2385
session.send(client.secret)
2386
except gnutls.Error as error:
2387
logger.warning("gnutls send failed",
1751
2391
logger.info("Sending secret to %s", client.name)
1752
2392
# bump the timeout using extended_timeout
1753
2393
client.bump_timeout(client.extended_timeout)
1754
2394
if self.server.use_dbus:
1755
2395
# Emit D-Bus signal
1756
2396
client.GotSecret()
1759
2399
if approval_required:
1760
2400
client.approvals_pending -= 1
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2403
except gnutls.Error as error:
2404
logger.warning("GnuTLS bye failed",
1767
2408
def peer_certificate(session):
1768
"Return the peer's OpenPGP certificate as a bytestring"
1769
# If not an OpenPGP certificate...
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
# ...do the normal thing
1774
return session.peer_certificate
2409
"Return the peer's certificate as a bytestring"
2411
cert_type = gnutls.certificate_type_get2(session._c_object,
2413
except AttributeError:
2414
cert_type = gnutls.certificate_type_get(session._c_object)
2415
if gnutls.has_rawpk:
2416
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2418
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2419
# If not a valid certificate type...
2420
if cert_type not in valid_cert_types:
2421
logger.info("Cert type %r not in %r", cert_type,
2423
# ...return invalid data
1775
2425
list_size = ctypes.c_uint(1)
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2426
cert_list = (gnutls.certificate_get_peers
1778
2427
(session._c_object, ctypes.byref(list_size)))
1779
2428
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2429
raise gnutls.Error("error getting peer certificate")
1782
2430
if list_size.value == 0:
1784
2432
cert = cert_list[0]
1785
2433
return ctypes.string_at(cert.data, cert.size)
2436
def key_id(certificate):
2437
"Convert a certificate bytestring to a hexdigit key ID"
2438
# New GnuTLS "datum" with the public key
2439
datum = gnutls.datum_t(
2440
ctypes.cast(ctypes.c_char_p(certificate),
2441
ctypes.POINTER(ctypes.c_ubyte)),
2442
ctypes.c_uint(len(certificate)))
2443
# XXX all these need to be created in the gnutls "module"
2444
# New empty GnuTLS certificate
2445
pubkey = gnutls.pubkey_t()
2446
gnutls.pubkey_init(ctypes.byref(pubkey))
2447
# Import the raw public key into the certificate
2448
gnutls.pubkey_import(pubkey,
2449
ctypes.byref(datum),
2450
gnutls.X509_FMT_DER)
2451
# New buffer for the key ID
2452
buf = ctypes.create_string_buffer(32)
2453
buf_len = ctypes.c_size_t(len(buf))
2454
# Get the key ID from the raw public key into the buffer
2455
gnutls.pubkey_get_key_id(pubkey,
2456
gnutls.KEYID_USE_SHA256,
2457
ctypes.cast(ctypes.byref(buf),
2458
ctypes.POINTER(ctypes.c_ubyte)),
2459
ctypes.byref(buf_len))
2460
# Deinit the certificate
2461
gnutls.pubkey_deinit(pubkey)
2463
# Convert the buffer to a Python bytestring
2464
key_id = ctypes.string_at(buf, buf_len.value)
2465
# Convert the bytestring to hexadecimal notation
2466
hex_key_id = binascii.hexlify(key_id).upper()
1788
2470
def fingerprint(openpgp):
1789
2471
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
2472
# New GnuTLS "datum" with the OpenPGP public key
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1795
ctypes.c_uint(len(openpgp))))
2473
datum = gnutls.datum_t(
2474
ctypes.cast(ctypes.c_char_p(openpgp),
2475
ctypes.POINTER(ctypes.c_ubyte)),
2476
ctypes.c_uint(len(openpgp)))
1796
2477
# New empty GnuTLS certificate
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2478
crt = gnutls.openpgp_crt_t()
2479
gnutls.openpgp_crt_init(ctypes.byref(crt))
1800
2480
# Import the OpenPGP public key into the certificate
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
2481
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2482
gnutls.OPENPGP_FMT_RAW)
1805
2483
# Verify the self signature in the key
1806
2484
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2485
gnutls.openpgp_crt_verify_self(crt, 0,
2486
ctypes.byref(crtverify))
1810
2487
if crtverify.value != 0:
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2488
gnutls.openpgp_crt_deinit(crt)
2489
raise gnutls.CertificateSecurityError(code
1814
2491
# New buffer for the fingerprint
1815
2492
buf = ctypes.create_string_buffer(20)
1816
2493
buf_len = ctypes.c_size_t()
1817
2494
# Get the fingerprint from the certificate into the buffer
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
2495
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2496
ctypes.byref(buf_len))
1821
2497
# Deinit the certificate
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2498
gnutls.openpgp_crt_deinit(crt)
1823
2499
# Convert the buffer to a Python bytestring
1824
2500
fpr = ctypes.string_at(buf, buf_len.value)
1825
2501
# Convert the bytestring to hexadecimal notation
1830
class MultiprocessingMixIn(object):
2506
class MultiprocessingMixIn:
1831
2507
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
2509
def sub_process_main(self, request, address):
1834
2511
self.finish_request(request, address)
1835
2512
except Exception:
1836
2513
self.handle_error(request, address)
1837
2514
self.close_request(request)
1839
2516
def process_request(self, request, address):
1840
2517
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2518
proc = multiprocessing.Process(target=self.sub_process_main,
2519
args=(request, address))
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2524
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1849
2525
""" adds a pipe to the MixIn """
1850
2527
def process_request(self, request, client_address):
1851
2528
"""Overrides and wraps the original process_request().
1853
2530
This function creates a new pipe in self.pipe
1855
2532
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1857
2534
proc = MultiprocessingMixIn.process_request(self, request,
1858
2535
client_address)
1859
2536
self.child_pipe.close()
1860
2537
self.add_pipe(parent_pipe, proc)
1862
2539
def add_pipe(self, parent_pipe, proc):
1863
2540
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
2541
raise NotImplementedError()
1867
2544
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
socketserver.TCPServer, object):
2545
socketserver.TCPServer):
1869
2546
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1872
2549
enabled: Boolean; whether this server is activated yet
1873
2550
interface: None or a network interface name (string)
1874
2551
use_ipv6: Boolean; to use IPv6 or not
1876
2554
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
2558
"""If socketfd is set, use that file descriptor instead of
2559
creating a new one with socket.socket().
1878
2561
self.interface = interface
1880
2563
self.address_family = socket.AF_INET6
2564
if socketfd is not None:
2565
# Save the file descriptor
2566
self.socketfd = socketfd
2567
# Save the original socket.socket() function
2568
self.socket_socket = socket.socket
2570
# To implement --socket, we monkey patch socket.socket.
2572
# (When socketserver.TCPServer is a new-style class, we
2573
# could make self.socket into a property instead of monkey
2574
# patching socket.socket.)
2576
# Create a one-time-only replacement for socket.socket()
2577
@functools.wraps(socket.socket)
2578
def socket_wrapper(*args, **kwargs):
2579
# Restore original function so subsequent calls are
2581
socket.socket = self.socket_socket
2582
del self.socket_socket
2583
# This time only, return a new socket object from the
2584
# saved file descriptor.
2585
return socket.fromfd(self.socketfd, *args, **kwargs)
2586
# Replace socket.socket() function with wrapper
2587
socket.socket = socket_wrapper
2588
# The socketserver.TCPServer.__init__ will call
2589
# socket.socket(), which might be our replacement,
2590
# socket_wrapper(), if socketfd was set.
1881
2591
socketserver.TCPServer.__init__(self, server_address,
1882
2592
RequestHandlerClass)
1883
2594
def server_bind(self):
1884
2595
"""This overrides the normal server_bind() function
1885
2596
to bind to an interface if one was specified, and also NOT to
1886
2597
bind to an address or port if they were not specified."""
2598
global SO_BINDTODEVICE
1887
2599
if self.interface is not None:
1888
2600
if SO_BINDTODEVICE is None:
1889
logger.error("SO_BINDTODEVICE does not exist;"
1890
" cannot bind to interface %s",
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1898
except socket.error as error:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1903
elif error[0] == errno.ENOPROTOOPT:
1904
logger.error("SO_BINDTODEVICE not available;"
1905
" cannot bind to interface %s",
2601
# Fall back to a hard-coded value which seems to be
2603
logger.warning("SO_BINDTODEVICE not found, trying 25")
2604
SO_BINDTODEVICE = 25
2606
self.socket.setsockopt(
2607
socket.SOL_SOCKET, SO_BINDTODEVICE,
2608
(self.interface + "\0").encode("utf-8"))
2609
except socket.error as error:
2610
if error.errno == errno.EPERM:
2611
logger.error("No permission to bind to"
2612
" interface %s", self.interface)
2613
elif error.errno == errno.ENOPROTOOPT:
2614
logger.error("SO_BINDTODEVICE not available;"
2615
" cannot bind to interface %s",
2617
elif error.errno == errno.ENODEV:
2618
logger.error("Interface %s does not exist,"
2619
" cannot bind", self.interface)
1909
2622
# Only bind(2) the socket if we really need to.
1910
2623
if self.server_address[0] or self.server_address[1]:
2624
if self.server_address[1]:
2625
self.allow_reuse_address = True
1911
2626
if not self.server_address[0]:
1912
2627
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
2628
any_address = "::" # in6addr_any
1915
any_address = socket.INADDR_ANY
2630
any_address = "0.0.0.0" # INADDR_ANY
1916
2631
self.server_address = (any_address,
1917
2632
self.server_address[1])
1918
2633
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
2634
self.server_address = (self.server_address[0], 0)
1921
2635
# if self.interface:
1922
2636
# self.server_address = (self.server_address[0],
1948
2667
self.gnutls_priority = gnutls_priority
1949
2668
IPv6_TCPServer.__init__(self, server_address,
1950
2669
RequestHandlerClass,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2670
interface=interface,
1953
2674
def server_activate(self):
1954
2675
if self.enabled:
1955
2676
return socketserver.TCPServer.server_activate(self)
1957
2678
def enable(self):
1958
2679
self.enabled = True
1960
2681
def add_pipe(self, parent_pipe, proc):
1961
2682
# Call "handle_ipc" for both data and EOF events
1962
gobject.io_add_watch(parent_pipe.fileno(),
1963
gobject.IO_IN | gobject.IO_HUP,
1964
functools.partial(self.handle_ipc,
1969
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1981
conditions_string = ' | '.join(name
1983
condition_names.iteritems()
1984
if cond & condition)
2684
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2685
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2686
functools.partial(self.handle_ipc,
2687
parent_pipe=parent_pipe,
2690
def handle_ipc(self, source, condition,
2693
client_object=None):
1985
2694
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2695
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1987
2696
# Wait for other process to exit
1991
2700
# Read a request from the child
1992
2701
request = parent_pipe.recv()
1993
2702
command = request[0]
1995
2704
if command == 'init':
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2705
key_id = request[1].decode("ascii")
2706
fpr = request[2].decode("ascii")
2707
address = request[3]
2709
for c in self.clients.values():
2710
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2712
if key_id and c.key_id == key_id:
2715
if fpr and c.fingerprint == fpr:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2719
logger.info("Client not found for key ID: %s, address"
2720
": %s", key_id or fpr, address)
2006
2721
if self.use_dbus:
2007
2722
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2723
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
2725
parent_pipe.send(False)
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2729
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2730
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2731
functools.partial(self.handle_ipc,
2732
parent_pipe=parent_pipe,
2734
client_object=client))
2021
2735
parent_pipe.send(True)
2022
2736
# remove the old hook in favor of the new above hook on
2026
2740
funcname = request[1]
2027
2741
args = request[2]
2028
2742
kwargs = request[3]
2030
2744
parent_pipe.send(('data', getattr(client_object,
2031
2745
funcname)(*args,
2034
2748
if command == 'getattr':
2035
2749
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2750
if isinstance(client_object.__getattribute__(attrname),
2751
collections.Callable):
2752
parent_pipe.send(('function', ))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2755
'data', client_object.__getattribute__(attrname)))
2042
2757
if command == 'setattr':
2043
2758
attrname = request[1]
2044
2759
value = request[2]
2045
2760
setattr(client_object, attrname, value)
2765
def rfc3339_duration_to_delta(duration):
2766
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2768
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2772
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2774
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2776
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2778
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2780
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2784
# Parsing an RFC 3339 duration with regular expressions is not
2785
# possible - there would have to be multiple places for the same
2786
# values, like seconds. The current code, while more esoteric, is
2787
# cleaner without depending on a parsing library. If Python had a
2788
# built-in library for parsing we would use it, but we'd like to
2789
# avoid excessive use of external libraries.
2791
# New type for defining tokens, syntax, and semantics all-in-one
2792
Token = collections.namedtuple("Token", (
2793
"regexp", # To match token; if "value" is not None, must have
2794
# a "group" containing digits
2795
"value", # datetime.timedelta or None
2796
"followers")) # Tokens valid after this token
2797
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2798
# the "duration" ABNF definition in RFC 3339, Appendix A.
2799
token_end = Token(re.compile(r"$"), None, frozenset())
2800
token_second = Token(re.compile(r"(\d+)S"),
2801
datetime.timedelta(seconds=1),
2802
frozenset((token_end, )))
2803
token_minute = Token(re.compile(r"(\d+)M"),
2804
datetime.timedelta(minutes=1),
2805
frozenset((token_second, token_end)))
2806
token_hour = Token(re.compile(r"(\d+)H"),
2807
datetime.timedelta(hours=1),
2808
frozenset((token_minute, token_end)))
2809
token_time = Token(re.compile(r"T"),
2811
frozenset((token_hour, token_minute,
2813
token_day = Token(re.compile(r"(\d+)D"),
2814
datetime.timedelta(days=1),
2815
frozenset((token_time, token_end)))
2816
token_month = Token(re.compile(r"(\d+)M"),
2817
datetime.timedelta(weeks=4),
2818
frozenset((token_day, token_end)))
2819
token_year = Token(re.compile(r"(\d+)Y"),
2820
datetime.timedelta(weeks=52),
2821
frozenset((token_month, token_end)))
2822
token_week = Token(re.compile(r"(\d+)W"),
2823
datetime.timedelta(weeks=1),
2824
frozenset((token_end, )))
2825
token_duration = Token(re.compile(r"P"), None,
2826
frozenset((token_year, token_month,
2827
token_day, token_time,
2829
# Define starting values:
2831
value = datetime.timedelta()
2833
# Following valid tokens
2834
followers = frozenset((token_duration, ))
2835
# String left to parse
2837
# Loop until end token is found
2838
while found_token is not token_end:
2839
# Search for any currently valid tokens
2840
for token in followers:
2841
match = token.regexp.match(s)
2842
if match is not None:
2844
if token.value is not None:
2845
# Value found, parse digits
2846
factor = int(match.group(1), 10)
2847
# Add to value so far
2848
value += factor * token.value
2849
# Strip token from string
2850
s = token.regexp.sub("", s, 1)
2853
# Set valid next tokens
2854
followers = found_token.followers
2857
# No currently valid tokens were found
2858
raise ValueError("Invalid RFC 3339 duration: {!r}"
2050
2864
def string_to_delta(interval):
2051
2865
"""Parse a string and return a datetime.timedelta
2053
>>> string_to_delta('7d')
2054
datetime.timedelta(7)
2055
>>> string_to_delta('60s')
2056
datetime.timedelta(0, 60)
2057
>>> string_to_delta('60m')
2058
datetime.timedelta(0, 3600)
2059
>>> string_to_delta('24h')
2060
datetime.timedelta(1)
2061
>>> string_to_delta('1w')
2062
datetime.timedelta(7)
2063
>>> string_to_delta('5m 30s')
2064
datetime.timedelta(0, 330)
2867
>>> string_to_delta('7d') == datetime.timedelta(7)
2869
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2871
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2873
>>> string_to_delta('24h') == datetime.timedelta(1)
2875
>>> string_to_delta('1w') == datetime.timedelta(7)
2877
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2882
return rfc3339_duration_to_delta(interval)
2066
2886
timevalue = datetime.timedelta(0)
2067
2887
for s in interval.split():
2069
suffix = unicode(s[-1])
2070
2890
value = int(s[:-1])
2071
2891
if suffix == "d":
2072
2892
delta = datetime.timedelta(value)
2145
2964
parser.add_argument("--no-dbus", action="store_false",
2146
2965
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2966
" system bus interface", default=None)
2148
2967
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2968
dest="use_ipv6", help="Do not use IPv6",
2150
2970
parser.add_argument("--no-restore", action="store_false",
2151
2971
dest="restore", help="Do not restore stored"
2972
" state", default=None)
2973
parser.add_argument("--socket", type=int,
2974
help="Specify a file descriptor to a network"
2975
" socket to use instead of creating one")
2153
2976
parser.add_argument("--statedir", metavar="DIR",
2154
2977
help="Directory to save/restore state in")
2978
parser.add_argument("--foreground", action="store_true",
2979
help="Run in foreground", default=None)
2980
parser.add_argument("--no-zeroconf", action="store_false",
2981
dest="zeroconf", help="Do not use Zeroconf",
2156
2984
options = parser.parse_args()
2163
2986
# Default values for config file for server-global settings
2164
server_defaults = { "interface": "",
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2170
"servicename": "Mandos",
2175
"statedir": "/var/lib/mandos"
2987
if gnutls.has_rawpk:
2988
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2989
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2991
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2992
":+SIGN-DSA-SHA256")
2993
server_defaults = {"interface": "",
2997
"priority": priority,
2998
"servicename": "Mandos",
3004
"statedir": "/var/lib/mandos",
3005
"foreground": "False",
2178
3010
# Parse config file for server-global settings
2179
server_config = configparser.SafeConfigParser(server_defaults)
3011
server_config = configparser.ConfigParser(server_defaults)
2180
3012
del server_defaults
2181
server_config.read(os.path.join(options.configdir,
2183
# Convert the SafeConfigParser object to a dict
3013
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3014
# Convert the ConfigParser object to a dict
2184
3015
server_settings = server_config.defaults()
2185
3016
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
3017
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3018
"foreground", "zeroconf"):
2187
3019
server_settings[option] = server_config.getboolean("DEFAULT",
2189
3021
if server_settings["port"]:
2190
3022
server_settings["port"] = server_config.getint("DEFAULT",
3024
if server_settings["socket"]:
3025
server_settings["socket"] = server_config.getint("DEFAULT",
3027
# Later, stdin will, and stdout and stderr might, be dup'ed
3028
# over with an opened os.devnull. But we don't want this to
3029
# happen with a supplied network socket.
3030
if 0 <= server_settings["socket"] <= 2:
3031
server_settings["socket"] = os.dup(server_settings
2192
3033
del server_config
2194
3035
# Override the settings from the config file with command line
2195
3036
# options, if set.
2196
3037
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
3038
"priority", "servicename", "configdir", "use_dbus",
3039
"use_ipv6", "debuglevel", "restore", "statedir",
3040
"socket", "foreground", "zeroconf"):
2200
3041
value = getattr(options, option)
2201
3042
if value is not None:
2202
3043
server_settings[option] = value
2204
3045
# Force all strings to be unicode
2205
3046
for option in server_settings.keys():
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
3047
if isinstance(server_settings[option], bytes):
3048
server_settings[option] = (server_settings[option]
3050
# Force all boolean options to be boolean
3051
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3052
"foreground", "zeroconf"):
3053
server_settings[option] = bool(server_settings[option])
3054
# Debug implies foreground
3055
if server_settings["debug"]:
3056
server_settings["foreground"] = True
2208
3057
# Now we have our good server settings in "server_settings"
2210
3059
##################################################################
3061
if (not server_settings["zeroconf"]
3062
and not (server_settings["port"]
3063
or server_settings["socket"] != "")):
3064
parser.error("Needs port or socket to work without Zeroconf")
2212
3066
# For convenience
2213
3067
debug = server_settings["debug"]
2214
3068
debuglevel = server_settings["debuglevel"]
3137
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2274
3139
except OSError as error:
2275
if error[0] != errno.EPERM:
3140
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3141
.format(uid, gid, os.strerror(error.errno)))
3142
if error.errno != errno.EPERM:
2279
3146
# Enable all possible GnuTLS debugging
2281
3148
# "Use a log level over 10 to enable all debugging options."
2282
3149
# - GnuTLS manual
2283
gnutls.library.functions.gnutls_global_set_log_level(11)
2285
@gnutls.library.types.gnutls_log_func
3150
gnutls.global_set_log_level(11)
2286
3153
def debug_gnutls(level, string):
2287
3154
logger.debug("GnuTLS: %s", string[:-1])
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
3156
gnutls.global_set_log_function(debug_gnutls)
2292
3158
# Redirect stdin so all checkers get /dev/null
2293
3159
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2294
3160
os.dup2(null, sys.stdin.fileno())
2298
3164
# Need to fork before connecting to D-Bus
2300
3166
# Close all input and output, do double fork, etc.
2303
gobject.threads_init()
3169
if gi.version_info < (3, 10, 2):
3170
# multiprocessing will use threads, so before we use GLib we
3171
# need to inform GLib that threads will be used.
2305
3174
global main_loop
2306
3175
# From the Avahi example code
2307
3176
DBusGMainLoop(set_as_default=True)
2308
main_loop = gobject.MainLoop()
3177
main_loop = GLib.MainLoop()
2309
3178
bus = dbus.SystemBus()
2310
3179
# End of Avahi example code
2313
3182
bus_name = dbus.service.BusName("se.recompile.Mandos",
2314
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
3185
old_bus_name = dbus.service.BusName(
3186
"se.bsnet.fukt.Mandos", bus,
3188
except dbus.exceptions.DBusException as e:
3189
logger.error("Disabling D-Bus:", exc_info=e)
2320
3190
use_dbus = False
2321
3191
server_settings["use_dbus"] = False
2322
3192
tcp_server.use_dbus = False
2323
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
2328
if server_settings["interface"]:
2329
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
3194
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3195
service = AvahiServiceToSyslog(
3196
name=server_settings["servicename"],
3197
servicetype="_mandos._tcp",
3200
if server_settings["interface"]:
3201
service.interface = if_nametoindex(
3202
server_settings["interface"].encode("utf-8"))
2332
3204
global multiprocessing_manager
2333
3205
multiprocessing_manager = multiprocessing.Manager()
2335
3207
client_class = Client
2337
client_class = functools.partial(ClientDBusTransitional,
3209
client_class = functools.partial(ClientDBus, bus=bus)
2340
3211
client_settings = Client.config_parser(client_config)
2341
3212
old_client_settings = {}
2342
3213
clients_data = {}
3215
# This is used to redirect stdout and stderr for checker processes
3217
wnull = open(os.devnull, "w") # A writable /dev/null
3218
# Only used if server is running in foreground but not in debug
3220
if debug or not foreground:
2344
3223
# Get client data and settings from last running state.
2345
3224
if server_settings["restore"]:
2347
3226
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
3227
if sys.version_info.major == 2:
3228
clients_data, old_client_settings = pickle.load(
3231
bytes_clients_data, bytes_old_client_settings = (
3232
pickle.load(stored_state, encoding="bytes"))
3233
# Fix bytes to strings
3236
clients_data = {(key.decode("utf-8")
3237
if isinstance(key, bytes)
3240
bytes_clients_data.items()}
3241
del bytes_clients_data
3242
for key in clients_data:
3243
value = {(k.decode("utf-8")
3244
if isinstance(k, bytes) else k): v
3246
clients_data[key].items()}
3247
clients_data[key] = value
3249
value["client_structure"] = [
3251
if isinstance(s, bytes)
3253
value["client_structure"]]
3255
for k in ("name", "host"):
3256
if isinstance(value[k], bytes):
3257
value[k] = value[k].decode("utf-8")
3258
if "key_id" not in value:
3259
value["key_id"] = ""
3260
elif "fingerprint" not in value:
3261
value["fingerprint"] = ""
3262
# old_client_settings
3264
old_client_settings = {
3265
(key.decode("utf-8")
3266
if isinstance(key, bytes)
3269
bytes_old_client_settings.items()}
3270
del bytes_old_client_settings
3272
for value in old_client_settings.values():
3273
if isinstance(value["host"], bytes):
3274
value["host"] = (value["host"]
2350
3276
os.remove(stored_state_path)
2351
3277
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
3278
if e.errno == errno.ENOENT:
3279
logger.warning("Could not load persistent state:"
3280
" {}".format(os.strerror(e.errno)))
3282
logger.critical("Could not load persistent state:",
2356
3285
except EOFError as e:
2357
3286
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2360
3290
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
3291
for client_name, client in clients_data.items():
3292
# Skip removed clients
3293
if client_name not in client_settings:
2362
3296
# Decide which value to use after restoring saved state.
2363
3297
# We have three different values: Old config file,
2364
3298
# new config file, and saved state.
2425
3358
clients_data[client_name] = client_settings[client_name]
2427
3360
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
3361
for client_name, client in clients_data.items():
2429
3362
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
3365
server_settings=server_settings)
2432
3367
if not tcp_server.clients:
2433
3368
logger.warning("No clients defined")
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
2442
logger.error("Could not write to file %r with PID %d",
2445
# "pidfile" was never created
3371
if pidfile is not None:
3375
print(pid, file=pidfile)
3377
logger.error("Could not write to file %r with PID %d",
2447
3380
del pidfilename
2448
signal.signal(signal.SIGINT, signal.SIG_IGN)
2450
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3382
for termsig in (signal.SIGHUP, signal.SIGTERM):
3383
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3384
lambda: main_loop.quit() and False)
2454
class MandosDBusService(DBusObjectWithProperties):
3388
@alternate_dbus_interfaces(
3389
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3390
class MandosDBusService(DBusObjectWithObjectManager):
2455
3391
"""A D-Bus proxy object"""
2456
3393
def __init__(self):
2457
3394
dbus.service.Object.__init__(self, bus, "/")
2458
3396
_interface = "se.recompile.Mandos"
2460
@dbus_interface_annotations(_interface)
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2466
3398
@dbus.service.signal(_interface, signature="o")
2467
3399
def ClientAdded(self, objpath):
2471
3403
@dbus.service.signal(_interface, signature="ss")
2472
def ClientNotFound(self, fingerprint, address):
3404
def ClientNotFound(self, key_id, address):
3408
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2476
3410
@dbus.service.signal(_interface, signature="os")
2477
3411
def ClientRemoved(self, objpath, name):
3415
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2481
3417
@dbus.service.method(_interface, out_signature="ao")
2482
3418
def GetAllClients(self):
2484
return dbus.Array(c.dbus_object_path
2486
tcp_server.clients.itervalues())
3420
return dbus.Array(c.dbus_object_path for c in
3421
tcp_server.clients.values())
3423
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2488
3425
@dbus.service.method(_interface,
2489
3426
out_signature="a{oa{sv}}")
2490
3427
def GetAllClientsWithProperties(self):
2492
3429
return dbus.Dictionary(
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
3430
{c.dbus_object_path: c.GetAll(
3431
"se.recompile.Mandos.Client")
3432
for c in tcp_server.clients.values()},
2495
3433
signature="oa{sv}")
2497
3435
@dbus.service.method(_interface, in_signature="o")
2498
3436
def RemoveClient(self, object_path):
2500
for c in tcp_server.clients.itervalues():
3438
for c in tcp_server.clients.values():
2501
3439
if c.dbus_object_path == object_path:
2502
3440
del tcp_server.clients[c.name]
2503
3441
c.remove_from_connection()
2504
# Don't signal anything except ClientRemoved
3442
# Don't signal the disabling
2505
3443
c.disable(quiet=True)
2507
self.ClientRemoved(object_path, c.name)
3444
# Emit D-Bus signal for removal
3445
self.client_removed_signal(c)
2509
3447
raise KeyError(object_path)
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
3451
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3452
out_signature="a{oa{sa{sv}}}")
3453
def GetManagedObjects(self):
3455
return dbus.Dictionary(
3456
{client.dbus_object_path:
3458
{interface: client.GetAll(interface)
3460
client._get_all_interface_names()})
3461
for client in tcp_server.clients.values()})
3463
def client_added_signal(self, client):
3464
"""Send the new standard signal and the old signal"""
3466
# New standard signal
3467
self.InterfacesAdded(
3468
client.dbus_object_path,
3470
{interface: client.GetAll(interface)
3472
client._get_all_interface_names()}))
3474
self.ClientAdded(client.dbus_object_path)
3476
def client_removed_signal(self, client):
3477
"""Send the new standard signal and the old signal"""
3479
# New standard signal
3480
self.InterfacesRemoved(
3481
client.dbus_object_path,
3482
client._get_all_interface_names())
3484
self.ClientRemoved(client.dbus_object_path,
3487
mandos_dbus_service = MandosDBusService()
3489
# Save modules to variables to exempt the modules from being
3490
# unloaded before the function registered with atexit() is run.
3491
mp = multiprocessing
2518
3495
"Cleanup function; run on exit"
2521
multiprocessing.active_children()
3499
mp.active_children()
2522
3501
if not (tcp_server.clients or client_settings):
2525
3504
# Store client before exiting. Secrets are encrypted with key
2526
3505
# based on what config file has. If config file is
2527
3506
# removed/edited, old secret will thus be unrecovable.
2529
3508
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
3509
for client in tcp_server.clients.values():
2531
3510
key = client_settings[client.name]["secret"]
2532
3511
client.encrypted_secret = pgp.encrypt(client.secret,
2534
3513
client_dict = {}
2536
3515
# A list of attributes that can not be pickled
2538
exclude = set(("bus", "changedstate", "secret",
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
3517
exclude = {"bus", "changedstate", "secret",
3518
"checker", "server_settings"}
3519
for name, typ in inspect.getmembers(dbus.service
2542
3521
exclude.add(name)
2544
3523
client_dict["encrypted_secret"] = (client
2545
3524
.encrypted_secret)
2546
3525
for attr in client.client_structure:
2547
3526
if attr not in exclude:
2548
3527
client_dict[attr] = getattr(client, attr)
2550
3529
clients[client.name] = client_dict
2551
3530
del client_settings[client.name]["secret"]
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2559
pickle.dump((clients, client_settings), stored_state)
3533
with tempfile.NamedTemporaryFile(
3537
dir=os.path.dirname(stored_state_path),
3538
delete=False) as stored_state:
3539
pickle.dump((clients, client_settings), stored_state,
3541
tempname = stored_state.name
2560
3542
os.rename(tempname, stored_state_path)
2561
3543
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2566
3546
os.remove(tempname)
2567
3547
except NameError:
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
3549
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3550
logger.warning("Could not save persistent state: {}"
3551
.format(os.strerror(e.errno)))
3553
logger.warning("Could not save persistent state:",
2573
3557
# Delete all clients, and settings from config
2574
3558
while tcp_server.clients:
2575
3559
name, client = tcp_server.clients.popitem()
2577
3561
client.remove_from_connection()
2578
# Don't signal anything except ClientRemoved
3562
# Don't signal the disabling
2579
3563
client.disable(quiet=True)
3564
# Emit D-Bus signal for removal
2582
mandos_dbus_service.ClientRemoved(client
3566
mandos_dbus_service.client_removed_signal(client)
2585
3567
client_settings.clear()
2587
3569
atexit.register(cleanup)
2589
for client in tcp_server.clients.itervalues():
3571
for client in tcp_server.clients.values():
2592
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3573
# Emit D-Bus signal for adding
3574
mandos_dbus_service.client_added_signal(client)
2593
3575
# Need to initiate checking of clients
2594
3576
if client.enabled:
2595
3577
client.init_checker()
2597
3579
tcp_server.enable()
2598
3580
tcp_server.server_activate()
2600
3582
# Find out what port we got
2601
service.port = tcp_server.socket.getsockname()[1]
3584
service.port = tcp_server.socket.getsockname()[1]
2603
3586
logger.info("Now listening on address %r, port %d,"
2604
3587
" flowinfo %d, scope_id %d",