2
# -*- coding: utf-8; lexical-binding: t -*-
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-2022 Teddy Hogeborn
15
# Copyright © 2008-2022 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>.
34
34
from __future__ import (division, absolute_import, print_function,
38
from future_builtins import *
37
from future_builtins import *
39
import SocketServer as socketserver
48
import SocketServer as socketserver
55
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
63
59
import logging.handlers
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
84
74
import dbus.service
86
from gi.repository import GLib
87
77
from dbus.mainloop.glib import DBusGMainLoop
90
80
import xml.dom.minidom
93
if sys.version_info.major == 2:
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Add os.set_inheritable if it does not exist
116
except AttributeError:
117
def set_inheritable(fd, inheritable):
118
flags = fcntl.fcntl(fd, fcntl.F_GETFD)
119
if inheritable and ((flags & fcntl.FD_CLOEXEC) != 0):
120
fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~fcntl.FD_CLOEXEC)
121
elif (not inheritable) and ((flags & fcntl.FD_CLOEXEC) == 0):
122
fcntl.fcntl(fd, fcntl.F_SETFL, flags | fcntl.FD_CLOEXEC)
123
os.set_inheritable = set_inheritable
126
# Show warnings by default
127
if not sys.warnoptions:
129
warnings.simplefilter("default")
131
# Try to find the value of SO_BINDTODEVICE:
133
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
134
# newer, and it is also the most natural place for it:
135
85
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
136
86
except AttributeError:
138
# This is where SO_BINDTODEVICE was up to and including Python
140
88
from IN import SO_BINDTODEVICE
141
89
except ImportError:
142
# In Python 2.7 it seems to have been removed entirely.
143
# Try running the C preprocessor:
145
cc = subprocess.Popen(["cc", "--language=c", "-E",
147
stdin=subprocess.PIPE,
148
stdout=subprocess.PIPE)
149
stdout = cc.communicate(
150
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
151
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
152
except (OSError, ValueError, IndexError):
154
SO_BINDTODEVICE = None
156
if sys.version_info < (3, 2):
157
configparser.Configparser = configparser.SafeConfigParser
90
SO_BINDTODEVICE = None
160
93
stored_state_file = "clients.pickle"
162
log = logging.getLogger(os.path.basename(sys.argv[0]))
163
logging.captureWarnings(True) # Show warnings via the logging system
95
logger = logging.getLogger()
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
167
if_nametoindex = ctypes.cdll.LoadLibrary(
168
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
169
104
except (OSError, AttributeError):
171
105
def if_nametoindex(interface):
172
106
"Get an interface index the hard way, i.e. using fcntl()"
173
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
174
108
with contextlib.closing(socket.socket()) as s:
175
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
176
struct.pack(b"16s16x", interface))
177
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
struct.pack(str("16s16x"),
112
interface_index = struct.unpack(str("I"),
178
114
return interface_index
181
def copy_function(func):
182
"""Make a copy of a function"""
183
if sys.version_info.major == 2:
184
return types.FunctionType(func.func_code,
190
return types.FunctionType(func.__code__,
197
117
def initlogger(debug, level=logging.WARNING):
198
118
"""init logger and add loglevel"""
201
syslogger = (logging.handlers.SysLogHandler(
202
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
204
120
syslogger.setFormatter(logging.Formatter
205
("Mandos [%(process)d]: %(levelname)s:"
207
log.addHandler(syslogger)
121
('Mandos [%(process)d]: %(levelname)s:'
123
logger.addHandler(syslogger)
210
126
console = logging.StreamHandler()
211
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
215
log.addHandler(console)
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
131
logger.addHandler(console)
132
logger.setLevel(level)
219
135
class PGPError(Exception):
268
172
os.rmdir(self.tempdir)
269
173
self.tempdir = None
271
175
def password_encode(self, password):
272
176
# Passphrase can not be empty and can not contain newlines or
273
177
# NUL bytes. So we prefix it and hex encode it.
274
encoded = b"mandos" + binascii.hexlify(password)
275
if len(encoded) > 2048:
276
# GnuPG can't handle long passwords, so encode differently
277
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
278
.replace(b"\n", b"\\n")
279
.replace(b"\0", b"\\x00"))
178
return b"mandos" + binascii.hexlify(password)
282
180
def encrypt(self, data, password):
283
passphrase = self.password_encode(password)
284
with tempfile.NamedTemporaryFile(
285
dir=self.tempdir) as passfile:
286
passfile.write(passphrase)
288
proc = subprocess.Popen([self.gpg, "--symmetric",
292
stdin=subprocess.PIPE,
293
stdout=subprocess.PIPE,
294
stderr=subprocess.PIPE)
295
ciphertext, err = proc.communicate(input=data)
296
if proc.returncode != 0:
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
194
self.gnupg.passphrase = None
298
195
return ciphertext
300
197
def decrypt(self, data, password):
301
passphrase = self.password_encode(password)
302
with tempfile.NamedTemporaryFile(
303
dir=self.tempdir) as passfile:
304
passfile.write(passphrase)
306
proc = subprocess.Popen([self.gpg, "--decrypt",
310
stdin=subprocess.PIPE,
311
stdout=subprocess.PIPE,
312
stderr=subprocess.PIPE)
313
decrypted_plaintext, err = proc.communicate(input=data)
314
if proc.returncode != 0:
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
211
self.gnupg.passphrase = None
316
212
return decrypted_plaintext
319
# Pretend that we have an Avahi module
321
"""This isn't so much a class as it is a module-like namespace."""
322
IF_UNSPEC = -1 # avahi-common/address.h
323
PROTO_UNSPEC = -1 # avahi-common/address.h
324
PROTO_INET = 0 # avahi-common/address.h
325
PROTO_INET6 = 1 # avahi-common/address.h
326
DBUS_NAME = "org.freedesktop.Avahi"
327
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
328
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
329
DBUS_PATH_SERVER = "/"
332
def string_array_to_txt_array(t):
333
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
334
for s in t), signature="ay")
335
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
336
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
337
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
338
SERVER_INVALID = 0 # avahi-common/defs.h
339
SERVER_REGISTERING = 1 # avahi-common/defs.h
340
SERVER_RUNNING = 2 # avahi-common/defs.h
341
SERVER_COLLISION = 3 # avahi-common/defs.h
342
SERVER_FAILURE = 4 # avahi-common/defs.h
345
215
class AvahiError(Exception):
346
216
def __init__(self, value, *args, **kwargs):
347
217
self.value = value
348
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
352
222
class AvahiServiceError(AvahiError):
356
225
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
361
230
"""An Avahi (Zeroconf) service.
364
233
interface: integer; avahi.IF_UNSPEC or an interface index.
365
234
Used to optionally bind to the specified interface.
366
name: string; Example: "Mandos"
367
type: string; Example: "_mandos._tcp".
368
See <https://www.iana.org/assignments/service-names-port-numbers>
235
name: string; Example: 'Mandos'
236
type: string; Example: '_mandos._tcp'.
237
See <http://www.dns-sd.org/ServiceTypes.html>
369
238
port: integer; what port to announce
370
239
TXT: list of strings; TXT record for the service
371
240
domain: string; Domain to publish on, default to .local if empty.
529
377
follow_name_owner_changes=True),
530
378
avahi.DBUS_INTERFACE_SERVER)
531
379
self.server.connect_to_signal("StateChanged",
532
self.server_state_changed)
380
self.server_state_changed)
533
381
self.server_state_changed(self.server.GetState())
536
384
class AvahiServiceToSyslog(AvahiService):
537
def rename(self, *args, **kwargs):
538
386
"""Add the new name to the syslog messages"""
539
ret = super(AvahiServiceToSyslog, self).rename(*args,
541
syslogger.setFormatter(logging.Formatter(
542
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
547
# Pretend that we have a GnuTLS module
549
"""This isn't so much a class as it is a module-like namespace."""
551
library = ctypes.util.find_library("gnutls")
553
library = ctypes.util.find_library("gnutls-deb0")
554
_library = ctypes.cdll.LoadLibrary(library)
557
# Unless otherwise indicated, the constants and types below are
558
# all from the gnutls/gnutls.h C header file.
569
E_NO_CERTIFICATE_FOUND = -49
574
KEYID_USE_SHA256 = 1 # gnutls/x509.h
575
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
578
class _session_int(ctypes.Structure):
580
session_t = ctypes.POINTER(_session_int)
582
class certificate_credentials_st(ctypes.Structure):
584
certificate_credentials_t = ctypes.POINTER(
585
certificate_credentials_st)
586
certificate_type_t = ctypes.c_int
588
class datum_t(ctypes.Structure):
589
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
590
("size", ctypes.c_uint)]
592
class _openpgp_crt_int(ctypes.Structure):
594
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
595
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
596
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
597
credentials_type_t = ctypes.c_int
598
transport_ptr_t = ctypes.c_void_p
599
close_request_t = ctypes.c_int
602
class Error(Exception):
603
def __init__(self, message=None, code=None, args=()):
604
# Default usage is by a message string, but if a return
605
# code is passed, convert it to a string with
608
if message is None and code is not None:
609
message = gnutls.strerror(code).decode(
610
"utf-8", errors="replace")
611
return super(gnutls.Error, self).__init__(
614
class CertificateSecurityError(Error):
618
def __init__(self, cls):
621
def from_param(self, obj):
622
if not isinstance(obj, self.cls):
623
raise TypeError("Not of type {}: {!r}"
624
.format(self.cls.__name__, obj))
625
return ctypes.byref(obj.from_param(obj))
627
class CastToVoidPointer:
628
def __init__(self, cls):
631
def from_param(self, obj):
632
if not isinstance(obj, self.cls):
633
raise TypeError("Not of type {}: {!r}"
634
.format(self.cls.__name__, obj))
635
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
637
class With_from_param:
639
def from_param(cls, obj):
640
return obj._as_parameter_
643
class Credentials(With_from_param):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
647
self.type = gnutls.CRD_CERTIFICATE
650
gnutls.certificate_free_credentials(self)
652
class ClientSession(With_from_param):
653
def __init__(self, socket, credentials=None):
654
self._as_parameter_ = gnutls.session_t()
655
gnutls_flags = gnutls.CLIENT
656
if gnutls.check_version(b"3.5.6"):
657
gnutls_flags |= gnutls.NO_TICKETS
659
gnutls_flags |= gnutls.ENABLE_RAWPK
660
gnutls.init(self, gnutls_flags)
662
gnutls.set_default_priority(self)
663
gnutls.transport_set_ptr(self, socket.fileno())
664
gnutls.handshake_set_private_extensions(self, True)
666
if credentials is None:
667
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
670
self.credentials = credentials
676
return gnutls.handshake(self)
678
def send(self, data):
682
data_len -= gnutls.record_send(self, data[-data_len:],
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
688
# Error handling functions
689
def _error_code(result):
690
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
694
if result == gnutls.E_NO_CERTIFICATE_FOUND:
695
raise gnutls.CertificateSecurityError(code=result)
696
raise gnutls.Error(code=result)
698
def _retry_on_error(result, func, arguments,
699
_error_code=_error_code):
700
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
703
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
return _error_code(result)
705
result = func(*arguments)
708
# Unless otherwise indicated, the function declarations below are
709
# all from the gnutls/gnutls.h C header file.
712
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
714
ctypes.POINTER(ctypes.c_char_p)]
715
priority_set_direct.restype = _error_code
717
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
719
init.restype = _error_code
721
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
723
set_default_priority.restype = _error_code
725
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
728
record_send.restype = ctypes.c_ssize_t
729
record_send.errcheck = _retry_on_error
731
certificate_allocate_credentials = (
732
_library.gnutls_certificate_allocate_credentials)
733
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
735
certificate_allocate_credentials.restype = _error_code
737
certificate_free_credentials = (
738
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
740
certificate_free_credentials.restype = None
742
handshake_set_private_extensions = (
743
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
746
handshake_set_private_extensions.restype = None
748
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
751
credentials_set.restype = _error_code
753
strerror = _library.gnutls_strerror
754
strerror.argtypes = [ctypes.c_int]
755
strerror.restype = ctypes.c_char_p
757
certificate_type_get = _library.gnutls_certificate_type_get
758
certificate_type_get.argtypes = [ClientSession]
759
certificate_type_get.restype = _error_code
761
certificate_get_peers = _library.gnutls_certificate_get_peers
762
certificate_get_peers.argtypes = [ClientSession,
763
ctypes.POINTER(ctypes.c_uint)]
764
certificate_get_peers.restype = ctypes.POINTER(datum_t)
766
global_set_log_level = _library.gnutls_global_set_log_level
767
global_set_log_level.argtypes = [ctypes.c_int]
768
global_set_log_level.restype = None
770
global_set_log_function = _library.gnutls_global_set_log_function
771
global_set_log_function.argtypes = [log_func]
772
global_set_log_function.restype = None
774
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
776
deinit.restype = None
778
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
781
handshake.errcheck = _retry_on_error
783
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
785
transport_set_ptr.restype = None
787
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
790
bye.errcheck = _retry_on_error
792
check_version = _library.gnutls_check_version
793
check_version.argtypes = [ctypes.c_char_p]
794
check_version.restype = ctypes.c_char_p
796
_need_version = b"3.3.0"
797
if check_version(_need_version) is None:
798
raise self.Error("Needs GnuTLS {} or later"
799
.format(_need_version))
801
_tls_rawpk_version = b"3.6.6"
802
has_rawpk = bool(check_version(_tls_rawpk_version))
806
class pubkey_st(ctypes.Structure):
808
pubkey_t = ctypes.POINTER(pubkey_st)
810
x509_crt_fmt_t = ctypes.c_int
812
# All the function declarations below are from
814
pubkey_init = _library.gnutls_pubkey_init
815
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
816
pubkey_init.restype = _error_code
818
pubkey_import = _library.gnutls_pubkey_import
819
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
821
pubkey_import.restype = _error_code
823
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
824
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
825
ctypes.POINTER(ctypes.c_ubyte),
826
ctypes.POINTER(ctypes.c_size_t)]
827
pubkey_get_key_id.restype = _error_code
829
pubkey_deinit = _library.gnutls_pubkey_deinit
830
pubkey_deinit.argtypes = [pubkey_t]
831
pubkey_deinit.restype = None
833
# All the function declarations below are from
836
openpgp_crt_init = _library.gnutls_openpgp_crt_init
837
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
838
openpgp_crt_init.restype = _error_code
840
openpgp_crt_import = _library.gnutls_openpgp_crt_import
841
openpgp_crt_import.argtypes = [openpgp_crt_t,
842
ctypes.POINTER(datum_t),
844
openpgp_crt_import.restype = _error_code
846
openpgp_crt_verify_self = \
847
_library.gnutls_openpgp_crt_verify_self
848
openpgp_crt_verify_self.argtypes = [
851
ctypes.POINTER(ctypes.c_uint),
853
openpgp_crt_verify_self.restype = _error_code
855
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
856
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
857
openpgp_crt_deinit.restype = None
859
openpgp_crt_get_fingerprint = (
860
_library.gnutls_openpgp_crt_get_fingerprint)
861
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
865
openpgp_crt_get_fingerprint.restype = _error_code
867
if check_version(b"3.6.4"):
868
certificate_type_get2 = _library.gnutls_certificate_type_get2
869
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
870
certificate_type_get2.restype = _error_code
872
# Remove non-public functions
873
del _error_code, _retry_on_error
876
def call_pipe(connection, # : multiprocessing.Connection
877
func, *args, **kwargs):
878
"""This function is meant to be called by multiprocessing.Process
880
This function runs func(*args, **kwargs), and writes the resulting
881
return value on the provided multiprocessing.Connection.
883
connection.send(func(*args, **kwargs))
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
402
class Client(object):
888
403
"""A representation of a client host served by this server.
891
approved: bool(); None if not yet approved/disapproved
406
approved: bool(); 'None' if not yet approved/disapproved
892
407
approval_delay: datetime.timedelta(); Time to wait for approval
893
408
approval_duration: datetime.timedelta(); Duration of one approval
894
checker: multiprocessing.Process(); a running checker process used
895
to see if the client lives. None if no process is
897
checker_callback_tag: a GLib event source tag, or None
409
checker: subprocess.Popen(); a running checker process used
410
to see if the client lives.
411
'None' if no process is running.
412
checker_callback_tag: a gobject event source tag, or None
898
413
checker_command: string; External command which is run to check
899
414
if client lives. %() expansions are done at
900
415
runtime with vars(self) as dict, so that for
901
416
instance %(name)s can be used in the command.
902
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
903
418
created: datetime.datetime(); (UTC) object creation
904
419
client_structure: Object describing what attributes a client has
905
420
and is used for storing the client at exit
906
421
current_checker_command: string; current running checker_command
907
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
909
424
fingerprint: string (40 or 32 hexadecimal digits); used to
910
uniquely identify an OpenPGP client
911
key_id: string (64 hexadecimal digits); used to uniquely identify
912
a client using raw public keys
425
uniquely identify the client
913
426
host: string; available for use by the checker command
914
427
interval: datetime.timedelta(); How often to start a new checker
915
428
last_approval_request: datetime.datetime(); (UTC) or None
1042
552
self.current_checker_command = None
1043
553
self.approved = None
1044
554
self.approvals_pending = 0
1045
self.changedstate = multiprocessing_manager.Condition(
1046
multiprocessing_manager.Lock())
1047
self.client_structure = [attr
1048
for attr in self.__dict__.keys()
555
self.changedstate = (multiprocessing_manager
556
.Condition(multiprocessing_manager
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
1049
560
if not attr.startswith("_")]
1050
561
self.client_structure.append("client_structure")
1052
for name, t in inspect.getmembers(
1053
type(self), lambda obj: isinstance(obj, property)):
563
for name, t in inspect.getmembers(type(self),
1054
567
if not name.startswith("_"):
1055
568
self.client_structure.append(name)
1057
570
# Send notice to process children that client state has changed
1058
571
def send_changedstate(self):
1059
572
with self.changedstate:
1060
573
self.changedstate.notify_all()
1062
575
def enable(self):
1063
576
"""Start this client's checker and timeout hooks"""
1064
577
if getattr(self, "enabled", False):
1065
578
# Already enabled
580
self.expires = datetime.datetime.utcnow() + self.timeout
1067
581
self.enabled = True
1068
582
self.last_enabled = datetime.datetime.utcnow()
1069
583
self.init_checker()
1070
584
self.send_changedstate()
1072
586
def disable(self, quiet=True):
1073
587
"""Disable this client."""
1074
588
if not getattr(self, "enabled", False):
1077
log.info("Disabling client %s", self.name)
591
logger.info("Disabling client %s", self.name)
1078
592
if getattr(self, "disable_initiator_tag", None) is not None:
1079
GLib.source_remove(self.disable_initiator_tag)
593
gobject.source_remove(self.disable_initiator_tag)
1080
594
self.disable_initiator_tag = None
1081
595
self.expires = None
1082
596
if getattr(self, "checker_initiator_tag", None) is not None:
1083
GLib.source_remove(self.checker_initiator_tag)
597
gobject.source_remove(self.checker_initiator_tag)
1084
598
self.checker_initiator_tag = None
1085
599
self.stop_checker()
1086
600
self.enabled = False
1088
602
self.send_changedstate()
1089
# Do not run this again if called by a GLib.timeout_add
603
# Do not run this again if called by a gobject.timeout_add
1092
606
def __del__(self):
1095
def init_checker(self, randomize_start=False):
1096
# Schedule a new checker to be started a randomly selected
1097
# time (a fraction of 'interval') from now. This spreads out
1098
# the startup of checkers over time when the server is
609
def init_checker(self):
610
# Schedule a new checker to be started an 'interval' from now,
611
# and every interval from then on.
1100
612
if self.checker_initiator_tag is not None:
1101
GLib.source_remove(self.checker_initiator_tag)
1102
interval_milliseconds = int(self.interval.total_seconds()
1105
delay_milliseconds = random.randrange(
1106
interval_milliseconds + 1)
1108
delay_milliseconds = interval_milliseconds
1109
self.checker_initiator_tag = GLib.timeout_add(
1110
delay_milliseconds, self.start_checker, randomize_start)
1111
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1112
# A checker might take up to an 'interval' of time, so we can
1113
# expire at the soonest one interval after a checker was
1114
# started. Since the initial checker is delayed, the expire
1115
# time might have to be extended.
1116
now = datetime.datetime.utcnow()
1117
self.expires = now + delay + self.interval
1118
# Schedule a disable() at expire time
613
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
617
# Schedule a disable() when 'timeout' has passed
1119
618
if self.disable_initiator_tag is not None:
1120
GLib.source_remove(self.disable_initiator_tag)
1121
self.disable_initiator_tag = GLib.timeout_add(
1122
int((self.expires - now).total_seconds() * 1000),
1125
def checker_callback(self, source, condition, connection,
619
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
623
# Also start a new checker *right now*.
626
def checker_callback(self, pid, condition, command):
1127
627
"""The checker has completed, so take appropriate actions."""
1128
# Read return code from connection (see call_pipe)
1129
returncode = connection.recv()
1131
if self.checker is not None:
1133
628
self.checker_callback_tag = None
1134
629
self.checker = None
1137
self.last_checker_status = returncode
1138
self.last_checker_signal = None
630
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
1139
632
if self.last_checker_status == 0:
1140
log.info("Checker for %(name)s succeeded", vars(self))
633
logger.info("Checker for %(name)s succeeded",
1141
635
self.checked_ok()
1143
log.info("Checker for %(name)s failed", vars(self))
637
logger.info("Checker for %(name)s failed",
1145
640
self.last_checker_status = -1
1146
self.last_checker_signal = -returncode
1147
log.warning("Checker for %(name)s crashed?", vars(self))
641
logger.warning("Checker for %(name)s crashed?",
1150
644
def checked_ok(self):
1151
645
"""Assert that the client has been seen, alive and well."""
1152
646
self.last_checked_ok = datetime.datetime.utcnow()
1153
647
self.last_checker_status = 0
1154
self.last_checker_signal = None
1155
648
self.bump_timeout()
1157
650
def bump_timeout(self, timeout=None):
1158
651
"""Bump up the timeout for this client."""
1159
652
if timeout is None:
1160
653
timeout = self.timeout
1161
654
if self.disable_initiator_tag is not None:
1162
GLib.source_remove(self.disable_initiator_tag)
655
gobject.source_remove(self.disable_initiator_tag)
1163
656
self.disable_initiator_tag = None
1164
657
if getattr(self, "enabled", False):
1165
self.disable_initiator_tag = GLib.timeout_add(
1166
int(timeout.total_seconds() * 1000), self.disable)
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
1167
661
self.expires = datetime.datetime.utcnow() + timeout
1169
663
def need_approval(self):
1170
664
self.last_approval_request = datetime.datetime.utcnow()
1172
def start_checker(self, start_was_randomized=False):
666
def start_checker(self):
1173
667
"""Start a new checker subprocess if one is not running.
1175
669
If a checker already exists, leave it running and do
1177
671
# The reason for not killing a running checker is that if we
1182
676
# checkers alone, the checker would have to take more time
1183
677
# than 'timeout' for the client to be disabled, which is as it
1186
if self.checker is not None and not self.checker.is_alive():
1187
log.warning("Checker was not alive; joining")
680
# If a checker exists, make sure it is not a zombie
682
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
683
except (AttributeError, OSError) as error:
684
if (isinstance(error, OSError)
685
and error.errno != errno.ECHILD):
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
1190
693
# Start a new checker if needed
1191
694
if self.checker is None:
1192
695
# Escape attributes for the shell
1194
attr: shlex.quote(str(getattr(self, attr)))
1195
for attr in self.runtime_expansions}
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
1197
701
command = self.checker_command % escaped_attrs
1198
702
except TypeError as error:
1199
log.error('Could not format string "%s"',
1200
self.checker_command, exc_info=error)
1201
return True # Try again later
703
logger.error('Could not format string "%s"',
704
self.checker_command, exc_info=error)
705
return True # Try again later
1202
706
self.current_checker_command = command
1203
log.info("Starting checker %r for %s", command, self.name)
1204
# We don't need to redirect stdout and stderr, since
1205
# in normal mode, that is already done by daemon(),
1206
# and in debug mode we don't want to. (Stdin is
1207
# always replaced by /dev/null.)
1208
# The exception is when not debugging but nevertheless
1209
# running in the foreground; use the previously
1211
popen_args = {"close_fds": True,
1214
if (not self.server_settings["debug"]
1215
and self.server_settings["foreground"]):
1216
popen_args.update({"stdout": wnull,
1218
pipe = multiprocessing.Pipe(duplex=False)
1219
self.checker = multiprocessing.Process(
1221
args=(pipe[1], subprocess.call, command),
1223
self.checker.start()
1224
self.checker_callback_tag = GLib.io_add_watch(
1225
GLib.IOChannel.unix_new(pipe[0].fileno()),
1226
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1227
self.checker_callback, pipe[0], command)
1228
if start_was_randomized:
1229
# We were started after a random delay; Schedule a new
1230
# checker to be started an 'interval' from now, and every
1231
# interval from then on.
1232
now = datetime.datetime.utcnow()
1233
self.checker_initiator_tag = GLib.timeout_add(
1234
int(self.interval.total_seconds() * 1000),
1236
self.expires = max(self.expires, now + self.interval)
1237
# Don't start a new checker again after same random delay
1239
# Re-run this periodically if run by GLib.timeout_add
708
logger.info("Starting checker %r for %s",
710
# We don't need to redirect stdout and stderr, since
711
# in normal mode, that is already done by daemon(),
712
# and in debug mode we don't want to. (Stdin is
713
# always replaced by /dev/null.)
714
self.checker = subprocess.Popen(command,
717
except OSError as error:
718
logger.error("Failed to start subprocess",
721
self.checker_callback_tag = (gobject.child_watch_add
723
self.checker_callback,
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
728
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
729
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
739
# Re-run this periodically if run by gobject.timeout_add
1242
742
def stop_checker(self):
1243
743
"""Force the checker process, if any, to stop."""
1244
744
if self.checker_callback_tag:
1245
GLib.source_remove(self.checker_callback_tag)
745
gobject.source_remove(self.checker_callback_tag)
1246
746
self.checker_callback_tag = None
1247
747
if getattr(self, "checker", None) is None:
1249
log.debug("Stopping checker for %(name)s", vars(self))
1250
self.checker.terminate()
749
logger.debug("Stopping checker for %(name)s", vars(self))
751
self.checker.terminate()
753
#if self.checker.poll() is None:
754
# self.checker.kill()
755
except OSError as error:
756
if error.errno != errno.ESRCH: # No such process
1251
758
self.checker = None
1254
def dbus_service_property(dbus_interface,
761
def dbus_service_property(dbus_interface, signature="v",
762
access="readwrite", byte_arrays=False):
1258
763
"""Decorators for marking methods of a DBusObjectWithProperties to
1259
764
become properties on the D-Bus.
1261
766
The decorated method will be called with no arguments by "Get"
1262
767
and with one argument by "Set".
1264
769
The parameters, where they are supported, are the same as
1265
770
dbus.service.method, except there is only "signature", since the
1266
771
type from Get() and the type sent to Set() is the same.
1349
class DBusObjectWithAnnotations(dbus.service.Object):
1350
"""A D-Bus object with annotations.
1352
Classes inheriting from this can use the dbus_annotations
1353
decorator to add annotations to methods or signals.
847
class DBusObjectWithProperties(dbus.service.Object):
848
"""A D-Bus object with properties.
850
Classes inheriting from this can use the dbus_service_property
851
decorator to expose methods as D-Bus properties. It exposes the
852
standard Get(), Set(), and GetAll() methods on the D-Bus.
1357
856
def _is_dbus_thing(thing):
1358
857
"""Returns a function testing if an attribute is a D-Bus thing
1360
859
If called like _is_dbus_thing("method") it returns a function
1361
860
suitable for use as predicate to inspect.getmembers().
1363
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
862
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1366
865
def _get_all_dbus_things(self, thing):
1367
866
"""Returns a generator of (name, attribute) pairs
1369
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
return ((getattr(athing.__get__(self), "_dbus_name",
1370
870
athing.__get__(self))
1371
871
for cls in self.__class__.__mro__
1372
872
for name, athing in
1373
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1375
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1377
path_keyword="object_path",
1378
connection_keyword="connection")
1379
def Introspect(self, object_path, connection):
1380
"""Overloading of standard D-Bus method.
1382
Inserts annotation tags on methods and signals.
1384
xmlstring = dbus.service.Object.Introspect(self, object_path,
1387
document = xml.dom.minidom.parseString(xmlstring)
1389
for if_tag in document.getElementsByTagName("interface"):
1390
# Add annotation tags
1391
for typ in ("method", "signal"):
1392
for tag in if_tag.getElementsByTagName(typ):
1394
for name, prop in (self.
1395
_get_all_dbus_things(typ)):
1396
if (name == tag.getAttribute("name")
1397
and prop._dbus_interface
1398
== if_tag.getAttribute("name")):
1399
annots.update(getattr(
1400
prop, "_dbus_annotations", {}))
1401
for name, value in annots.items():
1402
ann_tag = document.createElement(
1404
ann_tag.setAttribute("name", name)
1405
ann_tag.setAttribute("value", value)
1406
tag.appendChild(ann_tag)
1407
# Add interface annotation tags
1408
for annotation, value in dict(
1409
itertools.chain.from_iterable(
1410
annotations().items()
1411
for name, annotations
1412
in self._get_all_dbus_things("interface")
1413
if name == if_tag.getAttribute("name")
1415
ann_tag = document.createElement("annotation")
1416
ann_tag.setAttribute("name", annotation)
1417
ann_tag.setAttribute("value", value)
1418
if_tag.appendChild(ann_tag)
1419
# Fix argument name for the Introspect method itself
1420
if (if_tag.getAttribute("name")
1421
== dbus.INTROSPECTABLE_IFACE):
1422
for cn in if_tag.getElementsByTagName("method"):
1423
if cn.getAttribute("name") == "Introspect":
1424
for arg in cn.getElementsByTagName("arg"):
1425
if (arg.getAttribute("direction")
1427
arg.setAttribute("name",
1429
xmlstring = document.toxml("utf-8")
1431
except (AttributeError, xml.dom.DOMException,
1432
xml.parsers.expat.ExpatError) as error:
1433
log.error("Failed to override Introspection method",
1438
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1439
"""A D-Bus object with properties.
1441
Classes inheriting from this can use the dbus_service_property
1442
decorator to expose methods as D-Bus properties. It exposes the
1443
standard Get(), Set(), and GetAll() methods on the D-Bus.
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
1446
876
def _get_dbus_property(self, interface_name, property_name):
1447
877
"""Returns a bound method if one exists which is a D-Bus
1448
878
property with the specified name and interface.
1450
for cls in self.__class__.__mro__:
1451
for name, value in inspect.getmembers(
1452
cls, self._is_dbus_thing("property")):
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
883
self._is_dbus_thing("property"))):
1453
884
if (value._dbus_name == property_name
1454
885
and value._dbus_interface == interface_name):
1455
886
return value.__get__(self)
1457
888
# No such property
1458
raise DBusPropertyNotFound("{}:{}.{}".format(
1459
self.dbus_object_path, interface_name, property_name))
1462
def _get_all_interface_names(cls):
1463
"""Get a sequence of all interfaces supported by an object"""
1464
return (name for name in set(getattr(getattr(x, attr),
1465
"_dbus_interface", None)
1466
for x in (inspect.getmro(cls))
1468
if name is not None)
1470
@dbus.service.method(dbus.PROPERTIES_IFACE,
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1472
894
out_signature="v")
1473
895
def Get(self, interface_name, property_name):
1474
896
"""Standard D-Bus property Get() method, see D-Bus standard.
1597
1021
document.unlink()
1598
1022
except (AttributeError, xml.dom.DOMException,
1599
1023
xml.parsers.expat.ExpatError) as error:
1600
log.error("Failed to override Introspection method",
1606
dbus.OBJECT_MANAGER_IFACE
1607
except AttributeError:
1608
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1611
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1612
"""A D-Bus object with an ObjectManager.
1614
Classes inheriting from this exposes the standard
1615
GetManagedObjects call and the InterfacesAdded and
1616
InterfacesRemoved signals on the standard
1617
"org.freedesktop.DBus.ObjectManager" interface.
1619
Note: No signals are sent automatically; they must be sent
1622
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1623
out_signature="a{oa{sa{sv}}}")
1624
def GetManagedObjects(self):
1625
"""This function must be overridden"""
1626
raise NotImplementedError()
1628
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1629
signature="oa{sa{sv}}")
1630
def InterfacesAdded(self, object_path, interfaces_and_properties):
1633
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1634
def InterfacesRemoved(self, object_path, interfaces):
1637
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1639
path_keyword="object_path",
1640
connection_keyword="connection")
1641
def Introspect(self, object_path, connection):
1642
"""Overloading of standard D-Bus method.
1644
Override return argument name of GetManagedObjects to be
1645
"objpath_interfaces_and_properties"
1647
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1651
document = xml.dom.minidom.parseString(xmlstring)
1653
for if_tag in document.getElementsByTagName("interface"):
1654
# Fix argument name for the GetManagedObjects method
1655
if (if_tag.getAttribute("name")
1656
== dbus.OBJECT_MANAGER_IFACE):
1657
for cn in if_tag.getElementsByTagName("method"):
1658
if (cn.getAttribute("name")
1659
== "GetManagedObjects"):
1660
for arg in cn.getElementsByTagName("arg"):
1661
if (arg.getAttribute("direction")
1665
"objpath_interfaces"
1667
xmlstring = document.toxml("utf-8")
1669
except (AttributeError, xml.dom.DOMException,
1670
xml.parsers.expat.ExpatError) as error:
1671
log.error("Failed to override Introspection method",
1024
logger.error("Failed to override Introspection method",
1673
1026
return xmlstring
1676
1029
def datetime_to_dbus(dt, variant_level=0):
1677
1030
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1679
return dbus.String("", variant_level=variant_level)
1680
return dbus.String(dt.isoformat(), variant_level=variant_level)
1032
return dbus.String("", variant_level = variant_level)
1033
return dbus.String(dt.isoformat(),
1034
variant_level=variant_level)
1683
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
2044
1390
server to mandos-client
2048
1394
# Rejected - signal
2049
1395
@dbus.service.signal(_interface, signature="s")
2050
1396
def Rejected(self, reason):
2054
1400
# NeedApproval - signal
2055
1401
@dbus.service.signal(_interface, signature="tb")
2056
1402
def NeedApproval(self, timeout, default):
2058
1404
return self.need_approval()
2062
1408
# Approve - method
2063
1409
@dbus.service.method(_interface, in_signature="b")
2064
1410
def Approve(self, value):
2065
1411
self.approve(value)
2067
1413
# CheckedOK - method
2068
1414
@dbus.service.method(_interface)
2069
1415
def CheckedOK(self):
2070
1416
self.checked_ok()
2072
1418
# Enable - method
2073
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2074
1419
@dbus.service.method(_interface)
2075
1420
def Enable(self):
2079
1424
# StartChecker - method
2080
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2081
1425
@dbus.service.method(_interface)
2082
1426
def StartChecker(self):
2084
1428
self.start_checker()
2086
1430
# Disable - method
2087
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2088
1431
@dbus.service.method(_interface)
2089
1432
def Disable(self):
2093
1436
# StopChecker - method
2094
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2095
1437
@dbus.service.method(_interface)
2096
1438
def StopChecker(self):
2097
1439
self.stop_checker()
2101
1443
# ApprovalPending - property
2102
1444
@dbus_service_property(_interface, signature="b", access="read")
2103
1445
def ApprovalPending_dbus_property(self):
2104
1446
return dbus.Boolean(bool(self.approvals_pending))
2106
1448
# ApprovedByDefault - property
2107
@dbus_service_property(_interface,
1449
@dbus_service_property(_interface, signature="b",
2109
1450
access="readwrite")
2110
1451
def ApprovedByDefault_dbus_property(self, value=None):
2111
1452
if value is None: # get
2112
1453
return dbus.Boolean(self.approved_by_default)
2113
1454
self.approved_by_default = bool(value)
2115
1456
# ApprovalDelay - property
2116
@dbus_service_property(_interface,
1457
@dbus_service_property(_interface, signature="t",
2118
1458
access="readwrite")
2119
1459
def ApprovalDelay_dbus_property(self, value=None):
2120
1460
if value is None: # get
2121
return dbus.UInt64(self.approval_delay.total_seconds()
1461
return dbus.UInt64(self.approval_delay_milliseconds())
2123
1462
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2125
1464
# ApprovalDuration - property
2126
@dbus_service_property(_interface,
1465
@dbus_service_property(_interface, signature="t",
2128
1466
access="readwrite")
2129
1467
def ApprovalDuration_dbus_property(self, value=None):
2130
1468
if value is None: # get
2131
return dbus.UInt64(self.approval_duration.total_seconds()
1469
return dbus.UInt64(timedelta_to_milliseconds(
1470
self.approval_duration))
2133
1471
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2135
1473
# Name - property
2137
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2138
1474
@dbus_service_property(_interface, signature="s", access="read")
2139
1475
def Name_dbus_property(self):
2140
1476
return dbus.String(self.name)
2144
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2145
@dbus_service_property(_interface, signature="s", access="read")
2146
def KeyID_dbus_property(self):
2147
return dbus.String(self.key_id)
2149
1478
# Fingerprint - property
2151
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2152
1479
@dbus_service_property(_interface, signature="s", access="read")
2153
1480
def Fingerprint_dbus_property(self):
2154
1481
return dbus.String(self.fingerprint)
2156
1483
# Host - property
2157
@dbus_service_property(_interface,
1484
@dbus_service_property(_interface, signature="s",
2159
1485
access="readwrite")
2160
1486
def Host_dbus_property(self, value=None):
2161
1487
if value is None: # get
2162
1488
return dbus.String(self.host)
2163
self.host = str(value)
1489
self.host = unicode(value)
2165
1491
# Created - property
2167
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2168
1492
@dbus_service_property(_interface, signature="s", access="read")
2169
1493
def Created_dbus_property(self):
2170
1494
return datetime_to_dbus(self.created)
2172
1496
# LastEnabled - property
2173
1497
@dbus_service_property(_interface, signature="s", access="read")
2174
1498
def LastEnabled_dbus_property(self):
2175
1499
return datetime_to_dbus(self.last_enabled)
2177
1501
# Enabled - property
2178
@dbus_service_property(_interface,
1502
@dbus_service_property(_interface, signature="b",
2180
1503
access="readwrite")
2181
1504
def Enabled_dbus_property(self, value=None):
2182
1505
if value is None: # get
2283
1601
self.start_checker()
2285
1603
self.stop_checker()
2287
1605
# ObjectPath - property
2289
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2290
"org.freedesktop.DBus.Deprecated": "true"})
2291
1606
@dbus_service_property(_interface, signature="o", access="read")
2292
1607
def ObjectPath_dbus_property(self):
2293
return self.dbus_object_path # is already a dbus.ObjectPath
1608
return self.dbus_object_path # is already a dbus.ObjectPath
2295
1610
# Secret = property
2297
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2299
@dbus_service_property(_interface,
1611
@dbus_service_property(_interface, signature="ay",
1612
access="write", byte_arrays=True)
2303
1613
def Secret_dbus_property(self, value):
2304
self.secret = bytes(value)
1614
self.secret = str(value)
2310
def __init__(self, child_pipe, key_id, fpr, address):
1619
class ProxyClient(object):
1620
def __init__(self, child_pipe, fpr, address):
2311
1621
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
1622
self._pipe.send(('init', fpr, address))
2313
1623
if not self._pipe.recv():
2314
raise KeyError(key_id or fpr)
2316
1626
def __getattribute__(self, name):
2318
1628
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
1629
self._pipe.send(('getattr', name))
2320
1630
data = self._pipe.recv()
2321
if data[0] == "data":
1631
if data[0] == 'data':
2323
if data[0] == "function":
1633
if data[0] == 'function':
2325
1634
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
1635
self._pipe.send(('funcall', name, args, kwargs))
2327
1636
return self._pipe.recv()[1]
2331
1639
def __setattr__(self, name, value):
2333
1641
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
1642
self._pipe.send(('setattr', name, value))
2337
1645
class ClientHandler(socketserver.BaseRequestHandler, object):
2338
1646
"""A class to handle client connections.
2340
1648
Instantiated once for each connection to handle it.
2341
1649
Note: This will run in its own forked process."""
2343
1651
def handle(self):
2344
1652
with contextlib.closing(self.server.child_pipe) as child_pipe:
2345
log.info("TCP connection from: %s",
2346
str(self.client_address))
2347
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2349
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2352
# "+AES-256-CBC", "+SHA1",
2353
# "+COMP-NULL", "+CTYPE-OPENPGP",
1653
logger.info("TCP connection from: %s",
1654
unicode(self.client_address))
1655
logger.debug("Pipe FD: %d",
1656
self.server.child_pipe.fileno())
1658
session = (gnutls.connection
1659
.ClientSession(self.request,
1661
.X509Credentials()))
1663
# Note: gnutls.connection.X509Credentials is really a
1664
# generic GnuTLS certificate credentials object so long as
1665
# no X.509 keys are added to it. Therefore, we can use it
1666
# here despite using OpenPGP certificates.
1668
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1669
# "+AES-256-CBC", "+SHA1",
1670
# "+COMP-NULL", "+CTYPE-OPENPGP",
2355
1672
# Use a fallback default, since this MUST be set.
2356
1673
priority = self.server.gnutls_priority
2357
1674
if priority is None:
2358
1675
priority = "NORMAL"
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
1676
(gnutls.library.functions
1677
.gnutls_priority_set_direct(session._c_object,
2362
1680
# Start communication using the Mandos protocol
2363
1681
# Get protocol number
2364
1682
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
1683
logger.debug("Protocol version: %r", line)
2367
1685
if int(line.strip().split()[0]) > 1:
2368
raise RuntimeError(line)
2369
1687
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
1688
logger.error("Unknown protocol version: %s", error)
2373
1691
# Start GnuTLS connection
2375
1693
session.handshake()
2376
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
1694
except gnutls.errors.GNUTLSError as error:
1695
logger.warning("Handshake failed: %s", error)
2378
1696
# Do not run session.bye() here: the session is not
2379
1697
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
1699
logger.debug("Handshake succeeded")
2383
1701
approval_required = False
2385
if gnutls.has_rawpk:
2388
key_id = self.key_id(
2389
self.peer_certificate(session))
2390
except (TypeError, gnutls.Error) as error:
2391
log.warning("Bad certificate: %s", error)
2393
log.debug("Key ID: %s",
2394
key_id.decode("utf-8",
2400
fpr = self.fingerprint(
2401
self.peer_certificate(session))
2402
except (TypeError, gnutls.Error) as error:
2403
log.warning("Bad certificate: %s", error)
2405
log.debug("Fingerprint: %s", fpr)
2408
client = ProxyClient(child_pipe, key_id, fpr,
1704
fpr = self.fingerprint(self.peer_certificate
1707
gnutls.errors.GNUTLSError) as error:
1708
logger.warning("Bad certificate: %s", error)
1710
logger.debug("Fingerprint: %s", fpr)
1713
client = ProxyClient(child_pipe, fpr,
2409
1714
self.client_address)
2410
1715
except KeyError:
2413
1718
if client.approval_delay:
2414
1719
delay = client.approval_delay
2415
1720
client.approvals_pending += 1
2416
1721
approval_required = True
2419
1724
if not client.enabled:
2420
log.info("Client %s is disabled", client.name)
1725
logger.info("Client %s is disabled",
2421
1727
if self.server.use_dbus:
2422
1728
# Emit D-Bus signal
2423
1729
client.Rejected("Disabled")
2426
1732
if client.approved or not client.approval_delay:
2427
# We are approved or approval is disabled
1733
#We are approved or approval is disabled
2429
1735
elif client.approved is None:
2430
log.info("Client %s needs approval",
1736
logger.info("Client %s needs approval",
2432
1738
if self.server.use_dbus:
2433
1739
# Emit D-Bus signal
2434
1740
client.NeedApproval(
2435
client.approval_delay.total_seconds()
2436
* 1000, client.approved_by_default)
1741
client.approval_delay_milliseconds(),
1742
client.approved_by_default)
2438
log.warning("Client %s was not approved",
1744
logger.warning("Client %s was not approved",
2440
1746
if self.server.use_dbus:
2441
1747
# Emit D-Bus signal
2442
1748
client.Rejected("Denied")
2445
# wait until timeout or approved
1751
#wait until timeout or approved
2446
1752
time = datetime.datetime.now()
2447
1753
client.changedstate.acquire()
2448
client.changedstate.wait(delay.total_seconds())
1754
client.changedstate.wait(
1755
float(timedelta_to_milliseconds(delay)
2449
1757
client.changedstate.release()
2450
1758
time2 = datetime.datetime.now()
2451
1759
if (time2 - time) >= delay:
2452
1760
if not client.approved_by_default:
2453
log.warning("Client %s timed out while"
2454
" waiting for approval",
1761
logger.warning("Client %s timed out while"
1762
" waiting for approval",
2456
1764
if self.server.use_dbus:
2457
1765
# Emit D-Bus signal
2458
1766
client.Rejected("Approval timed out")
2463
1771
delay -= time2 - time
2466
session.send(client.secret)
2467
except gnutls.Error as error:
2468
log.warning("gnutls send failed", exc_info=error)
2471
log.info("Sending secret to %s", client.name)
1774
while sent_size < len(client.secret):
1776
sent = session.send(client.secret[sent_size:])
1777
except gnutls.errors.GNUTLSError as error:
1778
logger.warning("gnutls send failed",
1781
logger.debug("Sent: %d, remaining: %d",
1782
sent, len(client.secret)
1783
- (sent_size + sent))
1786
logger.info("Sending secret to %s", client.name)
2472
1787
# bump the timeout using extended_timeout
2473
1788
client.bump_timeout(client.extended_timeout)
2474
1789
if self.server.use_dbus:
2475
1790
# Emit D-Bus signal
2476
1791
client.GotSecret()
2479
1794
if approval_required:
2480
1795
client.approvals_pending -= 1
2483
except gnutls.Error as error:
2484
log.warning("GnuTLS bye failed", exc_info=error)
1798
except gnutls.errors.GNUTLSError as error:
1799
logger.warning("GnuTLS bye failed",
2487
1803
def peer_certificate(session):
2488
"Return the peer's certificate as a bytestring"
2490
cert_type = gnutls.certificate_type_get2(
2491
session, gnutls.CTYPE_PEERS)
2492
except AttributeError:
2493
cert_type = gnutls.certificate_type_get(session)
2494
if gnutls.has_rawpk:
2495
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2497
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2498
# If not a valid certificate type...
2499
if cert_type not in valid_cert_types:
2500
log.info("Cert type %r not in %r", cert_type,
2502
# ...return invalid data
1804
"Return the peer's OpenPGP certificate as a bytestring"
1805
# If not an OpenPGP certificate...
1806
if (gnutls.library.functions
1807
.gnutls_certificate_type_get(session._c_object)
1808
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1809
# ...do the normal thing
1810
return session.peer_certificate
2504
1811
list_size = ctypes.c_uint(1)
2505
cert_list = (gnutls.certificate_get_peers
2506
(session, ctypes.byref(list_size)))
1812
cert_list = (gnutls.library.functions
1813
.gnutls_certificate_get_peers
1814
(session._c_object, ctypes.byref(list_size)))
2507
1815
if not bool(cert_list) and list_size.value != 0:
2508
raise gnutls.Error("error getting peer certificate")
1816
raise gnutls.errors.GNUTLSError("error getting peer"
2509
1818
if list_size.value == 0:
2511
1820
cert = cert_list[0]
2512
1821
return ctypes.string_at(cert.data, cert.size)
2515
def key_id(certificate):
2516
"Convert a certificate bytestring to a hexdigit key ID"
2517
# New GnuTLS "datum" with the public key
2518
datum = gnutls.datum_t(
2519
ctypes.cast(ctypes.c_char_p(certificate),
2520
ctypes.POINTER(ctypes.c_ubyte)),
2521
ctypes.c_uint(len(certificate)))
2522
# XXX all these need to be created in the gnutls "module"
2523
# New empty GnuTLS certificate
2524
pubkey = gnutls.pubkey_t()
2525
gnutls.pubkey_init(ctypes.byref(pubkey))
2526
# Import the raw public key into the certificate
2527
gnutls.pubkey_import(pubkey,
2528
ctypes.byref(datum),
2529
gnutls.X509_FMT_DER)
2530
# New buffer for the key ID
2531
buf = ctypes.create_string_buffer(32)
2532
buf_len = ctypes.c_size_t(len(buf))
2533
# Get the key ID from the raw public key into the buffer
2534
gnutls.pubkey_get_key_id(
2536
gnutls.KEYID_USE_SHA256,
2537
ctypes.cast(ctypes.byref(buf),
2538
ctypes.POINTER(ctypes.c_ubyte)),
2539
ctypes.byref(buf_len))
2540
# Deinit the certificate
2541
gnutls.pubkey_deinit(pubkey)
2543
# Convert the buffer to a Python bytestring
2544
key_id = ctypes.string_at(buf, buf_len.value)
2545
# Convert the bytestring to hexadecimal notation
2546
hex_key_id = binascii.hexlify(key_id).upper()
2550
1824
def fingerprint(openpgp):
2551
1825
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2552
1826
# New GnuTLS "datum" with the OpenPGP public key
2553
datum = gnutls.datum_t(
2554
ctypes.cast(ctypes.c_char_p(openpgp),
2555
ctypes.POINTER(ctypes.c_ubyte)),
2556
ctypes.c_uint(len(openpgp)))
1827
datum = (gnutls.library.types
1828
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1831
ctypes.c_uint(len(openpgp))))
2557
1832
# New empty GnuTLS certificate
2558
crt = gnutls.openpgp_crt_t()
2559
gnutls.openpgp_crt_init(ctypes.byref(crt))
1833
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2560
1836
# Import the OpenPGP public key into the certificate
2561
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2562
gnutls.OPENPGP_FMT_RAW)
1837
(gnutls.library.functions
1838
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1839
gnutls.library.constants
1840
.GNUTLS_OPENPGP_FMT_RAW))
2563
1841
# Verify the self signature in the key
2564
1842
crtverify = ctypes.c_uint()
2565
gnutls.openpgp_crt_verify_self(crt, 0,
2566
ctypes.byref(crtverify))
1843
(gnutls.library.functions
1844
.gnutls_openpgp_crt_verify_self(crt, 0,
1845
ctypes.byref(crtverify)))
2567
1846
if crtverify.value != 0:
2568
gnutls.openpgp_crt_deinit(crt)
2569
raise gnutls.CertificateSecurityError(code
1847
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1848
raise (gnutls.errors.CertificateSecurityError
2571
1850
# New buffer for the fingerprint
2572
1851
buf = ctypes.create_string_buffer(20)
2573
1852
buf_len = ctypes.c_size_t()
2574
1853
# Get the fingerprint from the certificate into the buffer
2575
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2576
ctypes.byref(buf_len))
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1856
ctypes.byref(buf_len)))
2577
1857
# Deinit the certificate
2578
gnutls.openpgp_crt_deinit(crt)
1858
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2579
1859
# Convert the buffer to a Python bytestring
2580
1860
fpr = ctypes.string_at(buf, buf_len.value)
2581
1861
# Convert the bytestring to hexadecimal notation
2670
1944
# socket_wrapper(), if socketfd was set.
2671
1945
socketserver.TCPServer.__init__(self, server_address,
2672
1946
RequestHandlerClass)
2674
1948
def server_bind(self):
2675
1949
"""This overrides the normal server_bind() function
2676
1950
to bind to an interface if one was specified, and also NOT to
2677
1951
bind to an address or port if they were not specified."""
2678
global SO_BINDTODEVICE
2679
1952
if self.interface is not None:
2680
1953
if SO_BINDTODEVICE is None:
2681
# Fall back to a hard-coded value which seems to be
2683
log.warning("SO_BINDTODEVICE not found, trying 25")
2684
SO_BINDTODEVICE = 25
2686
self.socket.setsockopt(
2687
socket.SOL_SOCKET, SO_BINDTODEVICE,
2688
(self.interface + "\0").encode("utf-8"))
2689
except socket.error as error:
2690
if error.errno == errno.EPERM:
2691
log.error("No permission to bind to interface %s",
2693
elif error.errno == errno.ENOPROTOOPT:
2694
log.error("SO_BINDTODEVICE not available; cannot"
2695
" bind to interface %s", self.interface)
2696
elif error.errno == errno.ENODEV:
2697
log.error("Interface %s does not exist, cannot"
2698
" bind", self.interface)
1954
logger.error("SO_BINDTODEVICE does not exist;"
1955
" cannot bind to interface %s",
1959
self.socket.setsockopt(socket.SOL_SOCKET,
1961
str(self.interface + '\0'))
1962
except socket.error as error:
1963
if error.errno == errno.EPERM:
1964
logger.error("No permission to bind to"
1965
" interface %s", self.interface)
1966
elif error.errno == errno.ENOPROTOOPT:
1967
logger.error("SO_BINDTODEVICE not available;"
1968
" cannot bind to interface %s",
1970
elif error.errno == errno.ENODEV:
1971
logger.error("Interface %s does not exist,"
1972
" cannot bind", self.interface)
2701
1975
# Only bind(2) the socket if we really need to.
2702
1976
if self.server_address[0] or self.server_address[1]:
2703
if self.server_address[1]:
2704
self.allow_reuse_address = True
2705
1977
if not self.server_address[0]:
2706
1978
if self.address_family == socket.AF_INET6:
2707
any_address = "::" # in6addr_any
1979
any_address = "::" # in6addr_any
2709
any_address = "0.0.0.0" # INADDR_ANY
1981
any_address = socket.INADDR_ANY
2710
1982
self.server_address = (any_address,
2711
1983
self.server_address[1])
2712
1984
elif not self.server_address[1]:
2713
self.server_address = (self.server_address[0], 0)
1985
self.server_address = (self.server_address[0],
2714
1987
# if self.interface:
2715
1988
# self.server_address = (self.server_address[0],
2746
2014
self.gnutls_priority = gnutls_priority
2747
2015
IPv6_TCPServer.__init__(self, server_address,
2748
2016
RequestHandlerClass,
2749
interface=interface,
2017
interface = interface,
2018
use_ipv6 = use_ipv6,
2019
socketfd = socketfd)
2753
2020
def server_activate(self):
2754
2021
if self.enabled:
2755
2022
return socketserver.TCPServer.server_activate(self)
2757
2024
def enable(self):
2758
2025
self.enabled = True
2760
2027
def add_pipe(self, parent_pipe, proc):
2761
2028
# Call "handle_ipc" for both data and EOF events
2763
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2764
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2765
functools.partial(self.handle_ipc,
2766
parent_pipe=parent_pipe,
2769
def handle_ipc(self, source, condition,
2772
client_object=None):
2029
gobject.io_add_watch(parent_pipe.fileno(),
2030
gobject.IO_IN | gobject.IO_HUP,
2031
functools.partial(self.handle_ipc,
2036
def handle_ipc(self, source, condition, parent_pipe=None,
2037
proc = None, client_object=None):
2773
2038
# error, or the other end of multiprocessing.Pipe has closed
2774
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2039
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2775
2040
# Wait for other process to exit
2779
2044
# Read a request from the child
2780
2045
request = parent_pipe.recv()
2781
2046
command = request[0]
2783
if command == "init":
2784
key_id = request[1].decode("ascii")
2785
fpr = request[2].decode("ascii")
2786
address = request[3]
2788
for c in self.clients.values():
2789
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2790
"27AE41E4649B934CA495991B7852B855"):
2792
if key_id and c.key_id == key_id:
2795
if fpr and c.fingerprint == fpr:
2048
if command == 'init':
2050
address = request[2]
2052
for c in self.clients.itervalues():
2053
if c.fingerprint == fpr:
2799
log.info("Client not found for key ID: %s, address:"
2800
" %s", key_id or fpr, address)
2057
logger.info("Client not found for fingerprint: %s, ad"
2058
"dress: %s", fpr, address)
2801
2059
if self.use_dbus:
2802
2060
# Emit D-Bus signal
2803
mandos_dbus_service.ClientNotFound(key_id or fpr,
2061
mandos_dbus_service.ClientNotFound(fpr,
2805
2063
parent_pipe.send(False)
2809
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2810
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2811
functools.partial(self.handle_ipc,
2812
parent_pipe=parent_pipe,
2814
client_object=client))
2066
gobject.io_add_watch(parent_pipe.fileno(),
2067
gobject.IO_IN | gobject.IO_HUP,
2068
functools.partial(self.handle_ipc,
2815
2074
parent_pipe.send(True)
2816
2075
# remove the old hook in favor of the new above hook on
2819
if command == "funcall":
2078
if command == 'funcall':
2820
2079
funcname = request[1]
2821
2080
args = request[2]
2822
2081
kwargs = request[3]
2824
parent_pipe.send(("data", getattr(client_object,
2083
parent_pipe.send(('data', getattr(client_object,
2825
2084
funcname)(*args,
2828
if command == "getattr":
2087
if command == 'getattr':
2829
2088
attrname = request[1]
2830
if isinstance(client_object.__getattribute__(attrname),
2831
collections.abc.Callable):
2832
parent_pipe.send(("function", ))
2089
if callable(client_object.__getattribute__(attrname)):
2090
parent_pipe.send(('function',))
2835
"data", client_object.__getattribute__(attrname)))
2837
if command == "setattr":
2092
parent_pipe.send(('data', client_object
2093
.__getattribute__(attrname)))
2095
if command == 'setattr':
2838
2096
attrname = request[1]
2839
2097
value = request[2]
2840
2098
setattr(client_object, attrname, value)
2845
2103
def rfc3339_duration_to_delta(duration):
2846
2104
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2848
>>> timedelta = datetime.timedelta
2849
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2851
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2853
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2855
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2857
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2859
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2861
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2106
>>> rfc3339_duration_to_delta("P7D")
2107
datetime.timedelta(7)
2108
>>> rfc3339_duration_to_delta("PT60S")
2109
datetime.timedelta(0, 60)
2110
>>> rfc3339_duration_to_delta("PT60M")
2111
datetime.timedelta(0, 3600)
2112
>>> rfc3339_duration_to_delta("PT24H")
2113
datetime.timedelta(1)
2114
>>> rfc3339_duration_to_delta("P1W")
2115
datetime.timedelta(7)
2116
>>> rfc3339_duration_to_delta("PT5M30S")
2117
datetime.timedelta(0, 330)
2118
>>> rfc3339_duration_to_delta("P1DT3M20S")
2119
datetime.timedelta(1, 200)
2866
2122
# Parsing an RFC 3339 duration with regular expressions is not
2867
2123
# possible - there would have to be multiple places for the same
2868
2124
# values, like seconds. The current code, while more esoteric, is
2869
2125
# cleaner without depending on a parsing library. If Python had a
2870
2126
# built-in library for parsing we would use it, but we'd like to
2871
2127
# avoid excessive use of external libraries.
2873
2129
# New type for defining tokens, syntax, and semantics all-in-one
2874
Token = collections.namedtuple("Token", (
2875
"regexp", # To match token; if "value" is not None, must have
2876
# a "group" containing digits
2877
"value", # datetime.timedelta or None
2878
"followers")) # Tokens valid after this token
2130
Token = collections.namedtuple("Token",
2131
("regexp", # To match token; if
2132
# "value" is not None,
2133
# must have a "group"
2135
"value", # datetime.timedelta or
2137
"followers")) # Tokens valid after
2879
2139
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2880
2140
# the "duration" ABNF definition in RFC 3339, Appendix A.
2881
2141
token_end = Token(re.compile(r"$"), None, frozenset())
2882
2142
token_second = Token(re.compile(r"(\d+)S"),
2883
2143
datetime.timedelta(seconds=1),
2884
frozenset((token_end, )))
2144
frozenset((token_end,)))
2885
2145
token_minute = Token(re.compile(r"(\d+)M"),
2886
2146
datetime.timedelta(minutes=1),
2887
2147
frozenset((token_second, token_end)))
3046
2303
parser.add_argument("--no-dbus", action="store_false",
3047
2304
dest="use_dbus", help="Do not provide D-Bus"
3048
" system bus interface", default=None)
2305
" system bus interface")
3049
2306
parser.add_argument("--no-ipv6", action="store_false",
3050
dest="use_ipv6", help="Do not use IPv6",
2307
dest="use_ipv6", help="Do not use IPv6")
3052
2308
parser.add_argument("--no-restore", action="store_false",
3053
2309
dest="restore", help="Do not restore stored"
3054
" state", default=None)
3055
2311
parser.add_argument("--socket", type=int,
3056
2312
help="Specify a file descriptor to a network"
3057
2313
" socket to use instead of creating one")
3058
2314
parser.add_argument("--statedir", metavar="DIR",
3059
2315
help="Directory to save/restore state in")
3060
2316
parser.add_argument("--foreground", action="store_true",
3061
help="Run in foreground", default=None)
3062
parser.add_argument("--no-zeroconf", action="store_false",
3063
dest="zeroconf", help="Do not use Zeroconf",
2317
help="Run in foreground")
3066
2319
options = parser.parse_args()
3068
2326
# Default values for config file for server-global settings
3069
if gnutls.has_rawpk:
3070
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3071
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3073
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3074
":+SIGN-DSA-SHA256")
3075
server_defaults = {"interface": "",
3079
"priority": priority,
3080
"servicename": "Mandos",
3086
"statedir": "/var/lib/mandos",
3087
"foreground": "False",
2327
server_defaults = { "interface": "",
2332
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2333
"servicename": "Mandos",
2339
"statedir": "/var/lib/mandos",
2340
"foreground": "False",
3092
2343
# Parse config file for server-global settings
3093
server_config = configparser.ConfigParser(server_defaults)
2344
server_config = configparser.SafeConfigParser(server_defaults)
3094
2345
del server_defaults
3095
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3096
# Convert the ConfigParser object to a dict
2346
server_config.read(os.path.join(options.configdir,
2348
# Convert the SafeConfigParser object to a dict
3097
2349
server_settings = server_config.defaults()
3098
2350
# Use the appropriate methods on the non-string config options
3099
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3100
"foreground", "zeroconf"):
2351
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3101
2352
server_settings[option] = server_config.getboolean("DEFAULT",
3103
2354
if server_settings["port"]:
3219
log.debug("Did setuid/setgid to %s:%s", uid, gid)
3220
2456
except OSError as error:
3221
log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3222
os.strerror(error.errno))
3223
2457
if error.errno != errno.EPERM:
3227
2461
# Enable all possible GnuTLS debugging
3229
2463
# "Use a log level over 10 to enable all debugging options."
3230
2464
# - GnuTLS manual
3231
gnutls.global_set_log_level(11)
2465
gnutls.library.functions.gnutls_global_set_log_level(11)
2467
@gnutls.library.types.gnutls_log_func
3234
2468
def debug_gnutls(level, string):
3235
log.debug("GnuTLS: %s",
3236
string[:-1].decode("utf-8", errors="replace"))
3238
gnutls.global_set_log_function(debug_gnutls)
2469
logger.debug("GnuTLS: %s", string[:-1])
2471
(gnutls.library.functions
2472
.gnutls_global_set_log_function(debug_gnutls))
3240
2474
# Redirect stdin so all checkers get /dev/null
3241
2475
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3242
2476
os.dup2(null, sys.stdin.fileno())
3246
2480
# Need to fork before connecting to D-Bus
3247
2481
if not foreground:
3248
2482
# Close all input and output, do double fork, etc.
3251
if gi.version_info < (3, 10, 2):
3252
# multiprocessing will use threads, so before we use GLib we
3253
# need to inform GLib that threads will be used.
2485
# multiprocessing will use threads, so before we use gobject we
2486
# need to inform gobject that threads will be used.
2487
gobject.threads_init()
3256
2489
global main_loop
3257
2490
# From the Avahi example code
3258
2491
DBusGMainLoop(set_as_default=True)
3259
main_loop = GLib.MainLoop()
3260
if use_dbus or zeroconf:
3261
bus = dbus.SystemBus()
2492
main_loop = gobject.MainLoop()
2493
bus = dbus.SystemBus()
3262
2494
# End of Avahi example code
3265
2497
bus_name = dbus.service.BusName("se.recompile.Mandos",
3268
old_bus_name = dbus.service.BusName(
3269
"se.bsnet.fukt.Mandos", bus,
3271
except dbus.exceptions.DBusException as e:
3272
log.error("Disabling D-Bus:", exc_info=e)
2498
bus, do_not_queue=True)
2499
old_bus_name = (dbus.service.BusName
2500
("se.bsnet.fukt.Mandos", bus,
2502
except dbus.exceptions.NameExistsException as e:
2503
logger.error("Disabling D-Bus:", exc_info=e)
3273
2504
use_dbus = False
3274
2505
server_settings["use_dbus"] = False
3275
2506
tcp_server.use_dbus = False
3277
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3278
service = AvahiServiceToSyslog(
3279
name=server_settings["servicename"],
3280
servicetype="_mandos._tcp",
3283
if server_settings["interface"]:
3284
service.interface = if_nametoindex(
3285
server_settings["interface"].encode("utf-8"))
2507
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2508
service = AvahiServiceToSyslog(name =
2509
server_settings["servicename"],
2510
servicetype = "_mandos._tcp",
2511
protocol = protocol, bus = bus)
2512
if server_settings["interface"]:
2513
service.interface = (if_nametoindex
2514
(str(server_settings["interface"])))
3287
2516
global multiprocessing_manager
3288
2517
multiprocessing_manager = multiprocessing.Manager()
3290
2519
client_class = Client
3292
client_class = functools.partial(ClientDBus, bus=bus)
2521
client_class = functools.partial(ClientDBus, bus = bus)
3294
2523
client_settings = Client.config_parser(client_config)
3295
2524
old_client_settings = {}
3296
2525
clients_data = {}
3298
# This is used to redirect stdout and stderr for checker processes
3300
wnull = open(os.devnull, "w") # A writable /dev/null
3301
# Only used if server is running in foreground but not in debug
3303
if debug or not foreground:
3306
2527
# Get client data and settings from last running state.
3307
2528
if server_settings["restore"]:
3309
2530
with open(stored_state_path, "rb") as stored_state:
3310
if sys.version_info.major == 2:
3311
clients_data, old_client_settings = pickle.load(
3314
bytes_clients_data, bytes_old_client_settings = (
3315
pickle.load(stored_state, encoding="bytes"))
3316
# Fix bytes to strings
3319
clients_data = {(key.decode("utf-8")
3320
if isinstance(key, bytes)
3323
bytes_clients_data.items()}
3324
del bytes_clients_data
3325
for key in clients_data:
3326
value = {(k.decode("utf-8")
3327
if isinstance(k, bytes) else k): v
3329
clients_data[key].items()}
3330
clients_data[key] = value
3332
value["client_structure"] = [
3334
if isinstance(s, bytes)
3336
value["client_structure"]]
3337
# .name, .host, and .checker_command
3338
for k in ("name", "host", "checker_command"):
3339
if isinstance(value[k], bytes):
3340
value[k] = value[k].decode("utf-8")
3341
if "key_id" not in value:
3342
value["key_id"] = ""
3343
elif "fingerprint" not in value:
3344
value["fingerprint"] = ""
3345
# old_client_settings
3347
old_client_settings = {
3348
(key.decode("utf-8")
3349
if isinstance(key, bytes)
3352
bytes_old_client_settings.items()}
3353
del bytes_old_client_settings
3354
# .host and .checker_command
3355
for value in old_client_settings.values():
3356
for attribute in ("host", "checker_command"):
3357
if isinstance(value[attribute], bytes):
3358
value[attribute] = (value[attribute]
2531
clients_data, old_client_settings = (pickle.load
3360
2533
os.remove(stored_state_path)
3361
2534
except IOError as e:
3362
2535
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
2536
logger.warning("Could not load persistent state: {0}"
2537
.format(os.strerror(e.errno)))
3366
log.critical("Could not load persistent state:",
2539
logger.critical("Could not load persistent state:",
3369
2542
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
2543
logger.warning("Could not load persistent state: "
2544
"EOFError:", exc_info=e)
3373
2546
with PGPEngine() as pgp:
3374
for client_name, client in clients_data.items():
3375
# Skip removed clients
3376
if client_name not in client_settings:
2547
for client_name, client in clients_data.iteritems():
3379
2548
# Decide which value to use after restoring saved state.
3380
2549
# We have three different values: Old config file,
3381
2550
# new config file, and saved state.
3435
2608
for client_name in (set(client_settings)
3436
2609
- set(old_client_settings)):
3437
2610
clients_data[client_name] = client_settings[client_name]
3439
2612
# Create all client objects
3440
for client_name, client in clients_data.items():
2613
for client_name, client in clients_data.iteritems():
3441
2614
tcp_server.clients[client_name] = client_class(
3444
server_settings=server_settings)
2615
name = client_name, settings = client)
3446
2617
if not tcp_server.clients:
3447
log.warning("No clients defined")
2618
logger.warning("No clients defined")
3449
2620
if not foreground:
3450
2621
if pidfile is not None:
3454
print(pid, file=pidfile)
2625
pidfile.write(str(pid) + "\n".encode("utf-8"))
3455
2626
except IOError:
3456
log.error("Could not write to file %r with PID %d",
2627
logger.error("Could not write to file %r with PID %d",
3459
2630
del pidfilename
3461
for termsig in (signal.SIGHUP, signal.SIGTERM):
3462
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3463
lambda: main_loop.quit() and False)
2632
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3467
@alternate_dbus_interfaces(
3468
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3469
class MandosDBusService(DBusObjectWithObjectManager):
2636
@alternate_dbus_interfaces({"se.recompile.Mandos":
2637
"se.bsnet.fukt.Mandos"})
2638
class MandosDBusService(DBusObjectWithProperties):
3470
2639
"""A D-Bus proxy object"""
3472
2640
def __init__(self):
3473
2641
dbus.service.Object.__init__(self, bus, "/")
3475
2642
_interface = "se.recompile.Mandos"
2644
@dbus_interface_annotations(_interface)
2646
return { "org.freedesktop.DBus.Property"
2647
".EmitsChangedSignal":
3477
2650
@dbus.service.signal(_interface, signature="o")
3478
2651
def ClientAdded(self, objpath):
3482
2655
@dbus.service.signal(_interface, signature="ss")
3483
def ClientNotFound(self, key_id, address):
2656
def ClientNotFound(self, fingerprint, address):
3487
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3489
2660
@dbus.service.signal(_interface, signature="os")
3490
2661
def ClientRemoved(self, objpath, name):
3494
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3496
2665
@dbus.service.method(_interface, out_signature="ao")
3497
2666
def GetAllClients(self):
3499
return dbus.Array(c.dbus_object_path for c in
3500
tcp_server.clients.values())
3502
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2668
return dbus.Array(c.dbus_object_path
2670
tcp_server.clients.itervalues())
3504
2672
@dbus.service.method(_interface,
3505
2673
out_signature="a{oa{sv}}")
3506
2674
def GetAllClientsWithProperties(self):
3508
2676
return dbus.Dictionary(
3509
{c.dbus_object_path: c.GetAll(
3510
"se.recompile.Mandos.Client")
3511
for c in tcp_server.clients.values()},
2677
((c.dbus_object_path, c.GetAll(""))
2678
for c in tcp_server.clients.itervalues()),
3512
2679
signature="oa{sv}")
3514
2681
@dbus.service.method(_interface, in_signature="o")
3515
2682
def RemoveClient(self, object_path):
3517
for c in tcp_server.clients.values():
2684
for c in tcp_server.clients.itervalues():
3518
2685
if c.dbus_object_path == object_path:
3519
2686
del tcp_server.clients[c.name]
3520
2687
c.remove_from_connection()
3521
# Don't signal the disabling
2688
# Don't signal anything except ClientRemoved
3522
2689
c.disable(quiet=True)
3523
# Emit D-Bus signal for removal
3524
self.client_removed_signal(c)
2691
self.ClientRemoved(object_path, c.name)
3526
2693
raise KeyError(object_path)
3530
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3531
out_signature="a{oa{sa{sv}}}")
3532
def GetManagedObjects(self):
3534
return dbus.Dictionary(
3535
{client.dbus_object_path:
3537
{interface: client.GetAll(interface)
3539
client._get_all_interface_names()})
3540
for client in tcp_server.clients.values()})
3542
def client_added_signal(self, client):
3543
"""Send the new standard signal and the old signal"""
3545
# New standard signal
3546
self.InterfacesAdded(
3547
client.dbus_object_path,
3549
{interface: client.GetAll(interface)
3551
client._get_all_interface_names()}))
3553
self.ClientAdded(client.dbus_object_path)
3555
def client_removed_signal(self, client):
3556
"""Send the new standard signal and the old signal"""
3558
# New standard signal
3559
self.InterfacesRemoved(
3560
client.dbus_object_path,
3561
client._get_all_interface_names())
3563
self.ClientRemoved(client.dbus_object_path,
3566
2697
mandos_dbus_service = MandosDBusService()
3568
# Save modules to variables to exempt the modules from being
3569
# unloaded before the function registered with atexit() is run.
3570
mp = multiprocessing
3574
2700
"Cleanup function; run on exit"
3578
mp.active_children()
2703
multiprocessing.active_children()
3580
2704
if not (tcp_server.clients or client_settings):
3583
2707
# Store client before exiting. Secrets are encrypted with key
3584
2708
# based on what config file has. If config file is
3585
2709
# removed/edited, old secret will thus be unrecovable.
3587
2711
with PGPEngine() as pgp:
3588
for client in tcp_server.clients.values():
2712
for client in tcp_server.clients.itervalues():
3589
2713
key = client_settings[client.name]["secret"]
3590
2714
client.encrypted_secret = pgp.encrypt(client.secret,
3592
2716
client_dict = {}
3594
2718
# A list of attributes that can not be pickled
3596
exclude = {"bus", "changedstate", "secret",
3597
"checker", "server_settings"}
3598
for name, typ in inspect.getmembers(dbus.service
2720
exclude = set(("bus", "changedstate", "secret",
2722
for name, typ in (inspect.getmembers
2723
(dbus.service.Object)):
3600
2724
exclude.add(name)
3602
2726
client_dict["encrypted_secret"] = (client
3603
2727
.encrypted_secret)
3604
2728
for attr in client.client_structure:
3605
2729
if attr not in exclude:
3606
2730
client_dict[attr] = getattr(client, attr)
3608
2732
clients[client.name] = client_dict
3609
2733
del client_settings[client.name]["secret"]
3612
with tempfile.NamedTemporaryFile(
3616
dir=os.path.dirname(stored_state_path),
3617
delete=False) as stored_state:
3618
pickle.dump((clients, client_settings), stored_state,
3620
tempname = stored_state.name
2736
with (tempfile.NamedTemporaryFile
2737
(mode='wb', suffix=".pickle", prefix='clients-',
2738
dir=os.path.dirname(stored_state_path),
2739
delete=False)) as stored_state:
2740
pickle.dump((clients, client_settings), stored_state)
2741
tempname=stored_state.name
3621
2742
os.rename(tempname, stored_state_path)
3622
2743
except (IOError, OSError) as e:
3626
2747
except NameError:
3628
2749
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3629
log.warning("Could not save persistent state: %s",
3630
os.strerror(e.errno))
2750
logger.warning("Could not save persistent state: {0}"
2751
.format(os.strerror(e.errno)))
3632
log.warning("Could not save persistent state:",
2753
logger.warning("Could not save persistent state:",
3636
2757
# Delete all clients, and settings from config
3637
2758
while tcp_server.clients:
3638
2759
name, client = tcp_server.clients.popitem()
3640
2761
client.remove_from_connection()
3641
# Don't signal the disabling
2762
# Don't signal anything except ClientRemoved
3642
2763
client.disable(quiet=True)
3643
# Emit D-Bus signal for removal
3645
mandos_dbus_service.client_removed_signal(client)
2766
mandos_dbus_service.ClientRemoved(client
3646
2769
client_settings.clear()
3648
2771
atexit.register(cleanup)
3650
for client in tcp_server.clients.values():
2773
for client in tcp_server.clients.itervalues():
3652
# Emit D-Bus signal for adding
3653
mandos_dbus_service.client_added_signal(client)
2776
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3654
2777
# Need to initiate checking of clients
3655
2778
if client.enabled:
3656
client.init_checker(randomize_start=True)
2779
client.init_checker()
3658
2781
tcp_server.enable()
3659
2782
tcp_server.server_activate()
3661
2784
# Find out what port we got
3663
service.port = tcp_server.socket.getsockname()[1]
2785
service.port = tcp_server.socket.getsockname()[1]
3665
log.info("Now listening on address %r, port %d, flowinfo %d,"
3666
" scope_id %d", *tcp_server.socket.getsockname())
2787
logger.info("Now listening on address %r, port %d,"
2788
" flowinfo %d, scope_id %d",
2789
*tcp_server.socket.getsockname())
3668
log.info("Now listening on address %r, port %d",
3669
*tcp_server.socket.getsockname())
3671
# service.interface = tcp_server.socket.getsockname()[3]
2791
logger.info("Now listening on address %r, port %d",
2792
*tcp_server.socket.getsockname())
2794
#service.interface = tcp_server.socket.getsockname()[3]
3675
# From the Avahi example code
3678
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3682
# End of Avahi example code
3685
GLib.IOChannel.unix_new(tcp_server.fileno()),
3686
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3687
lambda *args, **kwargs: (tcp_server.handle_request
3688
(*args[2:], **kwargs) or True))
3690
log.debug("Starting main loop")
2797
# From the Avahi example code
2800
except dbus.exceptions.DBusException as error:
2801
logger.critical("D-Bus Exception", exc_info=error)
2804
# End of Avahi example code
2806
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2807
lambda *args, **kwargs:
2808
(tcp_server.handle_request
2809
(*args[2:], **kwargs) or True))
2811
logger.debug("Starting main loop")
3691
2812
main_loop.run()
3692
2813
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
2814
logger.critical("Avahi Error", exc_info=error)
3696
2817
except KeyboardInterrupt:
3698
2819
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
2820
logger.debug("Server received KeyboardInterrupt")
2821
logger.debug("Server exiting")
3701
2822
# Must run before the D-Bus bus name gets deregistered
3705
def parse_test_args():
3706
# type: () -> argparse.Namespace
3707
parser = argparse.ArgumentParser(add_help=False)
3708
parser.add_argument("--check", action="store_true")
3709
parser.add_argument("--prefix", )
3710
args, unknown_args = parser.parse_known_args()
3712
# Remove test options from sys.argv
3713
sys.argv[1:] = unknown_args
3716
# Add all tests from doctest strings
3717
def load_tests(loader, tests, none):
3719
tests.addTests(doctest.DocTestSuite())
3722
if __name__ == "__main__":
3723
options = parse_test_args()
3726
extra_test_prefix = options.prefix
3727
if extra_test_prefix is not None:
3728
if not (unittest.main(argv=[""], exit=False)
3729
.result.wasSuccessful()):
3731
class ExtraTestLoader(unittest.TestLoader):
3732
testMethodPrefix = extra_test_prefix
3733
# Call using ./scriptname --test [--verbose]
3734
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3736
unittest.main(argv=[""])
3744
# (lambda (&optional extra)
3745
# (if (not (funcall run-tests-in-test-buffer default-directory
3747
# (funcall show-test-buffer-in-test-window)
3748
# (funcall remove-test-window)
3749
# (if extra (message "Extra tests run successfully!"))))
3750
# run-tests-in-test-buffer:
3751
# (lambda (dir &optional extra)
3752
# (with-current-buffer (get-buffer-create "*Test*")
3753
# (setq buffer-read-only nil
3754
# default-directory dir)
3756
# (compilation-mode))
3757
# (let ((process-result
3758
# (let ((inhibit-read-only t))
3759
# (process-file-shell-command
3760
# (funcall get-command-line extra) nil "*Test*"))))
3761
# (and (numberp process-result)
3762
# (= process-result 0))))
3764
# (lambda (&optional extra)
3765
# (let ((quoted-script
3766
# (shell-quote-argument (funcall get-script-name))))
3768
# (concat "%s --check" (if extra " --prefix=atest" ""))
3772
# (if (fboundp 'file-local-name)
3773
# (file-local-name (buffer-file-name))
3774
# (or (file-remote-p (buffer-file-name) 'localname)
3775
# (buffer-file-name))))
3776
# remove-test-window:
3778
# (let ((test-window (get-buffer-window "*Test*")))
3779
# (if test-window (delete-window test-window))))
3780
# show-test-buffer-in-test-window:
3782
# (when (not (get-buffer-window-list "*Test*"))
3783
# (setq next-error-last-buffer (get-buffer "*Test*"))
3784
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3785
# (display-buffer-overriding-action
3786
# `((display-buffer-in-side-window) (side . ,side)
3787
# (window-height . fit-window-to-buffer)
3788
# (window-width . fit-window-to-buffer))))
3789
# (display-buffer "*Test*"))))
3792
# (let* ((run-extra-tests (lambda () (interactive)
3793
# (funcall run-tests t)))
3794
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3795
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3796
# (setq minor-mode-overriding-map-alist
3797
# (cons `(run-tests . ,outer-keymap)
3798
# minor-mode-overriding-map-alist)))
3799
# (add-hook 'after-save-hook run-tests 90 t))
2825
if __name__ == '__main__':