2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
44
import SocketServer as socketserver
37
import SocketServer as socketserver
52
import ConfigParser as configparser
43
import gnutls.connection
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
82
71
import dbus.service
83
from gi.repository import GLib
84
74
from dbus.mainloop.glib import DBusGMainLoop
87
77
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
82
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
83
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
85
from IN import SO_BINDTODEVICE
100
86
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
87
SO_BINDTODEVICE = None
119
90
stored_state_file = "clients.pickle"
121
92
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
127
101
except (OSError, AttributeError):
129
102
def if_nametoindex(interface):
130
103
"Get an interface index the hard way, i.e. using fcntl()"
131
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
105
with contextlib.closing(socket.socket()) as s:
133
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
136
111
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
114
def initlogger(debug, level=logging.WARNING):
156
115
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
117
syslogger.setFormatter(logging.Formatter
163
118
('Mandos [%(process)d]: %(levelname)s:'
165
120
logger.addHandler(syslogger)
168
123
console = logging.StreamHandler()
169
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
169
os.rmdir(self.tempdir)
227
170
self.tempdir = None
229
172
def password_encode(self, password):
230
173
# Passphrase can not be empty and can not contain newlines or
231
174
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
240
177
def encrypt(self, data, password):
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
256
192
return ciphertext
258
194
def decrypt(self, data, password):
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
274
209
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
303
213
class AvahiError(Exception):
304
214
def __init__(self, value, *args, **kwargs):
305
215
self.value = value
306
return super(AvahiError, self).__init__(value, *args,
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
310
220
class AvahiServiceError(AvahiError):
314
223
class AvahiGroupError(AvahiError):
318
227
class AvahiService(object):
319
228
"""An Avahi (Zeroconf) service.
322
231
interface: integer; avahi.IF_UNSPEC or an interface index.
323
232
Used to optionally bind to the specified interface.
324
233
name: string; Example: 'Mandos'
325
234
type: string; Example: '_mandos._tcp'.
326
See <https://www.iana.org/assignments/service-names-port-numbers>
235
See <http://www.dns-sd.org/ServiceTypes.html>
327
236
port: integer; what port to announce
328
237
TXT: list of strings; TXT record for the service
329
238
domain: string; Domain to publish on, default to .local if empty.
488
367
follow_name_owner_changes=True),
489
368
avahi.DBUS_INTERFACE_SERVER)
490
369
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
370
self.server_state_changed)
492
371
self.server_state_changed(self.server.GetState())
495
373
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
375
"""Add the new name to the syslog messages"""
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos (%s) [%%(process)d]:'
379
' %%(levelname)s: %%(message)s'
505
# Pretend that we have a GnuTLS module
506
class gnutls(object):
507
"""This isn't so much a class as it is a module-like namespace."""
509
library = ctypes.util.find_library("gnutls")
511
library = ctypes.util.find_library("gnutls-deb0")
512
_library = ctypes.cdll.LoadLibrary(library)
515
# Unless otherwise indicated, the constants and types below are
516
# all from the gnutls/gnutls.h C header file.
527
E_NO_CERTIFICATE_FOUND = -49
532
KEYID_USE_SHA256 = 1 # gnutls/x509.h
533
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
536
class session_int(ctypes.Structure):
538
session_t = ctypes.POINTER(session_int)
540
class certificate_credentials_st(ctypes.Structure):
542
certificate_credentials_t = ctypes.POINTER(
543
certificate_credentials_st)
544
certificate_type_t = ctypes.c_int
546
class datum_t(ctypes.Structure):
547
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
('size', ctypes.c_uint)]
550
class openpgp_crt_int(ctypes.Structure):
552
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
554
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
555
credentials_type_t = ctypes.c_int
556
transport_ptr_t = ctypes.c_void_p
557
close_request_t = ctypes.c_int
560
class Error(Exception):
561
def __init__(self, message=None, code=None, args=()):
562
# Default usage is by a message string, but if a return
563
# code is passed, convert it to a string with
566
if message is None and code is not None:
567
message = gnutls.strerror(code)
568
return super(gnutls.Error, self).__init__(
571
class CertificateSecurityError(Error):
575
class Credentials(object):
577
self._c_object = gnutls.certificate_credentials_t()
578
gnutls.certificate_allocate_credentials(
579
ctypes.byref(self._c_object))
580
self.type = gnutls.CRD_CERTIFICATE
583
gnutls.certificate_free_credentials(self._c_object)
585
class ClientSession(object):
586
def __init__(self, socket, credentials=None):
587
self._c_object = gnutls.session_t()
588
gnutls_flags = gnutls.CLIENT
589
if gnutls.check_version("3.5.6"):
590
gnutls_flags |= gnutls.NO_TICKETS
592
gnutls_flags |= gnutls.ENABLE_RAWPK
593
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
595
gnutls.set_default_priority(self._c_object)
596
gnutls.transport_set_ptr(self._c_object, socket.fileno())
597
gnutls.handshake_set_private_extensions(self._c_object,
600
if credentials is None:
601
credentials = gnutls.Credentials()
602
gnutls.credentials_set(self._c_object, credentials.type,
603
ctypes.cast(credentials._c_object,
605
self.credentials = credentials
608
gnutls.deinit(self._c_object)
611
return gnutls.handshake(self._c_object)
613
def send(self, data):
617
data_len -= gnutls.record_send(self._c_object,
622
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
624
# Error handling functions
625
def _error_code(result):
626
"""A function to raise exceptions on errors, suitable
627
for the 'restype' attribute on ctypes functions"""
630
if result == gnutls.E_NO_CERTIFICATE_FOUND:
631
raise gnutls.CertificateSecurityError(code=result)
632
raise gnutls.Error(code=result)
634
def _retry_on_error(result, func, arguments):
635
"""A function to retry on some errors, suitable
636
for the 'errcheck' attribute on ctypes functions"""
638
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
639
return _error_code(result)
640
result = func(*arguments)
643
# Unless otherwise indicated, the function declarations below are
644
# all from the gnutls/gnutls.h C header file.
647
priority_set_direct = _library.gnutls_priority_set_direct
648
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
649
ctypes.POINTER(ctypes.c_char_p)]
650
priority_set_direct.restype = _error_code
652
init = _library.gnutls_init
653
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
654
init.restype = _error_code
656
set_default_priority = _library.gnutls_set_default_priority
657
set_default_priority.argtypes = [session_t]
658
set_default_priority.restype = _error_code
660
record_send = _library.gnutls_record_send
661
record_send.argtypes = [session_t, ctypes.c_void_p,
663
record_send.restype = ctypes.c_ssize_t
664
record_send.errcheck = _retry_on_error
666
certificate_allocate_credentials = (
667
_library.gnutls_certificate_allocate_credentials)
668
certificate_allocate_credentials.argtypes = [
669
ctypes.POINTER(certificate_credentials_t)]
670
certificate_allocate_credentials.restype = _error_code
672
certificate_free_credentials = (
673
_library.gnutls_certificate_free_credentials)
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
676
certificate_free_credentials.restype = None
678
handshake_set_private_extensions = (
679
_library.gnutls_handshake_set_private_extensions)
680
handshake_set_private_extensions.argtypes = [session_t,
682
handshake_set_private_extensions.restype = None
684
credentials_set = _library.gnutls_credentials_set
685
credentials_set.argtypes = [session_t, credentials_type_t,
687
credentials_set.restype = _error_code
689
strerror = _library.gnutls_strerror
690
strerror.argtypes = [ctypes.c_int]
691
strerror.restype = ctypes.c_char_p
693
certificate_type_get = _library.gnutls_certificate_type_get
694
certificate_type_get.argtypes = [session_t]
695
certificate_type_get.restype = _error_code
697
certificate_get_peers = _library.gnutls_certificate_get_peers
698
certificate_get_peers.argtypes = [session_t,
699
ctypes.POINTER(ctypes.c_uint)]
700
certificate_get_peers.restype = ctypes.POINTER(datum_t)
702
global_set_log_level = _library.gnutls_global_set_log_level
703
global_set_log_level.argtypes = [ctypes.c_int]
704
global_set_log_level.restype = None
706
global_set_log_function = _library.gnutls_global_set_log_function
707
global_set_log_function.argtypes = [log_func]
708
global_set_log_function.restype = None
710
deinit = _library.gnutls_deinit
711
deinit.argtypes = [session_t]
712
deinit.restype = None
714
handshake = _library.gnutls_handshake
715
handshake.argtypes = [session_t]
716
handshake.restype = _error_code
717
handshake.errcheck = _retry_on_error
719
transport_set_ptr = _library.gnutls_transport_set_ptr
720
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
721
transport_set_ptr.restype = None
723
bye = _library.gnutls_bye
724
bye.argtypes = [session_t, close_request_t]
725
bye.restype = _error_code
726
bye.errcheck = _retry_on_error
728
check_version = _library.gnutls_check_version
729
check_version.argtypes = [ctypes.c_char_p]
730
check_version.restype = ctypes.c_char_p
732
_need_version = b"3.3.0"
733
if check_version(_need_version) is None:
734
raise self.Error("Needs GnuTLS {} or later"
735
.format(_need_version))
737
_tls_rawpk_version = b"3.6.6"
738
has_rawpk = bool(check_version(_tls_rawpk_version))
742
class pubkey_st(ctypes.Structure):
744
pubkey_t = ctypes.POINTER(pubkey_st)
746
x509_crt_fmt_t = ctypes.c_int
748
# All the function declarations below are from gnutls/abstract.h
749
pubkey_init = _library.gnutls_pubkey_init
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
751
pubkey_init.restype = _error_code
753
pubkey_import = _library.gnutls_pubkey_import
754
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
756
pubkey_import.restype = _error_code
758
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
759
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
760
ctypes.POINTER(ctypes.c_ubyte),
761
ctypes.POINTER(ctypes.c_size_t)]
762
pubkey_get_key_id.restype = _error_code
764
pubkey_deinit = _library.gnutls_pubkey_deinit
765
pubkey_deinit.argtypes = [pubkey_t]
766
pubkey_deinit.restype = None
768
# All the function declarations below are from gnutls/openpgp.h
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
772
openpgp_crt_init.restype = _error_code
774
openpgp_crt_import = _library.gnutls_openpgp_crt_import
775
openpgp_crt_import.argtypes = [openpgp_crt_t,
776
ctypes.POINTER(datum_t),
778
openpgp_crt_import.restype = _error_code
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
783
openpgp_crt_verify_self.restype = _error_code
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
786
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
787
openpgp_crt_deinit.restype = None
789
openpgp_crt_get_fingerprint = (
790
_library.gnutls_openpgp_crt_get_fingerprint)
791
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
795
openpgp_crt_get_fingerprint.restype = _error_code
797
if check_version("3.6.4"):
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
certificate_type_get2.restype = _error_code
802
# Remove non-public functions
803
del _error_code, _retry_on_error
806
def call_pipe(connection, # : multiprocessing.Connection
807
func, *args, **kwargs):
808
"""This function is meant to be called by multiprocessing.Process
810
This function runs func(*args, **kwargs), and writes the resulting
811
return value on the provided multiprocessing.Connection.
813
connection.send(func(*args, **kwargs))
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
817
389
class Client(object):
818
390
"""A representation of a client host served by this server.
821
393
approved: bool(); 'None' if not yet approved/disapproved
822
394
approval_delay: datetime.timedelta(); Time to wait for approval
859
427
runtime_expansions: Allowed attributes for runtime expansion.
860
428
expires: datetime.datetime(); time (UTC) when a client will be
861
429
disabled, or None
862
server_settings: The server_settings dict from main()
865
432
runtime_expansions = ("approval_delay", "approval_duration",
866
"created", "enabled", "expires", "key_id",
867
"fingerprint", "host", "interval",
868
"last_approval_request", "last_checked_ok",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
869
435
"last_enabled", "name", "timeout")
872
"extended_timeout": "PT15M",
874
"checker": "fping -q -- %%(host)s",
876
"approval_delay": "PT0S",
877
"approval_duration": "PT1S",
878
"approved_by_default": "True",
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
439
"checker": "fping -q -- %%(host)s",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
447
def timeout_milliseconds(self):
448
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
451
def extended_timeout_milliseconds(self):
452
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
455
def interval_milliseconds(self):
456
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
459
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
883
463
def config_parser(config):
966
542
self.current_checker_command = None
967
543
self.approved = None
968
544
self.approvals_pending = 0
969
self.changedstate = multiprocessing_manager.Condition(
970
multiprocessing_manager.Lock())
971
self.client_structure = [attr
972
for attr in self.__dict__.keys()
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
973
550
if not attr.startswith("_")]
974
551
self.client_structure.append("client_structure")
976
for name, t in inspect.getmembers(
977
type(self), lambda obj: isinstance(obj, property)):
553
for name, t in inspect.getmembers(type(self),
978
557
if not name.startswith("_"):
979
558
self.client_structure.append(name)
981
560
# Send notice to process children that client state has changed
982
561
def send_changedstate(self):
983
562
with self.changedstate:
984
563
self.changedstate.notify_all()
986
565
def enable(self):
987
566
"""Start this client's checker and timeout hooks"""
988
567
if getattr(self, "enabled", False):
989
568
# Already enabled
570
self.send_changedstate()
991
571
self.expires = datetime.datetime.utcnow() + self.timeout
992
572
self.enabled = True
993
573
self.last_enabled = datetime.datetime.utcnow()
994
574
self.init_checker()
995
self.send_changedstate()
997
576
def disable(self, quiet=True):
998
577
"""Disable this client."""
999
578
if not getattr(self, "enabled", False):
581
self.send_changedstate()
1002
583
logger.info("Disabling client %s", self.name)
1003
if getattr(self, "disable_initiator_tag", None) is not None:
1004
GLib.source_remove(self.disable_initiator_tag)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1005
586
self.disable_initiator_tag = None
1006
587
self.expires = None
1007
if getattr(self, "checker_initiator_tag", None) is not None:
1008
GLib.source_remove(self.checker_initiator_tag)
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1009
590
self.checker_initiator_tag = None
1010
591
self.stop_checker()
1011
592
self.enabled = False
1013
self.send_changedstate()
1014
# Do not run this again if called by a GLib.timeout_add
593
# Do not run this again if called by a gobject.timeout_add
1017
596
def __del__(self):
1020
599
def init_checker(self):
1021
600
# Schedule a new checker to be started an 'interval' from now,
1022
601
# and every interval from then on.
1023
if self.checker_initiator_tag is not None:
1024
GLib.source_remove(self.checker_initiator_tag)
1025
self.checker_initiator_tag = GLib.timeout_add(
1026
int(self.interval.total_seconds() * 1000),
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1028
605
# Schedule a disable() when 'timeout' has passed
1029
if self.disable_initiator_tag is not None:
1030
GLib.source_remove(self.disable_initiator_tag)
1031
self.disable_initiator_tag = GLib.timeout_add(
1032
int(self.timeout.total_seconds() * 1000), self.disable)
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1033
609
# Also start a new checker *right now*.
1034
610
self.start_checker()
1036
def checker_callback(self, source, condition, connection,
612
def checker_callback(self, pid, condition, command):
1038
613
"""The checker has completed, so take appropriate actions."""
1039
614
self.checker_callback_tag = None
1040
615
self.checker = None
1041
# Read return code from connection (see call_pipe)
1042
returncode = connection.recv()
1046
self.last_checker_status = returncode
1047
self.last_checker_signal = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1048
618
if self.last_checker_status == 0:
1049
619
logger.info("Checker for %(name)s succeeded",
1051
621
self.checked_ok()
1053
logger.info("Checker for %(name)s failed", vars(self))
623
logger.info("Checker for %(name)s failed",
1055
626
self.last_checker_status = -1
1056
self.last_checker_signal = -returncode
1057
627
logger.warning("Checker for %(name)s crashed?",
1061
630
def checked_ok(self):
1062
631
"""Assert that the client has been seen, alive and well."""
1063
632
self.last_checked_ok = datetime.datetime.utcnow()
1064
633
self.last_checker_status = 0
1065
self.last_checker_signal = None
1066
634
self.bump_timeout()
1068
636
def bump_timeout(self, timeout=None):
1069
637
"""Bump up the timeout for this client."""
1070
638
if timeout is None:
1071
639
timeout = self.timeout
1072
640
if self.disable_initiator_tag is not None:
1073
GLib.source_remove(self.disable_initiator_tag)
1074
self.disable_initiator_tag = None
641
gobject.source_remove(self.disable_initiator_tag)
1075
642
if getattr(self, "enabled", False):
1076
self.disable_initiator_tag = GLib.timeout_add(
1077
int(timeout.total_seconds() * 1000), self.disable)
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1078
646
self.expires = datetime.datetime.utcnow() + timeout
1080
648
def need_approval(self):
1081
649
self.last_approval_request = datetime.datetime.utcnow()
1083
651
def start_checker(self):
1084
652
"""Start a new checker subprocess if one is not running.
1086
654
If a checker already exists, leave it running and do
1088
656
# The reason for not killing a running checker is that if we
1089
# did that, and if a checker (for some reason) started running
1090
# slowly and taking more than 'interval' time, then the client
1091
# would inevitably timeout, since no checker would get a
1092
# chance to run to completion. If we instead leave running
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
1093
661
# checkers alone, the checker would have to take more time
1094
662
# than 'timeout' for the client to be disabled, which is as it
1097
if self.checker is not None and not self.checker.is_alive():
1098
logger.warning("Checker was not alive; joining")
665
# If a checker exists, make sure it is not a zombie
667
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
669
if (isinstance(error, OSError)
670
and error.errno != errno.ECHILD):
674
logger.warning("Checker was a zombie")
675
gobject.source_remove(self.checker_callback_tag)
676
self.checker_callback(pid, status,
677
self.current_checker_command)
1101
678
# Start a new checker if needed
1102
679
if self.checker is None:
1103
# Escape attributes for the shell
1105
attr: re.escape(str(getattr(self, attr)))
1106
for attr in self.runtime_expansions}
1108
command = self.checker_command % escaped_attrs
1109
except TypeError as error:
1110
logger.error('Could not format string "%s"',
1111
self.checker_command,
1113
return True # Try again later
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
684
# Escape attributes for the shell
685
escaped_attrs = dict(
687
re.escape(unicode(str(getattr(self, attr, "")),
691
self.runtime_expansions)
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s":'
697
' %s', self.checker_command, error)
698
return True # Try again later
1114
699
self.current_checker_command = command
1115
logger.info("Starting checker %r for %s", command,
1117
# We don't need to redirect stdout and stderr, since
1118
# in normal mode, that is already done by daemon(),
1119
# and in debug mode we don't want to. (Stdin is
1120
# always replaced by /dev/null.)
1121
# The exception is when not debugging but nevertheless
1122
# running in the foreground; use the previously
1124
popen_args = {"close_fds": True,
1127
if (not self.server_settings["debug"]
1128
and self.server_settings["foreground"]):
1129
popen_args.update({"stdout": wnull,
1131
pipe = multiprocessing.Pipe(duplex=False)
1132
self.checker = multiprocessing.Process(
1134
args=(pipe[1], subprocess.call, command),
1136
self.checker.start()
1137
self.checker_callback_tag = GLib.io_add_watch(
1138
pipe[0].fileno(), GLib.IO_IN,
1139
self.checker_callback, pipe[0], command)
1140
# Re-run this periodically if run by GLib.timeout_add
701
logger.info("Starting checker %r for %s",
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
710
self.checker_callback_tag = (gobject.child_watch_add
712
self.checker_callback,
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess: %s",
723
# Re-run this periodically if run by gobject.timeout_add
1143
726
def stop_checker(self):
1144
727
"""Force the checker process, if any, to stop."""
1145
728
if self.checker_callback_tag:
1146
GLib.source_remove(self.checker_callback_tag)
729
gobject.source_remove(self.checker_callback_tag)
1147
730
self.checker_callback_tag = None
1148
731
if getattr(self, "checker", None) is None:
1150
733
logger.debug("Stopping checker for %(name)s", vars(self))
1151
self.checker.terminate()
735
os.kill(self.checker.pid, signal.SIGTERM)
737
#if self.checker.poll() is None:
738
# os.kill(self.checker.pid, signal.SIGKILL)
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
1152
742
self.checker = None
1155
def dbus_service_property(dbus_interface,
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1159
747
"""Decorators for marking methods of a DBusObjectWithProperties to
1160
748
become properties on the D-Bus.
1162
750
The decorated method will be called with no arguments by "Get"
1163
751
and with one argument by "Set".
1165
753
The parameters, where they are supported, are the same as
1166
754
dbus.service.method, except there is only "signature", since the
1167
755
type from Get() and the type sent to Set() is the same.
1250
class DBusObjectWithAnnotations(dbus.service.Object):
1251
"""A D-Bus object with annotations.
1253
Classes inheriting from this can use the dbus_annotations
1254
decorator to add annotations to methods or signals.
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
840
def _is_dbus_thing(thing):
1259
841
"""Returns a function testing if an attribute is a D-Bus thing
1261
843
If called like _is_dbus_thing("method") it returns a function
1262
844
suitable for use as predicate to inspect.getmembers().
1264
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1267
849
def _get_all_dbus_things(self, thing):
1268
850
"""Returns a generator of (name, attribute) pairs
1270
return ((getattr(athing.__get__(self), "_dbus_name", name),
852
return ((getattr(athing.__get__(self), "_dbus_name",
1271
854
athing.__get__(self))
1272
855
for cls in self.__class__.__mro__
1273
856
for name, athing in
1274
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1276
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1278
path_keyword='object_path',
1279
connection_keyword='connection')
1280
def Introspect(self, object_path, connection):
1281
"""Overloading of standard D-Bus method.
1283
Inserts annotation tags on methods and signals.
1285
xmlstring = dbus.service.Object.Introspect(self, object_path,
1288
document = xml.dom.minidom.parseString(xmlstring)
1290
for if_tag in document.getElementsByTagName("interface"):
1291
# Add annotation tags
1292
for typ in ("method", "signal"):
1293
for tag in if_tag.getElementsByTagName(typ):
1295
for name, prop in (self.
1296
_get_all_dbus_things(typ)):
1297
if (name == tag.getAttribute("name")
1298
and prop._dbus_interface
1299
== if_tag.getAttribute("name")):
1300
annots.update(getattr(
1301
prop, "_dbus_annotations", {}))
1302
for name, value in annots.items():
1303
ann_tag = document.createElement(
1305
ann_tag.setAttribute("name", name)
1306
ann_tag.setAttribute("value", value)
1307
tag.appendChild(ann_tag)
1308
# Add interface annotation tags
1309
for annotation, value in dict(
1310
itertools.chain.from_iterable(
1311
annotations().items()
1312
for name, annotations
1313
in self._get_all_dbus_things("interface")
1314
if name == if_tag.getAttribute("name")
1316
ann_tag = document.createElement("annotation")
1317
ann_tag.setAttribute("name", annotation)
1318
ann_tag.setAttribute("value", value)
1319
if_tag.appendChild(ann_tag)
1320
# Fix argument name for the Introspect method itself
1321
if (if_tag.getAttribute("name")
1322
== dbus.INTROSPECTABLE_IFACE):
1323
for cn in if_tag.getElementsByTagName("method"):
1324
if cn.getAttribute("name") == "Introspect":
1325
for arg in cn.getElementsByTagName("arg"):
1326
if (arg.getAttribute("direction")
1328
arg.setAttribute("name",
1330
xmlstring = document.toxml("utf-8")
1332
except (AttributeError, xml.dom.DOMException,
1333
xml.parsers.expat.ExpatError) as error:
1334
logger.error("Failed to override Introspection method",
1339
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1340
"""A D-Bus object with properties.
1342
Classes inheriting from this can use the dbus_service_property
1343
decorator to expose methods as D-Bus properties. It exposes the
1344
standard Get(), Set(), and GetAll() methods on the D-Bus.
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1347
860
def _get_dbus_property(self, interface_name, property_name):
1348
861
"""Returns a bound method if one exists which is a D-Bus
1349
862
property with the specified name and interface.
1351
for cls in self.__class__.__mro__:
1352
for name, value in inspect.getmembers(
1353
cls, self._is_dbus_thing("property")):
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
867
self._is_dbus_thing("property"))):
1354
868
if (value._dbus_name == property_name
1355
869
and value._dbus_interface == interface_name):
1356
870
return value.__get__(self)
1358
872
# No such property
1359
raise DBusPropertyNotFound("{}:{}.{}".format(
1360
self.dbus_object_path, interface_name, property_name))
1363
def _get_all_interface_names(cls):
1364
"""Get a sequence of all interfaces supported by an object"""
1365
return (name for name in set(getattr(getattr(x, attr),
1366
"_dbus_interface", None)
1367
for x in (inspect.getmro(cls))
1369
if name is not None)
1371
@dbus.service.method(dbus.PROPERTIES_IFACE,
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1373
878
out_signature="v")
1374
879
def Get(self, interface_name, property_name):
1375
880
"""Standard D-Bus property Get() method, see D-Bus standard.
1500
1006
except (AttributeError, xml.dom.DOMException,
1501
1007
xml.parsers.expat.ExpatError) as error:
1502
1008
logger.error("Failed to override Introspection method",
1508
dbus.OBJECT_MANAGER_IFACE
1509
except AttributeError:
1510
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1513
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1514
"""A D-Bus object with an ObjectManager.
1516
Classes inheriting from this exposes the standard
1517
GetManagedObjects call and the InterfacesAdded and
1518
InterfacesRemoved signals on the standard
1519
"org.freedesktop.DBus.ObjectManager" interface.
1521
Note: No signals are sent automatically; they must be sent
1524
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1525
out_signature="a{oa{sa{sv}}}")
1526
def GetManagedObjects(self):
1527
"""This function must be overridden"""
1528
raise NotImplementedError()
1530
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1531
signature="oa{sa{sv}}")
1532
def InterfacesAdded(self, object_path, interfaces_and_properties):
1535
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1536
def InterfacesRemoved(self, object_path, interfaces):
1539
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1541
path_keyword='object_path',
1542
connection_keyword='connection')
1543
def Introspect(self, object_path, connection):
1544
"""Overloading of standard D-Bus method.
1546
Override return argument name of GetManagedObjects to be
1547
"objpath_interfaces_and_properties"
1549
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1553
document = xml.dom.minidom.parseString(xmlstring)
1555
for if_tag in document.getElementsByTagName("interface"):
1556
# Fix argument name for the GetManagedObjects method
1557
if (if_tag.getAttribute("name")
1558
== dbus.OBJECT_MANAGER_IFACE):
1559
for cn in if_tag.getElementsByTagName("method"):
1560
if (cn.getAttribute("name")
1561
== "GetManagedObjects"):
1562
for arg in cn.getElementsByTagName("arg"):
1563
if (arg.getAttribute("direction")
1567
"objpath_interfaces"
1569
xmlstring = document.toxml("utf-8")
1571
except (AttributeError, xml.dom.DOMException,
1572
xml.parsers.expat.ExpatError) as error:
1573
logger.error("Failed to override Introspection method",
1578
def datetime_to_dbus(dt, variant_level=0):
1013
def datetime_to_dbus (dt, variant_level=0):
1579
1014
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1581
return dbus.String("", variant_level=variant_level)
1582
return dbus.String(dt.isoformat(), variant_level=variant_level)
1585
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1586
"""A class decorator; applied to a subclass of
1587
dbus.service.Object, it will add alternate D-Bus attributes with
1588
interface names according to the "alt_interface_names" mapping.
1591
@alternate_dbus_interfaces({"org.example.Interface":
1592
"net.example.AlternateInterface"})
1593
class SampleDBusObject(dbus.service.Object):
1594
@dbus.service.method("org.example.Interface")
1595
def SampleDBusMethod():
1598
The above "SampleDBusMethod" on "SampleDBusObject" will be
1599
reachable via two interfaces: "org.example.Interface" and
1600
"net.example.AlternateInterface", the latter of which will have
1601
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1602
"true", unless "deprecate" is passed with a False value.
1604
This works for methods and signals, and also for D-Bus properties
1605
(from DBusObjectWithProperties) and interfaces (from the
1606
dbus_interface_annotations decorator).
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.
1610
for orig_interface_name, alt_interface_name in (
1611
alt_interface_names.items()):
1613
interface_names = set()
1614
# Go though all attributes of the class
1615
for attrname, attribute in inspect.getmembers(cls):
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):
1616
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1617
1035
# with the wrong interface name
1618
1036
if (not hasattr(attribute, "_dbus_interface")
1619
or not attribute._dbus_interface.startswith(
1620
orig_interface_name)):
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1622
1040
# Create an alternate D-Bus interface name based on
1623
1041
# the current name
1624
alt_interface = attribute._dbus_interface.replace(
1625
orig_interface_name, alt_interface_name)
1626
interface_names.add(alt_interface)
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)
1627
1047
# Is this a D-Bus signal?
1628
1048
if getattr(attribute, "_dbus_is_signal", False):
1629
# Extract the original non-method undecorated
1630
# function by black magic
1631
if sys.version_info.major == 2:
1632
nonmethod_func = (dict(
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1633
1052
zip(attribute.func_code.co_freevars,
1634
attribute.__closure__))
1635
["func"].cell_contents)
1637
nonmethod_func = (dict(
1638
zip(attribute.__code__.co_freevars,
1639
attribute.__closure__))
1640
["func"].cell_contents)
1053
attribute.__closure__))["func"]
1641
1055
# Create a new, but exactly alike, function
1642
1056
# object, and decorate it to be a new D-Bus signal
1643
1057
# with the alternate D-Bus interface name
1644
new_function = copy_function(nonmethod_func)
1645
new_function = (dbus.service.signal(
1647
attribute._dbus_signature)(new_function))
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)))
1648
1067
# Copy annotations, if any
1650
new_function._dbus_annotations = dict(
1651
attribute._dbus_annotations)
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1652
1071
except AttributeError:
1655
1073
# Define a creator of a function to call both the
1656
# original and alternate functions, so both the
1657
# original and alternate signals gets sent when
1658
# the function is called
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1659
1076
def fixscope(func1, func2):
1660
1077
"""This function is a scope container to pass
1661
1078
func1 and func2 to the "call_both" function
1662
1079
outside of its arguments"""
1664
@functools.wraps(func2)
1665
1080
def call_both(*args, **kwargs):
1666
1081
"""This function will emit two D-Bus
1667
1082
signals by calling func1 and func2"""
1668
1083
func1(*args, **kwargs)
1669
1084
func2(*args, **kwargs)
1670
# Make wrapper function look like a D-Bus
1672
for name, attr in inspect.getmembers(func2):
1673
if name.startswith("_dbus_"):
1674
setattr(call_both, name, attr)
1676
1085
return call_both
1677
1086
# Create the "call_both" function and add it to
1679
attr[attrname] = fixscope(attribute, new_function)
1088
attr[attrname] = fixscope(attribute,
1680
1090
# Is this a D-Bus method?
1681
1091
elif getattr(attribute, "_dbus_is_method", False):
1682
1092
# Create a new, but exactly alike, function
1683
1093
# object. Decorate it to be a new D-Bus method
1684
1094
# with the alternate D-Bus interface name. Add it
1685
1095
# to the class.
1687
dbus.service.method(
1689
attribute._dbus_in_signature,
1690
attribute._dbus_out_signature)
1691
(copy_function(attribute)))
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)))
1692
1106
# Copy annotations, if any
1694
attr[attrname]._dbus_annotations = dict(
1695
attribute._dbus_annotations)
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1696
1110
except AttributeError:
1698
1112
# Is this a D-Bus property?
1719
1140
# object. Decorate it to be a new D-Bus interface
1720
1141
# with the alternate D-Bus interface name. Add it
1721
1142
# to the class.
1723
dbus_interface_annotations(alt_interface)
1724
(copy_function(attribute)))
1726
# Deprecate all alternate interfaces
1727
iname = "_AlternateDBusNames_interface_annotation{}"
1728
for interface_name in interface_names:
1730
@dbus_interface_annotations(interface_name)
1732
return {"org.freedesktop.DBus.Deprecated":
1734
# Find an unused name
1735
for aname in (iname.format(i)
1736
for i in itertools.count()):
1737
if aname not in attr:
1741
# Replace the class with a new subclass of it with
1742
# methods, signals, etc. as created above.
1743
if sys.version_info.major == 2:
1744
cls = type(b"{}Alternate".format(cls.__name__),
1747
cls = type("{}Alternate".format(cls.__name__),
1754
@alternate_dbus_interfaces({"se.recompile.Mandos":
1755
"se.bsnet.fukt.Mandos"})
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)
1756
1166
class ClientDBus(Client, DBusObjectWithProperties):
1757
1167
"""A Client class using D-Bus
1760
1170
dbus_object_path: dbus.ObjectPath
1761
1171
bus: dbus.SystemBus()
1764
1174
runtime_expansions = (Client.runtime_expansions
1765
+ ("dbus_object_path", ))
1767
_interface = "se.recompile.Mandos.Client"
1175
+ ("dbus_object_path",))
1769
1177
# dbus.service.Object doesn't use super(), so we can't either.
1771
def __init__(self, bus=None, *args, **kwargs):
1179
def __init__(self, bus = None, *args, **kwargs):
1773
1181
Client.__init__(self, *args, **kwargs)
1774
1182
# Only now, when this client is initialized, can it show up on
1776
client_object_name = str(self.name).translate(
1184
client_object_name = unicode(self.name).translate(
1777
1185
{ord("."): ord("_"),
1778
1186
ord("-"): ord("_")})
1779
self.dbus_object_path = dbus.ObjectPath(
1780
"/clients/" + client_object_name)
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1781
1189
DBusObjectWithProperties.__init__(self, self.bus,
1782
1190
self.dbus_object_path)
1784
def notifychangeproperty(transform_func, dbus_name,
1785
type_func=lambda x: x,
1787
invalidate_only=False,
1788
_interface=_interface):
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1789
1195
""" Modify a variable so that it's a property which announces
1790
1196
its changes to DBus.
1792
1198
transform_fun: Function that takes a value and a variant_level
1793
1199
and transforms it to a D-Bus type.
1794
1200
dbus_name: D-Bus name of the variable
1946
1350
server to mandos-client
1950
1354
# Rejected - signal
1951
1355
@dbus.service.signal(_interface, signature="s")
1952
1356
def Rejected(self, reason):
1956
1360
# NeedApproval - signal
1957
1361
@dbus.service.signal(_interface, signature="tb")
1958
1362
def NeedApproval(self, timeout, default):
1960
1364
return self.need_approval()
1964
1368
# Approve - method
1965
1369
@dbus.service.method(_interface, in_signature="b")
1966
1370
def Approve(self, value):
1967
1371
self.approve(value)
1969
1373
# CheckedOK - method
1970
1374
@dbus.service.method(_interface)
1971
1375
def CheckedOK(self):
1972
1376
self.checked_ok()
1974
1378
# Enable - method
1975
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1976
1379
@dbus.service.method(_interface)
1977
1380
def Enable(self):
1981
1384
# StartChecker - method
1982
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1983
1385
@dbus.service.method(_interface)
1984
1386
def StartChecker(self):
1986
1388
self.start_checker()
1988
1390
# Disable - method
1989
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1990
1391
@dbus.service.method(_interface)
1991
1392
def Disable(self):
1995
1396
# StopChecker - method
1996
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1997
1397
@dbus.service.method(_interface)
1998
1398
def StopChecker(self):
1999
1399
self.stop_checker()
2003
1403
# ApprovalPending - property
2004
1404
@dbus_service_property(_interface, signature="b", access="read")
2005
1405
def ApprovalPending_dbus_property(self):
2006
1406
return dbus.Boolean(bool(self.approvals_pending))
2008
1408
# ApprovedByDefault - property
2009
@dbus_service_property(_interface,
1409
@dbus_service_property(_interface, signature="b",
2011
1410
access="readwrite")
2012
1411
def ApprovedByDefault_dbus_property(self, value=None):
2013
1412
if value is None: # get
2014
1413
return dbus.Boolean(self.approved_by_default)
2015
1414
self.approved_by_default = bool(value)
2017
1416
# ApprovalDelay - property
2018
@dbus_service_property(_interface,
1417
@dbus_service_property(_interface, signature="t",
2020
1418
access="readwrite")
2021
1419
def ApprovalDelay_dbus_property(self, value=None):
2022
1420
if value is None: # get
2023
return dbus.UInt64(self.approval_delay.total_seconds()
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2025
1422
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2027
1424
# ApprovalDuration - property
2028
@dbus_service_property(_interface,
1425
@dbus_service_property(_interface, signature="t",
2030
1426
access="readwrite")
2031
1427
def ApprovalDuration_dbus_property(self, value=None):
2032
1428
if value is None: # get
2033
return dbus.UInt64(self.approval_duration.total_seconds()
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2035
1431
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2037
1433
# Name - property
2039
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2040
1434
@dbus_service_property(_interface, signature="s", access="read")
2041
1435
def Name_dbus_property(self):
2042
1436
return dbus.String(self.name)
2046
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2047
@dbus_service_property(_interface, signature="s", access="read")
2048
def KeyID_dbus_property(self):
2049
return dbus.String(self.key_id)
2051
1438
# Fingerprint - property
2053
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2054
1439
@dbus_service_property(_interface, signature="s", access="read")
2055
1440
def Fingerprint_dbus_property(self):
2056
1441
return dbus.String(self.fingerprint)
2058
1443
# Host - property
2059
@dbus_service_property(_interface,
1444
@dbus_service_property(_interface, signature="s",
2061
1445
access="readwrite")
2062
1446
def Host_dbus_property(self, value=None):
2063
1447
if value is None: # get
2064
1448
return dbus.String(self.host)
2065
self.host = str(value)
1449
self.host = unicode(value)
2067
1451
# Created - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2070
1452
@dbus_service_property(_interface, signature="s", access="read")
2071
1453
def Created_dbus_property(self):
2072
1454
return datetime_to_dbus(self.created)
2074
1456
# LastEnabled - property
2075
1457
@dbus_service_property(_interface, signature="s", access="read")
2076
1458
def LastEnabled_dbus_property(self):
2077
1459
return datetime_to_dbus(self.last_enabled)
2079
1461
# Enabled - property
2080
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2082
1463
access="readwrite")
2083
1464
def Enabled_dbus_property(self, value=None):
2084
1465
if value is None: # get
2091
1472
# LastCheckedOK - property
2092
@dbus_service_property(_interface,
1473
@dbus_service_property(_interface, signature="s",
2094
1474
access="readwrite")
2095
1475
def LastCheckedOK_dbus_property(self, value=None):
2096
1476
if value is not None:
2097
1477
self.checked_ok()
2099
1479
return datetime_to_dbus(self.last_checked_ok)
2101
1481
# LastCheckerStatus - property
2102
@dbus_service_property(_interface, signature="n", access="read")
1482
@dbus_service_property(_interface, signature="n",
2103
1484
def LastCheckerStatus_dbus_property(self):
2104
1485
return dbus.Int16(self.last_checker_status)
2106
1487
# Expires - property
2107
1488
@dbus_service_property(_interface, signature="s", access="read")
2108
1489
def Expires_dbus_property(self):
2109
1490
return datetime_to_dbus(self.expires)
2111
1492
# LastApprovalRequest - property
2112
1493
@dbus_service_property(_interface, signature="s", access="read")
2113
1494
def LastApprovalRequest_dbus_property(self):
2114
1495
return datetime_to_dbus(self.last_approval_request)
2116
1497
# Timeout - property
2117
@dbus_service_property(_interface,
1498
@dbus_service_property(_interface, signature="t",
2119
1499
access="readwrite")
2120
1500
def Timeout_dbus_property(self, value=None):
2121
1501
if value is None: # get
2122
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2123
old_timeout = self.timeout
1502
return dbus.UInt64(self.timeout_milliseconds())
2124
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
2125
# Reschedule disabling
1504
# Reschedule timeout
2126
1505
if self.enabled:
2127
1506
now = datetime.datetime.utcnow()
2128
self.expires += self.timeout - old_timeout
2129
if self.expires <= now:
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
2130
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
2133
1516
if (getattr(self, "disable_initiator_tag", None)
2136
GLib.source_remove(self.disable_initiator_tag)
2137
self.disable_initiator_tag = GLib.timeout_add(
2138
int((self.expires - now).total_seconds() * 1000),
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2141
1524
# ExtendedTimeout - property
2142
@dbus_service_property(_interface,
1525
@dbus_service_property(_interface, signature="t",
2144
1526
access="readwrite")
2145
1527
def ExtendedTimeout_dbus_property(self, value=None):
2146
1528
if value is None: # get
2147
return dbus.UInt64(self.extended_timeout.total_seconds()
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2149
1530
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2151
1532
# Interval - property
2152
@dbus_service_property(_interface,
1533
@dbus_service_property(_interface, signature="t",
2154
1534
access="readwrite")
2155
1535
def Interval_dbus_property(self, value=None):
2156
1536
if value is None: # get
2157
return dbus.UInt64(self.interval.total_seconds() * 1000)
1537
return dbus.UInt64(self.interval_milliseconds())
2158
1538
self.interval = datetime.timedelta(0, 0, 0, value)
2159
1539
if getattr(self, "checker_initiator_tag", None) is None:
2161
1541
if self.enabled:
2162
1542
# Reschedule checker run
2163
GLib.source_remove(self.checker_initiator_tag)
2164
self.checker_initiator_tag = GLib.timeout_add(
2165
value, self.start_checker)
2166
self.start_checker() # Start one now, too
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
2168
1548
# Checker - property
2169
@dbus_service_property(_interface,
1549
@dbus_service_property(_interface, signature="s",
2171
1550
access="readwrite")
2172
1551
def Checker_dbus_property(self, value=None):
2173
1552
if value is None: # get
2174
1553
return dbus.String(self.checker_command)
2175
self.checker_command = str(value)
1554
self.checker_command = unicode(value)
2177
1556
# CheckerRunning - property
2178
@dbus_service_property(_interface,
1557
@dbus_service_property(_interface, signature="b",
2180
1558
access="readwrite")
2181
1559
def CheckerRunning_dbus_property(self, value=None):
2182
1560
if value is None: # get
2223
1593
if data[0] == 'data':
2225
1595
if data[0] == 'function':
2227
1596
def func(*args, **kwargs):
2228
1597
self._pipe.send(('funcall', name, args, kwargs))
2229
1598
return self._pipe.recv()[1]
2233
1601
def __setattr__(self, name, value):
2234
1602
if name == '_pipe':
2235
1603
return super(ProxyClient, self).__setattr__(name, value)
2236
1604
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
2239
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
2240
1612
"""A class to handle client connections.
2242
1614
Instantiated once for each connection to handle it.
2243
1615
Note: This will run in its own forked process."""
2245
1617
def handle(self):
2246
1618
with contextlib.closing(self.server.child_pipe) as child_pipe:
2247
1619
logger.info("TCP connection from: %s",
2248
str(self.client_address))
1620
unicode(self.client_address))
2249
1621
logger.debug("Pipe FD: %d",
2250
1622
self.server.child_pipe.fileno())
2252
session = gnutls.ClientSession(self.request)
2254
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2255
# "+AES-256-CBC", "+SHA1",
2256
# "+COMP-NULL", "+CTYPE-OPENPGP",
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",
2258
1638
# Use a fallback default, since this MUST be set.
2259
1639
priority = self.server.gnutls_priority
2260
1640
if priority is None:
2261
1641
priority = "NORMAL"
2262
gnutls.priority_set_direct(session._c_object,
2263
priority.encode("utf-8"),
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2266
1646
# Start communication using the Mandos protocol
2267
1647
# Get protocol number
2268
1648
line = self.request.makefile().readline()
2269
1649
logger.debug("Protocol version: %r", line)
2271
1651
if int(line.strip().split()[0]) > 1:
2272
raise RuntimeError(line)
2273
1653
except (ValueError, IndexError, RuntimeError) as error:
2274
1654
logger.error("Unknown protocol version: %s", error)
2277
1657
# Start GnuTLS connection
2279
1659
session.handshake()
2280
except gnutls.Error as error:
1660
except gnutls.errors.GNUTLSError as error:
2281
1661
logger.warning("Handshake failed: %s", error)
2282
1662
# Do not run session.bye() here: the session is not
2283
1663
# established. Just abandon the request.
2285
1665
logger.debug("Handshake succeeded")
2287
1667
approval_required = False
2289
if gnutls.has_rawpk:
2292
key_id = self.key_id(
2293
self.peer_certificate(session))
2294
except (TypeError, gnutls.Error) as error:
2295
logger.warning("Bad certificate: %s", error)
2297
logger.debug("Key ID: %s", key_id)
2302
fpr = self.fingerprint(
2303
self.peer_certificate(session))
2304
except (TypeError, gnutls.Error) as error:
2305
logger.warning("Bad certificate: %s", error)
2307
logger.debug("Fingerprint: %s", fpr)
2310
client = ProxyClient(child_pipe, key_id, fpr,
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,
2311
1680
self.client_address)
2312
1681
except KeyError:
2315
1684
if client.approval_delay:
2316
1685
delay = client.approval_delay
2317
1686
client.approvals_pending += 1
2318
1687
approval_required = True
2321
1690
if not client.enabled:
2322
1691
logger.info("Client %s is disabled",
2324
1693
if self.server.use_dbus:
2325
1694
# Emit D-Bus signal
2326
1695
client.Rejected("Disabled")
2329
1698
if client.approved or not client.approval_delay:
2330
# We are approved or approval is disabled
1699
#We are approved or approval is disabled
2332
1701
elif client.approved is None:
2333
1702
logger.info("Client %s needs approval",
2366
1737
delay -= time2 - time
2369
session.send(client.secret)
2370
except gnutls.Error as error:
2371
logger.warning("gnutls send failed",
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))
2375
1751
logger.info("Sending secret to %s", client.name)
2376
1752
# bump the timeout using extended_timeout
2377
1753
client.bump_timeout(client.extended_timeout)
2378
1754
if self.server.use_dbus:
2379
1755
# Emit D-Bus signal
2380
1756
client.GotSecret()
2383
1759
if approval_required:
2384
1760
client.approvals_pending -= 1
2387
except gnutls.Error as error:
2388
logger.warning("GnuTLS bye failed",
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2392
1767
def peer_certificate(session):
2393
"Return the peer's certificate as a bytestring"
2395
cert_type = gnutls.certificate_type_get2(session._c_object,
2397
except AttributeError:
2398
cert_type = gnutls.certificate_type_get(session._c_object)
2399
if gnutls.has_rawpk:
2400
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2402
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2403
# If not a valid certificate type...
2404
if cert_type not in valid_cert_types:
2405
logger.info("Cert type %r not in %r", cert_type,
2407
# ...return invalid data
1768
"Return the peer's OpenPGP certificate as a bytestring"
1769
# If not an OpenPGP certificate...
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
# ...do the normal thing
1774
return session.peer_certificate
2409
1775
list_size = ctypes.c_uint(1)
2410
cert_list = (gnutls.certificate_get_peers
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2411
1778
(session._c_object, ctypes.byref(list_size)))
2412
1779
if not bool(cert_list) and list_size.value != 0:
2413
raise gnutls.Error("error getting peer certificate")
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2414
1782
if list_size.value == 0:
2416
1784
cert = cert_list[0]
2417
1785
return ctypes.string_at(cert.data, cert.size)
2420
def key_id(certificate):
2421
"Convert a certificate bytestring to a hexdigit key ID"
2422
# New GnuTLS "datum" with the public key
2423
datum = gnutls.datum_t(
2424
ctypes.cast(ctypes.c_char_p(certificate),
2425
ctypes.POINTER(ctypes.c_ubyte)),
2426
ctypes.c_uint(len(certificate)))
2427
# XXX all these need to be created in the gnutls "module"
2428
# New empty GnuTLS certificate
2429
pubkey = gnutls.pubkey_t()
2430
gnutls.pubkey_init(ctypes.byref(pubkey))
2431
# Import the raw public key into the certificate
2432
gnutls.pubkey_import(pubkey,
2433
ctypes.byref(datum),
2434
gnutls.X509_FMT_DER)
2435
# New buffer for the key ID
2436
buf = ctypes.create_string_buffer(32)
2437
buf_len = ctypes.c_size_t(len(buf))
2438
# Get the key ID from the raw public key into the buffer
2439
gnutls.pubkey_get_key_id(pubkey,
2440
gnutls.KEYID_USE_SHA256,
2441
ctypes.cast(ctypes.byref(buf),
2442
ctypes.POINTER(ctypes.c_ubyte)),
2443
ctypes.byref(buf_len))
2444
# Deinit the certificate
2445
gnutls.pubkey_deinit(pubkey)
2447
# Convert the buffer to a Python bytestring
2448
key_id = ctypes.string_at(buf, buf_len.value)
2449
# Convert the bytestring to hexadecimal notation
2450
hex_key_id = binascii.hexlify(key_id).upper()
2454
1788
def fingerprint(openpgp):
2455
1789
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2456
1790
# New GnuTLS "datum" with the OpenPGP public key
2457
datum = gnutls.datum_t(
2458
ctypes.cast(ctypes.c_char_p(openpgp),
2459
ctypes.POINTER(ctypes.c_ubyte)),
2460
ctypes.c_uint(len(openpgp)))
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1795
ctypes.c_uint(len(openpgp))))
2461
1796
# New empty GnuTLS certificate
2462
crt = gnutls.openpgp_crt_t()
2463
gnutls.openpgp_crt_init(ctypes.byref(crt))
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2464
1800
# Import the OpenPGP public key into the certificate
2465
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2466
gnutls.OPENPGP_FMT_RAW)
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
2467
1805
# Verify the self signature in the key
2468
1806
crtverify = ctypes.c_uint()
2469
gnutls.openpgp_crt_verify_self(crt, 0,
2470
ctypes.byref(crtverify))
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2471
1810
if crtverify.value != 0:
2472
gnutls.openpgp_crt_deinit(crt)
2473
raise gnutls.CertificateSecurityError(code
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2475
1814
# New buffer for the fingerprint
2476
1815
buf = ctypes.create_string_buffer(20)
2477
1816
buf_len = ctypes.c_size_t()
2478
1817
# Get the fingerprint from the certificate into the buffer
2479
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2480
ctypes.byref(buf_len))
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
2481
1821
# Deinit the certificate
2482
gnutls.openpgp_crt_deinit(crt)
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2483
1823
# Convert the buffer to a Python bytestring
2484
1824
fpr = ctypes.string_at(buf, buf_len.value)
2485
1825
# Convert the bytestring to hexadecimal notation
2490
1830
class MultiprocessingMixIn(object):
2491
1831
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2493
1832
def sub_process_main(self, request, address):
2495
1834
self.finish_request(request, address)
2496
1835
except Exception:
2497
1836
self.handle_error(request, address)
2498
1837
self.close_request(request)
2500
1839
def process_request(self, request, address):
2501
1840
"""Start a new process to process the request."""
2502
proc = multiprocessing.Process(target=self.sub_process_main,
2503
args=(request, address))
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2508
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2509
1849
""" adds a pipe to the MixIn """
2511
1850
def process_request(self, request, client_address):
2512
1851
"""Overrides and wraps the original process_request().
2514
1853
This function creates a new pipe in self.pipe
2516
1855
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2518
1857
proc = MultiprocessingMixIn.process_request(self, request,
2519
1858
client_address)
2520
1859
self.child_pipe.close()
2521
1860
self.add_pipe(parent_pipe, proc)
2523
1862
def add_pipe(self, parent_pipe, proc):
2524
1863
"""Dummy function; override as necessary"""
2525
raise NotImplementedError()
1864
raise NotImplementedError
2528
1867
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2529
1868
socketserver.TCPServer, object):
2530
1869
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2533
1872
enabled: Boolean; whether this server is activated yet
2534
1873
interface: None or a network interface name (string)
2535
1874
use_ipv6: Boolean; to use IPv6 or not
2538
1876
def __init__(self, server_address, RequestHandlerClass,
2542
"""If socketfd is set, use that file descriptor instead of
2543
creating a new one with socket.socket().
1877
interface=None, use_ipv6=True):
2545
1878
self.interface = interface
2547
1880
self.address_family = socket.AF_INET6
2548
if socketfd is not None:
2549
# Save the file descriptor
2550
self.socketfd = socketfd
2551
# Save the original socket.socket() function
2552
self.socket_socket = socket.socket
2554
# To implement --socket, we monkey patch socket.socket.
2556
# (When socketserver.TCPServer is a new-style class, we
2557
# could make self.socket into a property instead of monkey
2558
# patching socket.socket.)
2560
# Create a one-time-only replacement for socket.socket()
2561
@functools.wraps(socket.socket)
2562
def socket_wrapper(*args, **kwargs):
2563
# Restore original function so subsequent calls are
2565
socket.socket = self.socket_socket
2566
del self.socket_socket
2567
# This time only, return a new socket object from the
2568
# saved file descriptor.
2569
return socket.fromfd(self.socketfd, *args, **kwargs)
2570
# Replace socket.socket() function with wrapper
2571
socket.socket = socket_wrapper
2572
# The socketserver.TCPServer.__init__ will call
2573
# socket.socket(), which might be our replacement,
2574
# socket_wrapper(), if socketfd was set.
2575
1881
socketserver.TCPServer.__init__(self, server_address,
2576
1882
RequestHandlerClass)
2578
1883
def server_bind(self):
2579
1884
"""This overrides the normal server_bind() function
2580
1885
to bind to an interface if one was specified, and also NOT to
2581
1886
bind to an address or port if they were not specified."""
2582
global SO_BINDTODEVICE
2583
1887
if self.interface is not None:
2584
1888
if SO_BINDTODEVICE is None:
2585
# Fall back to a hard-coded value which seems to be
2587
logger.warning("SO_BINDTODEVICE not found, trying 25")
2588
SO_BINDTODEVICE = 25
2590
self.socket.setsockopt(
2591
socket.SOL_SOCKET, SO_BINDTODEVICE,
2592
(self.interface + "\0").encode("utf-8"))
2593
except socket.error as error:
2594
if error.errno == errno.EPERM:
2595
logger.error("No permission to bind to"
2596
" interface %s", self.interface)
2597
elif error.errno == errno.ENOPROTOOPT:
2598
logger.error("SO_BINDTODEVICE not available;"
2599
" cannot bind to interface %s",
2601
elif error.errno == errno.ENODEV:
2602
logger.error("Interface %s does not exist,"
2603
" cannot bind", self.interface)
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",
2606
1909
# Only bind(2) the socket if we really need to.
2607
1910
if self.server_address[0] or self.server_address[1]:
2608
if self.server_address[1]:
2609
self.allow_reuse_address = True
2610
1911
if not self.server_address[0]:
2611
1912
if self.address_family == socket.AF_INET6:
2612
any_address = "::" # in6addr_any
1913
any_address = "::" # in6addr_any
2614
any_address = "0.0.0.0" # INADDR_ANY
1915
any_address = socket.INADDR_ANY
2615
1916
self.server_address = (any_address,
2616
1917
self.server_address[1])
2617
1918
elif not self.server_address[1]:
2618
self.server_address = (self.server_address[0], 0)
1919
self.server_address = (self.server_address[0],
2619
1921
# if self.interface:
2620
1922
# self.server_address = (self.server_address[0],
2651
1948
self.gnutls_priority = gnutls_priority
2652
1949
IPv6_TCPServer.__init__(self, server_address,
2653
1950
RequestHandlerClass,
2654
interface=interface,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2658
1953
def server_activate(self):
2659
1954
if self.enabled:
2660
1955
return socketserver.TCPServer.server_activate(self)
2662
1957
def enable(self):
2663
1958
self.enabled = True
2665
1960
def add_pipe(self, parent_pipe, proc):
2666
1961
# Call "handle_ipc" for both data and EOF events
2668
parent_pipe.fileno(),
2669
GLib.IO_IN | GLib.IO_HUP,
2670
functools.partial(self.handle_ipc,
2671
parent_pipe=parent_pipe,
2674
def handle_ipc(self, source, condition,
2677
client_object=None):
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)
2678
1985
# error, or the other end of multiprocessing.Pipe has closed
2679
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2680
1987
# Wait for other process to exit
2684
1991
# Read a request from the child
2685
1992
request = parent_pipe.recv()
2686
1993
command = request[0]
2688
1995
if command == 'init':
2689
key_id = request[1].decode("ascii")
2690
fpr = request[2].decode("ascii")
2691
address = request[3]
2693
for c in self.clients.values():
2694
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2696
if key_id and c.key_id == key_id:
2699
if fpr and c.fingerprint == fpr:
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2703
logger.info("Client not found for key ID: %s, address"
2704
": %s", key_id or fpr, address)
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2705
2006
if self.use_dbus:
2706
2007
# Emit D-Bus signal
2707
mandos_dbus_service.ClientNotFound(key_id or fpr,
2008
mandos_dbus_service.ClientNotFound(fpr,
2709
2010
parent_pipe.send(False)
2713
parent_pipe.fileno(),
2714
GLib.IO_IN | GLib.IO_HUP,
2715
functools.partial(self.handle_ipc,
2716
parent_pipe=parent_pipe,
2718
client_object=client))
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2719
2021
parent_pipe.send(True)
2720
2022
# remove the old hook in favor of the new above hook on
2724
2026
funcname = request[1]
2725
2027
args = request[2]
2726
2028
kwargs = request[3]
2728
2030
parent_pipe.send(('data', getattr(client_object,
2729
2031
funcname)(*args,
2732
2034
if command == 'getattr':
2733
2035
attrname = request[1]
2734
if isinstance(client_object.__getattribute__(attrname),
2735
collections.Callable):
2736
parent_pipe.send(('function', ))
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2739
'data', client_object.__getattribute__(attrname)))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2741
2042
if command == 'setattr':
2742
2043
attrname = request[1]
2743
2044
value = request[2]
2744
2045
setattr(client_object, attrname, value)
2749
def rfc3339_duration_to_delta(duration):
2750
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2752
>>> rfc3339_duration_to_delta("P7D")
2753
datetime.timedelta(7)
2754
>>> rfc3339_duration_to_delta("PT60S")
2755
datetime.timedelta(0, 60)
2756
>>> rfc3339_duration_to_delta("PT60M")
2757
datetime.timedelta(0, 3600)
2758
>>> rfc3339_duration_to_delta("PT24H")
2759
datetime.timedelta(1)
2760
>>> rfc3339_duration_to_delta("P1W")
2761
datetime.timedelta(7)
2762
>>> rfc3339_duration_to_delta("PT5M30S")
2763
datetime.timedelta(0, 330)
2764
>>> rfc3339_duration_to_delta("P1DT3M20S")
2765
datetime.timedelta(1, 200)
2768
# Parsing an RFC 3339 duration with regular expressions is not
2769
# possible - there would have to be multiple places for the same
2770
# values, like seconds. The current code, while more esoteric, is
2771
# cleaner without depending on a parsing library. If Python had a
2772
# built-in library for parsing we would use it, but we'd like to
2773
# avoid excessive use of external libraries.
2775
# New type for defining tokens, syntax, and semantics all-in-one
2776
Token = collections.namedtuple("Token", (
2777
"regexp", # To match token; if "value" is not None, must have
2778
# a "group" containing digits
2779
"value", # datetime.timedelta or None
2780
"followers")) # Tokens valid after this token
2781
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2782
# the "duration" ABNF definition in RFC 3339, Appendix A.
2783
token_end = Token(re.compile(r"$"), None, frozenset())
2784
token_second = Token(re.compile(r"(\d+)S"),
2785
datetime.timedelta(seconds=1),
2786
frozenset((token_end, )))
2787
token_minute = Token(re.compile(r"(\d+)M"),
2788
datetime.timedelta(minutes=1),
2789
frozenset((token_second, token_end)))
2790
token_hour = Token(re.compile(r"(\d+)H"),
2791
datetime.timedelta(hours=1),
2792
frozenset((token_minute, token_end)))
2793
token_time = Token(re.compile(r"T"),
2795
frozenset((token_hour, token_minute,
2797
token_day = Token(re.compile(r"(\d+)D"),
2798
datetime.timedelta(days=1),
2799
frozenset((token_time, token_end)))
2800
token_month = Token(re.compile(r"(\d+)M"),
2801
datetime.timedelta(weeks=4),
2802
frozenset((token_day, token_end)))
2803
token_year = Token(re.compile(r"(\d+)Y"),
2804
datetime.timedelta(weeks=52),
2805
frozenset((token_month, token_end)))
2806
token_week = Token(re.compile(r"(\d+)W"),
2807
datetime.timedelta(weeks=1),
2808
frozenset((token_end, )))
2809
token_duration = Token(re.compile(r"P"), None,
2810
frozenset((token_year, token_month,
2811
token_day, token_time,
2813
# Define starting values:
2815
value = datetime.timedelta()
2817
# Following valid tokens
2818
followers = frozenset((token_duration, ))
2819
# String left to parse
2821
# Loop until end token is found
2822
while found_token is not token_end:
2823
# Search for any currently valid tokens
2824
for token in followers:
2825
match = token.regexp.match(s)
2826
if match is not None:
2828
if token.value is not None:
2829
# Value found, parse digits
2830
factor = int(match.group(1), 10)
2831
# Add to value so far
2832
value += factor * token.value
2833
# Strip token from string
2834
s = token.regexp.sub("", s, 1)
2837
# Set valid next tokens
2838
followers = found_token.followers
2841
# No currently valid tokens were found
2842
raise ValueError("Invalid RFC 3339 duration: {!r}"
2848
2050
def string_to_delta(interval):
2849
2051
"""Parse a string and return a datetime.timedelta
2851
2053
>>> string_to_delta('7d')
2852
2054
datetime.timedelta(7)
2853
2055
>>> string_to_delta('60s')
2948
2144
parser.add_argument("--no-dbus", action="store_false",
2949
2145
dest="use_dbus", help="Do not provide D-Bus"
2950
" system bus interface", default=None)
2146
" system bus interface")
2951
2147
parser.add_argument("--no-ipv6", action="store_false",
2952
dest="use_ipv6", help="Do not use IPv6",
2148
dest="use_ipv6", help="Do not use IPv6")
2954
2149
parser.add_argument("--no-restore", action="store_false",
2955
2150
dest="restore", help="Do not restore stored"
2956
" state", default=None)
2957
parser.add_argument("--socket", type=int,
2958
help="Specify a file descriptor to a network"
2959
" socket to use instead of creating one")
2960
2152
parser.add_argument("--statedir", metavar="DIR",
2961
2153
help="Directory to save/restore state in")
2962
parser.add_argument("--foreground", action="store_true",
2963
help="Run in foreground", default=None)
2964
parser.add_argument("--no-zeroconf", action="store_false",
2965
dest="zeroconf", help="Do not use Zeroconf",
2968
2155
options = parser.parse_args()
2970
2157
if options.check:
2972
fail_count, test_count = doctest.testmod()
2973
sys.exit(os.EX_OK if fail_count == 0 else 1)
2975
2162
# Default values for config file for server-global settings
2976
if gnutls.has_rawpk:
2977
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2978
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2980
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2981
":+SIGN-DSA-SHA256")
2982
server_defaults = {"interface": "",
2986
"priority": priority,
2987
"servicename": "Mandos",
2993
"statedir": "/var/lib/mandos",
2994
"foreground": "False",
2163
server_defaults = { "interface": "",
2168
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2169
"servicename": "Mandos",
2174
"statedir": "/var/lib/mandos"
2999
2177
# Parse config file for server-global settings
3000
2178
server_config = configparser.SafeConfigParser(server_defaults)
3001
2179
del server_defaults
3002
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2180
server_config.read(os.path.join(options.configdir,
3003
2182
# Convert the SafeConfigParser object to a dict
3004
2183
server_settings = server_config.defaults()
3005
2184
# Use the appropriate methods on the non-string config options
3006
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3007
"foreground", "zeroconf"):
2185
for option in ("debug", "use_dbus", "use_ipv6"):
3008
2186
server_settings[option] = server_config.getboolean("DEFAULT",
3010
2188
if server_settings["port"]:
3011
2189
server_settings["port"] = server_config.getint("DEFAULT",
3013
if server_settings["socket"]:
3014
server_settings["socket"] = server_config.getint("DEFAULT",
3016
# Later, stdin will, and stdout and stderr might, be dup'ed
3017
# over with an opened os.devnull. But we don't want this to
3018
# happen with a supplied network socket.
3019
if 0 <= server_settings["socket"] <= 2:
3020
server_settings["socket"] = os.dup(server_settings
3022
2191
del server_config
3024
2193
# Override the settings from the config file with command line
3025
2194
# options, if set.
3026
2195
for option in ("interface", "address", "port", "debug",
3027
"priority", "servicename", "configdir", "use_dbus",
3028
"use_ipv6", "debuglevel", "restore", "statedir",
3029
"socket", "foreground", "zeroconf"):
2196
"priority", "servicename", "configdir",
2197
"use_dbus", "use_ipv6", "debuglevel", "restore",
3030
2199
value = getattr(options, option)
3031
2200
if value is not None:
3032
2201
server_settings[option] = value
3034
2203
# Force all strings to be unicode
3035
2204
for option in server_settings.keys():
3036
if isinstance(server_settings[option], bytes):
3037
server_settings[option] = (server_settings[option]
3039
# Force all boolean options to be boolean
3040
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3041
"foreground", "zeroconf"):
3042
server_settings[option] = bool(server_settings[option])
3043
# Debug implies foreground
3044
if server_settings["debug"]:
3045
server_settings["foreground"] = True
2205
if type(server_settings[option]) is str:
2206
server_settings[option] = unicode(server_settings[option])
3046
2207
# Now we have our good server settings in "server_settings"
3048
2209
##################################################################
3050
if (not server_settings["zeroconf"]
3051
and not (server_settings["port"]
3052
or server_settings["socket"] != "")):
3053
parser.error("Needs port or socket to work without Zeroconf")
3055
2211
# For convenience
3056
2212
debug = server_settings["debug"]
3057
2213
debuglevel = server_settings["debuglevel"]
3071
2225
level = getattr(logging, debuglevel.upper())
3072
2226
initlogger(debug, level)
3074
2228
if server_settings["servicename"] != "Mandos":
3075
syslogger.setFormatter(
3076
logging.Formatter('Mandos ({}) [%(process)d]:'
3077
' %(levelname)s: %(message)s'.format(
3078
server_settings["servicename"])))
2229
syslogger.setFormatter(logging.Formatter
2230
('Mandos (%s) [%%(process)d]:'
2231
' %%(levelname)s: %%(message)s'
2232
% server_settings["servicename"]))
3080
2234
# Parse config file with clients
3081
2235
client_config = configparser.SafeConfigParser(Client
3082
2236
.client_defaults)
3083
2237
client_config.read(os.path.join(server_settings["configdir"],
3084
2238
"clients.conf"))
3086
2240
global mandos_dbus_service
3087
2241
mandos_dbus_service = None
3090
if server_settings["socket"] != "":
3091
socketfd = server_settings["socket"]
3092
tcp_server = MandosServer(
3093
(server_settings["address"], server_settings["port"]),
3095
interface=(server_settings["interface"] or None),
3097
gnutls_priority=server_settings["priority"],
3101
pidfilename = "/run/mandos.pid"
3102
if not os.path.isdir("/run/."):
3103
pidfilename = "/var/run/mandos.pid"
3106
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3107
except IOError as e:
3108
logger.error("Could not open file %r", pidfilename,
3111
for name, group in (("_mandos", "_mandos"),
3112
("mandos", "mandos"),
3113
("nobody", "nogroup")):
3115
uid = pwd.getpwnam(name).pw_uid
3116
gid = pwd.getpwnam(group).pw_gid
2243
tcp_server = MandosServer((server_settings["address"],
2244
server_settings["port"]),
2246
interface=(server_settings["interface"]
2250
server_settings["priority"],
2253
pidfilename = "/var/run/mandos.pid"
2255
pidfile = open(pidfilename, "w")
2257
logger.error("Could not open file %r", pidfilename)
2260
uid = pwd.getpwnam("_mandos").pw_uid
2261
gid = pwd.getpwnam("_mandos").pw_gid
2264
uid = pwd.getpwnam("mandos").pw_uid
2265
gid = pwd.getpwnam("mandos").pw_gid
3118
2266
except KeyError:
2268
uid = pwd.getpwnam("nobody").pw_uid
2269
gid = pwd.getpwnam("nobody").pw_gid
3127
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3129
2276
except OSError as error:
3130
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3131
.format(uid, gid, os.strerror(error.errno)))
3132
if error.errno != errno.EPERM:
2277
if error[0] != errno.EPERM:
3136
2281
# Enable all possible GnuTLS debugging
3138
2283
# "Use a log level over 10 to enable all debugging options."
3139
2284
# - GnuTLS manual
3140
gnutls.global_set_log_level(11)
2285
gnutls.library.functions.gnutls_global_set_log_level(11)
2287
@gnutls.library.types.gnutls_log_func
3143
2288
def debug_gnutls(level, string):
3144
2289
logger.debug("GnuTLS: %s", string[:-1])
3146
gnutls.global_set_log_function(debug_gnutls)
2291
(gnutls.library.functions
2292
.gnutls_global_set_log_function(debug_gnutls))
3148
2294
# Redirect stdin so all checkers get /dev/null
3149
2295
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3150
2296
os.dup2(null, sys.stdin.fileno())
3154
2300
# Need to fork before connecting to D-Bus
3156
2302
# Close all input and output, do double fork, etc.
3159
# multiprocessing will use threads, so before we use GLib we need
3160
# to inform GLib that threads will be used.
2305
gobject.threads_init()
3163
2307
global main_loop
3164
2308
# From the Avahi example code
3165
2309
DBusGMainLoop(set_as_default=True)
3166
main_loop = GLib.MainLoop()
2310
main_loop = gobject.MainLoop()
3167
2311
bus = dbus.SystemBus()
3168
2312
# End of Avahi example code
3171
2315
bus_name = dbus.service.BusName("se.recompile.Mandos",
3174
old_bus_name = dbus.service.BusName(
3175
"se.bsnet.fukt.Mandos", bus,
3177
except dbus.exceptions.DBusException as e:
3178
logger.error("Disabling D-Bus:", exc_info=e)
2316
bus, do_not_queue=True)
2317
old_bus_name = (dbus.service.BusName
2318
("se.bsnet.fukt.Mandos", bus,
2320
except dbus.exceptions.NameExistsException as e:
2321
logger.error(unicode(e) + ", disabling D-Bus")
3179
2322
use_dbus = False
3180
2323
server_settings["use_dbus"] = False
3181
2324
tcp_server.use_dbus = False
3183
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3184
service = AvahiServiceToSyslog(
3185
name=server_settings["servicename"],
3186
servicetype="_mandos._tcp",
3189
if server_settings["interface"]:
3190
service.interface = if_nametoindex(
3191
server_settings["interface"].encode("utf-8"))
2325
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2326
service = AvahiServiceToSyslog(name =
2327
server_settings["servicename"],
2328
servicetype = "_mandos._tcp",
2329
protocol = protocol, bus = bus)
2330
if server_settings["interface"]:
2331
service.interface = (if_nametoindex
2332
(str(server_settings["interface"])))
3193
2334
global multiprocessing_manager
3194
2335
multiprocessing_manager = multiprocessing.Manager()
3196
2337
client_class = Client
3198
client_class = functools.partial(ClientDBus, bus=bus)
2339
client_class = functools.partial(ClientDBusTransitional,
3200
2342
client_settings = Client.config_parser(client_config)
3201
2343
old_client_settings = {}
3202
2344
clients_data = {}
3204
# This is used to redirect stdout and stderr for checker processes
3206
wnull = open(os.devnull, "w") # A writable /dev/null
3207
# Only used if server is running in foreground but not in debug
3209
if debug or not foreground:
3212
2346
# Get client data and settings from last running state.
3213
2347
if server_settings["restore"]:
3215
2349
with open(stored_state_path, "rb") as stored_state:
3216
if sys.version_info.major == 2:
3217
clients_data, old_client_settings = pickle.load(
3220
bytes_clients_data, bytes_old_client_settings = (
3221
pickle.load(stored_state, encoding="bytes"))
3222
# Fix bytes to strings
3225
clients_data = {(key.decode("utf-8")
3226
if isinstance(key, bytes)
3229
bytes_clients_data.items()}
3230
del bytes_clients_data
3231
for key in clients_data:
3232
value = {(k.decode("utf-8")
3233
if isinstance(k, bytes) else k): v
3235
clients_data[key].items()}
3236
clients_data[key] = value
3238
value["client_structure"] = [
3240
if isinstance(s, bytes)
3242
value["client_structure"]]
3244
for k in ("name", "host"):
3245
if isinstance(value[k], bytes):
3246
value[k] = value[k].decode("utf-8")
3247
if not value.has_key("key_id"):
3248
value["key_id"] = ""
3249
elif not value.has_key("fingerprint"):
3250
value["fingerprint"] = ""
3251
# old_client_settings
3253
old_client_settings = {
3254
(key.decode("utf-8")
3255
if isinstance(key, bytes)
3258
bytes_old_client_settings.items()}
3259
del bytes_old_client_settings
3261
for value in old_client_settings.values():
3262
if isinstance(value["host"], bytes):
3263
value["host"] = (value["host"]
2350
clients_data, old_client_settings = (pickle.load
3265
2352
os.remove(stored_state_path)
3266
2353
except IOError as e:
3267
if e.errno == errno.ENOENT:
3268
logger.warning("Could not load persistent state:"
3269
" {}".format(os.strerror(e.errno)))
3271
logger.critical("Could not load persistent state:",
2354
logger.warning("Could not load persistent state: {0}"
2356
if e.errno != errno.ENOENT:
3274
2358
except EOFError as e:
3275
2359
logger.warning("Could not load persistent state: "
2360
"EOFError: {0}".format(e))
3279
2362
with PGPEngine() as pgp:
3280
for client_name, client in clients_data.items():
3281
# Skip removed clients
3282
if client_name not in client_settings:
2363
for client_name, client in clients_data.iteritems():
3285
2364
# Decide which value to use after restoring saved state.
3286
2365
# We have three different values: Old config file,
3287
2366
# new config file, and saved state.
3347
2427
clients_data[client_name] = client_settings[client_name]
3349
2429
# Create all client objects
3350
for client_name, client in clients_data.items():
2430
for client_name, client in clients_data.iteritems():
3351
2431
tcp_server.clients[client_name] = client_class(
3354
server_settings=server_settings)
2432
name = client_name, settings = client)
3356
2434
if not tcp_server.clients:
3357
2435
logger.warning("No clients defined")
3360
if pidfile is not None:
3364
print(pid, file=pidfile)
3366
logger.error("Could not write to file %r with PID %d",
2441
pidfile.write(str(pid) + "\n".encode("utf-8"))
2444
logger.error("Could not write to file %r with PID %d",
2447
# "pidfile" was never created
3369
2449
del pidfilename
3371
for termsig in (signal.SIGHUP, signal.SIGTERM):
3372
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3373
lambda: main_loop.quit() and False)
2450
signal.signal(signal.SIGINT, signal.SIG_IGN)
2452
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2453
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3377
@alternate_dbus_interfaces(
3378
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3379
class MandosDBusService(DBusObjectWithObjectManager):
2456
class MandosDBusService(DBusObjectWithProperties):
3380
2457
"""A D-Bus proxy object"""
3382
2458
def __init__(self):
3383
2459
dbus.service.Object.__init__(self, bus, "/")
3385
2460
_interface = "se.recompile.Mandos"
2462
@dbus_interface_annotations(_interface)
2464
return { "org.freedesktop.DBus.Property"
2465
".EmitsChangedSignal":
3387
2468
@dbus.service.signal(_interface, signature="o")
3388
2469
def ClientAdded(self, objpath):
3392
2473
@dbus.service.signal(_interface, signature="ss")
3393
def ClientNotFound(self, key_id, address):
2474
def ClientNotFound(self, fingerprint, address):
3397
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3399
2478
@dbus.service.signal(_interface, signature="os")
3400
2479
def ClientRemoved(self, objpath, name):
3404
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3406
2483
@dbus.service.method(_interface, out_signature="ao")
3407
2484
def GetAllClients(self):
3409
return dbus.Array(c.dbus_object_path for c in
3410
tcp_server.clients.values())
3412
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2486
return dbus.Array(c.dbus_object_path
2488
tcp_server.clients.itervalues())
3414
2490
@dbus.service.method(_interface,
3415
2491
out_signature="a{oa{sv}}")
3416
2492
def GetAllClientsWithProperties(self):
3418
2494
return dbus.Dictionary(
3419
{c.dbus_object_path: c.GetAll(
3420
"se.recompile.Mandos.Client")
3421
for c in tcp_server.clients.values()},
2495
((c.dbus_object_path, c.GetAll(""))
2496
for c in tcp_server.clients.itervalues()),
3422
2497
signature="oa{sv}")
3424
2499
@dbus.service.method(_interface, in_signature="o")
3425
2500
def RemoveClient(self, object_path):
3427
for c in tcp_server.clients.values():
2502
for c in tcp_server.clients.itervalues():
3428
2503
if c.dbus_object_path == object_path:
3429
2504
del tcp_server.clients[c.name]
3430
2505
c.remove_from_connection()
3431
# Don't signal the disabling
2506
# Don't signal anything except ClientRemoved
3432
2507
c.disable(quiet=True)
3433
# Emit D-Bus signal for removal
3434
self.client_removed_signal(c)
2509
self.ClientRemoved(object_path, c.name)
3436
2511
raise KeyError(object_path)
3440
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3441
out_signature="a{oa{sa{sv}}}")
3442
def GetManagedObjects(self):
3444
return dbus.Dictionary(
3445
{client.dbus_object_path:
3447
{interface: client.GetAll(interface)
3449
client._get_all_interface_names()})
3450
for client in tcp_server.clients.values()})
3452
def client_added_signal(self, client):
3453
"""Send the new standard signal and the old signal"""
3455
# New standard signal
3456
self.InterfacesAdded(
3457
client.dbus_object_path,
3459
{interface: client.GetAll(interface)
3461
client._get_all_interface_names()}))
3463
self.ClientAdded(client.dbus_object_path)
3465
def client_removed_signal(self, client):
3466
"""Send the new standard signal and the old signal"""
3468
# New standard signal
3469
self.InterfacesRemoved(
3470
client.dbus_object_path,
3471
client._get_all_interface_names())
3473
self.ClientRemoved(client.dbus_object_path,
3476
mandos_dbus_service = MandosDBusService()
3478
# Save modules to variables to exempt the modules from being
3479
# unloaded before the function registered with atexit() is run.
3480
mp = multiprocessing
2515
class MandosDBusServiceTransitional(MandosDBusService):
2516
__metaclass__ = AlternateDBusNamesMetaclass
2517
mandos_dbus_service = MandosDBusServiceTransitional()
3484
2520
"Cleanup function; run on exit"
3488
mp.active_children()
2523
multiprocessing.active_children()
3490
2524
if not (tcp_server.clients or client_settings):
3493
2527
# Store client before exiting. Secrets are encrypted with key
3494
2528
# based on what config file has. If config file is
3495
2529
# removed/edited, old secret will thus be unrecovable.
3497
2531
with PGPEngine() as pgp:
3498
for client in tcp_server.clients.values():
2532
for client in tcp_server.clients.itervalues():
3499
2533
key = client_settings[client.name]["secret"]
3500
2534
client.encrypted_secret = pgp.encrypt(client.secret,
3502
2536
client_dict = {}
3504
2538
# A list of attributes that can not be pickled
3506
exclude = {"bus", "changedstate", "secret",
3507
"checker", "server_settings"}
3508
for name, typ in inspect.getmembers(dbus.service
2540
exclude = set(("bus", "changedstate", "secret",
2542
for name, typ in (inspect.getmembers
2543
(dbus.service.Object)):
3510
2544
exclude.add(name)
3512
2546
client_dict["encrypted_secret"] = (client
3513
2547
.encrypted_secret)
3514
2548
for attr in client.client_structure:
3515
2549
if attr not in exclude:
3516
2550
client_dict[attr] = getattr(client, attr)
3518
2552
clients[client.name] = client_dict
3519
2553
del client_settings[client.name]["secret"]
3522
with tempfile.NamedTemporaryFile(
3526
dir=os.path.dirname(stored_state_path),
3527
delete=False) as stored_state:
3528
pickle.dump((clients, client_settings), stored_state,
3530
tempname = stored_state.name
2556
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2559
(stored_state_path))
2560
with os.fdopen(tempfd, "wb") as stored_state:
2561
pickle.dump((clients, client_settings), stored_state)
3531
2562
os.rename(tempname, stored_state_path)
3532
2563
except (IOError, OSError) as e:
2564
logger.warning("Could not save persistent state: {0}"
3535
2568
os.remove(tempname)
3536
2569
except NameError:
3538
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3539
logger.warning("Could not save persistent state: {}"
3540
.format(os.strerror(e.errno)))
3542
logger.warning("Could not save persistent state:",
2571
if e.errno not in set((errno.ENOENT, errno.EACCES,
3546
2575
# Delete all clients, and settings from config
3547
2576
while tcp_server.clients:
3548
2577
name, client = tcp_server.clients.popitem()
3550
2579
client.remove_from_connection()
3551
# Don't signal the disabling
2580
# Don't signal anything except ClientRemoved
3552
2581
client.disable(quiet=True)
3553
# Emit D-Bus signal for removal
3555
mandos_dbus_service.client_removed_signal(client)
2584
mandos_dbus_service.ClientRemoved(client
3556
2587
client_settings.clear()
3558
2589
atexit.register(cleanup)
3560
for client in tcp_server.clients.values():
2591
for client in tcp_server.clients.itervalues():
3562
# Emit D-Bus signal for adding
3563
mandos_dbus_service.client_added_signal(client)
2594
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3564
2595
# Need to initiate checking of clients
3565
2596
if client.enabled:
3566
2597
client.init_checker()
3568
2599
tcp_server.enable()
3569
2600
tcp_server.server_activate()
3571
2602
# Find out what port we got
3573
service.port = tcp_server.socket.getsockname()[1]
2603
service.port = tcp_server.socket.getsockname()[1]
3575
2605
logger.info("Now listening on address %r, port %d,"
3576
" flowinfo %d, scope_id %d",
3577
*tcp_server.socket.getsockname())
2606
" flowinfo %d, scope_id %d"
2607
% tcp_server.socket.getsockname())
3579
logger.info("Now listening on address %r, port %d",
3580
*tcp_server.socket.getsockname())
3582
# service.interface = tcp_server.socket.getsockname()[3]
2609
logger.info("Now listening on address %r, port %d"
2610
% tcp_server.socket.getsockname())
2612
#service.interface = tcp_server.socket.getsockname()[3]
3586
# From the Avahi example code
3589
except dbus.exceptions.DBusException as error:
3590
logger.critical("D-Bus Exception", exc_info=error)
3593
# End of Avahi example code
3595
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3596
lambda *args, **kwargs:
3597
(tcp_server.handle_request
3598
(*args[2:], **kwargs) or True))
2615
# From the Avahi example code
2618
except dbus.exceptions.DBusException as error:
2619
logger.critical("DBusException: %s", error)
2622
# End of Avahi example code
2624
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2625
lambda *args, **kwargs:
2626
(tcp_server.handle_request
2627
(*args[2:], **kwargs) or True))
3600
2629
logger.debug("Starting main loop")
3601
2630
main_loop.run()
3602
2631
except AvahiError as error:
3603
logger.critical("Avahi Error", exc_info=error)
2632
logger.critical("AvahiError: %s", error)
3606
2635
except KeyboardInterrupt: