63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
71
83
import dbus.service
85
from gi.repository import GLib
74
86
from dbus.mainloop.glib import DBusGMainLoop
77
89
import xml.dom.minidom
92
if sys.version_info.major == 2:
96
# Show warnings by default
97
if not sys.warnoptions:
99
warnings.simplefilter("default")
101
# Try to find the value of SO_BINDTODEVICE:
103
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
104
# newer, and it is also the most natural place for it:
82
105
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
83
106
except AttributeError:
108
# This is where SO_BINDTODEVICE was up to and including Python
85
110
from IN import SO_BINDTODEVICE
86
111
except ImportError:
87
SO_BINDTODEVICE = None
112
# In Python 2.7 it seems to have been removed entirely.
113
# Try running the C preprocessor:
115
cc = subprocess.Popen(["cc", "--language=c", "-E",
117
stdin=subprocess.PIPE,
118
stdout=subprocess.PIPE)
119
stdout = cc.communicate(
120
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
121
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
122
except (OSError, ValueError, IndexError):
124
SO_BINDTODEVICE = None
126
if sys.version_info < (3, 2):
127
configparser.Configparser = configparser.SafeConfigParser
90
130
stored_state_file = "clients.pickle"
92
132
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
133
logging.captureWarnings(True) # Show warnings via the logging system
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
137
if_nametoindex = ctypes.cdll.LoadLibrary(
138
ctypes.util.find_library("c")).if_nametoindex
101
139
except (OSError, AttributeError):
102
141
def if_nametoindex(interface):
103
142
"Get an interface index the hard way, i.e. using fcntl()"
104
143
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
144
with contextlib.closing(socket.socket()) as s:
106
145
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
146
struct.pack(b"16s16x", interface))
147
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
148
return interface_index
151
def copy_function(func):
152
"""Make a copy of a function"""
153
if sys.version_info.major == 2:
154
return types.FunctionType(func.func_code,
160
return types.FunctionType(func.__code__,
114
167
def initlogger(debug, level=logging.WARNING):
115
168
"""init logger and add loglevel"""
171
syslogger = (logging.handlers.SysLogHandler(
172
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
174
syslogger.setFormatter(logging.Formatter
118
175
('Mandos [%(process)d]: %(levelname)s:'
120
177
logger.addHandler(syslogger)
123
180
console = logging.StreamHandler()
124
181
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
238
os.rmdir(self.tempdir)
170
239
self.tempdir = None
172
241
def password_encode(self, password):
173
242
# Passphrase can not be empty and can not contain newlines or
174
243
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
244
encoded = b"mandos" + binascii.hexlify(password)
245
if len(encoded) > 2048:
246
# GnuPG can't handle long passwords, so encode differently
247
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
248
.replace(b"\n", b"\\n")
249
.replace(b"\0", b"\\x00"))
177
252
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
253
passphrase = self.password_encode(password)
254
with tempfile.NamedTemporaryFile(
255
dir=self.tempdir) as passfile:
256
passfile.write(passphrase)
258
proc = subprocess.Popen([self.gpg, '--symmetric',
262
stdin=subprocess.PIPE,
263
stdout=subprocess.PIPE,
264
stderr=subprocess.PIPE)
265
ciphertext, err = proc.communicate(input=data)
266
if proc.returncode != 0:
192
268
return ciphertext
194
270
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
271
passphrase = self.password_encode(password)
272
with tempfile.NamedTemporaryFile(
273
dir=self.tempdir) as passfile:
274
passfile.write(passphrase)
276
proc = subprocess.Popen([self.gpg, '--decrypt',
280
stdin=subprocess.PIPE,
281
stdout=subprocess.PIPE,
282
stderr=subprocess.PIPE)
283
decrypted_plaintext, err = proc.communicate(input=data)
284
if proc.returncode != 0:
209
286
return decrypted_plaintext
289
# Pretend that we have an Avahi module
291
"""This isn't so much a class as it is a module-like namespace."""
292
IF_UNSPEC = -1 # avahi-common/address.h
293
PROTO_UNSPEC = -1 # avahi-common/address.h
294
PROTO_INET = 0 # avahi-common/address.h
295
PROTO_INET6 = 1 # avahi-common/address.h
296
DBUS_NAME = "org.freedesktop.Avahi"
297
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
298
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
299
DBUS_PATH_SERVER = "/"
302
def string_array_to_txt_array(t):
303
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
304
for s in t), signature="ay")
305
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
306
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
307
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
308
SERVER_INVALID = 0 # avahi-common/defs.h
309
SERVER_REGISTERING = 1 # avahi-common/defs.h
310
SERVER_RUNNING = 2 # avahi-common/defs.h
311
SERVER_COLLISION = 3 # avahi-common/defs.h
312
SERVER_FAILURE = 4 # avahi-common/defs.h
213
315
class AvahiError(Exception):
214
316
def __init__(self, value, *args, **kwargs):
215
317
self.value = value
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
318
return super(AvahiError, self).__init__(value, *args,
220
322
class AvahiServiceError(AvahiError):
223
326
class AvahiGroupError(AvahiError):
227
class AvahiService(object):
228
331
"""An Avahi (Zeroconf) service.
231
334
interface: integer; avahi.IF_UNSPEC or an interface index.
232
335
Used to optionally bind to the specified interface.
233
336
name: string; Example: 'Mandos'
234
337
type: string; Example: '_mandos._tcp'.
235
See <http://www.dns-sd.org/ServiceTypes.html>
338
See <https://www.iana.org/assignments/service-names-port-numbers>
236
339
port: integer; what port to announce
237
340
TXT: list of strings; TXT record for the service
238
341
domain: string; Domain to publish on, default to .local if empty.
367
500
follow_name_owner_changes=True),
368
501
avahi.DBUS_INTERFACE_SERVER)
369
502
self.server.connect_to_signal("StateChanged",
370
self.server_state_changed)
503
self.server_state_changed)
371
504
self.server_state_changed(self.server.GetState())
373
507
class AvahiServiceToSyslog(AvahiService):
508
def rename(self, *args, **kwargs):
375
509
"""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'
510
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
511
syslogger.setFormatter(logging.Formatter(
512
'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):
517
# Pretend that we have a GnuTLS module
519
"""This isn't so much a class as it is a module-like namespace."""
521
library = ctypes.util.find_library("gnutls")
523
library = ctypes.util.find_library("gnutls-deb0")
524
_library = ctypes.cdll.LoadLibrary(library)
527
# Unless otherwise indicated, the constants and types below are
528
# all from the gnutls/gnutls.h C header file.
539
E_NO_CERTIFICATE_FOUND = -49
544
KEYID_USE_SHA256 = 1 # gnutls/x509.h
545
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
548
class session_int(ctypes.Structure):
550
session_t = ctypes.POINTER(session_int)
552
class certificate_credentials_st(ctypes.Structure):
554
certificate_credentials_t = ctypes.POINTER(
555
certificate_credentials_st)
556
certificate_type_t = ctypes.c_int
558
class datum_t(ctypes.Structure):
559
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
560
('size', ctypes.c_uint)]
562
class openpgp_crt_int(ctypes.Structure):
564
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
565
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
566
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
567
credentials_type_t = ctypes.c_int
568
transport_ptr_t = ctypes.c_void_p
569
close_request_t = ctypes.c_int
572
class Error(Exception):
573
def __init__(self, message=None, code=None, args=()):
574
# Default usage is by a message string, but if a return
575
# code is passed, convert it to a string with
578
if message is None and code is not None:
579
message = gnutls.strerror(code)
580
return super(gnutls.Error, self).__init__(
583
class CertificateSecurityError(Error):
589
self._c_object = gnutls.certificate_credentials_t()
590
gnutls.certificate_allocate_credentials(
591
ctypes.byref(self._c_object))
592
self.type = gnutls.CRD_CERTIFICATE
595
gnutls.certificate_free_credentials(self._c_object)
598
def __init__(self, socket, credentials=None):
599
self._c_object = gnutls.session_t()
600
gnutls_flags = gnutls.CLIENT
601
if gnutls.check_version(b"3.5.6"):
602
gnutls_flags |= gnutls.NO_TICKETS
604
gnutls_flags |= gnutls.ENABLE_RAWPK
605
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
607
gnutls.set_default_priority(self._c_object)
608
gnutls.transport_set_ptr(self._c_object, socket.fileno())
609
gnutls.handshake_set_private_extensions(self._c_object,
612
if credentials is None:
613
credentials = gnutls.Credentials()
614
gnutls.credentials_set(self._c_object, credentials.type,
615
ctypes.cast(credentials._c_object,
617
self.credentials = credentials
620
gnutls.deinit(self._c_object)
623
return gnutls.handshake(self._c_object)
625
def send(self, data):
629
data_len -= gnutls.record_send(self._c_object,
634
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
636
# Error handling functions
637
def _error_code(result):
638
"""A function to raise exceptions on errors, suitable
639
for the 'restype' attribute on ctypes functions"""
642
if result == gnutls.E_NO_CERTIFICATE_FOUND:
643
raise gnutls.CertificateSecurityError(code=result)
644
raise gnutls.Error(code=result)
646
def _retry_on_error(result, func, arguments):
647
"""A function to retry on some errors, suitable
648
for the 'errcheck' attribute on ctypes functions"""
650
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
651
return _error_code(result)
652
result = func(*arguments)
655
# Unless otherwise indicated, the function declarations below are
656
# all from the gnutls/gnutls.h C header file.
659
priority_set_direct = _library.gnutls_priority_set_direct
660
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
661
ctypes.POINTER(ctypes.c_char_p)]
662
priority_set_direct.restype = _error_code
664
init = _library.gnutls_init
665
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
666
init.restype = _error_code
668
set_default_priority = _library.gnutls_set_default_priority
669
set_default_priority.argtypes = [session_t]
670
set_default_priority.restype = _error_code
672
record_send = _library.gnutls_record_send
673
record_send.argtypes = [session_t, ctypes.c_void_p,
675
record_send.restype = ctypes.c_ssize_t
676
record_send.errcheck = _retry_on_error
678
certificate_allocate_credentials = (
679
_library.gnutls_certificate_allocate_credentials)
680
certificate_allocate_credentials.argtypes = [
681
ctypes.POINTER(certificate_credentials_t)]
682
certificate_allocate_credentials.restype = _error_code
684
certificate_free_credentials = (
685
_library.gnutls_certificate_free_credentials)
686
certificate_free_credentials.argtypes = [
687
certificate_credentials_t]
688
certificate_free_credentials.restype = None
690
handshake_set_private_extensions = (
691
_library.gnutls_handshake_set_private_extensions)
692
handshake_set_private_extensions.argtypes = [session_t,
694
handshake_set_private_extensions.restype = None
696
credentials_set = _library.gnutls_credentials_set
697
credentials_set.argtypes = [session_t, credentials_type_t,
699
credentials_set.restype = _error_code
701
strerror = _library.gnutls_strerror
702
strerror.argtypes = [ctypes.c_int]
703
strerror.restype = ctypes.c_char_p
705
certificate_type_get = _library.gnutls_certificate_type_get
706
certificate_type_get.argtypes = [session_t]
707
certificate_type_get.restype = _error_code
709
certificate_get_peers = _library.gnutls_certificate_get_peers
710
certificate_get_peers.argtypes = [session_t,
711
ctypes.POINTER(ctypes.c_uint)]
712
certificate_get_peers.restype = ctypes.POINTER(datum_t)
714
global_set_log_level = _library.gnutls_global_set_log_level
715
global_set_log_level.argtypes = [ctypes.c_int]
716
global_set_log_level.restype = None
718
global_set_log_function = _library.gnutls_global_set_log_function
719
global_set_log_function.argtypes = [log_func]
720
global_set_log_function.restype = None
722
deinit = _library.gnutls_deinit
723
deinit.argtypes = [session_t]
724
deinit.restype = None
726
handshake = _library.gnutls_handshake
727
handshake.argtypes = [session_t]
728
handshake.restype = _error_code
729
handshake.errcheck = _retry_on_error
731
transport_set_ptr = _library.gnutls_transport_set_ptr
732
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
733
transport_set_ptr.restype = None
735
bye = _library.gnutls_bye
736
bye.argtypes = [session_t, close_request_t]
737
bye.restype = _error_code
738
bye.errcheck = _retry_on_error
740
check_version = _library.gnutls_check_version
741
check_version.argtypes = [ctypes.c_char_p]
742
check_version.restype = ctypes.c_char_p
744
_need_version = b"3.3.0"
745
if check_version(_need_version) is None:
746
raise self.Error("Needs GnuTLS {} or later"
747
.format(_need_version))
749
_tls_rawpk_version = b"3.6.6"
750
has_rawpk = bool(check_version(_tls_rawpk_version))
754
class pubkey_st(ctypes.Structure):
756
pubkey_t = ctypes.POINTER(pubkey_st)
758
x509_crt_fmt_t = ctypes.c_int
760
# All the function declarations below are from gnutls/abstract.h
761
pubkey_init = _library.gnutls_pubkey_init
762
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
763
pubkey_init.restype = _error_code
765
pubkey_import = _library.gnutls_pubkey_import
766
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
768
pubkey_import.restype = _error_code
770
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
771
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
772
ctypes.POINTER(ctypes.c_ubyte),
773
ctypes.POINTER(ctypes.c_size_t)]
774
pubkey_get_key_id.restype = _error_code
776
pubkey_deinit = _library.gnutls_pubkey_deinit
777
pubkey_deinit.argtypes = [pubkey_t]
778
pubkey_deinit.restype = None
780
# All the function declarations below are from gnutls/openpgp.h
782
openpgp_crt_init = _library.gnutls_openpgp_crt_init
783
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
784
openpgp_crt_init.restype = _error_code
786
openpgp_crt_import = _library.gnutls_openpgp_crt_import
787
openpgp_crt_import.argtypes = [openpgp_crt_t,
788
ctypes.POINTER(datum_t),
790
openpgp_crt_import.restype = _error_code
792
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
793
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
794
ctypes.POINTER(ctypes.c_uint)]
795
openpgp_crt_verify_self.restype = _error_code
797
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
798
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
799
openpgp_crt_deinit.restype = None
801
openpgp_crt_get_fingerprint = (
802
_library.gnutls_openpgp_crt_get_fingerprint)
803
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
807
openpgp_crt_get_fingerprint.restype = _error_code
809
if check_version(b"3.6.4"):
810
certificate_type_get2 = _library.gnutls_certificate_type_get2
811
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
812
certificate_type_get2.restype = _error_code
814
# Remove non-public functions
815
del _error_code, _retry_on_error
818
def call_pipe(connection, # : multiprocessing.Connection
819
func, *args, **kwargs):
820
"""This function is meant to be called by multiprocessing.Process
822
This function runs func(*args, **kwargs), and writes the resulting
823
return value on the provided multiprocessing.Connection.
825
connection.send(func(*args, **kwargs))
390
830
"""A representation of a client host served by this server.
393
833
approved: bool(); 'None' if not yet approved/disapproved
394
834
approval_delay: datetime.timedelta(); Time to wait for approval
395
835
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
836
checker: multiprocessing.Process(); a running checker process used
837
to see if the client lives. 'None' if no process is
839
checker_callback_tag: a GLib event source tag, or None
400
840
checker_command: string; External command which is run to check
401
841
if client lives. %() expansions are done at
402
842
runtime with vars(self) as dict, so that for
403
843
instance %(name)s can be used in the command.
404
checker_initiator_tag: a gobject event source tag, or None
844
checker_initiator_tag: a GLib event source tag, or None
405
845
created: datetime.datetime(); (UTC) object creation
406
846
client_structure: Object describing what attributes a client has
407
847
and is used for storing the client at exit
408
848
current_checker_command: string; current running checker_command
409
disable_initiator_tag: a gobject event source tag, or None
849
disable_initiator_tag: a GLib event source tag, or None
411
851
fingerprint: string (40 or 32 hexadecimal digits); used to
412
uniquely identify the client
852
uniquely identify an OpenPGP client
853
key_id: string (64 hexadecimal digits); used to uniquely identify
854
a client using raw public keys
413
855
host: string; available for use by the checker command
414
856
interval: datetime.timedelta(); How often to start a new checker
415
857
last_approval_request: datetime.datetime(); (UTC) or None
542
978
self.current_checker_command = None
543
979
self.approved = None
544
980
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()
981
self.changedstate = multiprocessing_manager.Condition(
982
multiprocessing_manager.Lock())
983
self.client_structure = [attr
984
for attr in self.__dict__.keys()
550
985
if not attr.startswith("_")]
551
986
self.client_structure.append("client_structure")
553
for name, t in inspect.getmembers(type(self),
988
for name, t in inspect.getmembers(
989
type(self), lambda obj: isinstance(obj, property)):
557
990
if not name.startswith("_"):
558
991
self.client_structure.append(name)
560
993
# Send notice to process children that client state has changed
561
994
def send_changedstate(self):
562
995
with self.changedstate:
563
996
self.changedstate.notify_all()
565
998
def enable(self):
566
999
"""Start this client's checker and timeout hooks"""
567
1000
if getattr(self, "enabled", False):
568
1001
# Already enabled
570
self.send_changedstate()
571
1003
self.expires = datetime.datetime.utcnow() + self.timeout
572
1004
self.enabled = True
573
1005
self.last_enabled = datetime.datetime.utcnow()
574
1006
self.init_checker()
1007
self.send_changedstate()
576
1009
def disable(self, quiet=True):
577
1010
"""Disable this client."""
578
1011
if not getattr(self, "enabled", False):
581
self.send_changedstate()
583
1014
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1015
if getattr(self, "disable_initiator_tag", None) is not None:
1016
GLib.source_remove(self.disable_initiator_tag)
586
1017
self.disable_initiator_tag = None
587
1018
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1019
if getattr(self, "checker_initiator_tag", None) is not None:
1020
GLib.source_remove(self.checker_initiator_tag)
590
1021
self.checker_initiator_tag = None
591
1022
self.stop_checker()
592
1023
self.enabled = False
593
# Do not run this again if called by a gobject.timeout_add
1025
self.send_changedstate()
1026
# Do not run this again if called by a GLib.timeout_add
596
1029
def __del__(self):
599
1032
def init_checker(self):
600
1033
# Schedule a new checker to be started an 'interval' from now,
601
1034
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1035
if self.checker_initiator_tag is not None:
1036
GLib.source_remove(self.checker_initiator_tag)
1037
self.checker_initiator_tag = GLib.timeout_add(
1038
int(self.interval.total_seconds() * 1000),
605
1040
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1041
if self.disable_initiator_tag is not None:
1042
GLib.source_remove(self.disable_initiator_tag)
1043
self.disable_initiator_tag = GLib.timeout_add(
1044
int(self.timeout.total_seconds() * 1000), self.disable)
609
1045
# Also start a new checker *right now*.
610
1046
self.start_checker()
612
def checker_callback(self, pid, condition, command):
1048
def checker_callback(self, source, condition, connection,
613
1050
"""The checker has completed, so take appropriate actions."""
1051
# Read return code from connection (see call_pipe)
1052
returncode = connection.recv()
1054
if self.checker is not None:
614
1056
self.checker_callback_tag = None
615
1057
self.checker = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1060
self.last_checker_status = returncode
1061
self.last_checker_signal = None
618
1062
if self.last_checker_status == 0:
619
1063
logger.info("Checker for %(name)s succeeded",
621
1065
self.checked_ok()
623
logger.info("Checker for %(name)s failed",
1067
logger.info("Checker for %(name)s failed", vars(self))
626
1069
self.last_checker_status = -1
1070
self.last_checker_signal = -returncode
627
1071
logger.warning("Checker for %(name)s crashed?",
630
1075
def checked_ok(self):
631
1076
"""Assert that the client has been seen, alive and well."""
632
1077
self.last_checked_ok = datetime.datetime.utcnow()
633
1078
self.last_checker_status = 0
1079
self.last_checker_signal = None
634
1080
self.bump_timeout()
636
1082
def bump_timeout(self, timeout=None):
637
1083
"""Bump up the timeout for this client."""
638
1084
if timeout is None:
639
1085
timeout = self.timeout
640
1086
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
1087
GLib.source_remove(self.disable_initiator_tag)
1088
self.disable_initiator_tag = None
642
1089
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1090
self.disable_initiator_tag = GLib.timeout_add(
1091
int(timeout.total_seconds() * 1000), self.disable)
646
1092
self.expires = datetime.datetime.utcnow() + timeout
648
1094
def need_approval(self):
649
1095
self.last_approval_request = datetime.datetime.utcnow()
651
1097
def start_checker(self):
652
1098
"""Start a new checker subprocess if one is not running.
654
1100
If a checker already exists, leave it running and do
656
1102
# 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
1103
# did that, and if a checker (for some reason) started running
1104
# slowly and taking more than 'interval' time, then the client
1105
# would inevitably timeout, since no checker would get a
1106
# chance to run to completion. If we instead leave running
661
1107
# checkers alone, the checker would have to take more time
662
1108
# 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)
1111
if self.checker is not None and not self.checker.is_alive():
1112
logger.warning("Checker was not alive; joining")
678
1115
# Start a new checker if needed
679
1116
if self.checker is None:
1117
# Escape attributes for the shell
1119
attr: re.escape(str(getattr(self, attr)))
1120
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
1122
command = self.checker_command % escaped_attrs
1123
except TypeError as error:
1124
logger.error('Could not format string "%s"',
1125
self.checker_command,
1127
return True # Try again later
699
1128
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
1129
logger.info("Starting checker %r for %s", command,
1131
# We don't need to redirect stdout and stderr, since
1132
# in normal mode, that is already done by daemon(),
1133
# and in debug mode we don't want to. (Stdin is
1134
# always replaced by /dev/null.)
1135
# The exception is when not debugging but nevertheless
1136
# running in the foreground; use the previously
1138
popen_args = {"close_fds": True,
1141
if (not self.server_settings["debug"]
1142
and self.server_settings["foreground"]):
1143
popen_args.update({"stdout": wnull,
1145
pipe = multiprocessing.Pipe(duplex=False)
1146
self.checker = multiprocessing.Process(
1148
args=(pipe[1], subprocess.call, command),
1150
self.checker.start()
1151
self.checker_callback_tag = GLib.io_add_watch(
1152
GLib.IOChannel.unix_new(pipe[0].fileno()),
1153
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1154
self.checker_callback, pipe[0], command)
1155
# Re-run this periodically if run by GLib.timeout_add
726
1158
def stop_checker(self):
727
1159
"""Force the checker process, if any, to stop."""
728
1160
if self.checker_callback_tag:
729
gobject.source_remove(self.checker_callback_tag)
1161
GLib.source_remove(self.checker_callback_tag)
730
1162
self.checker_callback_tag = None
731
1163
if getattr(self, "checker", None) is None:
733
1165
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
1166
self.checker.terminate()
742
1167
self.checker = None
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1170
def dbus_service_property(dbus_interface,
747
1174
"""Decorators for marking methods of a DBusObjectWithProperties to
748
1175
become properties on the D-Bus.
750
1177
The decorated method will be called with no arguments by "Get"
751
1178
and with one argument by "Set".
753
1180
The parameters, where they are supported, are the same as
754
1181
dbus.service.method, except there is only "signature", since the
755
1182
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.
1265
class DBusObjectWithAnnotations(dbus.service.Object):
1266
"""A D-Bus object with annotations.
1268
Classes inheriting from this can use the dbus_annotations
1269
decorator to add annotations to methods or signals.
840
1273
def _is_dbus_thing(thing):
841
1274
"""Returns a function testing if an attribute is a D-Bus thing
843
1276
If called like _is_dbus_thing("method") it returns a function
844
1277
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1279
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
849
1282
def _get_all_dbus_things(self, thing):
850
1283
"""Returns a generator of (name, attribute) pairs
852
return ((getattr(athing.__get__(self), "_dbus_name",
1285
return ((getattr(athing.__get__(self), "_dbus_name", name),
854
1286
athing.__get__(self))
855
1287
for cls in self.__class__.__mro__
856
1288
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1289
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1291
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1293
path_keyword='object_path',
1294
connection_keyword='connection')
1295
def Introspect(self, object_path, connection):
1296
"""Overloading of standard D-Bus method.
1298
Inserts annotation tags on methods and signals.
1300
xmlstring = dbus.service.Object.Introspect(self, object_path,
1303
document = xml.dom.minidom.parseString(xmlstring)
1305
for if_tag in document.getElementsByTagName("interface"):
1306
# Add annotation tags
1307
for typ in ("method", "signal"):
1308
for tag in if_tag.getElementsByTagName(typ):
1310
for name, prop in (self.
1311
_get_all_dbus_things(typ)):
1312
if (name == tag.getAttribute("name")
1313
and prop._dbus_interface
1314
== if_tag.getAttribute("name")):
1315
annots.update(getattr(
1316
prop, "_dbus_annotations", {}))
1317
for name, value in annots.items():
1318
ann_tag = document.createElement(
1320
ann_tag.setAttribute("name", name)
1321
ann_tag.setAttribute("value", value)
1322
tag.appendChild(ann_tag)
1323
# Add interface annotation tags
1324
for annotation, value in dict(
1325
itertools.chain.from_iterable(
1326
annotations().items()
1327
for name, annotations
1328
in self._get_all_dbus_things("interface")
1329
if name == if_tag.getAttribute("name")
1331
ann_tag = document.createElement("annotation")
1332
ann_tag.setAttribute("name", annotation)
1333
ann_tag.setAttribute("value", value)
1334
if_tag.appendChild(ann_tag)
1335
# Fix argument name for the Introspect method itself
1336
if (if_tag.getAttribute("name")
1337
== dbus.INTROSPECTABLE_IFACE):
1338
for cn in if_tag.getElementsByTagName("method"):
1339
if cn.getAttribute("name") == "Introspect":
1340
for arg in cn.getElementsByTagName("arg"):
1341
if (arg.getAttribute("direction")
1343
arg.setAttribute("name",
1345
xmlstring = document.toxml("utf-8")
1347
except (AttributeError, xml.dom.DOMException,
1348
xml.parsers.expat.ExpatError) as error:
1349
logger.error("Failed to override Introspection method",
1354
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1355
"""A D-Bus object with properties.
1357
Classes inheriting from this can use the dbus_service_property
1358
decorator to expose methods as D-Bus properties. It exposes the
1359
standard Get(), Set(), and GetAll() methods on the D-Bus.
860
1362
def _get_dbus_property(self, interface_name, property_name):
861
1363
"""Returns a bound method if one exists which is a D-Bus
862
1364
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"))):
1366
for cls in self.__class__.__mro__:
1367
for name, value in inspect.getmembers(
1368
cls, self._is_dbus_thing("property")):
868
1369
if (value._dbus_name == property_name
869
1370
and value._dbus_interface == interface_name):
870
1371
return value.__get__(self)
872
1373
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1374
raise DBusPropertyNotFound("{}:{}.{}".format(
1375
self.dbus_object_path, interface_name, property_name))
1378
def _get_all_interface_names(cls):
1379
"""Get a sequence of all interfaces supported by an object"""
1380
return (name for name in set(getattr(getattr(x, attr),
1381
"_dbus_interface", None)
1382
for x in (inspect.getmro(cls))
1384
if name is not None)
1386
@dbus.service.method(dbus.PROPERTIES_IFACE,
878
1388
out_signature="v")
879
1389
def Get(self, interface_name, property_name):
880
1390
"""Standard D-Bus property Get() method, see D-Bus standard.
1010
1518
return xmlstring
1013
def datetime_to_dbus (dt, variant_level=0):
1522
dbus.OBJECT_MANAGER_IFACE
1523
except AttributeError:
1524
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1527
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1528
"""A D-Bus object with an ObjectManager.
1530
Classes inheriting from this exposes the standard
1531
GetManagedObjects call and the InterfacesAdded and
1532
InterfacesRemoved signals on the standard
1533
"org.freedesktop.DBus.ObjectManager" interface.
1535
Note: No signals are sent automatically; they must be sent
1538
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1539
out_signature="a{oa{sa{sv}}}")
1540
def GetManagedObjects(self):
1541
"""This function must be overridden"""
1542
raise NotImplementedError()
1544
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1545
signature="oa{sa{sv}}")
1546
def InterfacesAdded(self, object_path, interfaces_and_properties):
1549
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1550
def InterfacesRemoved(self, object_path, interfaces):
1553
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1555
path_keyword='object_path',
1556
connection_keyword='connection')
1557
def Introspect(self, object_path, connection):
1558
"""Overloading of standard D-Bus method.
1560
Override return argument name of GetManagedObjects to be
1561
"objpath_interfaces_and_properties"
1563
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1567
document = xml.dom.minidom.parseString(xmlstring)
1569
for if_tag in document.getElementsByTagName("interface"):
1570
# Fix argument name for the GetManagedObjects method
1571
if (if_tag.getAttribute("name")
1572
== dbus.OBJECT_MANAGER_IFACE):
1573
for cn in if_tag.getElementsByTagName("method"):
1574
if (cn.getAttribute("name")
1575
== "GetManagedObjects"):
1576
for arg in cn.getElementsByTagName("arg"):
1577
if (arg.getAttribute("direction")
1581
"objpath_interfaces"
1583
xmlstring = document.toxml("utf-8")
1585
except (AttributeError, xml.dom.DOMException,
1586
xml.parsers.expat.ExpatError) as error:
1587
logger.error("Failed to override Introspection method",
1592
def datetime_to_dbus(dt, variant_level=0):
1014
1593
"""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.
1595
return dbus.String("", variant_level=variant_level)
1596
return dbus.String(dt.isoformat(), variant_level=variant_level)
1599
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1600
"""A class decorator; applied to a subclass of
1601
dbus.service.Object, it will add alternate D-Bus attributes with
1602
interface names according to the "alt_interface_names" mapping.
1605
@alternate_dbus_interfaces({"org.example.Interface":
1606
"net.example.AlternateInterface"})
1607
class SampleDBusObject(dbus.service.Object):
1608
@dbus.service.method("org.example.Interface")
1609
def SampleDBusMethod():
1612
The above "SampleDBusMethod" on "SampleDBusObject" will be
1613
reachable via two interfaces: "org.example.Interface" and
1614
"net.example.AlternateInterface", the latter of which will have
1615
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1616
"true", unless "deprecate" is passed with a False value.
1618
This works for methods and signals, and also for D-Bus properties
1619
(from DBusObjectWithProperties) and interfaces (from the
1620
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):
1624
for orig_interface_name, alt_interface_name in (
1625
alt_interface_names.items()):
1627
interface_names = set()
1628
# Go though all attributes of the class
1629
for attrname, attribute in inspect.getmembers(cls):
1034
1630
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1631
# with the wrong interface name
1036
1632
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1633
or not attribute._dbus_interface.startswith(
1634
orig_interface_name)):
1040
1636
# Create an alternate D-Bus interface name based on
1041
1637
# 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)
1638
alt_interface = attribute._dbus_interface.replace(
1639
orig_interface_name, alt_interface_name)
1640
interface_names.add(alt_interface)
1047
1641
# Is this a D-Bus signal?
1048
1642
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1643
# Extract the original non-method undecorated
1644
# function by black magic
1645
if sys.version_info.major == 2:
1646
nonmethod_func = (dict(
1052
1647
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1648
attribute.__closure__))
1649
["func"].cell_contents)
1651
nonmethod_func = (dict(
1652
zip(attribute.__code__.co_freevars,
1653
attribute.__closure__))
1654
["func"].cell_contents)
1055
1655
# Create a new, but exactly alike, function
1056
1656
# object, and decorate it to be a new D-Bus signal
1057
1657
# 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)))
1658
new_function = copy_function(nonmethod_func)
1659
new_function = (dbus.service.signal(
1661
attribute._dbus_signature)(new_function))
1067
1662
# Copy annotations, if any
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1664
new_function._dbus_annotations = dict(
1665
attribute._dbus_annotations)
1071
1666
except AttributeError:
1073
1669
# 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
1670
# original and alternate functions, so both the
1671
# original and alternate signals gets sent when
1672
# the function is called
1076
1673
def fixscope(func1, func2):
1077
1674
"""This function is a scope container to pass
1078
1675
func1 and func2 to the "call_both" function
1079
1676
outside of its arguments"""
1678
@functools.wraps(func2)
1080
1679
def call_both(*args, **kwargs):
1081
1680
"""This function will emit two D-Bus
1082
1681
signals by calling func1 and func2"""
1083
1682
func1(*args, **kwargs)
1084
1683
func2(*args, **kwargs)
1684
# Make wrapper function look like a D-Bus
1686
for name, attr in inspect.getmembers(func2):
1687
if name.startswith("_dbus_"):
1688
setattr(call_both, name, attr)
1085
1690
return call_both
1086
1691
# Create the "call_both" function and add it to
1088
attr[attrname] = fixscope(attribute,
1693
attr[attrname] = fixscope(attribute, new_function)
1090
1694
# Is this a D-Bus method?
1091
1695
elif getattr(attribute, "_dbus_is_method", False):
1092
1696
# Create a new, but exactly alike, function
1093
1697
# object. Decorate it to be a new D-Bus method
1094
1698
# with the alternate D-Bus interface name. Add it
1095
1699
# 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)))
1701
dbus.service.method(
1703
attribute._dbus_in_signature,
1704
attribute._dbus_out_signature)
1705
(copy_function(attribute)))
1106
1706
# Copy annotations, if any
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1708
attr[attrname]._dbus_annotations = dict(
1709
attribute._dbus_annotations)
1110
1710
except AttributeError:
1112
1712
# Is this a D-Bus property?
1140
1733
# object. Decorate it to be a new D-Bus interface
1141
1734
# with the alternate D-Bus interface name. Add it
1142
1735
# 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)
1737
dbus_interface_annotations(alt_interface)
1738
(copy_function(attribute)))
1740
# Deprecate all alternate interfaces
1741
iname = "_AlternateDBusNames_interface_annotation{}"
1742
for interface_name in interface_names:
1744
@dbus_interface_annotations(interface_name)
1746
return {"org.freedesktop.DBus.Deprecated":
1748
# Find an unused name
1749
for aname in (iname.format(i)
1750
for i in itertools.count()):
1751
if aname not in attr:
1755
# Replace the class with a new subclass of it with
1756
# methods, signals, etc. as created above.
1757
if sys.version_info.major == 2:
1758
cls = type(b"{}Alternate".format(cls.__name__),
1761
cls = type("{}Alternate".format(cls.__name__),
1768
@alternate_dbus_interfaces({"se.recompile.Mandos":
1769
"se.bsnet.fukt.Mandos"})
1166
1770
class ClientDBus(Client, DBusObjectWithProperties):
1167
1771
"""A Client class using D-Bus
1170
1774
dbus_object_path: dbus.ObjectPath
1171
1775
bus: dbus.SystemBus()
1174
1778
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
1779
+ ("dbus_object_path", ))
1781
_interface = "se.recompile.Mandos.Client"
1177
1783
# dbus.service.Object doesn't use super(), so we can't either.
1179
def __init__(self, bus = None, *args, **kwargs):
1785
def __init__(self, bus=None, *args, **kwargs):
1181
1787
Client.__init__(self, *args, **kwargs)
1182
1788
# Only now, when this client is initialized, can it show up on
1184
client_object_name = unicode(self.name).translate(
1790
client_object_name = str(self.name).translate(
1185
1791
{ord("."): ord("_"),
1186
1792
ord("-"): ord("_")})
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1793
self.dbus_object_path = dbus.ObjectPath(
1794
"/clients/" + client_object_name)
1189
1795
DBusObjectWithProperties.__init__(self, self.bus,
1190
1796
self.dbus_object_path)
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1798
def notifychangeproperty(transform_func, dbus_name,
1799
type_func=lambda x: x,
1801
invalidate_only=False,
1802
_interface=_interface):
1195
1803
""" Modify a variable so that it's a property which announces
1196
1804
its changes to DBus.
1198
1806
transform_fun: Function that takes a value and a variant_level
1199
1807
and transforms it to a D-Bus type.
1200
1808
dbus_name: D-Bus name of the variable
1350
1960
server to mandos-client
1354
1964
# Rejected - signal
1355
1965
@dbus.service.signal(_interface, signature="s")
1356
1966
def Rejected(self, reason):
1360
1970
# NeedApproval - signal
1361
1971
@dbus.service.signal(_interface, signature="tb")
1362
1972
def NeedApproval(self, timeout, default):
1364
1974
return self.need_approval()
1368
1978
# Approve - method
1369
1979
@dbus.service.method(_interface, in_signature="b")
1370
1980
def Approve(self, value):
1371
1981
self.approve(value)
1373
1983
# CheckedOK - method
1374
1984
@dbus.service.method(_interface)
1375
1985
def CheckedOK(self):
1376
1986
self.checked_ok()
1378
1988
# Enable - method
1989
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
1990
@dbus.service.method(_interface)
1380
1991
def Enable(self):
1384
1995
# StartChecker - method
1996
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
1997
@dbus.service.method(_interface)
1386
1998
def StartChecker(self):
1388
2000
self.start_checker()
1390
2002
# Disable - method
2003
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2004
@dbus.service.method(_interface)
1392
2005
def Disable(self):
1396
2009
# StopChecker - method
2010
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2011
@dbus.service.method(_interface)
1398
2012
def StopChecker(self):
1399
2013
self.stop_checker()
1403
2017
# ApprovalPending - property
1404
2018
@dbus_service_property(_interface, signature="b", access="read")
1405
2019
def ApprovalPending_dbus_property(self):
1406
2020
return dbus.Boolean(bool(self.approvals_pending))
1408
2022
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2023
@dbus_service_property(_interface,
1410
2025
access="readwrite")
1411
2026
def ApprovedByDefault_dbus_property(self, value=None):
1412
2027
if value is None: # get
1413
2028
return dbus.Boolean(self.approved_by_default)
1414
2029
self.approved_by_default = bool(value)
1416
2031
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2032
@dbus_service_property(_interface,
1418
2034
access="readwrite")
1419
2035
def ApprovalDelay_dbus_property(self, value=None):
1420
2036
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2037
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2039
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2041
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2042
@dbus_service_property(_interface,
1426
2044
access="readwrite")
1427
2045
def ApprovalDuration_dbus_property(self, value=None):
1428
2046
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2047
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2049
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2051
# Name - property
2053
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2054
@dbus_service_property(_interface, signature="s", access="read")
1435
2055
def Name_dbus_property(self):
1436
2056
return dbus.String(self.name)
2060
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2061
@dbus_service_property(_interface, signature="s", access="read")
2062
def KeyID_dbus_property(self):
2063
return dbus.String(self.key_id)
1438
2065
# Fingerprint - property
2067
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2068
@dbus_service_property(_interface, signature="s", access="read")
1440
2069
def Fingerprint_dbus_property(self):
1441
2070
return dbus.String(self.fingerprint)
1443
2072
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2073
@dbus_service_property(_interface,
1445
2075
access="readwrite")
1446
2076
def Host_dbus_property(self, value=None):
1447
2077
if value is None: # get
1448
2078
return dbus.String(self.host)
1449
self.host = unicode(value)
2079
self.host = str(value)
1451
2081
# Created - property
2083
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2084
@dbus_service_property(_interface, signature="s", access="read")
1453
2085
def Created_dbus_property(self):
1454
2086
return datetime_to_dbus(self.created)
1456
2088
# LastEnabled - property
1457
2089
@dbus_service_property(_interface, signature="s", access="read")
1458
2090
def LastEnabled_dbus_property(self):
1459
2091
return datetime_to_dbus(self.last_enabled)
1461
2093
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2094
@dbus_service_property(_interface,
1463
2096
access="readwrite")
1464
2097
def Enabled_dbus_property(self, value=None):
1465
2098
if value is None: # get
1472
2105
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2106
@dbus_service_property(_interface,
1474
2108
access="readwrite")
1475
2109
def LastCheckedOK_dbus_property(self, value=None):
1476
2110
if value is not None:
1477
2111
self.checked_ok()
1479
2113
return datetime_to_dbus(self.last_checked_ok)
1481
2115
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2116
@dbus_service_property(_interface, signature="n", access="read")
1484
2117
def LastCheckerStatus_dbus_property(self):
1485
2118
return dbus.Int16(self.last_checker_status)
1487
2120
# Expires - property
1488
2121
@dbus_service_property(_interface, signature="s", access="read")
1489
2122
def Expires_dbus_property(self):
1490
2123
return datetime_to_dbus(self.expires)
1492
2125
# LastApprovalRequest - property
1493
2126
@dbus_service_property(_interface, signature="s", access="read")
1494
2127
def LastApprovalRequest_dbus_property(self):
1495
2128
return datetime_to_dbus(self.last_approval_request)
1497
2130
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2131
@dbus_service_property(_interface,
1499
2133
access="readwrite")
1500
2134
def Timeout_dbus_property(self, value=None):
1501
2135
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2136
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2137
old_timeout = self.timeout
1503
2138
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2139
# Reschedule disabling
1505
2140
if self.enabled:
1506
2141
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:
2142
self.expires += self.timeout - old_timeout
2143
if self.expires <= now:
1510
2144
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2147
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2150
GLib.source_remove(self.disable_initiator_tag)
2151
self.disable_initiator_tag = GLib.timeout_add(
2152
int((self.expires - now).total_seconds() * 1000),
1524
2155
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2156
@dbus_service_property(_interface,
1526
2158
access="readwrite")
1527
2159
def ExtendedTimeout_dbus_property(self, value=None):
1528
2160
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2161
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2163
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2165
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2166
@dbus_service_property(_interface,
1534
2168
access="readwrite")
1535
2169
def Interval_dbus_property(self, value=None):
1536
2170
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2171
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2172
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2173
if getattr(self, "checker_initiator_tag", None) is None:
1541
2175
if self.enabled:
1542
2176
# 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
2177
GLib.source_remove(self.checker_initiator_tag)
2178
self.checker_initiator_tag = GLib.timeout_add(
2179
value, self.start_checker)
2180
self.start_checker() # Start one now, too
1548
2182
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2183
@dbus_service_property(_interface,
1550
2185
access="readwrite")
1551
2186
def Checker_dbus_property(self, value=None):
1552
2187
if value is None: # get
1553
2188
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2189
self.checker_command = str(value)
1556
2191
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2192
@dbus_service_property(_interface,
1558
2194
access="readwrite")
1559
2195
def CheckerRunning_dbus_property(self, value=None):
1560
2196
if value is None: # get
1593
2237
if data[0] == 'data':
1595
2239
if data[0] == 'function':
1596
2241
def func(*args, **kwargs):
1597
2242
self._pipe.send(('funcall', name, args, kwargs))
1598
2243
return self._pipe.recv()[1]
1601
2247
def __setattr__(self, name, value):
1602
2248
if name == '_pipe':
1603
2249
return super(ProxyClient, self).__setattr__(name, value)
1604
2250
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2253
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2254
"""A class to handle client connections.
1614
2256
Instantiated once for each connection to handle it.
1615
2257
Note: This will run in its own forked process."""
1617
2259
def handle(self):
1618
2260
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2261
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2262
str(self.client_address))
1621
2263
logger.debug("Pipe FD: %d",
1622
2264
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",
2266
session = gnutls.ClientSession(self.request)
2268
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2269
# "+AES-256-CBC", "+SHA1",
2270
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2272
# Use a fallback default, since this MUST be set.
1639
2273
priority = self.server.gnutls_priority
1640
2274
if priority is None:
1641
2275
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2276
gnutls.priority_set_direct(session._c_object,
2277
priority.encode("utf-8"),
1646
2280
# Start communication using the Mandos protocol
1647
2281
# Get protocol number
1648
2282
line = self.request.makefile().readline()
1649
2283
logger.debug("Protocol version: %r", line)
1651
2285
if int(line.strip().split()[0]) > 1:
2286
raise RuntimeError(line)
1653
2287
except (ValueError, IndexError, RuntimeError) as error:
1654
2288
logger.error("Unknown protocol version: %s", error)
1657
2291
# Start GnuTLS connection
1659
2293
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2294
except gnutls.Error as error:
1661
2295
logger.warning("Handshake failed: %s", error)
1662
2296
# Do not run session.bye() here: the session is not
1663
2297
# established. Just abandon the request.
1665
2299
logger.debug("Handshake succeeded")
1667
2301
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,
2303
if gnutls.has_rawpk:
2306
key_id = self.key_id(
2307
self.peer_certificate(session))
2308
except (TypeError, gnutls.Error) as error:
2309
logger.warning("Bad certificate: %s", error)
2311
logger.debug("Key ID: %s", key_id)
2316
fpr = self.fingerprint(
2317
self.peer_certificate(session))
2318
except (TypeError, gnutls.Error) as error:
2319
logger.warning("Bad certificate: %s", error)
2321
logger.debug("Fingerprint: %s", fpr)
2324
client = ProxyClient(child_pipe, key_id, fpr,
1680
2325
self.client_address)
1681
2326
except KeyError:
1684
2329
if client.approval_delay:
1685
2330
delay = client.approval_delay
1686
2331
client.approvals_pending += 1
1687
2332
approval_required = True
1690
2335
if not client.enabled:
1691
2336
logger.info("Client %s is disabled",
1693
2338
if self.server.use_dbus:
1694
2339
# Emit D-Bus signal
1695
2340
client.Rejected("Disabled")
1698
2343
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2344
# We are approved or approval is disabled
1701
2346
elif client.approved is None:
1702
2347
logger.info("Client %s needs approval",
1737
2380
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))
2383
session.send(client.secret)
2384
except gnutls.Error as error:
2385
logger.warning("gnutls send failed",
1751
2389
logger.info("Sending secret to %s", client.name)
1752
2390
# bump the timeout using extended_timeout
1753
2391
client.bump_timeout(client.extended_timeout)
1754
2392
if self.server.use_dbus:
1755
2393
# Emit D-Bus signal
1756
2394
client.GotSecret()
1759
2397
if approval_required:
1760
2398
client.approvals_pending -= 1
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2401
except gnutls.Error as error:
2402
logger.warning("GnuTLS bye failed",
1767
2406
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
2407
"Return the peer's certificate as a bytestring"
2409
cert_type = gnutls.certificate_type_get2(session._c_object,
2411
except AttributeError:
2412
cert_type = gnutls.certificate_type_get(session._c_object)
2413
if gnutls.has_rawpk:
2414
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2416
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2417
# If not a valid certificate type...
2418
if cert_type not in valid_cert_types:
2419
logger.info("Cert type %r not in %r", cert_type,
2421
# ...return invalid data
1775
2423
list_size = ctypes.c_uint(1)
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2424
cert_list = (gnutls.certificate_get_peers
1778
2425
(session._c_object, ctypes.byref(list_size)))
1779
2426
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2427
raise gnutls.Error("error getting peer certificate")
1782
2428
if list_size.value == 0:
1784
2430
cert = cert_list[0]
1785
2431
return ctypes.string_at(cert.data, cert.size)
2434
def key_id(certificate):
2435
"Convert a certificate bytestring to a hexdigit key ID"
2436
# New GnuTLS "datum" with the public key
2437
datum = gnutls.datum_t(
2438
ctypes.cast(ctypes.c_char_p(certificate),
2439
ctypes.POINTER(ctypes.c_ubyte)),
2440
ctypes.c_uint(len(certificate)))
2441
# XXX all these need to be created in the gnutls "module"
2442
# New empty GnuTLS certificate
2443
pubkey = gnutls.pubkey_t()
2444
gnutls.pubkey_init(ctypes.byref(pubkey))
2445
# Import the raw public key into the certificate
2446
gnutls.pubkey_import(pubkey,
2447
ctypes.byref(datum),
2448
gnutls.X509_FMT_DER)
2449
# New buffer for the key ID
2450
buf = ctypes.create_string_buffer(32)
2451
buf_len = ctypes.c_size_t(len(buf))
2452
# Get the key ID from the raw public key into the buffer
2453
gnutls.pubkey_get_key_id(pubkey,
2454
gnutls.KEYID_USE_SHA256,
2455
ctypes.cast(ctypes.byref(buf),
2456
ctypes.POINTER(ctypes.c_ubyte)),
2457
ctypes.byref(buf_len))
2458
# Deinit the certificate
2459
gnutls.pubkey_deinit(pubkey)
2461
# Convert the buffer to a Python bytestring
2462
key_id = ctypes.string_at(buf, buf_len.value)
2463
# Convert the bytestring to hexadecimal notation
2464
hex_key_id = binascii.hexlify(key_id).upper()
1788
2468
def fingerprint(openpgp):
1789
2469
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
2470
# 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))))
2471
datum = gnutls.datum_t(
2472
ctypes.cast(ctypes.c_char_p(openpgp),
2473
ctypes.POINTER(ctypes.c_ubyte)),
2474
ctypes.c_uint(len(openpgp)))
1796
2475
# 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)))
2476
crt = gnutls.openpgp_crt_t()
2477
gnutls.openpgp_crt_init(ctypes.byref(crt))
1800
2478
# 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))
2479
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2480
gnutls.OPENPGP_FMT_RAW)
1805
2481
# Verify the self signature in the key
1806
2482
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2483
gnutls.openpgp_crt_verify_self(crt, 0,
2484
ctypes.byref(crtverify))
1810
2485
if crtverify.value != 0:
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2486
gnutls.openpgp_crt_deinit(crt)
2487
raise gnutls.CertificateSecurityError(code
1814
2489
# New buffer for the fingerprint
1815
2490
buf = ctypes.create_string_buffer(20)
1816
2491
buf_len = ctypes.c_size_t()
1817
2492
# 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)))
2493
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2494
ctypes.byref(buf_len))
1821
2495
# Deinit the certificate
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2496
gnutls.openpgp_crt_deinit(crt)
1823
2497
# Convert the buffer to a Python bytestring
1824
2498
fpr = ctypes.string_at(buf, buf_len.value)
1825
2499
# Convert the bytestring to hexadecimal notation
1830
class MultiprocessingMixIn(object):
2504
class MultiprocessingMixIn:
1831
2505
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
2507
def sub_process_main(self, request, address):
1834
2509
self.finish_request(request, address)
1835
2510
except Exception:
1836
2511
self.handle_error(request, address)
1837
2512
self.close_request(request)
1839
2514
def process_request(self, request, address):
1840
2515
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2516
proc = multiprocessing.Process(target=self.sub_process_main,
2517
args=(request, address))
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2522
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1849
2523
""" adds a pipe to the MixIn """
1850
2525
def process_request(self, request, client_address):
1851
2526
"""Overrides and wraps the original process_request().
1853
2528
This function creates a new pipe in self.pipe
1855
2530
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1857
2532
proc = MultiprocessingMixIn.process_request(self, request,
1858
2533
client_address)
1859
2534
self.child_pipe.close()
1860
2535
self.add_pipe(parent_pipe, proc)
1862
2537
def add_pipe(self, parent_pipe, proc):
1863
2538
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
2539
raise NotImplementedError()
1867
2542
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
socketserver.TCPServer, object):
2543
socketserver.TCPServer):
1869
2544
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1872
2547
enabled: Boolean; whether this server is activated yet
1873
2548
interface: None or a network interface name (string)
1874
2549
use_ipv6: Boolean; to use IPv6 or not
1876
2552
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
2556
"""If socketfd is set, use that file descriptor instead of
2557
creating a new one with socket.socket().
1878
2559
self.interface = interface
1880
2561
self.address_family = socket.AF_INET6
2562
if socketfd is not None:
2563
# Save the file descriptor
2564
self.socketfd = socketfd
2565
# Save the original socket.socket() function
2566
self.socket_socket = socket.socket
2568
# To implement --socket, we monkey patch socket.socket.
2570
# (When socketserver.TCPServer is a new-style class, we
2571
# could make self.socket into a property instead of monkey
2572
# patching socket.socket.)
2574
# Create a one-time-only replacement for socket.socket()
2575
@functools.wraps(socket.socket)
2576
def socket_wrapper(*args, **kwargs):
2577
# Restore original function so subsequent calls are
2579
socket.socket = self.socket_socket
2580
del self.socket_socket
2581
# This time only, return a new socket object from the
2582
# saved file descriptor.
2583
return socket.fromfd(self.socketfd, *args, **kwargs)
2584
# Replace socket.socket() function with wrapper
2585
socket.socket = socket_wrapper
2586
# The socketserver.TCPServer.__init__ will call
2587
# socket.socket(), which might be our replacement,
2588
# socket_wrapper(), if socketfd was set.
1881
2589
socketserver.TCPServer.__init__(self, server_address,
1882
2590
RequestHandlerClass)
1883
2592
def server_bind(self):
1884
2593
"""This overrides the normal server_bind() function
1885
2594
to bind to an interface if one was specified, and also NOT to
1886
2595
bind to an address or port if they were not specified."""
2596
global SO_BINDTODEVICE
1887
2597
if self.interface is not None:
1888
2598
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",
2599
# Fall back to a hard-coded value which seems to be
2601
logger.warning("SO_BINDTODEVICE not found, trying 25")
2602
SO_BINDTODEVICE = 25
2604
self.socket.setsockopt(
2605
socket.SOL_SOCKET, SO_BINDTODEVICE,
2606
(self.interface + "\0").encode("utf-8"))
2607
except socket.error as error:
2608
if error.errno == errno.EPERM:
2609
logger.error("No permission to bind to"
2610
" interface %s", self.interface)
2611
elif error.errno == errno.ENOPROTOOPT:
2612
logger.error("SO_BINDTODEVICE not available;"
2613
" cannot bind to interface %s",
2615
elif error.errno == errno.ENODEV:
2616
logger.error("Interface %s does not exist,"
2617
" cannot bind", self.interface)
1909
2620
# Only bind(2) the socket if we really need to.
1910
2621
if self.server_address[0] or self.server_address[1]:
2622
if self.server_address[1]:
2623
self.allow_reuse_address = True
1911
2624
if not self.server_address[0]:
1912
2625
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
2626
any_address = "::" # in6addr_any
1915
any_address = socket.INADDR_ANY
2628
any_address = "0.0.0.0" # INADDR_ANY
1916
2629
self.server_address = (any_address,
1917
2630
self.server_address[1])
1918
2631
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
2632
self.server_address = (self.server_address[0], 0)
1921
2633
# if self.interface:
1922
2634
# self.server_address = (self.server_address[0],
1948
2665
self.gnutls_priority = gnutls_priority
1949
2666
IPv6_TCPServer.__init__(self, server_address,
1950
2667
RequestHandlerClass,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2668
interface=interface,
1953
2672
def server_activate(self):
1954
2673
if self.enabled:
1955
2674
return socketserver.TCPServer.server_activate(self)
1957
2676
def enable(self):
1958
2677
self.enabled = True
1960
2679
def add_pipe(self, parent_pipe, proc):
1961
2680
# 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)
2682
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2683
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2684
functools.partial(self.handle_ipc,
2685
parent_pipe=parent_pipe,
2688
def handle_ipc(self, source, condition,
2691
client_object=None):
1985
2692
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2693
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1987
2694
# Wait for other process to exit
1991
2698
# Read a request from the child
1992
2699
request = parent_pipe.recv()
1993
2700
command = request[0]
1995
2702
if command == 'init':
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2703
key_id = request[1].decode("ascii")
2704
fpr = request[2].decode("ascii")
2705
address = request[3]
2707
for c in self.clients.values():
2708
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2710
if key_id and c.key_id == key_id:
2713
if fpr and c.fingerprint == fpr:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2717
logger.info("Client not found for key ID: %s, address"
2718
": %s", key_id or fpr, address)
2006
2719
if self.use_dbus:
2007
2720
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2721
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
2723
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,
2727
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2728
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2729
functools.partial(self.handle_ipc,
2730
parent_pipe=parent_pipe,
2732
client_object=client))
2021
2733
parent_pipe.send(True)
2022
2734
# remove the old hook in favor of the new above hook on
2026
2738
funcname = request[1]
2027
2739
args = request[2]
2028
2740
kwargs = request[3]
2030
2742
parent_pipe.send(('data', getattr(client_object,
2031
2743
funcname)(*args,
2034
2746
if command == 'getattr':
2035
2747
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2748
if isinstance(client_object.__getattribute__(attrname),
2749
collections.Callable):
2750
parent_pipe.send(('function', ))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2753
'data', client_object.__getattribute__(attrname)))
2042
2755
if command == 'setattr':
2043
2756
attrname = request[1]
2044
2757
value = request[2]
2045
2758
setattr(client_object, attrname, value)
2763
def rfc3339_duration_to_delta(duration):
2764
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2766
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2768
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2770
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2772
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2774
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2776
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2778
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2782
# Parsing an RFC 3339 duration with regular expressions is not
2783
# possible - there would have to be multiple places for the same
2784
# values, like seconds. The current code, while more esoteric, is
2785
# cleaner without depending on a parsing library. If Python had a
2786
# built-in library for parsing we would use it, but we'd like to
2787
# avoid excessive use of external libraries.
2789
# New type for defining tokens, syntax, and semantics all-in-one
2790
Token = collections.namedtuple("Token", (
2791
"regexp", # To match token; if "value" is not None, must have
2792
# a "group" containing digits
2793
"value", # datetime.timedelta or None
2794
"followers")) # Tokens valid after this token
2795
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2796
# the "duration" ABNF definition in RFC 3339, Appendix A.
2797
token_end = Token(re.compile(r"$"), None, frozenset())
2798
token_second = Token(re.compile(r"(\d+)S"),
2799
datetime.timedelta(seconds=1),
2800
frozenset((token_end, )))
2801
token_minute = Token(re.compile(r"(\d+)M"),
2802
datetime.timedelta(minutes=1),
2803
frozenset((token_second, token_end)))
2804
token_hour = Token(re.compile(r"(\d+)H"),
2805
datetime.timedelta(hours=1),
2806
frozenset((token_minute, token_end)))
2807
token_time = Token(re.compile(r"T"),
2809
frozenset((token_hour, token_minute,
2811
token_day = Token(re.compile(r"(\d+)D"),
2812
datetime.timedelta(days=1),
2813
frozenset((token_time, token_end)))
2814
token_month = Token(re.compile(r"(\d+)M"),
2815
datetime.timedelta(weeks=4),
2816
frozenset((token_day, token_end)))
2817
token_year = Token(re.compile(r"(\d+)Y"),
2818
datetime.timedelta(weeks=52),
2819
frozenset((token_month, token_end)))
2820
token_week = Token(re.compile(r"(\d+)W"),
2821
datetime.timedelta(weeks=1),
2822
frozenset((token_end, )))
2823
token_duration = Token(re.compile(r"P"), None,
2824
frozenset((token_year, token_month,
2825
token_day, token_time,
2827
# Define starting values:
2829
value = datetime.timedelta()
2831
# Following valid tokens
2832
followers = frozenset((token_duration, ))
2833
# String left to parse
2835
# Loop until end token is found
2836
while found_token is not token_end:
2837
# Search for any currently valid tokens
2838
for token in followers:
2839
match = token.regexp.match(s)
2840
if match is not None:
2842
if token.value is not None:
2843
# Value found, parse digits
2844
factor = int(match.group(1), 10)
2845
# Add to value so far
2846
value += factor * token.value
2847
# Strip token from string
2848
s = token.regexp.sub("", s, 1)
2851
# Set valid next tokens
2852
followers = found_token.followers
2855
# No currently valid tokens were found
2856
raise ValueError("Invalid RFC 3339 duration: {!r}"
2050
2862
def string_to_delta(interval):
2051
2863
"""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)
2865
>>> string_to_delta('7d') == datetime.timedelta(7)
2867
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2869
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2871
>>> string_to_delta('24h') == datetime.timedelta(1)
2873
>>> string_to_delta('1w') == datetime.timedelta(7)
2875
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2880
return rfc3339_duration_to_delta(interval)
2066
2884
timevalue = datetime.timedelta(0)
2067
2885
for s in interval.split():
2069
suffix = unicode(s[-1])
2070
2888
value = int(s[:-1])
2071
2889
if suffix == "d":
2072
2890
delta = datetime.timedelta(value)
2145
2962
parser.add_argument("--no-dbus", action="store_false",
2146
2963
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2964
" system bus interface", default=None)
2148
2965
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2966
dest="use_ipv6", help="Do not use IPv6",
2150
2968
parser.add_argument("--no-restore", action="store_false",
2151
2969
dest="restore", help="Do not restore stored"
2970
" state", default=None)
2971
parser.add_argument("--socket", type=int,
2972
help="Specify a file descriptor to a network"
2973
" socket to use instead of creating one")
2153
2974
parser.add_argument("--statedir", metavar="DIR",
2154
2975
help="Directory to save/restore state in")
2976
parser.add_argument("--foreground", action="store_true",
2977
help="Run in foreground", default=None)
2978
parser.add_argument("--no-zeroconf", action="store_false",
2979
dest="zeroconf", help="Do not use Zeroconf",
2156
2982
options = parser.parse_args()
2163
2984
# 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"
2985
if gnutls.has_rawpk:
2986
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2987
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2989
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2990
":+SIGN-DSA-SHA256")
2991
server_defaults = {"interface": "",
2995
"priority": priority,
2996
"servicename": "Mandos",
3002
"statedir": "/var/lib/mandos",
3003
"foreground": "False",
2178
3008
# Parse config file for server-global settings
2179
server_config = configparser.SafeConfigParser(server_defaults)
3009
server_config = configparser.ConfigParser(server_defaults)
2180
3010
del server_defaults
2181
server_config.read(os.path.join(options.configdir,
2183
# Convert the SafeConfigParser object to a dict
3011
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3012
# Convert the ConfigParser object to a dict
2184
3013
server_settings = server_config.defaults()
2185
3014
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
3015
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3016
"foreground", "zeroconf"):
2187
3017
server_settings[option] = server_config.getboolean("DEFAULT",
2189
3019
if server_settings["port"]:
2190
3020
server_settings["port"] = server_config.getint("DEFAULT",
3022
if server_settings["socket"]:
3023
server_settings["socket"] = server_config.getint("DEFAULT",
3025
# Later, stdin will, and stdout and stderr might, be dup'ed
3026
# over with an opened os.devnull. But we don't want this to
3027
# happen with a supplied network socket.
3028
if 0 <= server_settings["socket"] <= 2:
3029
server_settings["socket"] = os.dup(server_settings
2192
3031
del server_config
2194
3033
# Override the settings from the config file with command line
2195
3034
# options, if set.
2196
3035
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
3036
"priority", "servicename", "configdir", "use_dbus",
3037
"use_ipv6", "debuglevel", "restore", "statedir",
3038
"socket", "foreground", "zeroconf"):
2200
3039
value = getattr(options, option)
2201
3040
if value is not None:
2202
3041
server_settings[option] = value
2204
3043
# Force all strings to be unicode
2205
3044
for option in server_settings.keys():
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
3045
if isinstance(server_settings[option], bytes):
3046
server_settings[option] = (server_settings[option]
3048
# Force all boolean options to be boolean
3049
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3050
"foreground", "zeroconf"):
3051
server_settings[option] = bool(server_settings[option])
3052
# Debug implies foreground
3053
if server_settings["debug"]:
3054
server_settings["foreground"] = True
2208
3055
# Now we have our good server settings in "server_settings"
2210
3057
##################################################################
3059
if (not server_settings["zeroconf"]
3060
and not (server_settings["port"]
3061
or server_settings["socket"] != "")):
3062
parser.error("Needs port or socket to work without Zeroconf")
2212
3064
# For convenience
2213
3065
debug = server_settings["debug"]
2214
3066
debuglevel = server_settings["debuglevel"]
3135
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2274
3137
except OSError as error:
2275
if error[0] != errno.EPERM:
3138
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3139
.format(uid, gid, os.strerror(error.errno)))
3140
if error.errno != errno.EPERM:
2279
3144
# Enable all possible GnuTLS debugging
2281
3146
# "Use a log level over 10 to enable all debugging options."
2282
3147
# - GnuTLS manual
2283
gnutls.library.functions.gnutls_global_set_log_level(11)
2285
@gnutls.library.types.gnutls_log_func
3148
gnutls.global_set_log_level(11)
2286
3151
def debug_gnutls(level, string):
2287
3152
logger.debug("GnuTLS: %s", string[:-1])
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
3154
gnutls.global_set_log_function(debug_gnutls)
2292
3156
# Redirect stdin so all checkers get /dev/null
2293
3157
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2294
3158
os.dup2(null, sys.stdin.fileno())
2298
3162
# Need to fork before connecting to D-Bus
2300
3164
# Close all input and output, do double fork, etc.
2303
gobject.threads_init()
3167
if gi.version_info < (3, 10, 2):
3168
# multiprocessing will use threads, so before we use GLib we
3169
# need to inform GLib that threads will be used.
2305
3172
global main_loop
2306
3173
# From the Avahi example code
2307
3174
DBusGMainLoop(set_as_default=True)
2308
main_loop = gobject.MainLoop()
3175
main_loop = GLib.MainLoop()
2309
3176
bus = dbus.SystemBus()
2310
3177
# End of Avahi example code
2313
3180
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")
3183
old_bus_name = dbus.service.BusName(
3184
"se.bsnet.fukt.Mandos", bus,
3186
except dbus.exceptions.DBusException as e:
3187
logger.error("Disabling D-Bus:", exc_info=e)
2320
3188
use_dbus = False
2321
3189
server_settings["use_dbus"] = False
2322
3190
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"])))
3192
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3193
service = AvahiServiceToSyslog(
3194
name=server_settings["servicename"],
3195
servicetype="_mandos._tcp",
3198
if server_settings["interface"]:
3199
service.interface = if_nametoindex(
3200
server_settings["interface"].encode("utf-8"))
2332
3202
global multiprocessing_manager
2333
3203
multiprocessing_manager = multiprocessing.Manager()
2335
3205
client_class = Client
2337
client_class = functools.partial(ClientDBusTransitional,
3207
client_class = functools.partial(ClientDBus, bus=bus)
2340
3209
client_settings = Client.config_parser(client_config)
2341
3210
old_client_settings = {}
2342
3211
clients_data = {}
3213
# This is used to redirect stdout and stderr for checker processes
3215
wnull = open(os.devnull, "w") # A writable /dev/null
3216
# Only used if server is running in foreground but not in debug
3218
if debug or not foreground:
2344
3221
# Get client data and settings from last running state.
2345
3222
if server_settings["restore"]:
2347
3224
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
3225
if sys.version_info.major == 2:
3226
clients_data, old_client_settings = pickle.load(
3229
bytes_clients_data, bytes_old_client_settings = (
3230
pickle.load(stored_state, encoding="bytes"))
3231
# Fix bytes to strings
3234
clients_data = {(key.decode("utf-8")
3235
if isinstance(key, bytes)
3238
bytes_clients_data.items()}
3239
del bytes_clients_data
3240
for key in clients_data:
3241
value = {(k.decode("utf-8")
3242
if isinstance(k, bytes) else k): v
3244
clients_data[key].items()}
3245
clients_data[key] = value
3247
value["client_structure"] = [
3249
if isinstance(s, bytes)
3251
value["client_structure"]]
3252
# .name, .host, and .checker_command
3253
for k in ("name", "host", "checker_command"):
3254
if isinstance(value[k], bytes):
3255
value[k] = value[k].decode("utf-8")
3256
if "key_id" not in value:
3257
value["key_id"] = ""
3258
elif "fingerprint" not in value:
3259
value["fingerprint"] = ""
3260
# old_client_settings
3262
old_client_settings = {
3263
(key.decode("utf-8")
3264
if isinstance(key, bytes)
3267
bytes_old_client_settings.items()}
3268
del bytes_old_client_settings
3269
# .host and .checker_command
3270
for value in old_client_settings.values():
3271
for attribute in ("host", "checker_command"):
3272
if isinstance(value[attribute], bytes):
3273
value[attribute] = (value[attribute]
2350
3275
os.remove(stored_state_path)
2351
3276
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
3277
if e.errno == errno.ENOENT:
3278
logger.warning("Could not load persistent state:"
3279
" {}".format(os.strerror(e.errno)))
3281
logger.critical("Could not load persistent state:",
2356
3284
except EOFError as e:
2357
3285
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2360
3289
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
3290
for client_name, client in clients_data.items():
3291
# Skip removed clients
3292
if client_name not in client_settings:
2362
3295
# Decide which value to use after restoring saved state.
2363
3296
# We have three different values: Old config file,
2364
3297
# new config file, and saved state.
2425
3357
clients_data[client_name] = client_settings[client_name]
2427
3359
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
3360
for client_name, client in clients_data.items():
2429
3361
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
3364
server_settings=server_settings)
2432
3366
if not tcp_server.clients:
2433
3367
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
3370
if pidfile is not None:
3374
print(pid, file=pidfile)
3376
logger.error("Could not write to file %r with PID %d",
2447
3379
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())
3381
for termsig in (signal.SIGHUP, signal.SIGTERM):
3382
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3383
lambda: main_loop.quit() and False)
2454
class MandosDBusService(DBusObjectWithProperties):
3387
@alternate_dbus_interfaces(
3388
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3389
class MandosDBusService(DBusObjectWithObjectManager):
2455
3390
"""A D-Bus proxy object"""
2456
3392
def __init__(self):
2457
3393
dbus.service.Object.__init__(self, bus, "/")
2458
3395
_interface = "se.recompile.Mandos"
2460
@dbus_interface_annotations(_interface)
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2466
3397
@dbus.service.signal(_interface, signature="o")
2467
3398
def ClientAdded(self, objpath):
2471
3402
@dbus.service.signal(_interface, signature="ss")
2472
def ClientNotFound(self, fingerprint, address):
3403
def ClientNotFound(self, key_id, address):
3407
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2476
3409
@dbus.service.signal(_interface, signature="os")
2477
3410
def ClientRemoved(self, objpath, name):
3414
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2481
3416
@dbus.service.method(_interface, out_signature="ao")
2482
3417
def GetAllClients(self):
2484
return dbus.Array(c.dbus_object_path
2486
tcp_server.clients.itervalues())
3419
return dbus.Array(c.dbus_object_path for c in
3420
tcp_server.clients.values())
3422
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2488
3424
@dbus.service.method(_interface,
2489
3425
out_signature="a{oa{sv}}")
2490
3426
def GetAllClientsWithProperties(self):
2492
3428
return dbus.Dictionary(
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
3429
{c.dbus_object_path: c.GetAll(
3430
"se.recompile.Mandos.Client")
3431
for c in tcp_server.clients.values()},
2495
3432
signature="oa{sv}")
2497
3434
@dbus.service.method(_interface, in_signature="o")
2498
3435
def RemoveClient(self, object_path):
2500
for c in tcp_server.clients.itervalues():
3437
for c in tcp_server.clients.values():
2501
3438
if c.dbus_object_path == object_path:
2502
3439
del tcp_server.clients[c.name]
2503
3440
c.remove_from_connection()
2504
# Don't signal anything except ClientRemoved
3441
# Don't signal the disabling
2505
3442
c.disable(quiet=True)
2507
self.ClientRemoved(object_path, c.name)
3443
# Emit D-Bus signal for removal
3444
self.client_removed_signal(c)
2509
3446
raise KeyError(object_path)
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
3450
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3451
out_signature="a{oa{sa{sv}}}")
3452
def GetManagedObjects(self):
3454
return dbus.Dictionary(
3455
{client.dbus_object_path:
3457
{interface: client.GetAll(interface)
3459
client._get_all_interface_names()})
3460
for client in tcp_server.clients.values()})
3462
def client_added_signal(self, client):
3463
"""Send the new standard signal and the old signal"""
3465
# New standard signal
3466
self.InterfacesAdded(
3467
client.dbus_object_path,
3469
{interface: client.GetAll(interface)
3471
client._get_all_interface_names()}))
3473
self.ClientAdded(client.dbus_object_path)
3475
def client_removed_signal(self, client):
3476
"""Send the new standard signal and the old signal"""
3478
# New standard signal
3479
self.InterfacesRemoved(
3480
client.dbus_object_path,
3481
client._get_all_interface_names())
3483
self.ClientRemoved(client.dbus_object_path,
3486
mandos_dbus_service = MandosDBusService()
3488
# Save modules to variables to exempt the modules from being
3489
# unloaded before the function registered with atexit() is run.
3490
mp = multiprocessing
2518
3494
"Cleanup function; run on exit"
2521
multiprocessing.active_children()
3498
mp.active_children()
2522
3500
if not (tcp_server.clients or client_settings):
2525
3503
# Store client before exiting. Secrets are encrypted with key
2526
3504
# based on what config file has. If config file is
2527
3505
# removed/edited, old secret will thus be unrecovable.
2529
3507
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
3508
for client in tcp_server.clients.values():
2531
3509
key = client_settings[client.name]["secret"]
2532
3510
client.encrypted_secret = pgp.encrypt(client.secret,
2534
3512
client_dict = {}
2536
3514
# 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)):
3516
exclude = {"bus", "changedstate", "secret",
3517
"checker", "server_settings"}
3518
for name, typ in inspect.getmembers(dbus.service
2542
3520
exclude.add(name)
2544
3522
client_dict["encrypted_secret"] = (client
2545
3523
.encrypted_secret)
2546
3524
for attr in client.client_structure:
2547
3525
if attr not in exclude:
2548
3526
client_dict[attr] = getattr(client, attr)
2550
3528
clients[client.name] = client_dict
2551
3529
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)
3532
with tempfile.NamedTemporaryFile(
3536
dir=os.path.dirname(stored_state_path),
3537
delete=False) as stored_state:
3538
pickle.dump((clients, client_settings), stored_state,
3540
tempname = stored_state.name
2560
3541
os.rename(tempname, stored_state_path)
2561
3542
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2566
3545
os.remove(tempname)
2567
3546
except NameError:
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
3548
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3549
logger.warning("Could not save persistent state: {}"
3550
.format(os.strerror(e.errno)))
3552
logger.warning("Could not save persistent state:",
2573
3556
# Delete all clients, and settings from config
2574
3557
while tcp_server.clients:
2575
3558
name, client = tcp_server.clients.popitem()
2577
3560
client.remove_from_connection()
2578
# Don't signal anything except ClientRemoved
3561
# Don't signal the disabling
2579
3562
client.disable(quiet=True)
3563
# Emit D-Bus signal for removal
2582
mandos_dbus_service.ClientRemoved(client
3565
mandos_dbus_service.client_removed_signal(client)
2585
3566
client_settings.clear()
2587
3568
atexit.register(cleanup)
2589
for client in tcp_server.clients.itervalues():
3570
for client in tcp_server.clients.values():
2592
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3572
# Emit D-Bus signal for adding
3573
mandos_dbus_service.client_added_signal(client)
2593
3574
# Need to initiate checking of clients
2594
3575
if client.enabled:
2595
3576
client.init_checker()
2597
3578
tcp_server.enable()
2598
3579
tcp_server.server_activate()
2600
3581
# Find out what port we got
2601
service.port = tcp_server.socket.getsockname()[1]
3583
service.port = tcp_server.socket.getsockname()[1]
2603
3585
logger.info("Now listening on address %r, port %d,"
2604
3586
" flowinfo %d, scope_id %d",