63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
71
82
import dbus.service
84
from gi.repository import GLib
74
85
from dbus.mainloop.glib import DBusGMainLoop
77
88
import xml.dom.minidom
91
if sys.version_info.major == 2:
94
# Try to find the value of SO_BINDTODEVICE:
96
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
97
# newer, and it is also the most natural place for it:
82
98
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
83
99
except AttributeError:
101
# This is where SO_BINDTODEVICE was up to and including Python
85
103
from IN import SO_BINDTODEVICE
86
104
except ImportError:
87
SO_BINDTODEVICE = None
105
# In Python 2.7 it seems to have been removed entirely.
106
# Try running the C preprocessor:
108
cc = subprocess.Popen(["cc", "--language=c", "-E",
110
stdin=subprocess.PIPE,
111
stdout=subprocess.PIPE)
112
stdout = cc.communicate(
113
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
114
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
115
except (OSError, ValueError, IndexError):
117
SO_BINDTODEVICE = None
119
if sys.version_info.major == 2:
122
if sys.version_info < (3, 2):
123
configparser.Configparser = configparser.SafeConfigParser
90
126
stored_state_file = "clients.pickle"
92
128
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
132
if_nametoindex = ctypes.cdll.LoadLibrary(
133
ctypes.util.find_library("c")).if_nametoindex
101
134
except (OSError, AttributeError):
102
136
def if_nametoindex(interface):
103
137
"Get an interface index the hard way, i.e. using fcntl()"
104
138
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
139
with contextlib.closing(socket.socket()) as s:
106
140
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
141
struct.pack(b"16s16x", interface))
142
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
143
return interface_index
146
def copy_function(func):
147
"""Make a copy of a function"""
148
if sys.version_info.major == 2:
149
return types.FunctionType(func.func_code,
155
return types.FunctionType(func.__code__,
114
162
def initlogger(debug, level=logging.WARNING):
115
163
"""init logger and add loglevel"""
166
syslogger = (logging.handlers.SysLogHandler(
167
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
169
syslogger.setFormatter(logging.Formatter
118
170
('Mandos [%(process)d]: %(levelname)s:'
120
172
logger.addHandler(syslogger)
123
175
console = logging.StreamHandler()
124
176
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
233
os.rmdir(self.tempdir)
170
234
self.tempdir = None
172
236
def password_encode(self, password):
173
237
# Passphrase can not be empty and can not contain newlines or
174
238
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
239
encoded = b"mandos" + binascii.hexlify(password)
240
if len(encoded) > 2048:
241
# GnuPG can't handle long passwords, so encode differently
242
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
243
.replace(b"\n", b"\\n")
244
.replace(b"\0", b"\\x00"))
177
247
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
248
passphrase = self.password_encode(password)
249
with tempfile.NamedTemporaryFile(
250
dir=self.tempdir) as passfile:
251
passfile.write(passphrase)
253
proc = subprocess.Popen([self.gpg, '--symmetric',
257
stdin=subprocess.PIPE,
258
stdout=subprocess.PIPE,
259
stderr=subprocess.PIPE)
260
ciphertext, err = proc.communicate(input=data)
261
if proc.returncode != 0:
192
263
return ciphertext
194
265
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
266
passphrase = self.password_encode(password)
267
with tempfile.NamedTemporaryFile(
268
dir=self.tempdir) as passfile:
269
passfile.write(passphrase)
271
proc = subprocess.Popen([self.gpg, '--decrypt',
275
stdin=subprocess.PIPE,
276
stdout=subprocess.PIPE,
277
stderr=subprocess.PIPE)
278
decrypted_plaintext, err = proc.communicate(input=data)
279
if proc.returncode != 0:
209
281
return decrypted_plaintext
284
# Pretend that we have an Avahi module
286
"""This isn't so much a class as it is a module-like namespace."""
287
IF_UNSPEC = -1 # avahi-common/address.h
288
PROTO_UNSPEC = -1 # avahi-common/address.h
289
PROTO_INET = 0 # avahi-common/address.h
290
PROTO_INET6 = 1 # avahi-common/address.h
291
DBUS_NAME = "org.freedesktop.Avahi"
292
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
293
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
294
DBUS_PATH_SERVER = "/"
297
def string_array_to_txt_array(t):
298
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
299
for s in t), signature="ay")
300
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
301
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
302
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
303
SERVER_INVALID = 0 # avahi-common/defs.h
304
SERVER_REGISTERING = 1 # avahi-common/defs.h
305
SERVER_RUNNING = 2 # avahi-common/defs.h
306
SERVER_COLLISION = 3 # avahi-common/defs.h
307
SERVER_FAILURE = 4 # avahi-common/defs.h
213
310
class AvahiError(Exception):
214
311
def __init__(self, value, *args, **kwargs):
215
312
self.value = value
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
313
return super(AvahiError, self).__init__(value, *args,
220
317
class AvahiServiceError(AvahiError):
223
321
class AvahiGroupError(AvahiError):
227
class AvahiService(object):
228
326
"""An Avahi (Zeroconf) service.
231
329
interface: integer; avahi.IF_UNSPEC or an interface index.
232
330
Used to optionally bind to the specified interface.
233
331
name: string; Example: 'Mandos'
234
332
type: string; Example: '_mandos._tcp'.
235
See <http://www.dns-sd.org/ServiceTypes.html>
333
See <https://www.iana.org/assignments/service-names-port-numbers>
236
334
port: integer; what port to announce
237
335
TXT: list of strings; TXT record for the service
238
336
domain: string; Domain to publish on, default to .local if empty.
367
495
follow_name_owner_changes=True),
368
496
avahi.DBUS_INTERFACE_SERVER)
369
497
self.server.connect_to_signal("StateChanged",
370
self.server_state_changed)
498
self.server_state_changed)
371
499
self.server_state_changed(self.server.GetState())
373
502
class AvahiServiceToSyslog(AvahiService):
503
def rename(self, *args, **kwargs):
375
504
"""Add the new name to the syslog messages"""
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos (%s) [%%(process)d]:'
379
' %%(levelname)s: %%(message)s'
505
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
506
syslogger.setFormatter(logging.Formatter(
507
'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):
512
# Pretend that we have a GnuTLS module
514
"""This isn't so much a class as it is a module-like namespace."""
516
library = ctypes.util.find_library("gnutls")
518
library = ctypes.util.find_library("gnutls-deb0")
519
_library = ctypes.cdll.LoadLibrary(library)
522
# Unless otherwise indicated, the constants and types below are
523
# all from the gnutls/gnutls.h C header file.
534
E_NO_CERTIFICATE_FOUND = -49
539
KEYID_USE_SHA256 = 1 # gnutls/x509.h
540
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
543
class session_int(ctypes.Structure):
545
session_t = ctypes.POINTER(session_int)
547
class certificate_credentials_st(ctypes.Structure):
549
certificate_credentials_t = ctypes.POINTER(
550
certificate_credentials_st)
551
certificate_type_t = ctypes.c_int
553
class datum_t(ctypes.Structure):
554
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
555
('size', ctypes.c_uint)]
557
class openpgp_crt_int(ctypes.Structure):
559
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
560
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
561
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
562
credentials_type_t = ctypes.c_int
563
transport_ptr_t = ctypes.c_void_p
564
close_request_t = ctypes.c_int
567
class Error(Exception):
568
def __init__(self, message=None, code=None, args=()):
569
# Default usage is by a message string, but if a return
570
# code is passed, convert it to a string with
573
if message is None and code is not None:
574
message = gnutls.strerror(code)
575
return super(gnutls.Error, self).__init__(
578
class CertificateSecurityError(Error):
584
self._c_object = gnutls.certificate_credentials_t()
585
gnutls.certificate_allocate_credentials(
586
ctypes.byref(self._c_object))
587
self.type = gnutls.CRD_CERTIFICATE
590
gnutls.certificate_free_credentials(self._c_object)
593
def __init__(self, socket, credentials=None):
594
self._c_object = gnutls.session_t()
595
gnutls_flags = gnutls.CLIENT
596
if gnutls.check_version(b"3.5.6"):
597
gnutls_flags |= gnutls.NO_TICKETS
599
gnutls_flags |= gnutls.ENABLE_RAWPK
600
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
602
gnutls.set_default_priority(self._c_object)
603
gnutls.transport_set_ptr(self._c_object, socket.fileno())
604
gnutls.handshake_set_private_extensions(self._c_object,
607
if credentials is None:
608
credentials = gnutls.Credentials()
609
gnutls.credentials_set(self._c_object, credentials.type,
610
ctypes.cast(credentials._c_object,
612
self.credentials = credentials
615
gnutls.deinit(self._c_object)
618
return gnutls.handshake(self._c_object)
620
def send(self, data):
624
data_len -= gnutls.record_send(self._c_object,
629
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
631
# Error handling functions
632
def _error_code(result):
633
"""A function to raise exceptions on errors, suitable
634
for the 'restype' attribute on ctypes functions"""
637
if result == gnutls.E_NO_CERTIFICATE_FOUND:
638
raise gnutls.CertificateSecurityError(code=result)
639
raise gnutls.Error(code=result)
641
def _retry_on_error(result, func, arguments):
642
"""A function to retry on some errors, suitable
643
for the 'errcheck' attribute on ctypes functions"""
645
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
646
return _error_code(result)
647
result = func(*arguments)
650
# Unless otherwise indicated, the function declarations below are
651
# all from the gnutls/gnutls.h C header file.
654
priority_set_direct = _library.gnutls_priority_set_direct
655
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
656
ctypes.POINTER(ctypes.c_char_p)]
657
priority_set_direct.restype = _error_code
659
init = _library.gnutls_init
660
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
661
init.restype = _error_code
663
set_default_priority = _library.gnutls_set_default_priority
664
set_default_priority.argtypes = [session_t]
665
set_default_priority.restype = _error_code
667
record_send = _library.gnutls_record_send
668
record_send.argtypes = [session_t, ctypes.c_void_p,
670
record_send.restype = ctypes.c_ssize_t
671
record_send.errcheck = _retry_on_error
673
certificate_allocate_credentials = (
674
_library.gnutls_certificate_allocate_credentials)
675
certificate_allocate_credentials.argtypes = [
676
ctypes.POINTER(certificate_credentials_t)]
677
certificate_allocate_credentials.restype = _error_code
679
certificate_free_credentials = (
680
_library.gnutls_certificate_free_credentials)
681
certificate_free_credentials.argtypes = [
682
certificate_credentials_t]
683
certificate_free_credentials.restype = None
685
handshake_set_private_extensions = (
686
_library.gnutls_handshake_set_private_extensions)
687
handshake_set_private_extensions.argtypes = [session_t,
689
handshake_set_private_extensions.restype = None
691
credentials_set = _library.gnutls_credentials_set
692
credentials_set.argtypes = [session_t, credentials_type_t,
694
credentials_set.restype = _error_code
696
strerror = _library.gnutls_strerror
697
strerror.argtypes = [ctypes.c_int]
698
strerror.restype = ctypes.c_char_p
700
certificate_type_get = _library.gnutls_certificate_type_get
701
certificate_type_get.argtypes = [session_t]
702
certificate_type_get.restype = _error_code
704
certificate_get_peers = _library.gnutls_certificate_get_peers
705
certificate_get_peers.argtypes = [session_t,
706
ctypes.POINTER(ctypes.c_uint)]
707
certificate_get_peers.restype = ctypes.POINTER(datum_t)
709
global_set_log_level = _library.gnutls_global_set_log_level
710
global_set_log_level.argtypes = [ctypes.c_int]
711
global_set_log_level.restype = None
713
global_set_log_function = _library.gnutls_global_set_log_function
714
global_set_log_function.argtypes = [log_func]
715
global_set_log_function.restype = None
717
deinit = _library.gnutls_deinit
718
deinit.argtypes = [session_t]
719
deinit.restype = None
721
handshake = _library.gnutls_handshake
722
handshake.argtypes = [session_t]
723
handshake.restype = _error_code
724
handshake.errcheck = _retry_on_error
726
transport_set_ptr = _library.gnutls_transport_set_ptr
727
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
728
transport_set_ptr.restype = None
730
bye = _library.gnutls_bye
731
bye.argtypes = [session_t, close_request_t]
732
bye.restype = _error_code
733
bye.errcheck = _retry_on_error
735
check_version = _library.gnutls_check_version
736
check_version.argtypes = [ctypes.c_char_p]
737
check_version.restype = ctypes.c_char_p
739
_need_version = b"3.3.0"
740
if check_version(_need_version) is None:
741
raise self.Error("Needs GnuTLS {} or later"
742
.format(_need_version))
744
_tls_rawpk_version = b"3.6.6"
745
has_rawpk = bool(check_version(_tls_rawpk_version))
749
class pubkey_st(ctypes.Structure):
751
pubkey_t = ctypes.POINTER(pubkey_st)
753
x509_crt_fmt_t = ctypes.c_int
755
# All the function declarations below are from gnutls/abstract.h
756
pubkey_init = _library.gnutls_pubkey_init
757
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
758
pubkey_init.restype = _error_code
760
pubkey_import = _library.gnutls_pubkey_import
761
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
763
pubkey_import.restype = _error_code
765
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
766
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
767
ctypes.POINTER(ctypes.c_ubyte),
768
ctypes.POINTER(ctypes.c_size_t)]
769
pubkey_get_key_id.restype = _error_code
771
pubkey_deinit = _library.gnutls_pubkey_deinit
772
pubkey_deinit.argtypes = [pubkey_t]
773
pubkey_deinit.restype = None
775
# All the function declarations below are from gnutls/openpgp.h
777
openpgp_crt_init = _library.gnutls_openpgp_crt_init
778
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
779
openpgp_crt_init.restype = _error_code
781
openpgp_crt_import = _library.gnutls_openpgp_crt_import
782
openpgp_crt_import.argtypes = [openpgp_crt_t,
783
ctypes.POINTER(datum_t),
785
openpgp_crt_import.restype = _error_code
787
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
788
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
789
ctypes.POINTER(ctypes.c_uint)]
790
openpgp_crt_verify_self.restype = _error_code
792
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
793
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
794
openpgp_crt_deinit.restype = None
796
openpgp_crt_get_fingerprint = (
797
_library.gnutls_openpgp_crt_get_fingerprint)
798
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
802
openpgp_crt_get_fingerprint.restype = _error_code
804
if check_version(b"3.6.4"):
805
certificate_type_get2 = _library.gnutls_certificate_type_get2
806
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
807
certificate_type_get2.restype = _error_code
809
# Remove non-public functions
810
del _error_code, _retry_on_error
813
def call_pipe(connection, # : multiprocessing.Connection
814
func, *args, **kwargs):
815
"""This function is meant to be called by multiprocessing.Process
817
This function runs func(*args, **kwargs), and writes the resulting
818
return value on the provided multiprocessing.Connection.
820
connection.send(func(*args, **kwargs))
390
825
"""A representation of a client host served by this server.
393
828
approved: bool(); 'None' if not yet approved/disapproved
394
829
approval_delay: datetime.timedelta(); Time to wait for approval
395
830
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
831
checker: multiprocessing.Process(); a running checker process used
832
to see if the client lives. 'None' if no process is
834
checker_callback_tag: a GLib event source tag, or None
400
835
checker_command: string; External command which is run to check
401
836
if client lives. %() expansions are done at
402
837
runtime with vars(self) as dict, so that for
403
838
instance %(name)s can be used in the command.
404
checker_initiator_tag: a gobject event source tag, or None
839
checker_initiator_tag: a GLib event source tag, or None
405
840
created: datetime.datetime(); (UTC) object creation
406
841
client_structure: Object describing what attributes a client has
407
842
and is used for storing the client at exit
408
843
current_checker_command: string; current running checker_command
409
disable_initiator_tag: a gobject event source tag, or None
844
disable_initiator_tag: a GLib event source tag, or None
411
846
fingerprint: string (40 or 32 hexadecimal digits); used to
412
uniquely identify the client
847
uniquely identify an OpenPGP client
848
key_id: string (64 hexadecimal digits); used to uniquely identify
849
a client using raw public keys
413
850
host: string; available for use by the checker command
414
851
interval: datetime.timedelta(); How often to start a new checker
415
852
last_approval_request: datetime.datetime(); (UTC) or None
542
973
self.current_checker_command = None
543
974
self.approved = None
544
975
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()
976
self.changedstate = multiprocessing_manager.Condition(
977
multiprocessing_manager.Lock())
978
self.client_structure = [attr
979
for attr in self.__dict__.keys()
550
980
if not attr.startswith("_")]
551
981
self.client_structure.append("client_structure")
553
for name, t in inspect.getmembers(type(self),
983
for name, t in inspect.getmembers(
984
type(self), lambda obj: isinstance(obj, property)):
557
985
if not name.startswith("_"):
558
986
self.client_structure.append(name)
560
988
# Send notice to process children that client state has changed
561
989
def send_changedstate(self):
562
990
with self.changedstate:
563
991
self.changedstate.notify_all()
565
993
def enable(self):
566
994
"""Start this client's checker and timeout hooks"""
567
995
if getattr(self, "enabled", False):
568
996
# Already enabled
570
self.send_changedstate()
571
998
self.expires = datetime.datetime.utcnow() + self.timeout
572
999
self.enabled = True
573
1000
self.last_enabled = datetime.datetime.utcnow()
574
1001
self.init_checker()
1002
self.send_changedstate()
576
1004
def disable(self, quiet=True):
577
1005
"""Disable this client."""
578
1006
if not getattr(self, "enabled", False):
581
self.send_changedstate()
583
1009
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1010
if getattr(self, "disable_initiator_tag", None) is not None:
1011
GLib.source_remove(self.disable_initiator_tag)
586
1012
self.disable_initiator_tag = None
587
1013
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1014
if getattr(self, "checker_initiator_tag", None) is not None:
1015
GLib.source_remove(self.checker_initiator_tag)
590
1016
self.checker_initiator_tag = None
591
1017
self.stop_checker()
592
1018
self.enabled = False
593
# Do not run this again if called by a gobject.timeout_add
1020
self.send_changedstate()
1021
# Do not run this again if called by a GLib.timeout_add
596
1024
def __del__(self):
599
1027
def init_checker(self):
600
1028
# Schedule a new checker to be started an 'interval' from now,
601
1029
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1030
if self.checker_initiator_tag is not None:
1031
GLib.source_remove(self.checker_initiator_tag)
1032
self.checker_initiator_tag = GLib.timeout_add(
1033
int(self.interval.total_seconds() * 1000),
605
1035
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1036
if self.disable_initiator_tag is not None:
1037
GLib.source_remove(self.disable_initiator_tag)
1038
self.disable_initiator_tag = GLib.timeout_add(
1039
int(self.timeout.total_seconds() * 1000), self.disable)
609
1040
# Also start a new checker *right now*.
610
1041
self.start_checker()
612
def checker_callback(self, pid, condition, command):
1043
def checker_callback(self, source, condition, connection,
613
1045
"""The checker has completed, so take appropriate actions."""
1046
# Read return code from connection (see call_pipe)
1047
returncode = connection.recv()
614
1050
self.checker_callback_tag = None
615
1051
self.checker = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1054
self.last_checker_status = returncode
1055
self.last_checker_signal = None
618
1056
if self.last_checker_status == 0:
619
1057
logger.info("Checker for %(name)s succeeded",
621
1059
self.checked_ok()
623
logger.info("Checker for %(name)s failed",
1061
logger.info("Checker for %(name)s failed", vars(self))
626
1063
self.last_checker_status = -1
1064
self.last_checker_signal = -returncode
627
1065
logger.warning("Checker for %(name)s crashed?",
630
1069
def checked_ok(self):
631
1070
"""Assert that the client has been seen, alive and well."""
632
1071
self.last_checked_ok = datetime.datetime.utcnow()
633
1072
self.last_checker_status = 0
1073
self.last_checker_signal = None
634
1074
self.bump_timeout()
636
1076
def bump_timeout(self, timeout=None):
637
1077
"""Bump up the timeout for this client."""
638
1078
if timeout is None:
639
1079
timeout = self.timeout
640
1080
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
1081
GLib.source_remove(self.disable_initiator_tag)
1082
self.disable_initiator_tag = None
642
1083
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1084
self.disable_initiator_tag = GLib.timeout_add(
1085
int(timeout.total_seconds() * 1000), self.disable)
646
1086
self.expires = datetime.datetime.utcnow() + timeout
648
1088
def need_approval(self):
649
1089
self.last_approval_request = datetime.datetime.utcnow()
651
1091
def start_checker(self):
652
1092
"""Start a new checker subprocess if one is not running.
654
1094
If a checker already exists, leave it running and do
656
1096
# 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
1097
# did that, and if a checker (for some reason) started running
1098
# slowly and taking more than 'interval' time, then the client
1099
# would inevitably timeout, since no checker would get a
1100
# chance to run to completion. If we instead leave running
661
1101
# checkers alone, the checker would have to take more time
662
1102
# 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)
1105
if self.checker is not None and not self.checker.is_alive():
1106
logger.warning("Checker was not alive; joining")
678
1109
# Start a new checker if needed
679
1110
if self.checker is None:
1111
# Escape attributes for the shell
1113
attr: re.escape(str(getattr(self, attr)))
1114
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
1116
command = self.checker_command % escaped_attrs
1117
except TypeError as error:
1118
logger.error('Could not format string "%s"',
1119
self.checker_command,
1121
return True # Try again later
699
1122
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
1123
logger.info("Starting checker %r for %s", command,
1125
# We don't need to redirect stdout and stderr, since
1126
# in normal mode, that is already done by daemon(),
1127
# and in debug mode we don't want to. (Stdin is
1128
# always replaced by /dev/null.)
1129
# The exception is when not debugging but nevertheless
1130
# running in the foreground; use the previously
1132
popen_args = {"close_fds": True,
1135
if (not self.server_settings["debug"]
1136
and self.server_settings["foreground"]):
1137
popen_args.update({"stdout": wnull,
1139
pipe = multiprocessing.Pipe(duplex=False)
1140
self.checker = multiprocessing.Process(
1142
args=(pipe[1], subprocess.call, command),
1144
self.checker.start()
1145
self.checker_callback_tag = GLib.io_add_watch(
1146
pipe[0].fileno(), GLib.IO_IN,
1147
self.checker_callback, pipe[0], command)
1148
# Re-run this periodically if run by GLib.timeout_add
726
1151
def stop_checker(self):
727
1152
"""Force the checker process, if any, to stop."""
728
1153
if self.checker_callback_tag:
729
gobject.source_remove(self.checker_callback_tag)
1154
GLib.source_remove(self.checker_callback_tag)
730
1155
self.checker_callback_tag = None
731
1156
if getattr(self, "checker", None) is None:
733
1158
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
1159
self.checker.terminate()
742
1160
self.checker = None
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1163
def dbus_service_property(dbus_interface,
747
1167
"""Decorators for marking methods of a DBusObjectWithProperties to
748
1168
become properties on the D-Bus.
750
1170
The decorated method will be called with no arguments by "Get"
751
1171
and with one argument by "Set".
753
1173
The parameters, where they are supported, are the same as
754
1174
dbus.service.method, except there is only "signature", since the
755
1175
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.
1258
class DBusObjectWithAnnotations(dbus.service.Object):
1259
"""A D-Bus object with annotations.
1261
Classes inheriting from this can use the dbus_annotations
1262
decorator to add annotations to methods or signals.
840
1266
def _is_dbus_thing(thing):
841
1267
"""Returns a function testing if an attribute is a D-Bus thing
843
1269
If called like _is_dbus_thing("method") it returns a function
844
1270
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1272
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
849
1275
def _get_all_dbus_things(self, thing):
850
1276
"""Returns a generator of (name, attribute) pairs
852
return ((getattr(athing.__get__(self), "_dbus_name",
1278
return ((getattr(athing.__get__(self), "_dbus_name", name),
854
1279
athing.__get__(self))
855
1280
for cls in self.__class__.__mro__
856
1281
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1282
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1284
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1286
path_keyword='object_path',
1287
connection_keyword='connection')
1288
def Introspect(self, object_path, connection):
1289
"""Overloading of standard D-Bus method.
1291
Inserts annotation tags on methods and signals.
1293
xmlstring = dbus.service.Object.Introspect(self, object_path,
1296
document = xml.dom.minidom.parseString(xmlstring)
1298
for if_tag in document.getElementsByTagName("interface"):
1299
# Add annotation tags
1300
for typ in ("method", "signal"):
1301
for tag in if_tag.getElementsByTagName(typ):
1303
for name, prop in (self.
1304
_get_all_dbus_things(typ)):
1305
if (name == tag.getAttribute("name")
1306
and prop._dbus_interface
1307
== if_tag.getAttribute("name")):
1308
annots.update(getattr(
1309
prop, "_dbus_annotations", {}))
1310
for name, value in annots.items():
1311
ann_tag = document.createElement(
1313
ann_tag.setAttribute("name", name)
1314
ann_tag.setAttribute("value", value)
1315
tag.appendChild(ann_tag)
1316
# Add interface annotation tags
1317
for annotation, value in dict(
1318
itertools.chain.from_iterable(
1319
annotations().items()
1320
for name, annotations
1321
in self._get_all_dbus_things("interface")
1322
if name == if_tag.getAttribute("name")
1324
ann_tag = document.createElement("annotation")
1325
ann_tag.setAttribute("name", annotation)
1326
ann_tag.setAttribute("value", value)
1327
if_tag.appendChild(ann_tag)
1328
# Fix argument name for the Introspect method itself
1329
if (if_tag.getAttribute("name")
1330
== dbus.INTROSPECTABLE_IFACE):
1331
for cn in if_tag.getElementsByTagName("method"):
1332
if cn.getAttribute("name") == "Introspect":
1333
for arg in cn.getElementsByTagName("arg"):
1334
if (arg.getAttribute("direction")
1336
arg.setAttribute("name",
1338
xmlstring = document.toxml("utf-8")
1340
except (AttributeError, xml.dom.DOMException,
1341
xml.parsers.expat.ExpatError) as error:
1342
logger.error("Failed to override Introspection method",
1347
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1348
"""A D-Bus object with properties.
1350
Classes inheriting from this can use the dbus_service_property
1351
decorator to expose methods as D-Bus properties. It exposes the
1352
standard Get(), Set(), and GetAll() methods on the D-Bus.
860
1355
def _get_dbus_property(self, interface_name, property_name):
861
1356
"""Returns a bound method if one exists which is a D-Bus
862
1357
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"))):
1359
for cls in self.__class__.__mro__:
1360
for name, value in inspect.getmembers(
1361
cls, self._is_dbus_thing("property")):
868
1362
if (value._dbus_name == property_name
869
1363
and value._dbus_interface == interface_name):
870
1364
return value.__get__(self)
872
1366
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1367
raise DBusPropertyNotFound("{}:{}.{}".format(
1368
self.dbus_object_path, interface_name, property_name))
1371
def _get_all_interface_names(cls):
1372
"""Get a sequence of all interfaces supported by an object"""
1373
return (name for name in set(getattr(getattr(x, attr),
1374
"_dbus_interface", None)
1375
for x in (inspect.getmro(cls))
1377
if name is not None)
1379
@dbus.service.method(dbus.PROPERTIES_IFACE,
878
1381
out_signature="v")
879
1382
def Get(self, interface_name, property_name):
880
1383
"""Standard D-Bus property Get() method, see D-Bus standard.
1010
1512
return xmlstring
1013
def datetime_to_dbus (dt, variant_level=0):
1516
dbus.OBJECT_MANAGER_IFACE
1517
except AttributeError:
1518
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1521
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1522
"""A D-Bus object with an ObjectManager.
1524
Classes inheriting from this exposes the standard
1525
GetManagedObjects call and the InterfacesAdded and
1526
InterfacesRemoved signals on the standard
1527
"org.freedesktop.DBus.ObjectManager" interface.
1529
Note: No signals are sent automatically; they must be sent
1532
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1533
out_signature="a{oa{sa{sv}}}")
1534
def GetManagedObjects(self):
1535
"""This function must be overridden"""
1536
raise NotImplementedError()
1538
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1539
signature="oa{sa{sv}}")
1540
def InterfacesAdded(self, object_path, interfaces_and_properties):
1543
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1544
def InterfacesRemoved(self, object_path, interfaces):
1547
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1549
path_keyword='object_path',
1550
connection_keyword='connection')
1551
def Introspect(self, object_path, connection):
1552
"""Overloading of standard D-Bus method.
1554
Override return argument name of GetManagedObjects to be
1555
"objpath_interfaces_and_properties"
1557
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1561
document = xml.dom.minidom.parseString(xmlstring)
1563
for if_tag in document.getElementsByTagName("interface"):
1564
# Fix argument name for the GetManagedObjects method
1565
if (if_tag.getAttribute("name")
1566
== dbus.OBJECT_MANAGER_IFACE):
1567
for cn in if_tag.getElementsByTagName("method"):
1568
if (cn.getAttribute("name")
1569
== "GetManagedObjects"):
1570
for arg in cn.getElementsByTagName("arg"):
1571
if (arg.getAttribute("direction")
1575
"objpath_interfaces"
1577
xmlstring = document.toxml("utf-8")
1579
except (AttributeError, xml.dom.DOMException,
1580
xml.parsers.expat.ExpatError) as error:
1581
logger.error("Failed to override Introspection method",
1586
def datetime_to_dbus(dt, variant_level=0):
1014
1587
"""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.
1589
return dbus.String("", variant_level=variant_level)
1590
return dbus.String(dt.isoformat(), variant_level=variant_level)
1593
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1594
"""A class decorator; applied to a subclass of
1595
dbus.service.Object, it will add alternate D-Bus attributes with
1596
interface names according to the "alt_interface_names" mapping.
1599
@alternate_dbus_interfaces({"org.example.Interface":
1600
"net.example.AlternateInterface"})
1601
class SampleDBusObject(dbus.service.Object):
1602
@dbus.service.method("org.example.Interface")
1603
def SampleDBusMethod():
1606
The above "SampleDBusMethod" on "SampleDBusObject" will be
1607
reachable via two interfaces: "org.example.Interface" and
1608
"net.example.AlternateInterface", the latter of which will have
1609
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1610
"true", unless "deprecate" is passed with a False value.
1612
This works for methods and signals, and also for D-Bus properties
1613
(from DBusObjectWithProperties) and interfaces (from the
1614
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):
1618
for orig_interface_name, alt_interface_name in (
1619
alt_interface_names.items()):
1621
interface_names = set()
1622
# Go though all attributes of the class
1623
for attrname, attribute in inspect.getmembers(cls):
1034
1624
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1625
# with the wrong interface name
1036
1626
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1627
or not attribute._dbus_interface.startswith(
1628
orig_interface_name)):
1040
1630
# Create an alternate D-Bus interface name based on
1041
1631
# 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)
1632
alt_interface = attribute._dbus_interface.replace(
1633
orig_interface_name, alt_interface_name)
1634
interface_names.add(alt_interface)
1047
1635
# Is this a D-Bus signal?
1048
1636
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1637
# Extract the original non-method undecorated
1638
# function by black magic
1639
if sys.version_info.major == 2:
1640
nonmethod_func = (dict(
1052
1641
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1642
attribute.__closure__))
1643
["func"].cell_contents)
1645
nonmethod_func = (dict(
1646
zip(attribute.__code__.co_freevars,
1647
attribute.__closure__))
1648
["func"].cell_contents)
1055
1649
# Create a new, but exactly alike, function
1056
1650
# object, and decorate it to be a new D-Bus signal
1057
1651
# 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)))
1652
new_function = copy_function(nonmethod_func)
1653
new_function = (dbus.service.signal(
1655
attribute._dbus_signature)(new_function))
1067
1656
# Copy annotations, if any
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1658
new_function._dbus_annotations = dict(
1659
attribute._dbus_annotations)
1071
1660
except AttributeError:
1073
1663
# 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
1664
# original and alternate functions, so both the
1665
# original and alternate signals gets sent when
1666
# the function is called
1076
1667
def fixscope(func1, func2):
1077
1668
"""This function is a scope container to pass
1078
1669
func1 and func2 to the "call_both" function
1079
1670
outside of its arguments"""
1672
@functools.wraps(func2)
1080
1673
def call_both(*args, **kwargs):
1081
1674
"""This function will emit two D-Bus
1082
1675
signals by calling func1 and func2"""
1083
1676
func1(*args, **kwargs)
1084
1677
func2(*args, **kwargs)
1678
# Make wrapper function look like a D-Bus
1680
for name, attr in inspect.getmembers(func2):
1681
if name.startswith("_dbus_"):
1682
setattr(call_both, name, attr)
1085
1684
return call_both
1086
1685
# Create the "call_both" function and add it to
1088
attr[attrname] = fixscope(attribute,
1687
attr[attrname] = fixscope(attribute, new_function)
1090
1688
# Is this a D-Bus method?
1091
1689
elif getattr(attribute, "_dbus_is_method", False):
1092
1690
# Create a new, but exactly alike, function
1093
1691
# object. Decorate it to be a new D-Bus method
1094
1692
# with the alternate D-Bus interface name. Add it
1095
1693
# 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)))
1695
dbus.service.method(
1697
attribute._dbus_in_signature,
1698
attribute._dbus_out_signature)
1699
(copy_function(attribute)))
1106
1700
# Copy annotations, if any
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1702
attr[attrname]._dbus_annotations = dict(
1703
attribute._dbus_annotations)
1110
1704
except AttributeError:
1112
1706
# Is this a D-Bus property?
1140
1727
# object. Decorate it to be a new D-Bus interface
1141
1728
# with the alternate D-Bus interface name. Add it
1142
1729
# 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)
1731
dbus_interface_annotations(alt_interface)
1732
(copy_function(attribute)))
1734
# Deprecate all alternate interfaces
1735
iname = "_AlternateDBusNames_interface_annotation{}"
1736
for interface_name in interface_names:
1738
@dbus_interface_annotations(interface_name)
1740
return {"org.freedesktop.DBus.Deprecated":
1742
# Find an unused name
1743
for aname in (iname.format(i)
1744
for i in itertools.count()):
1745
if aname not in attr:
1749
# Replace the class with a new subclass of it with
1750
# methods, signals, etc. as created above.
1751
if sys.version_info.major == 2:
1752
cls = type(b"{}Alternate".format(cls.__name__),
1755
cls = type("{}Alternate".format(cls.__name__),
1762
@alternate_dbus_interfaces({"se.recompile.Mandos":
1763
"se.bsnet.fukt.Mandos"})
1166
1764
class ClientDBus(Client, DBusObjectWithProperties):
1167
1765
"""A Client class using D-Bus
1170
1768
dbus_object_path: dbus.ObjectPath
1171
1769
bus: dbus.SystemBus()
1174
1772
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
1773
+ ("dbus_object_path", ))
1775
_interface = "se.recompile.Mandos.Client"
1177
1777
# dbus.service.Object doesn't use super(), so we can't either.
1179
def __init__(self, bus = None, *args, **kwargs):
1779
def __init__(self, bus=None, *args, **kwargs):
1181
1781
Client.__init__(self, *args, **kwargs)
1182
1782
# Only now, when this client is initialized, can it show up on
1184
client_object_name = unicode(self.name).translate(
1784
client_object_name = str(self.name).translate(
1185
1785
{ord("."): ord("_"),
1186
1786
ord("-"): ord("_")})
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1787
self.dbus_object_path = dbus.ObjectPath(
1788
"/clients/" + client_object_name)
1189
1789
DBusObjectWithProperties.__init__(self, self.bus,
1190
1790
self.dbus_object_path)
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1792
def notifychangeproperty(transform_func, dbus_name,
1793
type_func=lambda x: x,
1795
invalidate_only=False,
1796
_interface=_interface):
1195
1797
""" Modify a variable so that it's a property which announces
1196
1798
its changes to DBus.
1198
1800
transform_fun: Function that takes a value and a variant_level
1199
1801
and transforms it to a D-Bus type.
1200
1802
dbus_name: D-Bus name of the variable
1350
1954
server to mandos-client
1354
1958
# Rejected - signal
1355
1959
@dbus.service.signal(_interface, signature="s")
1356
1960
def Rejected(self, reason):
1360
1964
# NeedApproval - signal
1361
1965
@dbus.service.signal(_interface, signature="tb")
1362
1966
def NeedApproval(self, timeout, default):
1364
1968
return self.need_approval()
1368
1972
# Approve - method
1369
1973
@dbus.service.method(_interface, in_signature="b")
1370
1974
def Approve(self, value):
1371
1975
self.approve(value)
1373
1977
# CheckedOK - method
1374
1978
@dbus.service.method(_interface)
1375
1979
def CheckedOK(self):
1376
1980
self.checked_ok()
1378
1982
# Enable - method
1983
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
1984
@dbus.service.method(_interface)
1380
1985
def Enable(self):
1384
1989
# StartChecker - method
1990
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
1991
@dbus.service.method(_interface)
1386
1992
def StartChecker(self):
1388
1994
self.start_checker()
1390
1996
# Disable - method
1997
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
1998
@dbus.service.method(_interface)
1392
1999
def Disable(self):
1396
2003
# StopChecker - method
2004
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2005
@dbus.service.method(_interface)
1398
2006
def StopChecker(self):
1399
2007
self.stop_checker()
1403
2011
# ApprovalPending - property
1404
2012
@dbus_service_property(_interface, signature="b", access="read")
1405
2013
def ApprovalPending_dbus_property(self):
1406
2014
return dbus.Boolean(bool(self.approvals_pending))
1408
2016
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2017
@dbus_service_property(_interface,
1410
2019
access="readwrite")
1411
2020
def ApprovedByDefault_dbus_property(self, value=None):
1412
2021
if value is None: # get
1413
2022
return dbus.Boolean(self.approved_by_default)
1414
2023
self.approved_by_default = bool(value)
1416
2025
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2026
@dbus_service_property(_interface,
1418
2028
access="readwrite")
1419
2029
def ApprovalDelay_dbus_property(self, value=None):
1420
2030
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2031
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2033
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2035
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2036
@dbus_service_property(_interface,
1426
2038
access="readwrite")
1427
2039
def ApprovalDuration_dbus_property(self, value=None):
1428
2040
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2041
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2043
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2045
# Name - property
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2048
@dbus_service_property(_interface, signature="s", access="read")
1435
2049
def Name_dbus_property(self):
1436
2050
return dbus.String(self.name)
2054
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
@dbus_service_property(_interface, signature="s", access="read")
2056
def KeyID_dbus_property(self):
2057
return dbus.String(self.key_id)
1438
2059
# Fingerprint - property
2061
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2062
@dbus_service_property(_interface, signature="s", access="read")
1440
2063
def Fingerprint_dbus_property(self):
1441
2064
return dbus.String(self.fingerprint)
1443
2066
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2067
@dbus_service_property(_interface,
1445
2069
access="readwrite")
1446
2070
def Host_dbus_property(self, value=None):
1447
2071
if value is None: # get
1448
2072
return dbus.String(self.host)
1449
self.host = unicode(value)
2073
self.host = str(value)
1451
2075
# Created - property
2077
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2078
@dbus_service_property(_interface, signature="s", access="read")
1453
2079
def Created_dbus_property(self):
1454
2080
return datetime_to_dbus(self.created)
1456
2082
# LastEnabled - property
1457
2083
@dbus_service_property(_interface, signature="s", access="read")
1458
2084
def LastEnabled_dbus_property(self):
1459
2085
return datetime_to_dbus(self.last_enabled)
1461
2087
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2088
@dbus_service_property(_interface,
1463
2090
access="readwrite")
1464
2091
def Enabled_dbus_property(self, value=None):
1465
2092
if value is None: # get
1472
2099
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2100
@dbus_service_property(_interface,
1474
2102
access="readwrite")
1475
2103
def LastCheckedOK_dbus_property(self, value=None):
1476
2104
if value is not None:
1477
2105
self.checked_ok()
1479
2107
return datetime_to_dbus(self.last_checked_ok)
1481
2109
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2110
@dbus_service_property(_interface, signature="n", access="read")
1484
2111
def LastCheckerStatus_dbus_property(self):
1485
2112
return dbus.Int16(self.last_checker_status)
1487
2114
# Expires - property
1488
2115
@dbus_service_property(_interface, signature="s", access="read")
1489
2116
def Expires_dbus_property(self):
1490
2117
return datetime_to_dbus(self.expires)
1492
2119
# LastApprovalRequest - property
1493
2120
@dbus_service_property(_interface, signature="s", access="read")
1494
2121
def LastApprovalRequest_dbus_property(self):
1495
2122
return datetime_to_dbus(self.last_approval_request)
1497
2124
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2125
@dbus_service_property(_interface,
1499
2127
access="readwrite")
1500
2128
def Timeout_dbus_property(self, value=None):
1501
2129
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2130
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2131
old_timeout = self.timeout
1503
2132
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2133
# Reschedule disabling
1505
2134
if self.enabled:
1506
2135
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:
2136
self.expires += self.timeout - old_timeout
2137
if self.expires <= now:
1510
2138
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2141
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2144
GLib.source_remove(self.disable_initiator_tag)
2145
self.disable_initiator_tag = GLib.timeout_add(
2146
int((self.expires - now).total_seconds() * 1000),
1524
2149
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2150
@dbus_service_property(_interface,
1526
2152
access="readwrite")
1527
2153
def ExtendedTimeout_dbus_property(self, value=None):
1528
2154
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2155
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2157
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2159
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2160
@dbus_service_property(_interface,
1534
2162
access="readwrite")
1535
2163
def Interval_dbus_property(self, value=None):
1536
2164
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2165
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2166
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2167
if getattr(self, "checker_initiator_tag", None) is None:
1541
2169
if self.enabled:
1542
2170
# 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
2171
GLib.source_remove(self.checker_initiator_tag)
2172
self.checker_initiator_tag = GLib.timeout_add(
2173
value, self.start_checker)
2174
self.start_checker() # Start one now, too
1548
2176
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2177
@dbus_service_property(_interface,
1550
2179
access="readwrite")
1551
2180
def Checker_dbus_property(self, value=None):
1552
2181
if value is None: # get
1553
2182
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2183
self.checker_command = str(value)
1556
2185
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2186
@dbus_service_property(_interface,
1558
2188
access="readwrite")
1559
2189
def CheckerRunning_dbus_property(self, value=None):
1560
2190
if value is None: # get
1593
2231
if data[0] == 'data':
1595
2233
if data[0] == 'function':
1596
2235
def func(*args, **kwargs):
1597
2236
self._pipe.send(('funcall', name, args, kwargs))
1598
2237
return self._pipe.recv()[1]
1601
2241
def __setattr__(self, name, value):
1602
2242
if name == '_pipe':
1603
2243
return super(ProxyClient, self).__setattr__(name, value)
1604
2244
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2247
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2248
"""A class to handle client connections.
1614
2250
Instantiated once for each connection to handle it.
1615
2251
Note: This will run in its own forked process."""
1617
2253
def handle(self):
1618
2254
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2255
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2256
str(self.client_address))
1621
2257
logger.debug("Pipe FD: %d",
1622
2258
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",
2260
session = gnutls.ClientSession(self.request)
2262
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2263
# "+AES-256-CBC", "+SHA1",
2264
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2266
# Use a fallback default, since this MUST be set.
1639
2267
priority = self.server.gnutls_priority
1640
2268
if priority is None:
1641
2269
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2270
gnutls.priority_set_direct(session._c_object,
2271
priority.encode("utf-8"),
1646
2274
# Start communication using the Mandos protocol
1647
2275
# Get protocol number
1648
2276
line = self.request.makefile().readline()
1649
2277
logger.debug("Protocol version: %r", line)
1651
2279
if int(line.strip().split()[0]) > 1:
2280
raise RuntimeError(line)
1653
2281
except (ValueError, IndexError, RuntimeError) as error:
1654
2282
logger.error("Unknown protocol version: %s", error)
1657
2285
# Start GnuTLS connection
1659
2287
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2288
except gnutls.Error as error:
1661
2289
logger.warning("Handshake failed: %s", error)
1662
2290
# Do not run session.bye() here: the session is not
1663
2291
# established. Just abandon the request.
1665
2293
logger.debug("Handshake succeeded")
1667
2295
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,
2297
if gnutls.has_rawpk:
2300
key_id = self.key_id(
2301
self.peer_certificate(session))
2302
except (TypeError, gnutls.Error) as error:
2303
logger.warning("Bad certificate: %s", error)
2305
logger.debug("Key ID: %s", key_id)
2310
fpr = self.fingerprint(
2311
self.peer_certificate(session))
2312
except (TypeError, gnutls.Error) as error:
2313
logger.warning("Bad certificate: %s", error)
2315
logger.debug("Fingerprint: %s", fpr)
2318
client = ProxyClient(child_pipe, key_id, fpr,
1680
2319
self.client_address)
1681
2320
except KeyError:
1684
2323
if client.approval_delay:
1685
2324
delay = client.approval_delay
1686
2325
client.approvals_pending += 1
1687
2326
approval_required = True
1690
2329
if not client.enabled:
1691
2330
logger.info("Client %s is disabled",
1693
2332
if self.server.use_dbus:
1694
2333
# Emit D-Bus signal
1695
2334
client.Rejected("Disabled")
1698
2337
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2338
# We are approved or approval is disabled
1701
2340
elif client.approved is None:
1702
2341
logger.info("Client %s needs approval",
1737
2374
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))
2377
session.send(client.secret)
2378
except gnutls.Error as error:
2379
logger.warning("gnutls send failed",
1751
2383
logger.info("Sending secret to %s", client.name)
1752
2384
# bump the timeout using extended_timeout
1753
2385
client.bump_timeout(client.extended_timeout)
1754
2386
if self.server.use_dbus:
1755
2387
# Emit D-Bus signal
1756
2388
client.GotSecret()
1759
2391
if approval_required:
1760
2392
client.approvals_pending -= 1
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2395
except gnutls.Error as error:
2396
logger.warning("GnuTLS bye failed",
1767
2400
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
2401
"Return the peer's certificate as a bytestring"
2403
cert_type = gnutls.certificate_type_get2(session._c_object,
2405
except AttributeError:
2406
cert_type = gnutls.certificate_type_get(session._c_object)
2407
if gnutls.has_rawpk:
2408
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2410
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2411
# If not a valid certificate type...
2412
if cert_type not in valid_cert_types:
2413
logger.info("Cert type %r not in %r", cert_type,
2415
# ...return invalid data
1775
2417
list_size = ctypes.c_uint(1)
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2418
cert_list = (gnutls.certificate_get_peers
1778
2419
(session._c_object, ctypes.byref(list_size)))
1779
2420
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2421
raise gnutls.Error("error getting peer certificate")
1782
2422
if list_size.value == 0:
1784
2424
cert = cert_list[0]
1785
2425
return ctypes.string_at(cert.data, cert.size)
2428
def key_id(certificate):
2429
"Convert a certificate bytestring to a hexdigit key ID"
2430
# New GnuTLS "datum" with the public key
2431
datum = gnutls.datum_t(
2432
ctypes.cast(ctypes.c_char_p(certificate),
2433
ctypes.POINTER(ctypes.c_ubyte)),
2434
ctypes.c_uint(len(certificate)))
2435
# XXX all these need to be created in the gnutls "module"
2436
# New empty GnuTLS certificate
2437
pubkey = gnutls.pubkey_t()
2438
gnutls.pubkey_init(ctypes.byref(pubkey))
2439
# Import the raw public key into the certificate
2440
gnutls.pubkey_import(pubkey,
2441
ctypes.byref(datum),
2442
gnutls.X509_FMT_DER)
2443
# New buffer for the key ID
2444
buf = ctypes.create_string_buffer(32)
2445
buf_len = ctypes.c_size_t(len(buf))
2446
# Get the key ID from the raw public key into the buffer
2447
gnutls.pubkey_get_key_id(pubkey,
2448
gnutls.KEYID_USE_SHA256,
2449
ctypes.cast(ctypes.byref(buf),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.byref(buf_len))
2452
# Deinit the certificate
2453
gnutls.pubkey_deinit(pubkey)
2455
# Convert the buffer to a Python bytestring
2456
key_id = ctypes.string_at(buf, buf_len.value)
2457
# Convert the bytestring to hexadecimal notation
2458
hex_key_id = binascii.hexlify(key_id).upper()
1788
2462
def fingerprint(openpgp):
1789
2463
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
2464
# 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))))
2465
datum = gnutls.datum_t(
2466
ctypes.cast(ctypes.c_char_p(openpgp),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.c_uint(len(openpgp)))
1796
2469
# 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)))
2470
crt = gnutls.openpgp_crt_t()
2471
gnutls.openpgp_crt_init(ctypes.byref(crt))
1800
2472
# 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))
2473
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2474
gnutls.OPENPGP_FMT_RAW)
1805
2475
# Verify the self signature in the key
1806
2476
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2477
gnutls.openpgp_crt_verify_self(crt, 0,
2478
ctypes.byref(crtverify))
1810
2479
if crtverify.value != 0:
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2480
gnutls.openpgp_crt_deinit(crt)
2481
raise gnutls.CertificateSecurityError(code
1814
2483
# New buffer for the fingerprint
1815
2484
buf = ctypes.create_string_buffer(20)
1816
2485
buf_len = ctypes.c_size_t()
1817
2486
# 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)))
2487
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2488
ctypes.byref(buf_len))
1821
2489
# Deinit the certificate
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2490
gnutls.openpgp_crt_deinit(crt)
1823
2491
# Convert the buffer to a Python bytestring
1824
2492
fpr = ctypes.string_at(buf, buf_len.value)
1825
2493
# Convert the bytestring to hexadecimal notation
1830
class MultiprocessingMixIn(object):
2498
class MultiprocessingMixIn:
1831
2499
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
2501
def sub_process_main(self, request, address):
1834
2503
self.finish_request(request, address)
1835
2504
except Exception:
1836
2505
self.handle_error(request, address)
1837
2506
self.close_request(request)
1839
2508
def process_request(self, request, address):
1840
2509
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2510
proc = multiprocessing.Process(target=self.sub_process_main,
2511
args=(request, address))
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2516
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1849
2517
""" adds a pipe to the MixIn """
1850
2519
def process_request(self, request, client_address):
1851
2520
"""Overrides and wraps the original process_request().
1853
2522
This function creates a new pipe in self.pipe
1855
2524
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1857
2526
proc = MultiprocessingMixIn.process_request(self, request,
1858
2527
client_address)
1859
2528
self.child_pipe.close()
1860
2529
self.add_pipe(parent_pipe, proc)
1862
2531
def add_pipe(self, parent_pipe, proc):
1863
2532
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
2533
raise NotImplementedError()
1867
2536
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
socketserver.TCPServer, object):
2537
socketserver.TCPServer):
1869
2538
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1872
2541
enabled: Boolean; whether this server is activated yet
1873
2542
interface: None or a network interface name (string)
1874
2543
use_ipv6: Boolean; to use IPv6 or not
1876
2546
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
2550
"""If socketfd is set, use that file descriptor instead of
2551
creating a new one with socket.socket().
1878
2553
self.interface = interface
1880
2555
self.address_family = socket.AF_INET6
2556
if socketfd is not None:
2557
# Save the file descriptor
2558
self.socketfd = socketfd
2559
# Save the original socket.socket() function
2560
self.socket_socket = socket.socket
2562
# To implement --socket, we monkey patch socket.socket.
2564
# (When socketserver.TCPServer is a new-style class, we
2565
# could make self.socket into a property instead of monkey
2566
# patching socket.socket.)
2568
# Create a one-time-only replacement for socket.socket()
2569
@functools.wraps(socket.socket)
2570
def socket_wrapper(*args, **kwargs):
2571
# Restore original function so subsequent calls are
2573
socket.socket = self.socket_socket
2574
del self.socket_socket
2575
# This time only, return a new socket object from the
2576
# saved file descriptor.
2577
return socket.fromfd(self.socketfd, *args, **kwargs)
2578
# Replace socket.socket() function with wrapper
2579
socket.socket = socket_wrapper
2580
# The socketserver.TCPServer.__init__ will call
2581
# socket.socket(), which might be our replacement,
2582
# socket_wrapper(), if socketfd was set.
1881
2583
socketserver.TCPServer.__init__(self, server_address,
1882
2584
RequestHandlerClass)
1883
2586
def server_bind(self):
1884
2587
"""This overrides the normal server_bind() function
1885
2588
to bind to an interface if one was specified, and also NOT to
1886
2589
bind to an address or port if they were not specified."""
2590
global SO_BINDTODEVICE
1887
2591
if self.interface is not None:
1888
2592
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",
2593
# Fall back to a hard-coded value which seems to be
2595
logger.warning("SO_BINDTODEVICE not found, trying 25")
2596
SO_BINDTODEVICE = 25
2598
self.socket.setsockopt(
2599
socket.SOL_SOCKET, SO_BINDTODEVICE,
2600
(self.interface + "\0").encode("utf-8"))
2601
except socket.error as error:
2602
if error.errno == errno.EPERM:
2603
logger.error("No permission to bind to"
2604
" interface %s", self.interface)
2605
elif error.errno == errno.ENOPROTOOPT:
2606
logger.error("SO_BINDTODEVICE not available;"
2607
" cannot bind to interface %s",
2609
elif error.errno == errno.ENODEV:
2610
logger.error("Interface %s does not exist,"
2611
" cannot bind", self.interface)
1909
2614
# Only bind(2) the socket if we really need to.
1910
2615
if self.server_address[0] or self.server_address[1]:
2616
if self.server_address[1]:
2617
self.allow_reuse_address = True
1911
2618
if not self.server_address[0]:
1912
2619
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
2620
any_address = "::" # in6addr_any
1915
any_address = socket.INADDR_ANY
2622
any_address = "0.0.0.0" # INADDR_ANY
1916
2623
self.server_address = (any_address,
1917
2624
self.server_address[1])
1918
2625
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
2626
self.server_address = (self.server_address[0], 0)
1921
2627
# if self.interface:
1922
2628
# self.server_address = (self.server_address[0],
1948
2659
self.gnutls_priority = gnutls_priority
1949
2660
IPv6_TCPServer.__init__(self, server_address,
1950
2661
RequestHandlerClass,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2662
interface=interface,
1953
2666
def server_activate(self):
1954
2667
if self.enabled:
1955
2668
return socketserver.TCPServer.server_activate(self)
1957
2670
def enable(self):
1958
2671
self.enabled = True
1960
2673
def add_pipe(self, parent_pipe, proc):
1961
2674
# 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)
2676
parent_pipe.fileno(),
2677
GLib.IO_IN | GLib.IO_HUP,
2678
functools.partial(self.handle_ipc,
2679
parent_pipe=parent_pipe,
2682
def handle_ipc(self, source, condition,
2685
client_object=None):
1985
2686
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2687
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1987
2688
# Wait for other process to exit
1991
2692
# Read a request from the child
1992
2693
request = parent_pipe.recv()
1993
2694
command = request[0]
1995
2696
if command == 'init':
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2697
key_id = request[1].decode("ascii")
2698
fpr = request[2].decode("ascii")
2699
address = request[3]
2701
for c in self.clients.values():
2702
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2704
if key_id and c.key_id == key_id:
2707
if fpr and c.fingerprint == fpr:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2711
logger.info("Client not found for key ID: %s, address"
2712
": %s", key_id or fpr, address)
2006
2713
if self.use_dbus:
2007
2714
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2715
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
2717
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,
2721
parent_pipe.fileno(),
2722
GLib.IO_IN | GLib.IO_HUP,
2723
functools.partial(self.handle_ipc,
2724
parent_pipe=parent_pipe,
2726
client_object=client))
2021
2727
parent_pipe.send(True)
2022
2728
# remove the old hook in favor of the new above hook on
2026
2732
funcname = request[1]
2027
2733
args = request[2]
2028
2734
kwargs = request[3]
2030
2736
parent_pipe.send(('data', getattr(client_object,
2031
2737
funcname)(*args,
2034
2740
if command == 'getattr':
2035
2741
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2742
if isinstance(client_object.__getattribute__(attrname),
2743
collections.Callable):
2744
parent_pipe.send(('function', ))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2747
'data', client_object.__getattribute__(attrname)))
2042
2749
if command == 'setattr':
2043
2750
attrname = request[1]
2044
2751
value = request[2]
2045
2752
setattr(client_object, attrname, value)
2757
def rfc3339_duration_to_delta(duration):
2758
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2760
>>> rfc3339_duration_to_delta("P7D")
2761
datetime.timedelta(7)
2762
>>> rfc3339_duration_to_delta("PT60S")
2763
datetime.timedelta(0, 60)
2764
>>> rfc3339_duration_to_delta("PT60M")
2765
datetime.timedelta(0, 3600)
2766
>>> rfc3339_duration_to_delta("PT24H")
2767
datetime.timedelta(1)
2768
>>> rfc3339_duration_to_delta("P1W")
2769
datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT5M30S")
2771
datetime.timedelta(0, 330)
2772
>>> rfc3339_duration_to_delta("P1DT3M20S")
2773
datetime.timedelta(1, 200)
2776
# Parsing an RFC 3339 duration with regular expressions is not
2777
# possible - there would have to be multiple places for the same
2778
# values, like seconds. The current code, while more esoteric, is
2779
# cleaner without depending on a parsing library. If Python had a
2780
# built-in library for parsing we would use it, but we'd like to
2781
# avoid excessive use of external libraries.
2783
# New type for defining tokens, syntax, and semantics all-in-one
2784
Token = collections.namedtuple("Token", (
2785
"regexp", # To match token; if "value" is not None, must have
2786
# a "group" containing digits
2787
"value", # datetime.timedelta or None
2788
"followers")) # Tokens valid after this token
2789
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2790
# the "duration" ABNF definition in RFC 3339, Appendix A.
2791
token_end = Token(re.compile(r"$"), None, frozenset())
2792
token_second = Token(re.compile(r"(\d+)S"),
2793
datetime.timedelta(seconds=1),
2794
frozenset((token_end, )))
2795
token_minute = Token(re.compile(r"(\d+)M"),
2796
datetime.timedelta(minutes=1),
2797
frozenset((token_second, token_end)))
2798
token_hour = Token(re.compile(r"(\d+)H"),
2799
datetime.timedelta(hours=1),
2800
frozenset((token_minute, token_end)))
2801
token_time = Token(re.compile(r"T"),
2803
frozenset((token_hour, token_minute,
2805
token_day = Token(re.compile(r"(\d+)D"),
2806
datetime.timedelta(days=1),
2807
frozenset((token_time, token_end)))
2808
token_month = Token(re.compile(r"(\d+)M"),
2809
datetime.timedelta(weeks=4),
2810
frozenset((token_day, token_end)))
2811
token_year = Token(re.compile(r"(\d+)Y"),
2812
datetime.timedelta(weeks=52),
2813
frozenset((token_month, token_end)))
2814
token_week = Token(re.compile(r"(\d+)W"),
2815
datetime.timedelta(weeks=1),
2816
frozenset((token_end, )))
2817
token_duration = Token(re.compile(r"P"), None,
2818
frozenset((token_year, token_month,
2819
token_day, token_time,
2821
# Define starting values:
2823
value = datetime.timedelta()
2825
# Following valid tokens
2826
followers = frozenset((token_duration, ))
2827
# String left to parse
2829
# Loop until end token is found
2830
while found_token is not token_end:
2831
# Search for any currently valid tokens
2832
for token in followers:
2833
match = token.regexp.match(s)
2834
if match is not None:
2836
if token.value is not None:
2837
# Value found, parse digits
2838
factor = int(match.group(1), 10)
2839
# Add to value so far
2840
value += factor * token.value
2841
# Strip token from string
2842
s = token.regexp.sub("", s, 1)
2845
# Set valid next tokens
2846
followers = found_token.followers
2849
# No currently valid tokens were found
2850
raise ValueError("Invalid RFC 3339 duration: {!r}"
2050
2856
def string_to_delta(interval):
2051
2857
"""Parse a string and return a datetime.timedelta
2053
2859
>>> string_to_delta('7d')
2054
2860
datetime.timedelta(7)
2055
2861
>>> string_to_delta('60s')
2144
2956
parser.add_argument("--no-dbus", action="store_false",
2145
2957
dest="use_dbus", help="Do not provide D-Bus"
2146
" system bus interface")
2958
" system bus interface", default=None)
2147
2959
parser.add_argument("--no-ipv6", action="store_false",
2148
dest="use_ipv6", help="Do not use IPv6")
2960
dest="use_ipv6", help="Do not use IPv6",
2149
2962
parser.add_argument("--no-restore", action="store_false",
2150
2963
dest="restore", help="Do not restore stored"
2964
" state", default=None)
2965
parser.add_argument("--socket", type=int,
2966
help="Specify a file descriptor to a network"
2967
" socket to use instead of creating one")
2152
2968
parser.add_argument("--statedir", metavar="DIR",
2153
2969
help="Directory to save/restore state in")
2970
parser.add_argument("--foreground", action="store_true",
2971
help="Run in foreground", default=None)
2972
parser.add_argument("--no-zeroconf", action="store_false",
2973
dest="zeroconf", help="Do not use Zeroconf",
2155
2976
options = parser.parse_args()
2157
2978
if options.check:
2980
fail_count, test_count = doctest.testmod()
2981
sys.exit(os.EX_OK if fail_count == 0 else 1)
2162
2983
# Default values for config file for server-global settings
2163
server_defaults = { "interface": "",
2168
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2169
"servicename": "Mandos",
2174
"statedir": "/var/lib/mandos"
2984
if gnutls.has_rawpk:
2985
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2986
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2988
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2989
":+SIGN-DSA-SHA256")
2990
server_defaults = {"interface": "",
2994
"priority": priority,
2995
"servicename": "Mandos",
3001
"statedir": "/var/lib/mandos",
3002
"foreground": "False",
2177
3007
# Parse config file for server-global settings
2178
server_config = configparser.SafeConfigParser(server_defaults)
3008
server_config = configparser.ConfigParser(server_defaults)
2179
3009
del server_defaults
2180
server_config.read(os.path.join(options.configdir,
2182
# Convert the SafeConfigParser object to a dict
3010
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3011
# Convert the ConfigParser object to a dict
2183
3012
server_settings = server_config.defaults()
2184
3013
# Use the appropriate methods on the non-string config options
2185
for option in ("debug", "use_dbus", "use_ipv6"):
3014
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3015
"foreground", "zeroconf"):
2186
3016
server_settings[option] = server_config.getboolean("DEFAULT",
2188
3018
if server_settings["port"]:
2189
3019
server_settings["port"] = server_config.getint("DEFAULT",
3021
if server_settings["socket"]:
3022
server_settings["socket"] = server_config.getint("DEFAULT",
3024
# Later, stdin will, and stdout and stderr might, be dup'ed
3025
# over with an opened os.devnull. But we don't want this to
3026
# happen with a supplied network socket.
3027
if 0 <= server_settings["socket"] <= 2:
3028
server_settings["socket"] = os.dup(server_settings
2191
3030
del server_config
2193
3032
# Override the settings from the config file with command line
2194
3033
# options, if set.
2195
3034
for option in ("interface", "address", "port", "debug",
2196
"priority", "servicename", "configdir",
2197
"use_dbus", "use_ipv6", "debuglevel", "restore",
3035
"priority", "servicename", "configdir", "use_dbus",
3036
"use_ipv6", "debuglevel", "restore", "statedir",
3037
"socket", "foreground", "zeroconf"):
2199
3038
value = getattr(options, option)
2200
3039
if value is not None:
2201
3040
server_settings[option] = value
2203
3042
# Force all strings to be unicode
2204
3043
for option in server_settings.keys():
2205
if type(server_settings[option]) is str:
2206
server_settings[option] = unicode(server_settings[option])
3044
if isinstance(server_settings[option], bytes):
3045
server_settings[option] = (server_settings[option]
3047
# Force all boolean options to be boolean
3048
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3049
"foreground", "zeroconf"):
3050
server_settings[option] = bool(server_settings[option])
3051
# Debug implies foreground
3052
if server_settings["debug"]:
3053
server_settings["foreground"] = True
2207
3054
# Now we have our good server settings in "server_settings"
2209
3056
##################################################################
3058
if (not server_settings["zeroconf"]
3059
and not (server_settings["port"]
3060
or server_settings["socket"] != "")):
3061
parser.error("Needs port or socket to work without Zeroconf")
2211
3063
# For convenience
2212
3064
debug = server_settings["debug"]
2213
3065
debuglevel = server_settings["debuglevel"]
3134
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2272
3136
except OSError as error:
2273
if error[0] != errno.EPERM:
3137
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3138
.format(uid, gid, os.strerror(error.errno)))
3139
if error.errno != errno.EPERM:
2277
3143
# Enable all possible GnuTLS debugging
2279
3145
# "Use a log level over 10 to enable all debugging options."
2280
3146
# - GnuTLS manual
2281
gnutls.library.functions.gnutls_global_set_log_level(11)
2283
@gnutls.library.types.gnutls_log_func
3147
gnutls.global_set_log_level(11)
2284
3150
def debug_gnutls(level, string):
2285
3151
logger.debug("GnuTLS: %s", string[:-1])
2287
(gnutls.library.functions
2288
.gnutls_global_set_log_function(debug_gnutls))
3153
gnutls.global_set_log_function(debug_gnutls)
2290
3155
# Redirect stdin so all checkers get /dev/null
2291
3156
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2292
3157
os.dup2(null, sys.stdin.fileno())
2296
3161
# Need to fork before connecting to D-Bus
2298
3163
# Close all input and output, do double fork, etc.
2301
gobject.threads_init()
3166
if gi.version_info < (3, 10, 2):
3167
# multiprocessing will use threads, so before we use GLib we
3168
# need to inform GLib that threads will be used.
2303
3171
global main_loop
2304
3172
# From the Avahi example code
2305
3173
DBusGMainLoop(set_as_default=True)
2306
main_loop = gobject.MainLoop()
3174
main_loop = GLib.MainLoop()
2307
3175
bus = dbus.SystemBus()
2308
3176
# End of Avahi example code
2311
3179
bus_name = dbus.service.BusName("se.recompile.Mandos",
2312
bus, do_not_queue=True)
2313
old_bus_name = (dbus.service.BusName
2314
("se.bsnet.fukt.Mandos", bus,
2316
except dbus.exceptions.NameExistsException as e:
2317
logger.error(unicode(e) + ", disabling D-Bus")
3182
old_bus_name = dbus.service.BusName(
3183
"se.bsnet.fukt.Mandos", bus,
3185
except dbus.exceptions.DBusException as e:
3186
logger.error("Disabling D-Bus:", exc_info=e)
2318
3187
use_dbus = False
2319
3188
server_settings["use_dbus"] = False
2320
3189
tcp_server.use_dbus = False
2321
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2322
service = AvahiServiceToSyslog(name =
2323
server_settings["servicename"],
2324
servicetype = "_mandos._tcp",
2325
protocol = protocol, bus = bus)
2326
if server_settings["interface"]:
2327
service.interface = (if_nametoindex
2328
(str(server_settings["interface"])))
3191
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3192
service = AvahiServiceToSyslog(
3193
name=server_settings["servicename"],
3194
servicetype="_mandos._tcp",
3197
if server_settings["interface"]:
3198
service.interface = if_nametoindex(
3199
server_settings["interface"].encode("utf-8"))
2330
3201
global multiprocessing_manager
2331
3202
multiprocessing_manager = multiprocessing.Manager()
2333
3204
client_class = Client
2335
client_class = functools.partial(ClientDBusTransitional,
3206
client_class = functools.partial(ClientDBus, bus=bus)
2338
3208
client_settings = Client.config_parser(client_config)
2339
3209
old_client_settings = {}
2340
3210
clients_data = {}
3212
# This is used to redirect stdout and stderr for checker processes
3214
wnull = open(os.devnull, "w") # A writable /dev/null
3215
# Only used if server is running in foreground but not in debug
3217
if debug or not foreground:
2342
3220
# Get client data and settings from last running state.
2343
3221
if server_settings["restore"]:
2345
3223
with open(stored_state_path, "rb") as stored_state:
2346
clients_data, old_client_settings = (pickle.load
3224
if sys.version_info.major == 2:
3225
clients_data, old_client_settings = pickle.load(
3228
bytes_clients_data, bytes_old_client_settings = (
3229
pickle.load(stored_state, encoding="bytes"))
3230
# Fix bytes to strings
3233
clients_data = {(key.decode("utf-8")
3234
if isinstance(key, bytes)
3237
bytes_clients_data.items()}
3238
del bytes_clients_data
3239
for key in clients_data:
3240
value = {(k.decode("utf-8")
3241
if isinstance(k, bytes) else k): v
3243
clients_data[key].items()}
3244
clients_data[key] = value
3246
value["client_structure"] = [
3248
if isinstance(s, bytes)
3250
value["client_structure"]]
3252
for k in ("name", "host"):
3253
if isinstance(value[k], bytes):
3254
value[k] = value[k].decode("utf-8")
3255
if "key_id" not in value:
3256
value["key_id"] = ""
3257
elif "fingerprint" not in value:
3258
value["fingerprint"] = ""
3259
# old_client_settings
3261
old_client_settings = {
3262
(key.decode("utf-8")
3263
if isinstance(key, bytes)
3266
bytes_old_client_settings.items()}
3267
del bytes_old_client_settings
3269
for value in old_client_settings.values():
3270
if isinstance(value["host"], bytes):
3271
value["host"] = (value["host"]
2348
3273
os.remove(stored_state_path)
2349
3274
except IOError as e:
2350
logger.warning("Could not load persistent state: {0}"
2352
if e.errno != errno.ENOENT:
3275
if e.errno == errno.ENOENT:
3276
logger.warning("Could not load persistent state:"
3277
" {}".format(os.strerror(e.errno)))
3279
logger.critical("Could not load persistent state:",
2354
3282
except EOFError as e:
2355
3283
logger.warning("Could not load persistent state: "
2356
"EOFError: {0}".format(e))
2358
3287
with PGPEngine() as pgp:
2359
for client_name, client in clients_data.iteritems():
3288
for client_name, client in clients_data.items():
3289
# Skip removed clients
3290
if client_name not in client_settings:
2360
3293
# Decide which value to use after restoring saved state.
2361
3294
# We have three different values: Old config file,
2362
3295
# new config file, and saved state.
2423
3355
clients_data[client_name] = client_settings[client_name]
2425
3357
# Create all client objects
2426
for client_name, client in clients_data.iteritems():
3358
for client_name, client in clients_data.items():
2427
3359
tcp_server.clients[client_name] = client_class(
2428
name = client_name, settings = client)
3362
server_settings=server_settings)
2430
3364
if not tcp_server.clients:
2431
3365
logger.warning("No clients defined")
2437
pidfile.write(str(pid) + "\n".encode("utf-8"))
2440
logger.error("Could not write to file %r with PID %d",
2443
# "pidfile" was never created
3368
if pidfile is not None:
3372
print(pid, file=pidfile)
3374
logger.error("Could not write to file %r with PID %d",
2445
3377
del pidfilename
2446
signal.signal(signal.SIGINT, signal.SIG_IGN)
2448
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2449
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3379
for termsig in (signal.SIGHUP, signal.SIGTERM):
3380
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3381
lambda: main_loop.quit() and False)
2452
class MandosDBusService(DBusObjectWithProperties):
3385
@alternate_dbus_interfaces(
3386
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3387
class MandosDBusService(DBusObjectWithObjectManager):
2453
3388
"""A D-Bus proxy object"""
2454
3390
def __init__(self):
2455
3391
dbus.service.Object.__init__(self, bus, "/")
2456
3393
_interface = "se.recompile.Mandos"
2458
@dbus_interface_annotations(_interface)
2460
return { "org.freedesktop.DBus.Property"
2461
".EmitsChangedSignal":
2464
3395
@dbus.service.signal(_interface, signature="o")
2465
3396
def ClientAdded(self, objpath):
2469
3400
@dbus.service.signal(_interface, signature="ss")
2470
def ClientNotFound(self, fingerprint, address):
3401
def ClientNotFound(self, key_id, address):
3405
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2474
3407
@dbus.service.signal(_interface, signature="os")
2475
3408
def ClientRemoved(self, objpath, name):
3412
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2479
3414
@dbus.service.method(_interface, out_signature="ao")
2480
3415
def GetAllClients(self):
2482
return dbus.Array(c.dbus_object_path
2484
tcp_server.clients.itervalues())
3417
return dbus.Array(c.dbus_object_path for c in
3418
tcp_server.clients.values())
3420
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2486
3422
@dbus.service.method(_interface,
2487
3423
out_signature="a{oa{sv}}")
2488
3424
def GetAllClientsWithProperties(self):
2490
3426
return dbus.Dictionary(
2491
((c.dbus_object_path, c.GetAll(""))
2492
for c in tcp_server.clients.itervalues()),
3427
{c.dbus_object_path: c.GetAll(
3428
"se.recompile.Mandos.Client")
3429
for c in tcp_server.clients.values()},
2493
3430
signature="oa{sv}")
2495
3432
@dbus.service.method(_interface, in_signature="o")
2496
3433
def RemoveClient(self, object_path):
2498
for c in tcp_server.clients.itervalues():
3435
for c in tcp_server.clients.values():
2499
3436
if c.dbus_object_path == object_path:
2500
3437
del tcp_server.clients[c.name]
2501
3438
c.remove_from_connection()
2502
# Don't signal anything except ClientRemoved
3439
# Don't signal the disabling
2503
3440
c.disable(quiet=True)
2505
self.ClientRemoved(object_path, c.name)
3441
# Emit D-Bus signal for removal
3442
self.client_removed_signal(c)
2507
3444
raise KeyError(object_path)
2511
class MandosDBusServiceTransitional(MandosDBusService):
2512
__metaclass__ = AlternateDBusNamesMetaclass
2513
mandos_dbus_service = MandosDBusServiceTransitional()
3448
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3449
out_signature="a{oa{sa{sv}}}")
3450
def GetManagedObjects(self):
3452
return dbus.Dictionary(
3453
{client.dbus_object_path:
3455
{interface: client.GetAll(interface)
3457
client._get_all_interface_names()})
3458
for client in tcp_server.clients.values()})
3460
def client_added_signal(self, client):
3461
"""Send the new standard signal and the old signal"""
3463
# New standard signal
3464
self.InterfacesAdded(
3465
client.dbus_object_path,
3467
{interface: client.GetAll(interface)
3469
client._get_all_interface_names()}))
3471
self.ClientAdded(client.dbus_object_path)
3473
def client_removed_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesRemoved(
3478
client.dbus_object_path,
3479
client._get_all_interface_names())
3481
self.ClientRemoved(client.dbus_object_path,
3484
mandos_dbus_service = MandosDBusService()
3486
# Save modules to variables to exempt the modules from being
3487
# unloaded before the function registered with atexit() is run.
3488
mp = multiprocessing
2516
3492
"Cleanup function; run on exit"
2519
multiprocessing.active_children()
3496
mp.active_children()
2520
3498
if not (tcp_server.clients or client_settings):
2523
3501
# Store client before exiting. Secrets are encrypted with key
2524
3502
# based on what config file has. If config file is
2525
3503
# removed/edited, old secret will thus be unrecovable.
2527
3505
with PGPEngine() as pgp:
2528
for client in tcp_server.clients.itervalues():
3506
for client in tcp_server.clients.values():
2529
3507
key = client_settings[client.name]["secret"]
2530
3508
client.encrypted_secret = pgp.encrypt(client.secret,
2532
3510
client_dict = {}
2534
3512
# A list of attributes that can not be pickled
2536
exclude = set(("bus", "changedstate", "secret",
2538
for name, typ in (inspect.getmembers
2539
(dbus.service.Object)):
3514
exclude = {"bus", "changedstate", "secret",
3515
"checker", "server_settings"}
3516
for name, typ in inspect.getmembers(dbus.service
2540
3518
exclude.add(name)
2542
3520
client_dict["encrypted_secret"] = (client
2543
3521
.encrypted_secret)
2544
3522
for attr in client.client_structure:
2545
3523
if attr not in exclude:
2546
3524
client_dict[attr] = getattr(client, attr)
2548
3526
clients[client.name] = client_dict
2549
3527
del client_settings[client.name]["secret"]
2552
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
(stored_state_path))
2556
with os.fdopen(tempfd, "wb") as stored_state:
2557
pickle.dump((clients, client_settings), stored_state)
3530
with tempfile.NamedTemporaryFile(
3534
dir=os.path.dirname(stored_state_path),
3535
delete=False) as stored_state:
3536
pickle.dump((clients, client_settings), stored_state,
3538
tempname = stored_state.name
2558
3539
os.rename(tempname, stored_state_path)
2559
3540
except (IOError, OSError) as e:
2560
logger.warning("Could not save persistent state: {0}"
2564
3543
os.remove(tempname)
2565
3544
except NameError:
2567
if e.errno not in set((errno.ENOENT, errno.EACCES,
3546
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3547
logger.warning("Could not save persistent state: {}"
3548
.format(os.strerror(e.errno)))
3550
logger.warning("Could not save persistent state:",
2571
3554
# Delete all clients, and settings from config
2572
3555
while tcp_server.clients:
2573
3556
name, client = tcp_server.clients.popitem()
2575
3558
client.remove_from_connection()
2576
# Don't signal anything except ClientRemoved
3559
# Don't signal the disabling
2577
3560
client.disable(quiet=True)
3561
# Emit D-Bus signal for removal
2580
mandos_dbus_service.ClientRemoved(client
3563
mandos_dbus_service.client_removed_signal(client)
2583
3564
client_settings.clear()
2585
3566
atexit.register(cleanup)
2587
for client in tcp_server.clients.itervalues():
3568
for client in tcp_server.clients.values():
2590
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3570
# Emit D-Bus signal for adding
3571
mandos_dbus_service.client_added_signal(client)
2591
3572
# Need to initiate checking of clients
2592
3573
if client.enabled:
2593
3574
client.init_checker()
2595
3576
tcp_server.enable()
2596
3577
tcp_server.server_activate()
2598
3579
# Find out what port we got
2599
service.port = tcp_server.socket.getsockname()[1]
3581
service.port = tcp_server.socket.getsockname()[1]
2601
3583
logger.info("Now listening on address %r, port %d,"
2602
" flowinfo %d, scope_id %d"
2603
% tcp_server.socket.getsockname())
3584
" flowinfo %d, scope_id %d",
3585
*tcp_server.socket.getsockname())
2605
logger.info("Now listening on address %r, port %d"
2606
% tcp_server.socket.getsockname())
2608
#service.interface = tcp_server.socket.getsockname()[3]
3587
logger.info("Now listening on address %r, port %d",
3588
*tcp_server.socket.getsockname())
3590
# service.interface = tcp_server.socket.getsockname()[3]
2611
# From the Avahi example code
2614
except dbus.exceptions.DBusException as error:
2615
logger.critical("D-Bus Exception", exc_info=error)
2618
# End of Avahi example code
2620
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2621
lambda *args, **kwargs:
2622
(tcp_server.handle_request
2623
(*args[2:], **kwargs) or True))
3594
# From the Avahi example code
3597
except dbus.exceptions.DBusException as error:
3598
logger.critical("D-Bus Exception", exc_info=error)
3601
# End of Avahi example code
3603
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3604
lambda *args, **kwargs:
3605
(tcp_server.handle_request
3606
(*args[2:], **kwargs) or True))
2625
3608
logger.debug("Starting main loop")
2626
3609
main_loop.run()
2627
3610
except AvahiError as error: