63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
71
84
import dbus.service
86
from gi.repository import GLib
74
87
from dbus.mainloop.glib import DBusGMainLoop
77
90
import xml.dom.minidom
93
if sys.version_info.major == 2:
97
# Add collections.abc.Callable if it does not exist
99
collections.abc.Callable
100
except AttributeError:
102
Callable = collections.Callable
103
collections.abc = abc
106
# Show warnings by default
107
if not sys.warnoptions:
109
warnings.simplefilter("default")
111
# Try to find the value of SO_BINDTODEVICE:
113
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
114
# newer, and it is also the most natural place for it:
82
115
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
83
116
except AttributeError:
118
# This is where SO_BINDTODEVICE was up to and including Python
85
120
from IN import SO_BINDTODEVICE
86
121
except ImportError:
87
SO_BINDTODEVICE = None
122
# In Python 2.7 it seems to have been removed entirely.
123
# Try running the C preprocessor:
125
cc = subprocess.Popen(["cc", "--language=c", "-E",
127
stdin=subprocess.PIPE,
128
stdout=subprocess.PIPE)
129
stdout = cc.communicate(
130
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
131
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
132
except (OSError, ValueError, IndexError):
134
SO_BINDTODEVICE = None
136
if sys.version_info < (3, 2):
137
configparser.Configparser = configparser.SafeConfigParser
90
140
stored_state_file = "clients.pickle"
92
142
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
143
logging.captureWarnings(True) # Show warnings via the logging system
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
147
if_nametoindex = ctypes.cdll.LoadLibrary(
148
ctypes.util.find_library("c")).if_nametoindex
101
149
except (OSError, AttributeError):
102
151
def if_nametoindex(interface):
103
152
"Get an interface index the hard way, i.e. using fcntl()"
104
153
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
154
with contextlib.closing(socket.socket()) as s:
106
155
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
156
struct.pack(b"16s16x", interface))
157
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
158
return interface_index
161
def copy_function(func):
162
"""Make a copy of a function"""
163
if sys.version_info.major == 2:
164
return types.FunctionType(func.func_code,
170
return types.FunctionType(func.__code__,
114
177
def initlogger(debug, level=logging.WARNING):
115
178
"""init logger and add loglevel"""
181
syslogger = (logging.handlers.SysLogHandler(
182
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
184
syslogger.setFormatter(logging.Formatter
118
185
('Mandos [%(process)d]: %(levelname)s:'
120
187
logger.addHandler(syslogger)
123
190
console = logging.StreamHandler()
124
191
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
248
os.rmdir(self.tempdir)
170
249
self.tempdir = None
172
251
def password_encode(self, password):
173
252
# Passphrase can not be empty and can not contain newlines or
174
253
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
254
encoded = b"mandos" + binascii.hexlify(password)
255
if len(encoded) > 2048:
256
# GnuPG can't handle long passwords, so encode differently
257
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
258
.replace(b"\n", b"\\n")
259
.replace(b"\0", b"\\x00"))
177
262
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
263
passphrase = self.password_encode(password)
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
266
passfile.write(passphrase)
268
proc = subprocess.Popen([self.gpg, '--symmetric',
272
stdin=subprocess.PIPE,
273
stdout=subprocess.PIPE,
274
stderr=subprocess.PIPE)
275
ciphertext, err = proc.communicate(input=data)
276
if proc.returncode != 0:
192
278
return ciphertext
194
280
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
281
passphrase = self.password_encode(password)
282
with tempfile.NamedTemporaryFile(
283
dir=self.tempdir) as passfile:
284
passfile.write(passphrase)
286
proc = subprocess.Popen([self.gpg, '--decrypt',
290
stdin=subprocess.PIPE,
291
stdout=subprocess.PIPE,
292
stderr=subprocess.PIPE)
293
decrypted_plaintext, err = proc.communicate(input=data)
294
if proc.returncode != 0:
209
296
return decrypted_plaintext
299
# Pretend that we have an Avahi module
301
"""This isn't so much a class as it is a module-like namespace."""
302
IF_UNSPEC = -1 # avahi-common/address.h
303
PROTO_UNSPEC = -1 # avahi-common/address.h
304
PROTO_INET = 0 # avahi-common/address.h
305
PROTO_INET6 = 1 # avahi-common/address.h
306
DBUS_NAME = "org.freedesktop.Avahi"
307
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
308
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
309
DBUS_PATH_SERVER = "/"
312
def string_array_to_txt_array(t):
313
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
314
for s in t), signature="ay")
315
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
316
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
317
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
318
SERVER_INVALID = 0 # avahi-common/defs.h
319
SERVER_REGISTERING = 1 # avahi-common/defs.h
320
SERVER_RUNNING = 2 # avahi-common/defs.h
321
SERVER_COLLISION = 3 # avahi-common/defs.h
322
SERVER_FAILURE = 4 # avahi-common/defs.h
213
325
class AvahiError(Exception):
214
326
def __init__(self, value, *args, **kwargs):
215
327
self.value = value
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
328
return super(AvahiError, self).__init__(value, *args,
220
332
class AvahiServiceError(AvahiError):
223
336
class AvahiGroupError(AvahiError):
227
class AvahiService(object):
228
341
"""An Avahi (Zeroconf) service.
231
344
interface: integer; avahi.IF_UNSPEC or an interface index.
232
345
Used to optionally bind to the specified interface.
233
346
name: string; Example: 'Mandos'
234
347
type: string; Example: '_mandos._tcp'.
235
See <http://www.dns-sd.org/ServiceTypes.html>
348
See <https://www.iana.org/assignments/service-names-port-numbers>
236
349
port: integer; what port to announce
237
350
TXT: list of strings; TXT record for the service
238
351
domain: string; Domain to publish on, default to .local if empty.
367
510
follow_name_owner_changes=True),
368
511
avahi.DBUS_INTERFACE_SERVER)
369
512
self.server.connect_to_signal("StateChanged",
370
self.server_state_changed)
513
self.server_state_changed)
371
514
self.server_state_changed(self.server.GetState())
373
517
class AvahiServiceToSyslog(AvahiService):
518
def rename(self, *args, **kwargs):
375
519
"""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'
520
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
521
syslogger.setFormatter(logging.Formatter(
522
'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):
527
# Pretend that we have a GnuTLS module
529
"""This isn't so much a class as it is a module-like namespace."""
531
library = ctypes.util.find_library("gnutls")
533
library = ctypes.util.find_library("gnutls-deb0")
534
_library = ctypes.cdll.LoadLibrary(library)
537
# Unless otherwise indicated, the constants and types below are
538
# all from the gnutls/gnutls.h C header file.
549
E_NO_CERTIFICATE_FOUND = -49
554
KEYID_USE_SHA256 = 1 # gnutls/x509.h
555
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
558
class session_int(ctypes.Structure):
560
session_t = ctypes.POINTER(session_int)
562
class certificate_credentials_st(ctypes.Structure):
564
certificate_credentials_t = ctypes.POINTER(
565
certificate_credentials_st)
566
certificate_type_t = ctypes.c_int
568
class datum_t(ctypes.Structure):
569
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
570
('size', ctypes.c_uint)]
572
class openpgp_crt_int(ctypes.Structure):
574
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
575
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
576
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
577
credentials_type_t = ctypes.c_int
578
transport_ptr_t = ctypes.c_void_p
579
close_request_t = ctypes.c_int
582
class Error(Exception):
583
def __init__(self, message=None, code=None, args=()):
584
# Default usage is by a message string, but if a return
585
# code is passed, convert it to a string with
588
if message is None and code is not None:
589
message = gnutls.strerror(code)
590
return super(gnutls.Error, self).__init__(
593
class CertificateSecurityError(Error):
599
self._c_object = gnutls.certificate_credentials_t()
600
gnutls.certificate_allocate_credentials(
601
ctypes.byref(self._c_object))
602
self.type = gnutls.CRD_CERTIFICATE
605
gnutls.certificate_free_credentials(self._c_object)
608
def __init__(self, socket, credentials=None):
609
self._c_object = gnutls.session_t()
610
gnutls_flags = gnutls.CLIENT
611
if gnutls.check_version(b"3.5.6"):
612
gnutls_flags |= gnutls.NO_TICKETS
614
gnutls_flags |= gnutls.ENABLE_RAWPK
615
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
617
gnutls.set_default_priority(self._c_object)
618
gnutls.transport_set_ptr(self._c_object, socket.fileno())
619
gnutls.handshake_set_private_extensions(self._c_object,
622
if credentials is None:
623
credentials = gnutls.Credentials()
624
gnutls.credentials_set(self._c_object, credentials.type,
625
ctypes.cast(credentials._c_object,
627
self.credentials = credentials
630
gnutls.deinit(self._c_object)
633
return gnutls.handshake(self._c_object)
635
def send(self, data):
639
data_len -= gnutls.record_send(self._c_object,
644
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
646
# Error handling functions
647
def _error_code(result):
648
"""A function to raise exceptions on errors, suitable
649
for the 'restype' attribute on ctypes functions"""
652
if result == gnutls.E_NO_CERTIFICATE_FOUND:
653
raise gnutls.CertificateSecurityError(code=result)
654
raise gnutls.Error(code=result)
656
def _retry_on_error(result, func, arguments):
657
"""A function to retry on some errors, suitable
658
for the 'errcheck' attribute on ctypes functions"""
660
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
661
return _error_code(result)
662
result = func(*arguments)
665
# Unless otherwise indicated, the function declarations below are
666
# all from the gnutls/gnutls.h C header file.
669
priority_set_direct = _library.gnutls_priority_set_direct
670
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
671
ctypes.POINTER(ctypes.c_char_p)]
672
priority_set_direct.restype = _error_code
674
init = _library.gnutls_init
675
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
676
init.restype = _error_code
678
set_default_priority = _library.gnutls_set_default_priority
679
set_default_priority.argtypes = [session_t]
680
set_default_priority.restype = _error_code
682
record_send = _library.gnutls_record_send
683
record_send.argtypes = [session_t, ctypes.c_void_p,
685
record_send.restype = ctypes.c_ssize_t
686
record_send.errcheck = _retry_on_error
688
certificate_allocate_credentials = (
689
_library.gnutls_certificate_allocate_credentials)
690
certificate_allocate_credentials.argtypes = [
691
ctypes.POINTER(certificate_credentials_t)]
692
certificate_allocate_credentials.restype = _error_code
694
certificate_free_credentials = (
695
_library.gnutls_certificate_free_credentials)
696
certificate_free_credentials.argtypes = [
697
certificate_credentials_t]
698
certificate_free_credentials.restype = None
700
handshake_set_private_extensions = (
701
_library.gnutls_handshake_set_private_extensions)
702
handshake_set_private_extensions.argtypes = [session_t,
704
handshake_set_private_extensions.restype = None
706
credentials_set = _library.gnutls_credentials_set
707
credentials_set.argtypes = [session_t, credentials_type_t,
709
credentials_set.restype = _error_code
711
strerror = _library.gnutls_strerror
712
strerror.argtypes = [ctypes.c_int]
713
strerror.restype = ctypes.c_char_p
715
certificate_type_get = _library.gnutls_certificate_type_get
716
certificate_type_get.argtypes = [session_t]
717
certificate_type_get.restype = _error_code
719
certificate_get_peers = _library.gnutls_certificate_get_peers
720
certificate_get_peers.argtypes = [session_t,
721
ctypes.POINTER(ctypes.c_uint)]
722
certificate_get_peers.restype = ctypes.POINTER(datum_t)
724
global_set_log_level = _library.gnutls_global_set_log_level
725
global_set_log_level.argtypes = [ctypes.c_int]
726
global_set_log_level.restype = None
728
global_set_log_function = _library.gnutls_global_set_log_function
729
global_set_log_function.argtypes = [log_func]
730
global_set_log_function.restype = None
732
deinit = _library.gnutls_deinit
733
deinit.argtypes = [session_t]
734
deinit.restype = None
736
handshake = _library.gnutls_handshake
737
handshake.argtypes = [session_t]
738
handshake.restype = _error_code
739
handshake.errcheck = _retry_on_error
741
transport_set_ptr = _library.gnutls_transport_set_ptr
742
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
743
transport_set_ptr.restype = None
745
bye = _library.gnutls_bye
746
bye.argtypes = [session_t, close_request_t]
747
bye.restype = _error_code
748
bye.errcheck = _retry_on_error
750
check_version = _library.gnutls_check_version
751
check_version.argtypes = [ctypes.c_char_p]
752
check_version.restype = ctypes.c_char_p
754
_need_version = b"3.3.0"
755
if check_version(_need_version) is None:
756
raise self.Error("Needs GnuTLS {} or later"
757
.format(_need_version))
759
_tls_rawpk_version = b"3.6.6"
760
has_rawpk = bool(check_version(_tls_rawpk_version))
764
class pubkey_st(ctypes.Structure):
766
pubkey_t = ctypes.POINTER(pubkey_st)
768
x509_crt_fmt_t = ctypes.c_int
770
# All the function declarations below are from gnutls/abstract.h
771
pubkey_init = _library.gnutls_pubkey_init
772
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
773
pubkey_init.restype = _error_code
775
pubkey_import = _library.gnutls_pubkey_import
776
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
778
pubkey_import.restype = _error_code
780
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
781
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
782
ctypes.POINTER(ctypes.c_ubyte),
783
ctypes.POINTER(ctypes.c_size_t)]
784
pubkey_get_key_id.restype = _error_code
786
pubkey_deinit = _library.gnutls_pubkey_deinit
787
pubkey_deinit.argtypes = [pubkey_t]
788
pubkey_deinit.restype = None
790
# All the function declarations below are from gnutls/openpgp.h
792
openpgp_crt_init = _library.gnutls_openpgp_crt_init
793
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
794
openpgp_crt_init.restype = _error_code
796
openpgp_crt_import = _library.gnutls_openpgp_crt_import
797
openpgp_crt_import.argtypes = [openpgp_crt_t,
798
ctypes.POINTER(datum_t),
800
openpgp_crt_import.restype = _error_code
802
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
803
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
804
ctypes.POINTER(ctypes.c_uint)]
805
openpgp_crt_verify_self.restype = _error_code
807
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
808
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
809
openpgp_crt_deinit.restype = None
811
openpgp_crt_get_fingerprint = (
812
_library.gnutls_openpgp_crt_get_fingerprint)
813
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
817
openpgp_crt_get_fingerprint.restype = _error_code
819
if check_version(b"3.6.4"):
820
certificate_type_get2 = _library.gnutls_certificate_type_get2
821
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
822
certificate_type_get2.restype = _error_code
824
# Remove non-public functions
825
del _error_code, _retry_on_error
828
def call_pipe(connection, # : multiprocessing.Connection
829
func, *args, **kwargs):
830
"""This function is meant to be called by multiprocessing.Process
832
This function runs func(*args, **kwargs), and writes the resulting
833
return value on the provided multiprocessing.Connection.
835
connection.send(func(*args, **kwargs))
390
840
"""A representation of a client host served by this server.
393
843
approved: bool(); 'None' if not yet approved/disapproved
394
844
approval_delay: datetime.timedelta(); Time to wait for approval
395
845
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
846
checker: multiprocessing.Process(); a running checker process used
847
to see if the client lives. 'None' if no process is
849
checker_callback_tag: a GLib event source tag, or None
400
850
checker_command: string; External command which is run to check
401
851
if client lives. %() expansions are done at
402
852
runtime with vars(self) as dict, so that for
403
853
instance %(name)s can be used in the command.
404
checker_initiator_tag: a gobject event source tag, or None
854
checker_initiator_tag: a GLib event source tag, or None
405
855
created: datetime.datetime(); (UTC) object creation
406
856
client_structure: Object describing what attributes a client has
407
857
and is used for storing the client at exit
408
858
current_checker_command: string; current running checker_command
409
disable_initiator_tag: a gobject event source tag, or None
859
disable_initiator_tag: a GLib event source tag, or None
411
861
fingerprint: string (40 or 32 hexadecimal digits); used to
412
uniquely identify the client
862
uniquely identify an OpenPGP client
863
key_id: string (64 hexadecimal digits); used to uniquely identify
864
a client using raw public keys
413
865
host: string; available for use by the checker command
414
866
interval: datetime.timedelta(); How often to start a new checker
415
867
last_approval_request: datetime.datetime(); (UTC) or None
542
988
self.current_checker_command = None
543
989
self.approved = None
544
990
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()
991
self.changedstate = multiprocessing_manager.Condition(
992
multiprocessing_manager.Lock())
993
self.client_structure = [attr
994
for attr in self.__dict__.keys()
550
995
if not attr.startswith("_")]
551
996
self.client_structure.append("client_structure")
553
for name, t in inspect.getmembers(type(self),
998
for name, t in inspect.getmembers(
999
type(self), lambda obj: isinstance(obj, property)):
557
1000
if not name.startswith("_"):
558
1001
self.client_structure.append(name)
560
1003
# Send notice to process children that client state has changed
561
1004
def send_changedstate(self):
562
1005
with self.changedstate:
563
1006
self.changedstate.notify_all()
565
1008
def enable(self):
566
1009
"""Start this client's checker and timeout hooks"""
567
1010
if getattr(self, "enabled", False):
568
1011
# Already enabled
570
self.send_changedstate()
571
1013
self.expires = datetime.datetime.utcnow() + self.timeout
572
1014
self.enabled = True
573
1015
self.last_enabled = datetime.datetime.utcnow()
574
1016
self.init_checker()
1017
self.send_changedstate()
576
1019
def disable(self, quiet=True):
577
1020
"""Disable this client."""
578
1021
if not getattr(self, "enabled", False):
581
self.send_changedstate()
583
1024
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1025
if getattr(self, "disable_initiator_tag", None) is not None:
1026
GLib.source_remove(self.disable_initiator_tag)
586
1027
self.disable_initiator_tag = None
587
1028
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1029
if getattr(self, "checker_initiator_tag", None) is not None:
1030
GLib.source_remove(self.checker_initiator_tag)
590
1031
self.checker_initiator_tag = None
591
1032
self.stop_checker()
592
1033
self.enabled = False
593
# Do not run this again if called by a gobject.timeout_add
1035
self.send_changedstate()
1036
# Do not run this again if called by a GLib.timeout_add
596
1039
def __del__(self):
599
1042
def init_checker(self):
600
1043
# Schedule a new checker to be started an 'interval' from now,
601
1044
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1045
if self.checker_initiator_tag is not None:
1046
GLib.source_remove(self.checker_initiator_tag)
1047
self.checker_initiator_tag = GLib.timeout_add(
1048
random.randrange(int(self.interval.total_seconds() * 1000
605
1051
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1052
if self.disable_initiator_tag is not None:
1053
GLib.source_remove(self.disable_initiator_tag)
1054
self.disable_initiator_tag = GLib.timeout_add(
1055
int(self.timeout.total_seconds() * 1000), self.disable)
609
1056
# Also start a new checker *right now*.
610
1057
self.start_checker()
612
def checker_callback(self, pid, condition, command):
1059
def checker_callback(self, source, condition, connection,
613
1061
"""The checker has completed, so take appropriate actions."""
1062
# Read return code from connection (see call_pipe)
1063
returncode = connection.recv()
1065
if self.checker is not None:
614
1067
self.checker_callback_tag = None
615
1068
self.checker = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1071
self.last_checker_status = returncode
1072
self.last_checker_signal = None
618
1073
if self.last_checker_status == 0:
619
1074
logger.info("Checker for %(name)s succeeded",
621
1076
self.checked_ok()
623
logger.info("Checker for %(name)s failed",
1078
logger.info("Checker for %(name)s failed", vars(self))
626
1080
self.last_checker_status = -1
1081
self.last_checker_signal = -returncode
627
1082
logger.warning("Checker for %(name)s crashed?",
630
1086
def checked_ok(self):
631
1087
"""Assert that the client has been seen, alive and well."""
632
1088
self.last_checked_ok = datetime.datetime.utcnow()
633
1089
self.last_checker_status = 0
1090
self.last_checker_signal = None
634
1091
self.bump_timeout()
636
1093
def bump_timeout(self, timeout=None):
637
1094
"""Bump up the timeout for this client."""
638
1095
if timeout is None:
639
1096
timeout = self.timeout
640
1097
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
1098
GLib.source_remove(self.disable_initiator_tag)
1099
self.disable_initiator_tag = None
642
1100
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1101
self.disable_initiator_tag = GLib.timeout_add(
1102
int(timeout.total_seconds() * 1000), self.disable)
646
1103
self.expires = datetime.datetime.utcnow() + timeout
648
1105
def need_approval(self):
649
1106
self.last_approval_request = datetime.datetime.utcnow()
651
1108
def start_checker(self):
652
1109
"""Start a new checker subprocess if one is not running.
654
1111
If a checker already exists, leave it running and do
656
1113
# 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
1114
# did that, and if a checker (for some reason) started running
1115
# slowly and taking more than 'interval' time, then the client
1116
# would inevitably timeout, since no checker would get a
1117
# chance to run to completion. If we instead leave running
661
1118
# checkers alone, the checker would have to take more time
662
1119
# 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)
1122
if self.checker is not None and not self.checker.is_alive():
1123
logger.warning("Checker was not alive; joining")
678
1126
# Start a new checker if needed
679
1127
if self.checker is None:
1128
# Escape attributes for the shell
1130
attr: re.escape(str(getattr(self, attr)))
1131
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
1133
command = self.checker_command % escaped_attrs
1134
except TypeError as error:
1135
logger.error('Could not format string "%s"',
1136
self.checker_command,
1138
return True # Try again later
699
1139
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
1140
logger.info("Starting checker %r for %s", command,
1142
# We don't need to redirect stdout and stderr, since
1143
# in normal mode, that is already done by daemon(),
1144
# and in debug mode we don't want to. (Stdin is
1145
# always replaced by /dev/null.)
1146
# The exception is when not debugging but nevertheless
1147
# running in the foreground; use the previously
1149
popen_args = {"close_fds": True,
1152
if (not self.server_settings["debug"]
1153
and self.server_settings["foreground"]):
1154
popen_args.update({"stdout": wnull,
1156
pipe = multiprocessing.Pipe(duplex=False)
1157
self.checker = multiprocessing.Process(
1159
args=(pipe[1], subprocess.call, command),
1161
self.checker.start()
1162
self.checker_callback_tag = GLib.io_add_watch(
1163
GLib.IOChannel.unix_new(pipe[0].fileno()),
1164
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1165
self.checker_callback, pipe[0], command)
1166
# Re-run this periodically if run by GLib.timeout_add
726
1169
def stop_checker(self):
727
1170
"""Force the checker process, if any, to stop."""
728
1171
if self.checker_callback_tag:
729
gobject.source_remove(self.checker_callback_tag)
1172
GLib.source_remove(self.checker_callback_tag)
730
1173
self.checker_callback_tag = None
731
1174
if getattr(self, "checker", None) is None:
733
1176
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
1177
self.checker.terminate()
742
1178
self.checker = None
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1181
def dbus_service_property(dbus_interface,
747
1185
"""Decorators for marking methods of a DBusObjectWithProperties to
748
1186
become properties on the D-Bus.
750
1188
The decorated method will be called with no arguments by "Get"
751
1189
and with one argument by "Set".
753
1191
The parameters, where they are supported, are the same as
754
1192
dbus.service.method, except there is only "signature", since the
755
1193
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.
1276
class DBusObjectWithAnnotations(dbus.service.Object):
1277
"""A D-Bus object with annotations.
1279
Classes inheriting from this can use the dbus_annotations
1280
decorator to add annotations to methods or signals.
840
1284
def _is_dbus_thing(thing):
841
1285
"""Returns a function testing if an attribute is a D-Bus thing
843
1287
If called like _is_dbus_thing("method") it returns a function
844
1288
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1290
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
849
1293
def _get_all_dbus_things(self, thing):
850
1294
"""Returns a generator of (name, attribute) pairs
852
return ((getattr(athing.__get__(self), "_dbus_name",
1296
return ((getattr(athing.__get__(self), "_dbus_name", name),
854
1297
athing.__get__(self))
855
1298
for cls in self.__class__.__mro__
856
1299
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1300
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1302
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1304
path_keyword='object_path',
1305
connection_keyword='connection')
1306
def Introspect(self, object_path, connection):
1307
"""Overloading of standard D-Bus method.
1309
Inserts annotation tags on methods and signals.
1311
xmlstring = dbus.service.Object.Introspect(self, object_path,
1314
document = xml.dom.minidom.parseString(xmlstring)
1316
for if_tag in document.getElementsByTagName("interface"):
1317
# Add annotation tags
1318
for typ in ("method", "signal"):
1319
for tag in if_tag.getElementsByTagName(typ):
1321
for name, prop in (self.
1322
_get_all_dbus_things(typ)):
1323
if (name == tag.getAttribute("name")
1324
and prop._dbus_interface
1325
== if_tag.getAttribute("name")):
1326
annots.update(getattr(
1327
prop, "_dbus_annotations", {}))
1328
for name, value in annots.items():
1329
ann_tag = document.createElement(
1331
ann_tag.setAttribute("name", name)
1332
ann_tag.setAttribute("value", value)
1333
tag.appendChild(ann_tag)
1334
# Add interface annotation tags
1335
for annotation, value in dict(
1336
itertools.chain.from_iterable(
1337
annotations().items()
1338
for name, annotations
1339
in self._get_all_dbus_things("interface")
1340
if name == if_tag.getAttribute("name")
1342
ann_tag = document.createElement("annotation")
1343
ann_tag.setAttribute("name", annotation)
1344
ann_tag.setAttribute("value", value)
1345
if_tag.appendChild(ann_tag)
1346
# Fix argument name for the Introspect method itself
1347
if (if_tag.getAttribute("name")
1348
== dbus.INTROSPECTABLE_IFACE):
1349
for cn in if_tag.getElementsByTagName("method"):
1350
if cn.getAttribute("name") == "Introspect":
1351
for arg in cn.getElementsByTagName("arg"):
1352
if (arg.getAttribute("direction")
1354
arg.setAttribute("name",
1356
xmlstring = document.toxml("utf-8")
1358
except (AttributeError, xml.dom.DOMException,
1359
xml.parsers.expat.ExpatError) as error:
1360
logger.error("Failed to override Introspection method",
1365
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1366
"""A D-Bus object with properties.
1368
Classes inheriting from this can use the dbus_service_property
1369
decorator to expose methods as D-Bus properties. It exposes the
1370
standard Get(), Set(), and GetAll() methods on the D-Bus.
860
1373
def _get_dbus_property(self, interface_name, property_name):
861
1374
"""Returns a bound method if one exists which is a D-Bus
862
1375
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"))):
1377
for cls in self.__class__.__mro__:
1378
for name, value in inspect.getmembers(
1379
cls, self._is_dbus_thing("property")):
868
1380
if (value._dbus_name == property_name
869
1381
and value._dbus_interface == interface_name):
870
1382
return value.__get__(self)
872
1384
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1385
raise DBusPropertyNotFound("{}:{}.{}".format(
1386
self.dbus_object_path, interface_name, property_name))
1389
def _get_all_interface_names(cls):
1390
"""Get a sequence of all interfaces supported by an object"""
1391
return (name for name in set(getattr(getattr(x, attr),
1392
"_dbus_interface", None)
1393
for x in (inspect.getmro(cls))
1395
if name is not None)
1397
@dbus.service.method(dbus.PROPERTIES_IFACE,
878
1399
out_signature="v")
879
1400
def Get(self, interface_name, property_name):
880
1401
"""Standard D-Bus property Get() method, see D-Bus standard.
1010
1529
return xmlstring
1013
def datetime_to_dbus (dt, variant_level=0):
1533
dbus.OBJECT_MANAGER_IFACE
1534
except AttributeError:
1535
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1538
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1539
"""A D-Bus object with an ObjectManager.
1541
Classes inheriting from this exposes the standard
1542
GetManagedObjects call and the InterfacesAdded and
1543
InterfacesRemoved signals on the standard
1544
"org.freedesktop.DBus.ObjectManager" interface.
1546
Note: No signals are sent automatically; they must be sent
1549
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1550
out_signature="a{oa{sa{sv}}}")
1551
def GetManagedObjects(self):
1552
"""This function must be overridden"""
1553
raise NotImplementedError()
1555
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1556
signature="oa{sa{sv}}")
1557
def InterfacesAdded(self, object_path, interfaces_and_properties):
1560
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1561
def InterfacesRemoved(self, object_path, interfaces):
1564
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1566
path_keyword='object_path',
1567
connection_keyword='connection')
1568
def Introspect(self, object_path, connection):
1569
"""Overloading of standard D-Bus method.
1571
Override return argument name of GetManagedObjects to be
1572
"objpath_interfaces_and_properties"
1574
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1578
document = xml.dom.minidom.parseString(xmlstring)
1580
for if_tag in document.getElementsByTagName("interface"):
1581
# Fix argument name for the GetManagedObjects method
1582
if (if_tag.getAttribute("name")
1583
== dbus.OBJECT_MANAGER_IFACE):
1584
for cn in if_tag.getElementsByTagName("method"):
1585
if (cn.getAttribute("name")
1586
== "GetManagedObjects"):
1587
for arg in cn.getElementsByTagName("arg"):
1588
if (arg.getAttribute("direction")
1592
"objpath_interfaces"
1594
xmlstring = document.toxml("utf-8")
1596
except (AttributeError, xml.dom.DOMException,
1597
xml.parsers.expat.ExpatError) as error:
1598
logger.error("Failed to override Introspection method",
1603
def datetime_to_dbus(dt, variant_level=0):
1014
1604
"""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.
1606
return dbus.String("", variant_level=variant_level)
1607
return dbus.String(dt.isoformat(), variant_level=variant_level)
1610
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1611
"""A class decorator; applied to a subclass of
1612
dbus.service.Object, it will add alternate D-Bus attributes with
1613
interface names according to the "alt_interface_names" mapping.
1616
@alternate_dbus_interfaces({"org.example.Interface":
1617
"net.example.AlternateInterface"})
1618
class SampleDBusObject(dbus.service.Object):
1619
@dbus.service.method("org.example.Interface")
1620
def SampleDBusMethod():
1623
The above "SampleDBusMethod" on "SampleDBusObject" will be
1624
reachable via two interfaces: "org.example.Interface" and
1625
"net.example.AlternateInterface", the latter of which will have
1626
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1627
"true", unless "deprecate" is passed with a False value.
1629
This works for methods and signals, and also for D-Bus properties
1630
(from DBusObjectWithProperties) and interfaces (from the
1631
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):
1635
for orig_interface_name, alt_interface_name in (
1636
alt_interface_names.items()):
1638
interface_names = set()
1639
# Go though all attributes of the class
1640
for attrname, attribute in inspect.getmembers(cls):
1034
1641
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1642
# with the wrong interface name
1036
1643
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1644
or not attribute._dbus_interface.startswith(
1645
orig_interface_name)):
1040
1647
# Create an alternate D-Bus interface name based on
1041
1648
# 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)
1649
alt_interface = attribute._dbus_interface.replace(
1650
orig_interface_name, alt_interface_name)
1651
interface_names.add(alt_interface)
1047
1652
# Is this a D-Bus signal?
1048
1653
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1654
# Extract the original non-method undecorated
1655
# function by black magic
1656
if sys.version_info.major == 2:
1657
nonmethod_func = (dict(
1052
1658
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1659
attribute.__closure__))
1660
["func"].cell_contents)
1662
nonmethod_func = (dict(
1663
zip(attribute.__code__.co_freevars,
1664
attribute.__closure__))
1665
["func"].cell_contents)
1055
1666
# Create a new, but exactly alike, function
1056
1667
# object, and decorate it to be a new D-Bus signal
1057
1668
# 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)))
1669
new_function = copy_function(nonmethod_func)
1670
new_function = (dbus.service.signal(
1672
attribute._dbus_signature)(new_function))
1067
1673
# Copy annotations, if any
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1675
new_function._dbus_annotations = dict(
1676
attribute._dbus_annotations)
1071
1677
except AttributeError:
1073
1680
# 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
1681
# original and alternate functions, so both the
1682
# original and alternate signals gets sent when
1683
# the function is called
1076
1684
def fixscope(func1, func2):
1077
1685
"""This function is a scope container to pass
1078
1686
func1 and func2 to the "call_both" function
1079
1687
outside of its arguments"""
1689
@functools.wraps(func2)
1080
1690
def call_both(*args, **kwargs):
1081
1691
"""This function will emit two D-Bus
1082
1692
signals by calling func1 and func2"""
1083
1693
func1(*args, **kwargs)
1084
1694
func2(*args, **kwargs)
1695
# Make wrapper function look like a D-Bus
1697
for name, attr in inspect.getmembers(func2):
1698
if name.startswith("_dbus_"):
1699
setattr(call_both, name, attr)
1085
1701
return call_both
1086
1702
# Create the "call_both" function and add it to
1088
attr[attrname] = fixscope(attribute,
1704
attr[attrname] = fixscope(attribute, new_function)
1090
1705
# Is this a D-Bus method?
1091
1706
elif getattr(attribute, "_dbus_is_method", False):
1092
1707
# Create a new, but exactly alike, function
1093
1708
# object. Decorate it to be a new D-Bus method
1094
1709
# with the alternate D-Bus interface name. Add it
1095
1710
# 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)))
1712
dbus.service.method(
1714
attribute._dbus_in_signature,
1715
attribute._dbus_out_signature)
1716
(copy_function(attribute)))
1106
1717
# Copy annotations, if any
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1719
attr[attrname]._dbus_annotations = dict(
1720
attribute._dbus_annotations)
1110
1721
except AttributeError:
1112
1723
# Is this a D-Bus property?
1140
1744
# object. Decorate it to be a new D-Bus interface
1141
1745
# with the alternate D-Bus interface name. Add it
1142
1746
# 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)
1748
dbus_interface_annotations(alt_interface)
1749
(copy_function(attribute)))
1751
# Deprecate all alternate interfaces
1752
iname = "_AlternateDBusNames_interface_annotation{}"
1753
for interface_name in interface_names:
1755
@dbus_interface_annotations(interface_name)
1757
return {"org.freedesktop.DBus.Deprecated":
1759
# Find an unused name
1760
for aname in (iname.format(i)
1761
for i in itertools.count()):
1762
if aname not in attr:
1766
# Replace the class with a new subclass of it with
1767
# methods, signals, etc. as created above.
1768
if sys.version_info.major == 2:
1769
cls = type(b"{}Alternate".format(cls.__name__),
1772
cls = type("{}Alternate".format(cls.__name__),
1779
@alternate_dbus_interfaces({"se.recompile.Mandos":
1780
"se.bsnet.fukt.Mandos"})
1166
1781
class ClientDBus(Client, DBusObjectWithProperties):
1167
1782
"""A Client class using D-Bus
1170
1785
dbus_object_path: dbus.ObjectPath
1171
1786
bus: dbus.SystemBus()
1174
1789
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
1790
+ ("dbus_object_path", ))
1792
_interface = "se.recompile.Mandos.Client"
1177
1794
# dbus.service.Object doesn't use super(), so we can't either.
1179
def __init__(self, bus = None, *args, **kwargs):
1796
def __init__(self, bus=None, *args, **kwargs):
1181
1798
Client.__init__(self, *args, **kwargs)
1182
1799
# Only now, when this client is initialized, can it show up on
1184
client_object_name = unicode(self.name).translate(
1801
client_object_name = str(self.name).translate(
1185
1802
{ord("."): ord("_"),
1186
1803
ord("-"): ord("_")})
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1804
self.dbus_object_path = dbus.ObjectPath(
1805
"/clients/" + client_object_name)
1189
1806
DBusObjectWithProperties.__init__(self, self.bus,
1190
1807
self.dbus_object_path)
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1809
def notifychangeproperty(transform_func, dbus_name,
1810
type_func=lambda x: x,
1812
invalidate_only=False,
1813
_interface=_interface):
1195
1814
""" Modify a variable so that it's a property which announces
1196
1815
its changes to DBus.
1198
1817
transform_fun: Function that takes a value and a variant_level
1199
1818
and transforms it to a D-Bus type.
1200
1819
dbus_name: D-Bus name of the variable
1350
1971
server to mandos-client
1354
1975
# Rejected - signal
1355
1976
@dbus.service.signal(_interface, signature="s")
1356
1977
def Rejected(self, reason):
1360
1981
# NeedApproval - signal
1361
1982
@dbus.service.signal(_interface, signature="tb")
1362
1983
def NeedApproval(self, timeout, default):
1364
1985
return self.need_approval()
1368
1989
# Approve - method
1369
1990
@dbus.service.method(_interface, in_signature="b")
1370
1991
def Approve(self, value):
1371
1992
self.approve(value)
1373
1994
# CheckedOK - method
1374
1995
@dbus.service.method(_interface)
1375
1996
def CheckedOK(self):
1376
1997
self.checked_ok()
1378
1999
# Enable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
2001
@dbus.service.method(_interface)
1380
2002
def Enable(self):
1384
2006
# StartChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
2008
@dbus.service.method(_interface)
1386
2009
def StartChecker(self):
1388
2011
self.start_checker()
1390
2013
# Disable - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2015
@dbus.service.method(_interface)
1392
2016
def Disable(self):
1396
2020
# StopChecker - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2022
@dbus.service.method(_interface)
1398
2023
def StopChecker(self):
1399
2024
self.stop_checker()
1403
2028
# ApprovalPending - property
1404
2029
@dbus_service_property(_interface, signature="b", access="read")
1405
2030
def ApprovalPending_dbus_property(self):
1406
2031
return dbus.Boolean(bool(self.approvals_pending))
1408
2033
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2034
@dbus_service_property(_interface,
1410
2036
access="readwrite")
1411
2037
def ApprovedByDefault_dbus_property(self, value=None):
1412
2038
if value is None: # get
1413
2039
return dbus.Boolean(self.approved_by_default)
1414
2040
self.approved_by_default = bool(value)
1416
2042
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2043
@dbus_service_property(_interface,
1418
2045
access="readwrite")
1419
2046
def ApprovalDelay_dbus_property(self, value=None):
1420
2047
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2048
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2050
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2052
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2053
@dbus_service_property(_interface,
1426
2055
access="readwrite")
1427
2056
def ApprovalDuration_dbus_property(self, value=None):
1428
2057
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2058
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2060
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2062
# Name - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2065
@dbus_service_property(_interface, signature="s", access="read")
1435
2066
def Name_dbus_property(self):
1436
2067
return dbus.String(self.name)
2071
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2072
@dbus_service_property(_interface, signature="s", access="read")
2073
def KeyID_dbus_property(self):
2074
return dbus.String(self.key_id)
1438
2076
# Fingerprint - property
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2079
@dbus_service_property(_interface, signature="s", access="read")
1440
2080
def Fingerprint_dbus_property(self):
1441
2081
return dbus.String(self.fingerprint)
1443
2083
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2084
@dbus_service_property(_interface,
1445
2086
access="readwrite")
1446
2087
def Host_dbus_property(self, value=None):
1447
2088
if value is None: # get
1448
2089
return dbus.String(self.host)
1449
self.host = unicode(value)
2090
self.host = str(value)
1451
2092
# Created - property
2094
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2095
@dbus_service_property(_interface, signature="s", access="read")
1453
2096
def Created_dbus_property(self):
1454
2097
return datetime_to_dbus(self.created)
1456
2099
# LastEnabled - property
1457
2100
@dbus_service_property(_interface, signature="s", access="read")
1458
2101
def LastEnabled_dbus_property(self):
1459
2102
return datetime_to_dbus(self.last_enabled)
1461
2104
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2105
@dbus_service_property(_interface,
1463
2107
access="readwrite")
1464
2108
def Enabled_dbus_property(self, value=None):
1465
2109
if value is None: # get
1472
2116
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2117
@dbus_service_property(_interface,
1474
2119
access="readwrite")
1475
2120
def LastCheckedOK_dbus_property(self, value=None):
1476
2121
if value is not None:
1477
2122
self.checked_ok()
1479
2124
return datetime_to_dbus(self.last_checked_ok)
1481
2126
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2127
@dbus_service_property(_interface, signature="n", access="read")
1484
2128
def LastCheckerStatus_dbus_property(self):
1485
2129
return dbus.Int16(self.last_checker_status)
1487
2131
# Expires - property
1488
2132
@dbus_service_property(_interface, signature="s", access="read")
1489
2133
def Expires_dbus_property(self):
1490
2134
return datetime_to_dbus(self.expires)
1492
2136
# LastApprovalRequest - property
1493
2137
@dbus_service_property(_interface, signature="s", access="read")
1494
2138
def LastApprovalRequest_dbus_property(self):
1495
2139
return datetime_to_dbus(self.last_approval_request)
1497
2141
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2142
@dbus_service_property(_interface,
1499
2144
access="readwrite")
1500
2145
def Timeout_dbus_property(self, value=None):
1501
2146
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2147
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2148
old_timeout = self.timeout
1503
2149
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2150
# Reschedule disabling
1505
2151
if self.enabled:
1506
2152
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:
2153
self.expires += self.timeout - old_timeout
2154
if self.expires <= now:
1510
2155
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2158
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2161
GLib.source_remove(self.disable_initiator_tag)
2162
self.disable_initiator_tag = GLib.timeout_add(
2163
int((self.expires - now).total_seconds() * 1000),
1524
2166
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2167
@dbus_service_property(_interface,
1526
2169
access="readwrite")
1527
2170
def ExtendedTimeout_dbus_property(self, value=None):
1528
2171
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2172
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2174
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2176
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2177
@dbus_service_property(_interface,
1534
2179
access="readwrite")
1535
2180
def Interval_dbus_property(self, value=None):
1536
2181
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2182
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2183
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2184
if getattr(self, "checker_initiator_tag", None) is None:
1541
2186
if self.enabled:
1542
2187
# 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
2188
GLib.source_remove(self.checker_initiator_tag)
2189
self.checker_initiator_tag = GLib.timeout_add(
2190
value, self.start_checker)
2191
self.start_checker() # Start one now, too
1548
2193
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2194
@dbus_service_property(_interface,
1550
2196
access="readwrite")
1551
2197
def Checker_dbus_property(self, value=None):
1552
2198
if value is None: # get
1553
2199
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2200
self.checker_command = str(value)
1556
2202
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2203
@dbus_service_property(_interface,
1558
2205
access="readwrite")
1559
2206
def CheckerRunning_dbus_property(self, value=None):
1560
2207
if value is None: # get
1593
2248
if data[0] == 'data':
1595
2250
if data[0] == 'function':
1596
2252
def func(*args, **kwargs):
1597
2253
self._pipe.send(('funcall', name, args, kwargs))
1598
2254
return self._pipe.recv()[1]
1601
2258
def __setattr__(self, name, value):
1602
2259
if name == '_pipe':
1603
2260
return super(ProxyClient, self).__setattr__(name, value)
1604
2261
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2264
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2265
"""A class to handle client connections.
1614
2267
Instantiated once for each connection to handle it.
1615
2268
Note: This will run in its own forked process."""
1617
2270
def handle(self):
1618
2271
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2272
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2273
str(self.client_address))
1621
2274
logger.debug("Pipe FD: %d",
1622
2275
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",
2277
session = gnutls.ClientSession(self.request)
2279
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2280
# "+AES-256-CBC", "+SHA1",
2281
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2283
# Use a fallback default, since this MUST be set.
1639
2284
priority = self.server.gnutls_priority
1640
2285
if priority is None:
1641
2286
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2287
gnutls.priority_set_direct(session._c_object,
2288
priority.encode("utf-8"),
1646
2291
# Start communication using the Mandos protocol
1647
2292
# Get protocol number
1648
2293
line = self.request.makefile().readline()
1649
2294
logger.debug("Protocol version: %r", line)
1651
2296
if int(line.strip().split()[0]) > 1:
2297
raise RuntimeError(line)
1653
2298
except (ValueError, IndexError, RuntimeError) as error:
1654
2299
logger.error("Unknown protocol version: %s", error)
1657
2302
# Start GnuTLS connection
1659
2304
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2305
except gnutls.Error as error:
1661
2306
logger.warning("Handshake failed: %s", error)
1662
2307
# Do not run session.bye() here: the session is not
1663
2308
# established. Just abandon the request.
1665
2310
logger.debug("Handshake succeeded")
1667
2312
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,
2314
if gnutls.has_rawpk:
2317
key_id = self.key_id(
2318
self.peer_certificate(session))
2319
except (TypeError, gnutls.Error) as error:
2320
logger.warning("Bad certificate: %s", error)
2322
logger.debug("Key ID: %s", key_id)
2327
fpr = self.fingerprint(
2328
self.peer_certificate(session))
2329
except (TypeError, gnutls.Error) as error:
2330
logger.warning("Bad certificate: %s", error)
2332
logger.debug("Fingerprint: %s", fpr)
2335
client = ProxyClient(child_pipe, key_id, fpr,
1680
2336
self.client_address)
1681
2337
except KeyError:
1684
2340
if client.approval_delay:
1685
2341
delay = client.approval_delay
1686
2342
client.approvals_pending += 1
1687
2343
approval_required = True
1690
2346
if not client.enabled:
1691
2347
logger.info("Client %s is disabled",
1693
2349
if self.server.use_dbus:
1694
2350
# Emit D-Bus signal
1695
2351
client.Rejected("Disabled")
1698
2354
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2355
# We are approved or approval is disabled
1701
2357
elif client.approved is None:
1702
2358
logger.info("Client %s needs approval",
1737
2391
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))
2394
session.send(client.secret)
2395
except gnutls.Error as error:
2396
logger.warning("gnutls send failed",
1751
2400
logger.info("Sending secret to %s", client.name)
1752
2401
# bump the timeout using extended_timeout
1753
2402
client.bump_timeout(client.extended_timeout)
1754
2403
if self.server.use_dbus:
1755
2404
# Emit D-Bus signal
1756
2405
client.GotSecret()
1759
2408
if approval_required:
1760
2409
client.approvals_pending -= 1
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2412
except gnutls.Error as error:
2413
logger.warning("GnuTLS bye failed",
1767
2417
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
2418
"Return the peer's certificate as a bytestring"
2420
cert_type = gnutls.certificate_type_get2(session._c_object,
2422
except AttributeError:
2423
cert_type = gnutls.certificate_type_get(session._c_object)
2424
if gnutls.has_rawpk:
2425
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2427
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2428
# If not a valid certificate type...
2429
if cert_type not in valid_cert_types:
2430
logger.info("Cert type %r not in %r", cert_type,
2432
# ...return invalid data
1775
2434
list_size = ctypes.c_uint(1)
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2435
cert_list = (gnutls.certificate_get_peers
1778
2436
(session._c_object, ctypes.byref(list_size)))
1779
2437
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2438
raise gnutls.Error("error getting peer certificate")
1782
2439
if list_size.value == 0:
1784
2441
cert = cert_list[0]
1785
2442
return ctypes.string_at(cert.data, cert.size)
2445
def key_id(certificate):
2446
"Convert a certificate bytestring to a hexdigit key ID"
2447
# New GnuTLS "datum" with the public key
2448
datum = gnutls.datum_t(
2449
ctypes.cast(ctypes.c_char_p(certificate),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.c_uint(len(certificate)))
2452
# XXX all these need to be created in the gnutls "module"
2453
# New empty GnuTLS certificate
2454
pubkey = gnutls.pubkey_t()
2455
gnutls.pubkey_init(ctypes.byref(pubkey))
2456
# Import the raw public key into the certificate
2457
gnutls.pubkey_import(pubkey,
2458
ctypes.byref(datum),
2459
gnutls.X509_FMT_DER)
2460
# New buffer for the key ID
2461
buf = ctypes.create_string_buffer(32)
2462
buf_len = ctypes.c_size_t(len(buf))
2463
# Get the key ID from the raw public key into the buffer
2464
gnutls.pubkey_get_key_id(pubkey,
2465
gnutls.KEYID_USE_SHA256,
2466
ctypes.cast(ctypes.byref(buf),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.byref(buf_len))
2469
# Deinit the certificate
2470
gnutls.pubkey_deinit(pubkey)
2472
# Convert the buffer to a Python bytestring
2473
key_id = ctypes.string_at(buf, buf_len.value)
2474
# Convert the bytestring to hexadecimal notation
2475
hex_key_id = binascii.hexlify(key_id).upper()
1788
2479
def fingerprint(openpgp):
1789
2480
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
2481
# 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))))
2482
datum = gnutls.datum_t(
2483
ctypes.cast(ctypes.c_char_p(openpgp),
2484
ctypes.POINTER(ctypes.c_ubyte)),
2485
ctypes.c_uint(len(openpgp)))
1796
2486
# 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)))
2487
crt = gnutls.openpgp_crt_t()
2488
gnutls.openpgp_crt_init(ctypes.byref(crt))
1800
2489
# 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))
2490
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2491
gnutls.OPENPGP_FMT_RAW)
1805
2492
# Verify the self signature in the key
1806
2493
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2494
gnutls.openpgp_crt_verify_self(crt, 0,
2495
ctypes.byref(crtverify))
1810
2496
if crtverify.value != 0:
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2497
gnutls.openpgp_crt_deinit(crt)
2498
raise gnutls.CertificateSecurityError(code
1814
2500
# New buffer for the fingerprint
1815
2501
buf = ctypes.create_string_buffer(20)
1816
2502
buf_len = ctypes.c_size_t()
1817
2503
# 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)))
2504
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2505
ctypes.byref(buf_len))
1821
2506
# Deinit the certificate
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2507
gnutls.openpgp_crt_deinit(crt)
1823
2508
# Convert the buffer to a Python bytestring
1824
2509
fpr = ctypes.string_at(buf, buf_len.value)
1825
2510
# Convert the bytestring to hexadecimal notation
1830
class MultiprocessingMixIn(object):
2515
class MultiprocessingMixIn:
1831
2516
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
2518
def sub_process_main(self, request, address):
1834
2520
self.finish_request(request, address)
1835
2521
except Exception:
1836
2522
self.handle_error(request, address)
1837
2523
self.close_request(request)
1839
2525
def process_request(self, request, address):
1840
2526
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2527
proc = multiprocessing.Process(target=self.sub_process_main,
2528
args=(request, address))
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2533
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1849
2534
""" adds a pipe to the MixIn """
1850
2536
def process_request(self, request, client_address):
1851
2537
"""Overrides and wraps the original process_request().
1853
2539
This function creates a new pipe in self.pipe
1855
2541
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1857
2543
proc = MultiprocessingMixIn.process_request(self, request,
1858
2544
client_address)
1859
2545
self.child_pipe.close()
1860
2546
self.add_pipe(parent_pipe, proc)
1862
2548
def add_pipe(self, parent_pipe, proc):
1863
2549
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
2550
raise NotImplementedError()
1867
2553
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
socketserver.TCPServer, object):
2554
socketserver.TCPServer):
1869
2555
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1872
2558
enabled: Boolean; whether this server is activated yet
1873
2559
interface: None or a network interface name (string)
1874
2560
use_ipv6: Boolean; to use IPv6 or not
1876
2563
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
2567
"""If socketfd is set, use that file descriptor instead of
2568
creating a new one with socket.socket().
1878
2570
self.interface = interface
1880
2572
self.address_family = socket.AF_INET6
2573
if socketfd is not None:
2574
# Save the file descriptor
2575
self.socketfd = socketfd
2576
# Save the original socket.socket() function
2577
self.socket_socket = socket.socket
2579
# To implement --socket, we monkey patch socket.socket.
2581
# (When socketserver.TCPServer is a new-style class, we
2582
# could make self.socket into a property instead of monkey
2583
# patching socket.socket.)
2585
# Create a one-time-only replacement for socket.socket()
2586
@functools.wraps(socket.socket)
2587
def socket_wrapper(*args, **kwargs):
2588
# Restore original function so subsequent calls are
2590
socket.socket = self.socket_socket
2591
del self.socket_socket
2592
# This time only, return a new socket object from the
2593
# saved file descriptor.
2594
return socket.fromfd(self.socketfd, *args, **kwargs)
2595
# Replace socket.socket() function with wrapper
2596
socket.socket = socket_wrapper
2597
# The socketserver.TCPServer.__init__ will call
2598
# socket.socket(), which might be our replacement,
2599
# socket_wrapper(), if socketfd was set.
1881
2600
socketserver.TCPServer.__init__(self, server_address,
1882
2601
RequestHandlerClass)
1883
2603
def server_bind(self):
1884
2604
"""This overrides the normal server_bind() function
1885
2605
to bind to an interface if one was specified, and also NOT to
1886
2606
bind to an address or port if they were not specified."""
2607
global SO_BINDTODEVICE
1887
2608
if self.interface is not None:
1888
2609
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",
2610
# Fall back to a hard-coded value which seems to be
2612
logger.warning("SO_BINDTODEVICE not found, trying 25")
2613
SO_BINDTODEVICE = 25
2615
self.socket.setsockopt(
2616
socket.SOL_SOCKET, SO_BINDTODEVICE,
2617
(self.interface + "\0").encode("utf-8"))
2618
except socket.error as error:
2619
if error.errno == errno.EPERM:
2620
logger.error("No permission to bind to"
2621
" interface %s", self.interface)
2622
elif error.errno == errno.ENOPROTOOPT:
2623
logger.error("SO_BINDTODEVICE not available;"
2624
" cannot bind to interface %s",
2626
elif error.errno == errno.ENODEV:
2627
logger.error("Interface %s does not exist,"
2628
" cannot bind", self.interface)
1909
2631
# Only bind(2) the socket if we really need to.
1910
2632
if self.server_address[0] or self.server_address[1]:
2633
if self.server_address[1]:
2634
self.allow_reuse_address = True
1911
2635
if not self.server_address[0]:
1912
2636
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
2637
any_address = "::" # in6addr_any
1915
any_address = socket.INADDR_ANY
2639
any_address = "0.0.0.0" # INADDR_ANY
1916
2640
self.server_address = (any_address,
1917
2641
self.server_address[1])
1918
2642
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
2643
self.server_address = (self.server_address[0], 0)
1921
2644
# if self.interface:
1922
2645
# self.server_address = (self.server_address[0],
1948
2676
self.gnutls_priority = gnutls_priority
1949
2677
IPv6_TCPServer.__init__(self, server_address,
1950
2678
RequestHandlerClass,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2679
interface=interface,
1953
2683
def server_activate(self):
1954
2684
if self.enabled:
1955
2685
return socketserver.TCPServer.server_activate(self)
1957
2687
def enable(self):
1958
2688
self.enabled = True
1960
2690
def add_pipe(self, parent_pipe, proc):
1961
2691
# 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)
2693
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2694
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2695
functools.partial(self.handle_ipc,
2696
parent_pipe=parent_pipe,
2699
def handle_ipc(self, source, condition,
2702
client_object=None):
1985
2703
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2704
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1987
2705
# Wait for other process to exit
1991
2709
# Read a request from the child
1992
2710
request = parent_pipe.recv()
1993
2711
command = request[0]
1995
2713
if command == 'init':
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2714
key_id = request[1].decode("ascii")
2715
fpr = request[2].decode("ascii")
2716
address = request[3]
2718
for c in self.clients.values():
2719
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2721
if key_id and c.key_id == key_id:
2724
if fpr and c.fingerprint == fpr:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2728
logger.info("Client not found for key ID: %s, address"
2729
": %s", key_id or fpr, address)
2006
2730
if self.use_dbus:
2007
2731
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2732
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
2734
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,
2738
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2739
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2740
functools.partial(self.handle_ipc,
2741
parent_pipe=parent_pipe,
2743
client_object=client))
2021
2744
parent_pipe.send(True)
2022
2745
# remove the old hook in favor of the new above hook on
2026
2749
funcname = request[1]
2027
2750
args = request[2]
2028
2751
kwargs = request[3]
2030
2753
parent_pipe.send(('data', getattr(client_object,
2031
2754
funcname)(*args,
2034
2757
if command == 'getattr':
2035
2758
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2759
if isinstance(client_object.__getattribute__(attrname),
2760
collections.abc.Callable):
2761
parent_pipe.send(('function', ))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2764
'data', client_object.__getattribute__(attrname)))
2042
2766
if command == 'setattr':
2043
2767
attrname = request[1]
2044
2768
value = request[2]
2045
2769
setattr(client_object, attrname, value)
2774
def rfc3339_duration_to_delta(duration):
2775
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2777
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2779
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2781
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2783
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2785
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2787
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2789
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2793
# Parsing an RFC 3339 duration with regular expressions is not
2794
# possible - there would have to be multiple places for the same
2795
# values, like seconds. The current code, while more esoteric, is
2796
# cleaner without depending on a parsing library. If Python had a
2797
# built-in library for parsing we would use it, but we'd like to
2798
# avoid excessive use of external libraries.
2800
# New type for defining tokens, syntax, and semantics all-in-one
2801
Token = collections.namedtuple("Token", (
2802
"regexp", # To match token; if "value" is not None, must have
2803
# a "group" containing digits
2804
"value", # datetime.timedelta or None
2805
"followers")) # Tokens valid after this token
2806
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2807
# the "duration" ABNF definition in RFC 3339, Appendix A.
2808
token_end = Token(re.compile(r"$"), None, frozenset())
2809
token_second = Token(re.compile(r"(\d+)S"),
2810
datetime.timedelta(seconds=1),
2811
frozenset((token_end, )))
2812
token_minute = Token(re.compile(r"(\d+)M"),
2813
datetime.timedelta(minutes=1),
2814
frozenset((token_second, token_end)))
2815
token_hour = Token(re.compile(r"(\d+)H"),
2816
datetime.timedelta(hours=1),
2817
frozenset((token_minute, token_end)))
2818
token_time = Token(re.compile(r"T"),
2820
frozenset((token_hour, token_minute,
2822
token_day = Token(re.compile(r"(\d+)D"),
2823
datetime.timedelta(days=1),
2824
frozenset((token_time, token_end)))
2825
token_month = Token(re.compile(r"(\d+)M"),
2826
datetime.timedelta(weeks=4),
2827
frozenset((token_day, token_end)))
2828
token_year = Token(re.compile(r"(\d+)Y"),
2829
datetime.timedelta(weeks=52),
2830
frozenset((token_month, token_end)))
2831
token_week = Token(re.compile(r"(\d+)W"),
2832
datetime.timedelta(weeks=1),
2833
frozenset((token_end, )))
2834
token_duration = Token(re.compile(r"P"), None,
2835
frozenset((token_year, token_month,
2836
token_day, token_time,
2838
# Define starting values:
2840
value = datetime.timedelta()
2842
# Following valid tokens
2843
followers = frozenset((token_duration, ))
2844
# String left to parse
2846
# Loop until end token is found
2847
while found_token is not token_end:
2848
# Search for any currently valid tokens
2849
for token in followers:
2850
match = token.regexp.match(s)
2851
if match is not None:
2853
if token.value is not None:
2854
# Value found, parse digits
2855
factor = int(match.group(1), 10)
2856
# Add to value so far
2857
value += factor * token.value
2858
# Strip token from string
2859
s = token.regexp.sub("", s, 1)
2862
# Set valid next tokens
2863
followers = found_token.followers
2866
# No currently valid tokens were found
2867
raise ValueError("Invalid RFC 3339 duration: {!r}"
2050
2873
def string_to_delta(interval):
2051
2874
"""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)
2876
>>> string_to_delta('7d') == datetime.timedelta(7)
2878
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2880
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2882
>>> string_to_delta('24h') == datetime.timedelta(1)
2884
>>> string_to_delta('1w') == datetime.timedelta(7)
2886
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2891
return rfc3339_duration_to_delta(interval)
2066
2895
timevalue = datetime.timedelta(0)
2067
2896
for s in interval.split():
2069
suffix = unicode(s[-1])
2070
2899
value = int(s[:-1])
2071
2900
if suffix == "d":
2072
2901
delta = datetime.timedelta(value)
2145
2973
parser.add_argument("--no-dbus", action="store_false",
2146
2974
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2975
" system bus interface", default=None)
2148
2976
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2977
dest="use_ipv6", help="Do not use IPv6",
2150
2979
parser.add_argument("--no-restore", action="store_false",
2151
2980
dest="restore", help="Do not restore stored"
2981
" state", default=None)
2982
parser.add_argument("--socket", type=int,
2983
help="Specify a file descriptor to a network"
2984
" socket to use instead of creating one")
2153
2985
parser.add_argument("--statedir", metavar="DIR",
2154
2986
help="Directory to save/restore state in")
2987
parser.add_argument("--foreground", action="store_true",
2988
help="Run in foreground", default=None)
2989
parser.add_argument("--no-zeroconf", action="store_false",
2990
dest="zeroconf", help="Do not use Zeroconf",
2156
2993
options = parser.parse_args()
2163
2995
# 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"
2996
if gnutls.has_rawpk:
2997
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2998
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3000
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3001
":+SIGN-DSA-SHA256")
3002
server_defaults = {"interface": "",
3006
"priority": priority,
3007
"servicename": "Mandos",
3013
"statedir": "/var/lib/mandos",
3014
"foreground": "False",
2178
3019
# Parse config file for server-global settings
2179
server_config = configparser.SafeConfigParser(server_defaults)
3020
server_config = configparser.ConfigParser(server_defaults)
2180
3021
del server_defaults
2181
server_config.read(os.path.join(options.configdir,
2183
# Convert the SafeConfigParser object to a dict
3022
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3023
# Convert the ConfigParser object to a dict
2184
3024
server_settings = server_config.defaults()
2185
3025
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
3026
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3027
"foreground", "zeroconf"):
2187
3028
server_settings[option] = server_config.getboolean("DEFAULT",
2189
3030
if server_settings["port"]:
2190
3031
server_settings["port"] = server_config.getint("DEFAULT",
3033
if server_settings["socket"]:
3034
server_settings["socket"] = server_config.getint("DEFAULT",
3036
# Later, stdin will, and stdout and stderr might, be dup'ed
3037
# over with an opened os.devnull. But we don't want this to
3038
# happen with a supplied network socket.
3039
if 0 <= server_settings["socket"] <= 2:
3040
server_settings["socket"] = os.dup(server_settings
2192
3042
del server_config
2194
3044
# Override the settings from the config file with command line
2195
3045
# options, if set.
2196
3046
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
3047
"priority", "servicename", "configdir", "use_dbus",
3048
"use_ipv6", "debuglevel", "restore", "statedir",
3049
"socket", "foreground", "zeroconf"):
2200
3050
value = getattr(options, option)
2201
3051
if value is not None:
2202
3052
server_settings[option] = value
2204
3054
# Force all strings to be unicode
2205
3055
for option in server_settings.keys():
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
3056
if isinstance(server_settings[option], bytes):
3057
server_settings[option] = (server_settings[option]
3059
# Force all boolean options to be boolean
3060
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3061
"foreground", "zeroconf"):
3062
server_settings[option] = bool(server_settings[option])
3063
# Debug implies foreground
3064
if server_settings["debug"]:
3065
server_settings["foreground"] = True
2208
3066
# Now we have our good server settings in "server_settings"
2210
3068
##################################################################
3070
if (not server_settings["zeroconf"]
3071
and not (server_settings["port"]
3072
or server_settings["socket"] != "")):
3073
parser.error("Needs port or socket to work without Zeroconf")
2212
3075
# For convenience
2213
3076
debug = server_settings["debug"]
2214
3077
debuglevel = server_settings["debuglevel"]
3146
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2274
3148
except OSError as error:
2275
if error[0] != errno.EPERM:
3149
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3150
.format(uid, gid, os.strerror(error.errno)))
3151
if error.errno != errno.EPERM:
2279
3155
# Enable all possible GnuTLS debugging
2281
3157
# "Use a log level over 10 to enable all debugging options."
2282
3158
# - GnuTLS manual
2283
gnutls.library.functions.gnutls_global_set_log_level(11)
2285
@gnutls.library.types.gnutls_log_func
3159
gnutls.global_set_log_level(11)
2286
3162
def debug_gnutls(level, string):
2287
3163
logger.debug("GnuTLS: %s", string[:-1])
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
3165
gnutls.global_set_log_function(debug_gnutls)
2292
3167
# Redirect stdin so all checkers get /dev/null
2293
3168
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2294
3169
os.dup2(null, sys.stdin.fileno())
2298
3173
# Need to fork before connecting to D-Bus
2300
3175
# Close all input and output, do double fork, etc.
2303
gobject.threads_init()
3178
if gi.version_info < (3, 10, 2):
3179
# multiprocessing will use threads, so before we use GLib we
3180
# need to inform GLib that threads will be used.
2305
3183
global main_loop
2306
3184
# From the Avahi example code
2307
3185
DBusGMainLoop(set_as_default=True)
2308
main_loop = gobject.MainLoop()
3186
main_loop = GLib.MainLoop()
2309
3187
bus = dbus.SystemBus()
2310
3188
# End of Avahi example code
2313
3191
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")
3194
old_bus_name = dbus.service.BusName(
3195
"se.bsnet.fukt.Mandos", bus,
3197
except dbus.exceptions.DBusException as e:
3198
logger.error("Disabling D-Bus:", exc_info=e)
2320
3199
use_dbus = False
2321
3200
server_settings["use_dbus"] = False
2322
3201
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"])))
3203
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3204
service = AvahiServiceToSyslog(
3205
name=server_settings["servicename"],
3206
servicetype="_mandos._tcp",
3209
if server_settings["interface"]:
3210
service.interface = if_nametoindex(
3211
server_settings["interface"].encode("utf-8"))
2332
3213
global multiprocessing_manager
2333
3214
multiprocessing_manager = multiprocessing.Manager()
2335
3216
client_class = Client
2337
client_class = functools.partial(ClientDBusTransitional,
3218
client_class = functools.partial(ClientDBus, bus=bus)
2340
3220
client_settings = Client.config_parser(client_config)
2341
3221
old_client_settings = {}
2342
3222
clients_data = {}
3224
# This is used to redirect stdout and stderr for checker processes
3226
wnull = open(os.devnull, "w") # A writable /dev/null
3227
# Only used if server is running in foreground but not in debug
3229
if debug or not foreground:
2344
3232
# Get client data and settings from last running state.
2345
3233
if server_settings["restore"]:
2347
3235
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
3236
if sys.version_info.major == 2:
3237
clients_data, old_client_settings = pickle.load(
3240
bytes_clients_data, bytes_old_client_settings = (
3241
pickle.load(stored_state, encoding="bytes"))
3242
# Fix bytes to strings
3245
clients_data = {(key.decode("utf-8")
3246
if isinstance(key, bytes)
3249
bytes_clients_data.items()}
3250
del bytes_clients_data
3251
for key in clients_data:
3252
value = {(k.decode("utf-8")
3253
if isinstance(k, bytes) else k): v
3255
clients_data[key].items()}
3256
clients_data[key] = value
3258
value["client_structure"] = [
3260
if isinstance(s, bytes)
3262
value["client_structure"]]
3263
# .name, .host, and .checker_command
3264
for k in ("name", "host", "checker_command"):
3265
if isinstance(value[k], bytes):
3266
value[k] = value[k].decode("utf-8")
3267
if "key_id" not in value:
3268
value["key_id"] = ""
3269
elif "fingerprint" not in value:
3270
value["fingerprint"] = ""
3271
# old_client_settings
3273
old_client_settings = {
3274
(key.decode("utf-8")
3275
if isinstance(key, bytes)
3278
bytes_old_client_settings.items()}
3279
del bytes_old_client_settings
3280
# .host and .checker_command
3281
for value in old_client_settings.values():
3282
for attribute in ("host", "checker_command"):
3283
if isinstance(value[attribute], bytes):
3284
value[attribute] = (value[attribute]
2350
3286
os.remove(stored_state_path)
2351
3287
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
3288
if e.errno == errno.ENOENT:
3289
logger.warning("Could not load persistent state:"
3290
" {}".format(os.strerror(e.errno)))
3292
logger.critical("Could not load persistent state:",
2356
3295
except EOFError as e:
2357
3296
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2360
3300
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
3301
for client_name, client in clients_data.items():
3302
# Skip removed clients
3303
if client_name not in client_settings:
2362
3306
# Decide which value to use after restoring saved state.
2363
3307
# We have three different values: Old config file,
2364
3308
# new config file, and saved state.
2425
3368
clients_data[client_name] = client_settings[client_name]
2427
3370
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
3371
for client_name, client in clients_data.items():
2429
3372
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
3375
server_settings=server_settings)
2432
3377
if not tcp_server.clients:
2433
3378
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
3381
if pidfile is not None:
3385
print(pid, file=pidfile)
3387
logger.error("Could not write to file %r with PID %d",
2447
3390
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())
3392
for termsig in (signal.SIGHUP, signal.SIGTERM):
3393
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3394
lambda: main_loop.quit() and False)
2454
class MandosDBusService(DBusObjectWithProperties):
3398
@alternate_dbus_interfaces(
3399
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3400
class MandosDBusService(DBusObjectWithObjectManager):
2455
3401
"""A D-Bus proxy object"""
2456
3403
def __init__(self):
2457
3404
dbus.service.Object.__init__(self, bus, "/")
2458
3406
_interface = "se.recompile.Mandos"
2460
@dbus_interface_annotations(_interface)
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2466
3408
@dbus.service.signal(_interface, signature="o")
2467
3409
def ClientAdded(self, objpath):
2471
3413
@dbus.service.signal(_interface, signature="ss")
2472
def ClientNotFound(self, fingerprint, address):
3414
def ClientNotFound(self, key_id, address):
3418
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2476
3420
@dbus.service.signal(_interface, signature="os")
2477
3421
def ClientRemoved(self, objpath, name):
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2481
3427
@dbus.service.method(_interface, out_signature="ao")
2482
3428
def GetAllClients(self):
2484
return dbus.Array(c.dbus_object_path
2486
tcp_server.clients.itervalues())
3430
return dbus.Array(c.dbus_object_path for c in
3431
tcp_server.clients.values())
3433
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2488
3435
@dbus.service.method(_interface,
2489
3436
out_signature="a{oa{sv}}")
2490
3437
def GetAllClientsWithProperties(self):
2492
3439
return dbus.Dictionary(
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
3440
{c.dbus_object_path: c.GetAll(
3441
"se.recompile.Mandos.Client")
3442
for c in tcp_server.clients.values()},
2495
3443
signature="oa{sv}")
2497
3445
@dbus.service.method(_interface, in_signature="o")
2498
3446
def RemoveClient(self, object_path):
2500
for c in tcp_server.clients.itervalues():
3448
for c in tcp_server.clients.values():
2501
3449
if c.dbus_object_path == object_path:
2502
3450
del tcp_server.clients[c.name]
2503
3451
c.remove_from_connection()
2504
# Don't signal anything except ClientRemoved
3452
# Don't signal the disabling
2505
3453
c.disable(quiet=True)
2507
self.ClientRemoved(object_path, c.name)
3454
# Emit D-Bus signal for removal
3455
self.client_removed_signal(c)
2509
3457
raise KeyError(object_path)
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
3461
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3462
out_signature="a{oa{sa{sv}}}")
3463
def GetManagedObjects(self):
3465
return dbus.Dictionary(
3466
{client.dbus_object_path:
3468
{interface: client.GetAll(interface)
3470
client._get_all_interface_names()})
3471
for client in tcp_server.clients.values()})
3473
def client_added_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesAdded(
3478
client.dbus_object_path,
3480
{interface: client.GetAll(interface)
3482
client._get_all_interface_names()}))
3484
self.ClientAdded(client.dbus_object_path)
3486
def client_removed_signal(self, client):
3487
"""Send the new standard signal and the old signal"""
3489
# New standard signal
3490
self.InterfacesRemoved(
3491
client.dbus_object_path,
3492
client._get_all_interface_names())
3494
self.ClientRemoved(client.dbus_object_path,
3497
mandos_dbus_service = MandosDBusService()
3499
# Save modules to variables to exempt the modules from being
3500
# unloaded before the function registered with atexit() is run.
3501
mp = multiprocessing
2518
3505
"Cleanup function; run on exit"
2521
multiprocessing.active_children()
3509
mp.active_children()
2522
3511
if not (tcp_server.clients or client_settings):
2525
3514
# Store client before exiting. Secrets are encrypted with key
2526
3515
# based on what config file has. If config file is
2527
3516
# removed/edited, old secret will thus be unrecovable.
2529
3518
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
3519
for client in tcp_server.clients.values():
2531
3520
key = client_settings[client.name]["secret"]
2532
3521
client.encrypted_secret = pgp.encrypt(client.secret,
2534
3523
client_dict = {}
2536
3525
# 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)):
3527
exclude = {"bus", "changedstate", "secret",
3528
"checker", "server_settings"}
3529
for name, typ in inspect.getmembers(dbus.service
2542
3531
exclude.add(name)
2544
3533
client_dict["encrypted_secret"] = (client
2545
3534
.encrypted_secret)
2546
3535
for attr in client.client_structure:
2547
3536
if attr not in exclude:
2548
3537
client_dict[attr] = getattr(client, attr)
2550
3539
clients[client.name] = client_dict
2551
3540
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)
3543
with tempfile.NamedTemporaryFile(
3547
dir=os.path.dirname(stored_state_path),
3548
delete=False) as stored_state:
3549
pickle.dump((clients, client_settings), stored_state,
3551
tempname = stored_state.name
2560
3552
os.rename(tempname, stored_state_path)
2561
3553
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2566
3556
os.remove(tempname)
2567
3557
except NameError:
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
3559
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3560
logger.warning("Could not save persistent state: {}"
3561
.format(os.strerror(e.errno)))
3563
logger.warning("Could not save persistent state:",
2573
3567
# Delete all clients, and settings from config
2574
3568
while tcp_server.clients:
2575
3569
name, client = tcp_server.clients.popitem()
2577
3571
client.remove_from_connection()
2578
# Don't signal anything except ClientRemoved
3572
# Don't signal the disabling
2579
3573
client.disable(quiet=True)
3574
# Emit D-Bus signal for removal
2582
mandos_dbus_service.ClientRemoved(client
3576
mandos_dbus_service.client_removed_signal(client)
2585
3577
client_settings.clear()
2587
3579
atexit.register(cleanup)
2589
for client in tcp_server.clients.itervalues():
3581
for client in tcp_server.clients.values():
2592
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3583
# Emit D-Bus signal for adding
3584
mandos_dbus_service.client_added_signal(client)
2593
3585
# Need to initiate checking of clients
2594
3586
if client.enabled:
2595
3587
client.init_checker()
2597
3589
tcp_server.enable()
2598
3590
tcp_server.server_activate()
2600
3592
# Find out what port we got
2601
service.port = tcp_server.socket.getsockname()[1]
3594
service.port = tcp_server.socket.getsockname()[1]
2603
3596
logger.info("Now listening on address %r, port %d,"
2604
3597
" flowinfo %d, scope_id %d",